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

7 files changed, 21 insertions, 21 deletions

diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
index 00ba06c7..92fc9ba3 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
@@ -1616,7 +1616,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
   d->mainDockWidget=0;
 
 #ifndef NO_KDE2
-  d->splitterOpaqueResize = KGlobalSettings::opaqueResize();
+  d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize();
 #else
   d->splitterOpaqueResize = false;
 #endif
@@ -2477,7 +2477,7 @@ void KDockManager::setReadDockConfigMode(int mode)
 void KDockManager::writeConfig( KConfig* c, TQString group )
 {
   //debug("BEGIN Write Config");
-  if ( !c ) c = KGlobal::config();
+  if ( !c ) c = TDEGlobal::config();
   if ( group.isEmpty() ) group = "dock_setting_default";
 
   c->setGroup( group );
@@ -2618,7 +2618,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 #include <tqmessagebox.h>
 void KDockManager::readConfig( KConfig* c, TQString group )
 {
-  if ( !c ) c = KGlobal::config();
+  if ( !c ) c = TDEGlobal::config();
   if ( group.isEmpty() ) group = "dock_setting_default";
 
   c->setGroup( group );
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index c4b4b97b..d0cb5681 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -1030,7 +1030,7 @@ public:
   KDockWidget* getDockWidgetFromName( const TQString& dockName );
 
   /**
-   * Enables opaque resizing. Opaque resizing defaults to KGlobalSettings::opaqueResize().
+   * Enables opaque resizing. Opaque resizing defaults to TDEGlobalSettings::opaqueResize().
    * Call this method before you create any dock widgets!
    */
   void setSplitterOpaqueResize(bool b=true);
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
index 3d87eace..1ba89270 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
@@ -52,10 +52,10 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent )
 	m_captionFont = TQFont();
 	TQFontMetrics fm( m_captionFont );
 	m_captionFontLineSpacing = fm.lineSpacing();
-	m_captionActiveBackColor = KGlobalSettings::activeTitleColor();
-	m_captionActiveForeColor = KGlobalSettings::activeTextColor();
-	m_captionInactiveBackColor = KGlobalSettings::inactiveTitleColor();
-	m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor();
+	m_captionActiveBackColor = TDEGlobalSettings::activeTitleColor();
+	m_captionActiveForeColor = TDEGlobalSettings::activeTextColor();
+	m_captionInactiveBackColor = TDEGlobalSettings::inactiveTitleColor();
+	m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor();
 	m_pZ = new TQPtrList<KMdiChildFrm>;
 	m_pZ->setAutoDelete( true );
 	setFocusPolicy( TQ_ClickFocus );
@@ -784,10 +784,10 @@ void KMdiChildArea::setMdiCaptionInactiveBackColor( const TQColor& clr )
 void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeBG,
                                       TQColor& activeFG, TQColor& inactiveBG, TQColor& inactiveFG )
 {
-	activeBG = KGlobalSettings::activeTitleColor();
-	activeFG = KGlobalSettings::activeTextColor();
-	inactiveBG = KGlobalSettings::inactiveTitleColor();
-	inactiveFG = KGlobalSettings::inactiveTextColor();
+	activeBG = TDEGlobalSettings::activeTitleColor();
+	activeFG = TDEGlobalSettings::activeTextColor();
+	inactiveBG = TDEGlobalSettings::inactiveTitleColor();
+	inactiveFG = TDEGlobalSettings::inactiveTextColor();
 }
 
 // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
index 035cdccc..09624887 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
@@ -191,8 +191,8 @@ public:
 	 * This method is useful not only for KMDI child windows.
 	 * Colors are returned via activeBG, activeFG, inactiveBG, inactiveFG references.
 	 *
-	 * @deprecated Use KGlobalSettings::activeTitleColor(), KGlobalSettings::activeTextColor(),
-	 * KGlobalSettings::inactiveTitleColor() and KGlobalSettings::inactiveTextColor() instead.
+	 * @deprecated Use TDEGlobalSettings::activeTitleColor(), TDEGlobalSettings::activeTextColor(),
+	 * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead.
 	 */
 	static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG,
 	                              TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index 23190dec..4fde9799 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -298,7 +298,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 		if ( m_movingState == WaitingForMoveStart )
 		{
 			TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
-			if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
+			if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
 			{
 				m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
 				m_dockManager->eventFilter( m_dragPanel, event );
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
index 471ca4f0..a3fa51c8 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
@@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
           mDragSwitchTab = 0;
         }
 
-        int delay = KGlobalSettings::dndEventDelay();
+        int delay = TDEGlobalSettings::dndEventDelay();
         TQPoint newPos = e->pos();
         if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay ||
             newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay )
@@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
     }
     else if ( e->state() == Qt::MidButton ) {
         if (mReorderStartTab==-1) {
-            int delay = KGlobalSettings::dndEventDelay();
+            int delay = TDEGlobalSettings::dndEventDelay();
             TQPoint newPos = e->pos();
             if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay ||
                 newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay )
@@ -190,7 +190,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
                 }
 
                 mHoverCloseButton = new TQPushButton( this );
-                mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) );
+                mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) );
                 mHoverCloseButton->setGeometry( rect );
                 TQToolTip::add(mHoverCloseButton,i18n("Close this tab"));
                 mHoverCloseButton->setFlat(true);
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
index 216ca3f6..39b7678e 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
@@ -41,9 +41,9 @@ public:
 
     KTabWidgetPrivate() {
         m_automaticResizeTabs = false;
-        KConfigGroupSaver groupsaver(KGlobal::config(), "General");
-        m_maxLength = KGlobal::config()->readNumEntry("MaximumTabLength", 30);
-        m_minLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3);
+        KConfigGroupSaver groupsaver(TDEGlobal::config(), "General");
+        m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30);
+        m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3);
         m_CurrentMaxLength = m_minLength;
     }
 };