From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:22 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kinit/autostart.cpp        | 10 +++++-----
 kinit/kdostartupconfig.cpp |  2 +-
 kinit/kinit.cpp            |  4 ++--
 kinit/klauncher.cpp        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kinit')

diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index c7feb1752..4e8b6c784 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -49,14 +49,14 @@ AutoStart::AutoStart( bool new_startup )
 {
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
-  KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  TDEGlobal::dirs()->addResourceType("autostart", "share/autostart");
   TQString xdgdirs = getenv("XDG_CONFIG_DIRS");
   if (xdgdirs.isEmpty())
         xdgdirs = "/etc/xdg";
 
   TQStringList xdgdirslist = TQStringList::split( ':', xdgdirs );
   for ( TQStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) {
-	KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart");
+	TDEGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart");
   }
 }
 
@@ -114,8 +114,8 @@ static bool startCondition(const TQString &condition)
 void
 AutoStart::loadAutoStartList()
 {
-   TQStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true);
-   TQStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
+   TQStringList files = TDEGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true);
+   TQStringList kdefiles = TDEGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
    files += kdefiles;
    
    for(TQStringList::ConstIterator it = files.begin();
@@ -143,7 +143,7 @@ AutoStart::loadAutoStartList()
            localit != files.end();
            ++localit)
        {
-           if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) {
+           if (((*localit).startsWith(TDEGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(TDEGlobal::dirs()->localtdedir()) == true)) {
                // Same local file name?
                TQString localOuter;
                TQString localInner;
diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp
index 650a3e129..470e7faba 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/kdostartupconfig.cpp
@@ -126,7 +126,7 @@ int main()
             }
         startupconfigfiles << line << endl;
         // use even currently non-existing paths in $TDEDIRS
-        TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes());
+        TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, TDEGlobal::dirs()->kfsstnd_prefixes());
         for( TQStringList::ConstIterator it = dirs.begin();
              it != dirs.end();
              ++it )
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 9bc6b7b1b..d7e7c7e1c 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -1759,8 +1759,8 @@ int main(int argc, char **argv, char **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 TDEInstance)
-   KGlobal::_instance = 0L;
+   // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance)
+   TDEGlobal::_instance = 0L;
    // don't change envvars before tdeinit_initsetproctitle()
    unsetenv("LD_BIND_NOW");
    unsetenv("DYLD_BIND_AT_LAUNCH");
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 15a0882fe..3f5510ea0 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -396,7 +396,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
    }
    else if (fun == "reparseConfiguration()")
    {
-      KGlobal::config()->reparseConfiguration();
+      TDEGlobal::config()->reparseConfiguration();
       kdDebug(7016) << "KLauncher::process : reparseConfiguration" << endl;
       KProtocolManager::reparseConfiguration();
       IdleSlave *slave;
-- 
cgit v1.2.1