From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kinit/kinit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kinit/kinit.cpp') diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 478331fd8..9bc6b7b1b 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -113,7 +113,7 @@ static Display *X11display = 0; static int X11_startup_notify_fd = -1; static Display *X11_startup_notify_display = 0; #endif -static const KInstance *s_instance = 0; +static const TDEInstance *s_instance = 0; #define MAX_SOCK_FILE 255 static char sock_file[MAX_SOCK_FILE]; static char sock_file_old[MAX_SOCK_FILE]; @@ -1752,14 +1752,14 @@ int main(int argc, char **argv, char **envp) setsid(); /** Create our instance **/ - s_instance = new KInstance("tdeinit"); + s_instance = new TDEInstance("tdeinit"); /** Prepare to change process name **/ tdeinit_initsetproctitle(argc, argv, envp); tdeinit_library_path(); // Don't make our instance the global instance // (do it only after tdeinit_library_path, that one indirectly uses KConfig, - // which seems to be buggy and always use KGlobal instead of the maching KInstance) + // which seems to be buggy and always use KGlobal instead of the maching TDEInstance) KGlobal::_instance = 0L; // don't change envvars before tdeinit_initsetproctitle() unsetenv("LD_BIND_NOW"); -- cgit v1.2.1