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

---
 kicker/taskbar/taskbar.cpp       | 10 +++++-----
 kicker/taskbar/taskbar.h         |  4 ++--
 kicker/taskbar/taskcontainer.cpp |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kicker/taskbar')

diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 131a1d79d..ddeef37a5 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -125,7 +125,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TQWidget *parent, const char
     blocklayout = false;
 
     connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    keys = new KGlobalAccel( TQT_TQOBJECT(this) );
+    keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
 #include "taskbarbindings.cpp"
     keys->readSettings();
     keys->updateConnections();
@@ -172,7 +172,7 @@ TQSize TaskBar::sizeHint() const
 {
     // get our minimum height based on the minimum button height or the
     // height of the font in use, which is largest
-    TQFontMetrics fm(KGlobalSettings::taskbarFont());
+    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
     int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
                           fm.height() : m_settingsObject->minimumButtonHeight();
 
@@ -183,7 +183,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
 {
     // get our minimum height based on the minimum button height or the
     // height of the font in use, which is largest
-    TQFontMetrics fm(KGlobalSettings::taskbarFont());
+    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
     int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
                           fm.height() : m_settingsObject->minimumButtonHeight();
 
@@ -710,7 +710,7 @@ void TaskBar::reLayout()
     // number of rows simply depends on our height which is either the
     // minimum button height or the height of the font in use, whichever is
     // largest
-    TQFontMetrics fm(KGlobalSettings::taskbarFont());
+    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
     int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
                           fm.height() : m_settingsObject->minimumButtonHeight();
 
@@ -970,7 +970,7 @@ int TaskBar::taskCount() const
 
 int TaskBar::maximumButtonsWithoutShrinking() const
 {
-    TQFontMetrics fm(KGlobalSettings::taskbarFont());
+    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
     int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
                           fm.height() : m_settingsObject->minimumButtonHeight();
     int rows = contentsRect().height() / minButtonHeight;
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 78f95844c..7c9540efe 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Startup;
 class Task;
-class KGlobalAccel;
+class TDEGlobalAccel;
 
 class TaskBar : public Panner
 {
@@ -127,7 +127,7 @@ private:
     bool                        shouldGroup() const;
     bool                        isGrouping;
     void                        reGroup();
-    KGlobalAccel*               keys;
+    TDEGlobalAccel*               keys;
     KTextShadowEngine*		m_textShadowEngine;
     bool			m_ignoreUpdates;
     TQTimer			m_relayoutTimer;
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 8e10d131b..9d259176f 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -577,7 +577,7 @@ void TaskContainer::drawButton(TQPainter *p)
     bool drawButton = alwaysDrawButtons ||
                       (m_mouseOver && !halo && isEnabled() &&
                        m_settingsObject->showButtonOnHover());
-    TQFont font(KGlobalSettings::taskbarFont());
+    TQFont font(TDEGlobalSettings::taskbarFont());
 
     // draw sunken if we contain the active task
     bool active = false;
@@ -1273,7 +1273,7 @@ bool TaskContainer::startDrag(const TQPoint& pos)
         return false;
     }
 
-    int delay = KGlobalSettings::dndEventDelay();
+    int delay = TDEGlobalSettings::dndEventDelay();
 
     if ((m_dragStartPos - pos).manhattanLength() > delay)
     {
@@ -1663,7 +1663,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
         data.message = m_startup->text();
         data.duration = 4000;
         data.subtext = i18n("Loading application ...");
-        data.icon = KGlobal::iconLoader()->loadIcon(m_startup->icon(),
+        data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
                                                     KIcon::Small,
                                                     KIcon::SizeMedium,
                                                     KIcon::DefaultState,
-- 
cgit v1.2.3