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

---
 kcontrol/konsole/schemaeditor.cpp  |  8 ++++----
 kcontrol/konsole/sessioneditor.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kcontrol/konsole')

diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index e870aff33..f712c8c0d 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -93,7 +93,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
     transparencyCheck->setChecked(false);
 
 
-    KGlobal::locale()->insertCatalogue("konsole"); // For schema translations
+    TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations
     connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect()));
     connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
     connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
@@ -228,7 +228,7 @@ void SchemaEditor::show()
 
 void SchemaEditor::loadAllSchema(TQString currentFile)
 {
-    TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema");
+    TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema");
     TQStringList::ConstIterator it;
     disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
     schemaList->clear();
@@ -263,7 +263,7 @@ void SchemaEditor::imageSelect()
     start = backgndLine->text();
     if (start.isEmpty())
     {
-        TQStringList list=KGlobal::dirs()->resourceDirs("wallpaper");
+        TQStringList list=TDEGlobal::dirs()->resourceDirs("wallpaper");
         if(list.count()>0)
             start= list.last();
     }
@@ -361,7 +361,7 @@ void SchemaEditor::saveCurrent()
     }
 
     if (fullpath[0] != '/')
-        fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
+        fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
 
     TQFile f(fullpath);
     if (f.open(IO_WriteOnly)) {
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index e93084af1..c9a767cac 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -56,8 +56,8 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name)
   oldSession=-1;
   loaded=false;
 
-  KGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
-  KGlobal::iconLoader()->addAppDir( "konsole" );
+  TDEGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
+  TDEGlobal::iconLoader()->addAppDir( "konsole" );
 
   directoryLine->setMode(KFile::Directory);
   connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
@@ -97,7 +97,7 @@ void SessionEditor::show()
 
 void SessionEditor::loadAllKeytab()
 {
-  TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+  TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
   keytabCombo->clear();
   keytabFilename.clear();
 
@@ -159,7 +159,7 @@ TQString SessionEditor::readKeymapTitle(const TQString & file)
 
 void SessionEditor::loadAllSession(TQString currentFile)
 {
-  TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
+  TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
   sessionList->clear();
 
   TQListBoxItem* currentItem = 0;
@@ -296,7 +296,7 @@ void SessionEditor::saveCurrent()
       exec = exec.mid( 7, exec.length() - 8 );
     exec = KRun::binaryName( exec, false );
     exec = KShell::tildeExpand( exec );
-    TQString pexec = KGlobal::dirs()->findExe( exec );
+    TQString pexec = TDEGlobal::dirs()->findExe( exec );
 
     if ( pexec.isEmpty() )
     {
@@ -326,7 +326,7 @@ void SessionEditor::saveCurrent()
   }
 
   if (fullpath[0] != '/')
-    fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
+    fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
 
   KSimpleConfig* co = new KSimpleConfig(fullpath);
   co->setDesktopGroup();
-- 
cgit v1.2.1