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 /noatun/modules/keyz | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/keyz')
| -rw-r--r-- | noatun/modules/keyz/keyz.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/keyz/keyz.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 0229f619..3a3bb547 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -20,7 +20,7 @@ extern "C" } } -KGlobalAccel * Keyz::s_accel = 0L; +TDEGlobalAccel * Keyz::s_accel = 0L; Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) { @@ -29,7 +29,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) if ( !s_accel ) { - s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); + s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" ); s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, player, TQT_SLOT( playpause() )); 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; }; |