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

5 files changed, 13 insertions, 13 deletions

diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index fec6dc693..f2b7cc1b4 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -120,7 +120,7 @@ void AppletTab::load( bool useDefaults )
 
   list_group->setEnabled(trusted_rb->isChecked());
 
-  TQStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop");
+  TQStringList list = TDEGlobal::dirs()->findAllResources("applets", "*.desktop");
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
     {
       TQFileInfo fi(*it);
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 24c640a1d..b2e6a79dc 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -319,7 +319,7 @@ void LookAndFeelTab::fillTileCombos()
   m_tilename.clear();
   m_tilename << "" << "Colorize";
 
-  TQStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
+  TQStringList list = TDEGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
   int minHeight = 0;
 
   for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it)
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 8bf4646df..5fa5ceb06 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -100,7 +100,7 @@ void KickerConfig::init()
     }
 
     TQString configname = configName();
-    TQString configpath = KGlobal::dirs()->findResource("config", configname);
+    TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
     if (configpath.isEmpty())
        configpath = locateLocal("config", configname);
     KSharedConfig::Ptr config = KSharedConfig::openConfig(configname);
@@ -195,9 +195,9 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
         // set config group
         config.setGroup(group);
 
-        TQString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
+        TQString df = TDEGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
         TQString configname = config.readEntry("ConfigFile");
-        TQString configpath = KGlobal::dirs()->findResource("config", configname);
+        TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
 
         if (checkExists)
         {
@@ -383,14 +383,14 @@ extern "C"
 
     KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
     {
-        KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+        TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new PositionConfig(parent, "kcmkicker");
     }
 
     KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
     {
-        KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+        TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new HidingConfig(parent, "kcmkicker");
     }
@@ -403,9 +403,9 @@ extern "C"
     KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
     {
         KImageIO::registerFormats();
-        KGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
+        TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
                 "kicker/tiles");
-        KGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
+        TDEGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
                 "kcmkicker/pics");
         return new LookAndFeelConfig(parent, "kcmkicker");
     }
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 8380efbdd..5b08627cb 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -84,7 +84,7 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
     connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
 
-    KIconLoader * ldr = KGlobal::iconLoader();
+    KIconLoader * ldr = TDEGlobal::iconLoader();
     TQPixmap kmenu_icon;
     m_kmenu_icon = KickerSettings::customKMenuIcon();
     if (m_kmenu_icon.isNull() == true) {
@@ -136,7 +136,7 @@ void MenuTab::load( bool useDefaults )
     TQStringList ext_default;
     ext_default << "prefmenu.desktop" << "systemmenu.desktop";
     TQStringList ext = c->readListEntry("Extensions", ext_default);
-    TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext");
+    TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/menuext");
     kSubMenuItem* menuItem(0);
     for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit)
     {
@@ -312,7 +312,7 @@ void MenuTab::launchIconEditor()
         return;
 
     m_kmenu_icon = newIcon;
-    KIconLoader * ldr = KGlobal::iconLoader();
+    KIconLoader * ldr = TDEGlobal::iconLoader();
     TQPixmap kmenu_icon;
     kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 5e90a9c54..8c02821b9 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -689,7 +689,7 @@ void PositionTab::showIdentify()
 
         TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM) );
 
-        TQFont identifyFont(KGlobalSettings::generalFont());
+        TQFont identifyFont(TDEGlobalSettings::generalFont());
         identifyFont.setPixelSize(100);
         screenLabel->setFont(identifyFont);