summaryrefslogtreecommitdiffstats
path: root/juk/juk.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:46 -0600
commit27430f06c6cc2187c639f59f342f07f1fde91a8b (patch)
tree493c1095950b7f0a82690cedac1b749666be1b47 /juk/juk.h
parent794a886cbd6d6893d62026f3800b95051652fc5a (diff)
downloadtdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz
tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'juk/juk.h')
-rw-r--r--juk/juk.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/juk/juk.h b/juk/juk.h
index 597e639e..de51350f 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -26,7 +26,7 @@ class TQListViewItem;
class KToggleAction;
class KSelectAction;
class KToolBarPopupAction;
-class KGlobalAccel;
+class TDEGlobalAccel;
class SliderAction;
class StatusLabel;
@@ -91,7 +91,7 @@ private:
KSelectAction *m_outputSelectAction;
PlayerManager *m_player;
- KGlobalAccel *m_accel;
+ TDEGlobalAccel *m_accel;
bool m_startDocked;
bool m_showSplash;