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

4 files changed, 16 insertions, 16 deletions

diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 307a04a6d..757385cd0 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -122,7 +122,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
    * or left handed.  The outer button functionality is actually swapped
    *
    */
-  bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
+  bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
 
   m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
 
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 37ab6f71c..a01cdc06d 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -246,11 +246,11 @@ void KonqFontOptions::load( bool useDefaults )
     if ( m_fSize == -1 )
         m_fSize = TQFontInfo(stdFont).pointSize();
 
-    normalTextColor = KGlobalSettings::textColor();
+    normalTextColor = TDEGlobalSettings::textColor();
     normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor );
     m_pNormalText->setColor( normalTextColor );
 
-    /* highlightedTextColor = KGlobalSettings::highlightedTextColor();
+    /* highlightedTextColor = TDEGlobalSettings::highlightedTextColor();
     highlightedTextColor = g_pConfig->readColorEntry( "HighlightedTextColor", &highlightedTextColor );
     m_pHighlightedText->setColor( highlightedTextColor );
     */
@@ -298,7 +298,7 @@ void KonqFontOptions::defaults()
 void KonqFontOptions::updateGUI()
 {
     if ( m_stdName.isEmpty() )
-        m_stdName = KGlobalSettings::generalFont().family();
+        m_stdName = TDEGlobalSettings::generalFont().family();
 
     m_pStandard->setCurrentFont( m_stdName );
     m_pSize->setValue( m_fSize );
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 53c16f15f..cfa367448 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -158,8 +158,8 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
 void KPreviewOptions::load(bool useDefaults)
 {
     // *** load and apply to GUI ***
-    KGlobal::config()->setReadDefaults(useDefaults);
-    KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+    TDEGlobal::config()->setReadDefaults(useDefaults);
+    KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
     TQPtrListIterator<TQCheckListItem> it( m_items );
 
     for ( ; it.current() ; ++it ) {
@@ -176,7 +176,7 @@ void KPreviewOptions::load(bool useDefaults)
 
     m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) );
     m_useFileThumbnails->setChecked( group.readBoolEntry( "UseFileThumbnails", true /*default*/ ) );
-    KGlobal::config()->setReadDefaults(false);
+    TDEGlobal::config()->setReadDefaults(false);
 }
 
 void KPreviewOptions::load()
@@ -191,7 +191,7 @@ void KPreviewOptions::defaults()
 
 void KPreviewOptions::save()
 {
-    KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+    KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
     TQPtrListIterator<TQCheckListItem> it( m_items );
     for ( ; it.current() ; ++it ) {
         TQString protocol( it.current()->text() );
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 589ad0e3a..ea3c5baa4 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -131,7 +131,7 @@ void DesktopPathConfig::load( bool useDefaults )
     // Desktop Paths
 	config.setReadDefaults( useDefaults );
     config.setGroup("Paths");
-    urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() ));
+    urAutostart->setURL( config.readPathEntry( "Autostart" , TDEGlobalSettings::autostartPath() ));
 
     KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
      
@@ -148,7 +148,7 @@ void DesktopPathConfig::defaults()
 
 void DesktopPathConfig::save()
 {
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
     KConfigGroupSaver cgs( config, "Paths" );
 
@@ -156,17 +156,17 @@ void DesktopPathConfig::save()
     bool autostartMoved = false;
 
     KURL desktopURL;
-    desktopURL.setPath( KGlobalSettings::desktopPath() );
+    desktopURL.setPath( TDEGlobalSettings::desktopPath() );
     KURL newDesktopURL;
     newDesktopURL.setPath(urDesktop->url());
 
     KURL autostartURL;
-    autostartURL.setPath( KGlobalSettings::autostartPath() );
+    autostartURL.setPath( TDEGlobalSettings::autostartPath() );
     KURL newAutostartURL;
     newAutostartURL.setPath(urAutostart->url());
 
     KURL documentURL;
-    documentURL.setPath( KGlobalSettings::documentPath() );
+    documentURL.setPath( TDEGlobalSettings::documentPath() );
     KURL newDocumentURL;
     newDocumentURL.setPath(urDocument->url());
 
@@ -202,11 +202,11 @@ void DesktopPathConfig::save()
                 if ( newAutostartURL.equals( futureAutostartURL, true ) )
                     autostartMoved = true;
                 else
-                    autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
+                    autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
             }
         }
 
-        if ( moveDir( KURL( KGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
+        if ( moveDir( KURL( TDEGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
         {
             xdgconfig->writePathEntry( "XDG_DESKTOP_DIR", '"'+ urlDesktop + '"', true, false );
             pathChanged = true;
@@ -216,7 +216,7 @@ void DesktopPathConfig::save()
     if ( !newAutostartURL.equals( autostartURL, true ) )
     {
         if (!autostartMoved)
-            autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
+            autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
         if (autostartMoved)
         {
             config->writePathEntry( "Autostart", urAutostart->url(), true, true );