From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:46 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kscd/cddbdlg.cpp |  2 +-
 kscd/docking.cpp | 10 +++++-----
 kscd/kscd.cpp    |  8 ++++----
 kscd/kscd.h      |  2 +-
 kscd/kscd.kcfg   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kscd')

diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index e574ba92..2faa6cdf 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -37,7 +37,7 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name )
     : KDialogBase( parent, name, false, i18n( "CD Editor" ),
       Ok|Cancel|User1|User2, Ok, true )
 {
-  KGlobal::locale()->insertCatalogue("libkcddb");
+  TDEGlobal::locale()->insertCatalogue("libkcddb");
 
   m_dlgBase = new CDInfoDialogBase( this, "m_dlgBase" );
 
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 3759ab7b..1483611c 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
     // popup menu for right mouse button
     TQPopupMenu* popup = contextMenu();
 
-    popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
-    popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
-    popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
-    popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
-    popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
 
     TQToolTip::add(this, kapp->aboutData()->programName());
 }
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index cc9bc389..49ab2950 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -227,7 +227,7 @@ KSCD::~KSCD()
 
 void KSCD::initGlobalShortcuts() {
 
-  m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) );
+  m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
   
   //Definition of global shortcuts is based on 'local' shortcuts which follow
   //the WIN key.
@@ -280,7 +280,7 @@ void KSCD::initFont()
 /*  int theSmallPtSize = 10;
 
   // Find a font that fits the 13 and 14 pixel widgets
-  TQFont fn( KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold );
+  TQFont fn( TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold );
   bool fits = false;
   while (!fits && theSmallPtSize > 1)
   {
@@ -293,7 +293,7 @@ void KSCD::initFont()
           fits = true;
       }
   }
-  smallfont = TQFont(KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold);
+  smallfont = TQFont(TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold);
 */
 } // initFont()
 
@@ -371,7 +371,7 @@ void KSCD::setupPopups()
 
     connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) );
 
-    KHelpMenu* helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
     mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu());
     mainPopup->insertSeparator();
     m_actions->action(KStdAction::name(KStdAction::Quit))->plug(mainPopup);
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 98531cd0..8ed84a37 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -224,7 +224,7 @@ private:
     TQStringList     playlist;
     KCDDB::Client*  cddb;
     KActionCollection* m_actions;
-    KGlobalAccel* m_globalAccel;
+    TDEGlobalAccel* m_globalAccel;
     KToggleAction* m_togglePopupsAction;
     DockWidget* m_dockWidget;
     void lookupDevice();
diff --git a/kscd/kscd.kcfg b/kscd/kscd.kcfg
index f781cfe1..0da4d53e 100644
--- a/kscd/kscd.kcfg
+++ b/kscd/kscd.kcfg
@@ -77,7 +77,7 @@
         </entry>
         <entry name="ledFont" type="Font">
             <label>The font that will be used for the LCD display.</label>
-            <default><code>TQFont(KGlobalSettings::generalFont().family(), 10, TQFont::Bold)</code></default>
+            <default><code>TQFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold)</code></default>
         </entry>
         <entry name="BackColor" type="Color">
             <label>The background color that will be used for the LCD display.</label>
-- 
cgit v1.2.3