Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

26 files changed, 49 insertions, 49 deletions

diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 7102c8be..3a6af941 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -60,8 +60,8 @@ extern "C"
 {
   void *init_kcal_kabc()
   {
-	  KGlobal::locale()->insertCatalogue( "kres_birthday" );
-    KGlobal::locale()->insertCatalogue( "libkcal" );
+	  TDEGlobal::locale()->insertCatalogue( "kres_birthday" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
     return new KRES::PluginFactory<ResourceKABC,ResourceKABCConfig>();
   }
 }
diff --git a/kresources/blogging/kcal_resourceblogging_plugin.cpp b/kresources/blogging/kcal_resourceblogging_plugin.cpp
index b3eaf937..4cc3dd8c 100644
--- a/kresources/blogging/kcal_resourceblogging_plugin.cpp
+++ b/kresources/blogging/kcal_resourceblogging_plugin.cpp
@@ -34,8 +34,8 @@ extern "C"
 {
   void *init_kcal_blogging()
   {
-    KGlobal::locale()->insertCatalogue( "tdepimresources" );
-    KGlobal::locale()->insertCatalogue( "kres_blogging" );
+    TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
+    TDEGlobal::locale()->insertCatalogue( "kres_blogging" );
     return new BloggingFactory;
   }
 }
diff --git a/kresources/caldav/export.h b/kresources/caldav/export.h
index e747b58a..2e22c557 100644
--- a/kresources/caldav/export.h
+++ b/kresources/caldav/export.h
@@ -39,7 +39,7 @@
 #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \
   typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
   class Factory : public FactoryBase { \
-    public: Factory() { KGlobal::locale()->insertCatalogue(catalog); } \
+    public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \
   }; \
   K_EXPORT_PLUGIN( Factory )
 
@@ -48,8 +48,8 @@
 #define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \
   typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
   class Factory : public FactoryBase { \
-    public: Factory() { KGlobal::locale()->insertCatalogue(catalog1); \
-      KGlobal::locale()->insertCatalogue(catalog2); } \
+    public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \
+      TDEGlobal::locale()->insertCatalogue(catalog2); } \
   }; \
   K_EXPORT_PLUGIN( Factory )
 
diff --git a/kresources/caldav/plugin.cpp b/kresources/caldav/plugin.cpp
index ffccf678..9ce6d60f 100644
--- a/kresources/caldav/plugin.cpp
+++ b/kresources/caldav/plugin.cpp
@@ -40,8 +40,8 @@ extern "C"
 {
   void *init_kcal_caldav()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_caldav" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_caldav" );
     return new CalDavFactory;
   }
 }
diff --git a/kresources/carddav/export.h b/kresources/carddav/export.h
index e747b58a..2e22c557 100644
--- a/kresources/carddav/export.h
+++ b/kresources/carddav/export.h
@@ -39,7 +39,7 @@
 #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \
   typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
   class Factory : public FactoryBase { \
-    public: Factory() { KGlobal::locale()->insertCatalogue(catalog); } \
+    public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \
   }; \
   K_EXPORT_PLUGIN( Factory )
 
@@ -48,8 +48,8 @@
 #define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \
   typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
   class Factory : public FactoryBase { \
-    public: Factory() { KGlobal::locale()->insertCatalogue(catalog1); \
-      KGlobal::locale()->insertCatalogue(catalog2); } \
+    public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \
+      TDEGlobal::locale()->insertCatalogue(catalog2); } \
   }; \
   K_EXPORT_PLUGIN( Factory )
 
diff --git a/kresources/carddav/plugin.cpp b/kresources/carddav/plugin.cpp
index 8d51e53b..d0c4724f 100644
--- a/kresources/carddav/plugin.cpp
+++ b/kresources/carddav/plugin.cpp
@@ -38,8 +38,8 @@ extern "C"
 {
   void *init_kabc_carddav()
   {
-    KGlobal::locale()->insertCatalogue( "tdepimresources" );
-    KGlobal::locale()->insertCatalogue( "kres_caldav" );
+    TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
+    TDEGlobal::locale()->insertCatalogue( "kres_caldav" );
     return new CardDavFactory;
   }
 }
diff --git a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp
index 68918f8c..c4c0cc6c 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp
@@ -34,7 +34,7 @@ extern "C"
 {
   void *init_kabc_xmlrpc()
   {
-    KGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
+    TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
     return new XMLRPCFactory;
   }
 }
diff --git a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp
index a22e55a0..021389b6 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp
@@ -34,7 +34,7 @@ extern "C"
 {
   void *init_kcal_xmlrpc()
   {
-    KGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
+    TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
     return new XMLRPCFactory;
   }
 }
