summaryrefslogtreecommitdiffstats
path: root/kmix/mixdevicewidget.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 /kmix/mixdevicewidget.h
parent794a886cbd6d6893d62026f3800b95051652fc5a (diff)
downloadtdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz
tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmix/mixdevicewidget.h')
-rw-r--r--kmix/mixdevicewidget.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index fe35c482..c9c62d6a 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -43,7 +43,7 @@ class KLedButton;
class KAction;
class KActionCollection;
class KSmallSlider;
-class KGlobalAccel;
+class TDEGlobalAccel;
class MixDevice;
class VerticalText;
@@ -80,7 +80,7 @@ public:
virtual void setTicks( bool ) {};
virtual void setValueStyle( ValueStyle ) {};
- virtual KGlobalAccel *keys(void);
+ virtual TDEGlobalAccel *keys(void);
public slots:
virtual void setDisabled( bool value );
@@ -103,7 +103,7 @@ protected:
Mixer* m_mixer;
MixDevice* m_mixdevice;
KActionCollection* _mdwActions;
- KGlobalAccel* m_keys;
+ TDEGlobalAccel* m_keys;
ViewBase* m_mixerwidget;
bool m_disabled;
Qt::Orientation _orientation;