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

5 files changed, 8 insertions, 8 deletions

diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp
index c25431f2..a1480dad 100644
--- a/amarok/src/statusbar/queueLabel.cpp
+++ b/amarok/src/statusbar/queueLabel.cpp
@@ -75,7 +75,7 @@ void QueueLabel::getCover( const TQString &artist, const TQString &album )
 {
     m_cover = CollectionDB::instance()->albumImage( artist, album, 50 );
     if( m_cover == CollectionDB::instance()->notAvailCover( 50 ) )
-        m_cover = KGlobal::iconLoader()->iconPath( "goto", -KIcon::SizeHuge );
+        m_cover = TDEGlobal::iconLoader()->iconPath( "goto", -KIcon::SizeHuge );
 }
 
 void QueueLabel::setNum( int num )
diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h
index 5e942686..37738db9 100644
--- a/amarok/src/statusbar/selectLabel.h
+++ b/amarok/src/statusbar/selectLabel.h
@@ -146,7 +146,7 @@ class SelectLabel : public TQLabel
             m_tooltip->setShowCounter( false );
             m_tooltip->setMaskEffect( KDE::PopupMessage::Plain );
             m_tooltip->setText( tip );
-            const TQPixmap pix = KGlobal::iconLoader()
+            const TQPixmap pix = TDEGlobal::iconLoader()
                                 ->loadIconSet( m_action->currentIcon(), KIcon::Toolbar, KIcon::SizeHuge )
                                 .pixmap( TQIconSet::Large, m_action->isEnabled()
                                                           ? TQIconSet::Normal
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index 957e7a77..36cc912d 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -297,16 +297,16 @@ StatusBar::longMessage( const TQString &text, int type )
     {
         case Information:
         case Question:
-            image = KGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge );
+            image = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge );
             break;
 
         case Sorry:
         case Warning:
-            image = KGlobal::iconLoader()->iconPath( "messagebox_warning", -KIcon::SizeHuge );
+            image = TDEGlobal::iconLoader()->iconPath( "messagebox_warning", -KIcon::SizeHuge );
             break;
 
         case Error:
-            image = KGlobal::iconLoader()->iconPath( "messagebox_critical", -KIcon::SizeHuge );
+            image = TDEGlobal::iconLoader()->iconPath( "messagebox_critical", -KIcon::SizeHuge );
             // don't hide error messages.
 //             message->setTimeout( 0 );
             break;
@@ -669,7 +669,7 @@ StatusBar::writeLogFile( const TQString &text )
     TQTextStream stream( &file );
     stream.setEncoding( TQTextStream::UnicodeUTF8 );
 
-    stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) << "] " << text << endl;
+    stream << "[" << TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) << "] " << text << endl;
 }
 
 } //namespace KDE
diff --git a/amarok/src/statusbar/timeLabel.h b/amarok/src/statusbar/timeLabel.h
index ec703b93..1cd06f13 100644
--- a/amarok/src/statusbar/timeLabel.h
+++ b/amarok/src/statusbar/timeLabel.h
@@ -27,7 +27,7 @@ class TimeLabel : public TQLabel
 public:
     TimeLabel( TQWidget *parent ) : TQLabel( " 0:00:00 ", parent )
     {
-        setFont( KGlobalSettings::fixedFont() );
+        setFont( TDEGlobalSettings::fixedFont() );
         setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
     }
 
diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h
index dce06d4b..7c840c38 100644
--- a/amarok/src/statusbar/toggleLabel.h
+++ b/amarok/src/statusbar/toggleLabel.h
@@ -116,7 +116,7 @@ class ToggleLabel : public TQLabel
                 tip += i18n("&nbsp;<br>&nbsp;<i>Disabled</i>");
 
             tip += "&nbsp;";
-            const TQString path = KGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge );
+            const TQString path = TDEGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge );
 
 
             m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ );