summaryrefslogtreecommitdiffstats
path: root/noatun/modules/keyz/keyz.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 /noatun/modules/keyz/keyz.h
parent794a886cbd6d6893d62026f3800b95051652fc5a (diff)
downloadtdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz
tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/keyz/keyz.h')
-rw-r--r--noatun/modules/keyz/keyz.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h
index ad3fe550..2145448b 100644
--- a/noatun/modules/keyz/keyz.h
+++ b/noatun/modules/keyz/keyz.h
@@ -14,7 +14,7 @@ public:
Keyz();
~Keyz();
- static KGlobalAccel *accel() { return s_accel; }
+ static TDEGlobalAccel *accel() { return s_accel; }
public slots:
void slotVolumeUp();
@@ -28,7 +28,7 @@ void slotVolumeUp();
void slotCopyTitle();
private:
- static KGlobalAccel *s_accel;
+ static TDEGlobalAccel *s_accel;
int preMuteVol;
};