diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
tree | 493c1095950b7f0a82690cedac1b749666be1b47 /kmix/mixdevicewidget.cpp | |
parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmix/mixdevicewidget.cpp')
-rw-r--r-- | kmix/mixdevicewidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index f90a9455..9096c2c0 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -59,7 +59,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new KActionCollection( this ); - m_keys = new KGlobalAccel( TQT_TQOBJECT(this), "Keys" ); + m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" ); } MixDeviceWidget::~MixDeviceWidget() @@ -79,7 +79,7 @@ bool MixDeviceWidget::isDisabled() const } -KGlobalAccel *MixDeviceWidget::keys( void ) +TDEGlobalAccel *MixDeviceWidget::keys( void ) { return m_keys; } |