diff --git a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp
index db8cfdc4..276cb6b0 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp
@@ -34,7 +34,7 @@ extern "C"
 {
   void *init_knotes_xmlrpc()
   {
-    KGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
+    TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
     return new XMLRPCFactory;
   }
 }
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index 9aace416..eb90b8c4 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -60,7 +60,7 @@ extern "C"
 {
   void* init_resourcecalendarexchange()
   {
-    KGlobal::locale()->insertCatalogue( "kres_exchange" );
+    TDEGlobal::locale()->insertCatalogue( "kres_exchange" );
     return new ExchangeFactory;
   }
 }
diff --git a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp
index 8f384ac9..ae2759e4 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp
@@ -34,7 +34,7 @@ extern "C"
 {
   void* init_kcal_resourcefeatureplan()
   {
-    KGlobal::locale()->insertCatalogue( "kres_featureplan" );
+    TDEGlobal::locale()->insertCatalogue( "kres_featureplan" );
     return new FeatureplanFactory;
   }
 }
diff --git a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp
index 63614979..d487889f 100644
--- a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp
+++ b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp
@@ -35,8 +35,8 @@ extern "C"
 {
   void *init_kabc_groupdav()
   {
-    KGlobal::locale()->insertCatalogue( "tdepimresources" );
-    KGlobal::locale()->insertCatalogue( "kres_groupdav" );
+    TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
+    TDEGlobal::locale()->insertCatalogue( "kres_groupdav" );
     return new GroupDavFactory;
   }
 }
diff --git a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp
index 10b751a3..f06e5d24 100644
--- a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp
+++ b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp
@@ -36,8 +36,8 @@ extern "C"
 {
   void *init_kcal_groupdav()
   {
-    KGlobal::locale()->insertCatalogue( "tdepimresources" );
-    KGlobal::locale()->insertCatalogue( "kres_groupdav" );
+    TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
+    TDEGlobal::locale()->insertCatalogue( "kres_groupdav" );
     return new GroupDavFactory;
   }
 }
diff --git a/kresources/groupware/kabc_resourcegroupware_plugin.cpp b/kresources/groupware/kabc_resourcegroupware_plugin.cpp
index 38b156fd..c7266b18 100644
--- a/kresources/groupware/kabc_resourcegroupware_plugin.cpp
+++ b/kresources/groupware/kabc_resourcegroupware_plugin.cpp
@@ -32,8 +32,8 @@ extern "C"
 {
   void *init_kabc_groupware()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_groupware" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_groupware" );
     return new ResourceGroupware;
   }
 }
diff --git a/kresources/groupware/kcal_resourcegroupware_plugin.cpp b/kresources/groupware/kcal_resourcegroupware_plugin.cpp
index bfa4f9f6..992a95d5 100644
--- a/kresources/groupware/kcal_resourcegroupware_plugin.cpp
+++ b/kresources/groupware/kcal_resourcegroupware_plugin.cpp
@@ -33,8 +33,8 @@ extern "C"
 {
   void *init_kcal_groupware()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_groupware" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_groupware" );
     return new ResourceGroupware;
   }
 }
diff --git a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp
index bacd1a7b..3f973bc5 100644
--- a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp
@@ -33,8 +33,8 @@ extern "C"
 {
   void *init_kabc_groupwise()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_groupwise" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_groupwise" );
     return new GroupwiseFactory;
   }
 }
diff --git a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp
index 8cce68e7..1c1df762 100644
--- a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp
@@ -33,8 +33,8 @@ extern "C"
 {
   void *init_kcal_groupwise()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_groupwise" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_groupwise" );
     return new GroupwiseFactory;
   }
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index d88c2125..c6f1f425 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -52,8 +52,8 @@ static unsigned int uniquifier = 0;
 ResourceKolabBase::ResourceKolabBase( const TQCString& objId )
   : mSilent( false )
 {
-  KGlobal::locale()->insertCatalogue( "kres_kolab" );
-  KGlobal::locale()->insertCatalogue( "libkcal" );
+  TDEGlobal::locale()->insertCatalogue( "kres_kolab" );
+  TDEGlobal::locale()->insertCatalogue( "libkcal" );
   TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ );
   mConnection = new KMailConnection( this, uniqueObjId.utf8() );
 }
diff --git a/kresources/remote/resourceremote_plugin.cpp b/kresources/remote/resourceremote_plugin.cpp
index 85e6363e..67eaa92f 100644
--- a/kresources/remote/resourceremote_plugin.cpp
+++ b/kresources/remote/resourceremote_plugin.cpp
@@ -34,8 +34,8 @@ extern "C"
 {
   void *init_kcal_remote()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_remote" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_remote" );
     return new RemoteFactory;
   }
 }
diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp
index b317d90d..6b9192a3 100644
--- a/kresources/scalix/scalixadmin/main.cpp
+++ b/kresources/scalix/scalixadmin/main.cpp
@@ -42,7 +42,7 @@ int main( int argc, char **argv )
 
   TDEApplication app;
 
-  KGlobal::locale()->insertCatalogue( "scalixadmin" );
+  TDEGlobal::locale()->insertCatalogue( "scalixadmin" );
 
   MainWindow *window = new MainWindow;
   window->show();
diff --git a/kresources/scalix/scalixadmin/mainwindow.cpp b/kresources/scalix/scalixadmin/mainwindow.cpp
index 4f3dbf94..04e396d7 100644
--- a/kresources/scalix/scalixadmin/mainwindow.cpp
+++ b/kresources/scalix/scalixadmin/mainwindow.cpp
@@ -37,19 +37,19 @@ MainWindow::MainWindow()
 {
   KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList );
 
-  TQPixmap icon = KGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop );
+  TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop );
   TQVBox *page = wdg->addVBoxPage( i18n( "Other Accounts" ), i18n( "Register other accounts" ), icon );
   new OtherUserPage( page );
 
-  icon = KGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop );
+  icon = TDEGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop );
   page = wdg->addVBoxPage( i18n( "Delegates" ), i18n( "Setup delegates for my account" ), icon );
   new DelegatePage( page );
 
-  icon = KGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop );
+  icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop );
   page = wdg->addVBoxPage( i18n( "Out of Office..." ), i18n( "Setup Out of Office Message" ), icon );
   new OutOfOfficePage( page );
 
-  icon = KGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop );
+  icon = TDEGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop );
   page = wdg->addVBoxPage( i18n( "Password" ), i18n( "Change the password" ), icon );
   new PasswordPage( page );
 
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9c7ee11..de1aa915 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -51,8 +51,8 @@ static unsigned int uniquifier = 0;
 ResourceScalixBase::ResourceScalixBase( const TQCString& objId )
   : mSilent( false )
 {
-  KGlobal::locale()->insertCatalogue( "kres_scalix" );
-  KGlobal::locale()->insertCatalogue( "libkcal" );
+  TDEGlobal::locale()->insertCatalogue( "kres_scalix" );
+  TDEGlobal::locale()->insertCatalogue( "libkcal" );
   TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ );
   mConnection = new KMailConnection( this, uniqueObjId.utf8() );
 }
diff --git a/kresources/slox/kabcresourceslox_plugin.cpp b/kresources/slox/kabcresourceslox_plugin.cpp
index f570cff9..cbc02f25 100644
--- a/kresources/slox/kabcresourceslox_plugin.cpp
+++ b/kresources/slox/kabcresourceslox_plugin.cpp
@@ -32,8 +32,8 @@ extern "C"
 {
   void *init_kabc_slox()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kabc_slox" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kabc_slox" );
     return new SloxFactory;
   }
 }
diff --git a/kresources/slox/kcalresourceslox_plugin.cpp b/kresources/slox/kcalresourceslox_plugin.cpp
index e141892d..8a5cf690 100644
--- a/kresources/slox/kcalresourceslox_plugin.cpp
+++ b/kresources/slox/kcalresourceslox_plugin.cpp
@@ -33,8 +33,8 @@ extern "C"
 {
   void *init_kcal_slox()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kabc_slox" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kabc_slox" );
     return new SLOXFactory;
   }
 }
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index 4f17ea89..4d21c230 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -82,7 +82,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
   }
   folder->item->setText( 0, folder->name() );
   folder->item->setText( 1, folder->id() );
-  KGlobal::instance()->iconLoader()->addAppDir( "kmail" );
+  TDEGlobal::instance()->iconLoader()->addAppDir( "kmail" );
   switch ( folder->type() ) {
     case Calendar:
       folder->item->setPixmap( 0, SmallIcon( "kmgroupware_folder_calendar" ) );
diff --git a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp
index 481a62b5..9ff0ae75 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp
@@ -33,8 +33,8 @@ extern "C"
 {
   void *init_kcal_tvanytime()
   {
-    KGlobal::locale()->insertCatalogue( "libkcal" );
-    KGlobal::locale()->insertCatalogue( "kres_tvanytime" );
+    TDEGlobal::locale()->insertCatalogue( "libkcal" );
+    TDEGlobal::locale()->insertCatalogue( "kres_tvanytime" );
     return new TVAnytimeFactory;
   }
 }