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

---
 kontact/src/aboutdialog.cpp    | 8 ++++----
 kontact/src/iconsidepane.cpp   | 2 +-
 kontact/src/main.cpp           | 2 +-
 kontact/src/mainwindow.cpp     | 6 +++---
 kontact/src/profilemanager.cpp | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kontact/src')

diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index ae0d0965..db40083a 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -46,7 +46,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name )
     mCore( core )
 {
   addAboutData( i18n( "Kontact Container" ), TQString( "kontact" ),
-                KGlobal::instance()->aboutData() );
+                TDEGlobal::instance()->aboutData() );
 
   TQValueList<Plugin*> plugins = mCore->pluginList();
   TQValueList<Plugin*>::ConstIterator end = plugins.end();
@@ -54,7 +54,7 @@ AboutDialog::AboutDialog( Kontact::Core *core, const char *name )
   for ( ; it != end; ++it )
     addAboutPlugin( *it );
 
-  addLicenseText( KGlobal::instance()->aboutData() );
+  addLicenseText( TDEGlobal::instance()->aboutData() );
 }
 
 void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin )
@@ -65,7 +65,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin )
 void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
                                 const TDEAboutData *about )
 {
-  TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon,
+  TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( icon,
                                                     KIcon::Desktop, 48 );
 
   TQFrame *topFrame = addPage( title, TQString(), pixmap );
@@ -160,7 +160,7 @@ void AboutDialog::addLicenseText( const TDEAboutData *about )
   if ( !about || about->license().isEmpty() )
     return;
 
-  TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature",
+  TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( "signature",
                                                     KIcon::Desktop, 48 );
 
   TQString title = i18n( "%1 License" ).arg( about->programName() );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index a6490766..2fef3e0b 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -111,7 +111,7 @@ void EntryItem::reloadPixmap()
 {
   int size = (int)navigator()->viewMode();
   if ( size != 0 )
-    mPixmap = KGlobal::iconLoader()->loadIcon( mPlugin->icon(),
+    mPixmap = TDEGlobal::iconLoader()->loadIcon( mPlugin->icon(),
                                                KIcon::Desktop, size,
                                                mPlugin->disabled() ?
                                                  KIcon::DisabledState
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 0fa50b21..71fb5e1b 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -53,7 +53,7 @@ class KontactApp : public KUniqueApplication {
   public:
     KontactApp() : mMainWindow( 0 ), mSessionRestored( false )
     {
-      KGlobal::iconLoader()->addAppDir( "tdepim" );
+      TDEGlobal::iconLoader()->addAppDir( "tdepim" );
     }
     ~KontactApp() {}
 
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 307f1c4b..5ac040f7 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -1050,7 +1050,7 @@ void MainWindow::configureShortcuts()
 
 void MainWindow::configureToolbars()
 {
-  saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+  saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
 
   KEditToolbar edit( factory() );
   connect( &edit, TQT_SIGNAL( newToolbarConfig() ),
@@ -1064,7 +1064,7 @@ void MainWindow::slotNewToolbarConfig()
     createGUI( mCurrentPlugin->part() );
   }
   if ( mCurrentPlugin ) {
-    applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+    applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
   }
   updateShortcuts(); // for the plugActionList call
 }
@@ -1160,7 +1160,7 @@ void MainWindow::slotShowStatusMsg( const TQString &msg )
 
 TQString MainWindow::introductionString()
 {
-  KIconLoader *iconloader = KGlobal::iconLoader();
+  KIconLoader *iconloader = TDEGlobal::iconLoader();
   int iconSize = iconloader->currentSize( KIcon::Desktop );
 
   TQString handbook_icon_path = iconloader->iconPath( "contents2",  KIcon::Desktop );
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index d929bcb3..c64cbf97 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 void Kontact::ProfileManager::readConfig()
 {
     
-    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
+    const TQStringList profilePaths = TDEGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
 
     typedef TQMap<TQString, Kontact::Profile> ProfileMap;
     ProfileMap profiles;
-- 
cgit v1.2.3