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

6 files changed, 8 insertions, 8 deletions

diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index 34615e3..929e1f1 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -96,7 +96,7 @@ void K3bBusyWidget::drawContents( TQPainter* p )
 
   //  p->eraseRect( rect );
   if( m_bBusy )
-    p->fillRect( pos, (rect.height() - squareSize)/2, squareSize, squareSize, KGlobalSettings::highlightColor() );
+    p->fillRect( pos, (rect.height() - squareSize)/2, squareSize, squareSize, TDEGlobalSettings::highlightColor() );
 }
 
 
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index cddf0e7..eedca01 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -69,8 +69,8 @@ public:
   }
   
   bool countDir( const TQString& dir ) {
-    const TQString& dot = KGlobal::staticQString( "." );
-    const TQString& dotdot = KGlobal::staticQString( ".." );
+    const TQString& dot = TDEGlobal::staticQString( "." );
+    const TQString& dotdot = TDEGlobal::staticQString( ".." );
     TQStringList l = TQDir(dir).entryList( TQDir::All|TQDir::Hidden|TQDir::System );
     l.remove( dot );
     l.remove( dotdot );
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index 69c6ed5..7a01caf 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -105,7 +105,7 @@ bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev )
       }
       else if( ev->type() == TQEvent::MouseMove ) {
         TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
-        if( ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
+        if( ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
 	  d->popupTimer->stop();
 	  slotDelayedPopup();
           return true;
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 1dee2b1..36c0a63 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -37,14 +37,14 @@ static TQString qrichtextify( const TQString& text )
 
 K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+  m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
   setAlignment( TQt::WordBreak );
   setText(text);
 }
 
 K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+  m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
   setAlignment( TQt::WordBreak );
 }
 
diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp
index 18ad803..0136f91 100644
--- a/libk3b/tools/k3btempfile.cpp
+++ b/libk3b/tools/k3btempfile.cpp
@@ -24,7 +24,7 @@ static inline TQString defaultTempDir()
   // we need a world-readable temp dir
   
   // FIXME: check if the default is world-readable
-//   TQStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" );
+//   TQStringList dirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
 //   for( TQStringList::const_iterator it = dirs.begin();
 //        it != dirs.end(); ++it ) {
 //     const TQString& dir = *it;
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index 04d767c..b897ebd 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -97,7 +97,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev )
       else if( ev->type() == TQEvent::MouseMove ) {
         TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
         if( !d->instantMenu &&
-	    ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
+	    ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
 	  openPopup();
           return true;
         }