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

3 files changed, 17 insertions, 17 deletions

diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 8cd96a01b..aebf467a0 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -54,7 +54,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile )
     //kdDebug() << m_dom.toString( 2 ) << endl;
 
     setName( TQFileInfo( file ).baseName() );
-    m_kgd = KGlobal::dirs();
+    m_kgd = TDEGlobal::dirs();
 }
 
 KTheme::KTheme( TQWidget *parent, bool create )
@@ -72,7 +72,7 @@ KTheme::KTheme( TQWidget *parent, bool create )
         m_root.appendChild( m_general );
     }
 
-    m_kgd = KGlobal::dirs();
+    m_kgd = TDEGlobal::dirs();
 }
 
 KTheme::~KTheme()
@@ -125,7 +125,7 @@ TQString KTheme::createYourself( bool pack )
     // 1. General stuff set by methods setBlah()
 
     // 2. Background theme
-    KConfig * globalConf = KGlobal::config();
+    KConfig * globalConf = TDEGlobal::config();
 
     KConfig twinConf( "twinrc", true );
     twinConf.setGroup( "Desktops" );
@@ -448,7 +448,7 @@ void KTheme::apply()
     TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement();
     if ( !iconElem.isNull() )
     {
-        KConfig * iconConf = KGlobal::config();
+        KConfig * iconConf = TDEGlobal::config();
         iconConf->setGroup( "Icons" );
         iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true );
 
@@ -526,7 +526,7 @@ void KTheme::apply()
     if ( !colorsElem.isNull() )
     {
         TQDomNodeList colorList = colorsElem.childNodes();
-        KConfig * colorConf = KGlobal::config();
+        KConfig * colorConf = TDEGlobal::config();
 
         TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
         KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
@@ -643,7 +643,7 @@ void KTheme::apply()
 
     if ( !widgetsElem.isNull() )
     {
-        KConfig * widgetConf = KGlobal::config();
+        KConfig * widgetConf = TDEGlobal::config();
         widgetConf->setGroup( "General" );
         widgetConf->writeEntry( "widgetStyle", widgetsElem.attribute( "name" ), true, true );
         widgetConf->sync();
@@ -654,7 +654,7 @@ void KTheme::apply()
     TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement();
     if ( !fontsElem.isNull() )
     {
-        KConfig * fontsConf = KGlobal::config();
+        KConfig * fontsConf = TDEGlobal::config();
         KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
         kde1xConf->setGroup( "General" );
 
@@ -688,7 +688,7 @@ void KTheme::apply()
 bool KTheme::remove( const TQString & name )
 {
     kdDebug() << "Going to remove theme: " << name << endl;
-    return KIO::NetAccess::del( KGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
+    return KIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
 }
 
 void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent )
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index 6ba23f535..fd659d3c7 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -200,7 +200,7 @@ private:
     bool copyFile( const TQString & from, const TQString & to );
 
     /**
-     * Wrapper around KGlobal::dirs()->findResource()
+     * Wrapper around TDEGlobal::dirs()->findResource()
      * @param section Section to work on (desktop, sounds, panel etc)
      * @param path The file to find
      */
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 4a3f21644..5489aedbf 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -106,7 +106,7 @@ kthememanager::~kthememanager()
 
 void kthememanager::init()
 {
-    KGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
+    TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
                                       "kthememanager/themes/" );
 }
 
@@ -115,7 +115,7 @@ void kthememanager::updateButton()
     TQListViewItem * cur = dlg->lvThemes->currentItem();
     bool enable = (cur != 0);
     if (enable) {
-        enable = TQFile(KGlobal::dirs()->saveLocation( "themes",  cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
+        enable = TQFile(TDEGlobal::dirs()->saveLocation( "themes",  cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
     }
     dlg->btnRemove->setEnabled(enable);
 }
@@ -160,7 +160,7 @@ void kthememanager::save()
     {
         TQString themeName = cur->text( 0 );
 
-        m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
+        m_theme = new KTheme( this, TDEGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
         m_theme->apply();
 
         // Save the current theme name
@@ -180,7 +180,7 @@ void kthememanager::listThemes()
     dlg->lvThemes->clear();
     dlg->lbPreview->setPixmap( TQPixmap() );
 
-    TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
+    TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
 
     TQStringList::const_iterator it;
 
@@ -197,7 +197,7 @@ void kthememanager::listThemes()
 
 float kthememanager::getThemeVersion( const TQString & themeName )
 {
-    TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
+    TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
 
     TQStringList::const_iterator it;
 
@@ -325,7 +325,7 @@ void kthememanager::slotThemeChanged( TQListViewItem * item )
         TQString themeName = item->text(0);
         kdDebug() << "Activated theme: " << themeName  << endl;
 
-        TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
+        TQString themeDir = TDEGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
 
         TQString pixFile = themeDir + themeName + ".preview.png";
 
@@ -392,7 +392,7 @@ void kthememanager::queryLNFModules()
     dlg->lvDetails->sort();*/
 
     // For now use a static list
-    KIconLoader * il = KGlobal::iconLoader();
+    KIconLoader * il = TDEGlobal::iconLoader();
     dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
     dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
     dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
@@ -417,7 +417,7 @@ extern "C"
 {
     KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *)
     {
-        KGlobal::locale()->insertCatalogue( "kthememanager" );
+        TDEGlobal::locale()->insertCatalogue( "kthememanager" );
         return new kthememanager( parent, "kthememanager" );
     }
 }