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/kmixtoolbox.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/kmixtoolbox.cpp')
| -rw-r--r-- | kmix/kmixtoolbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp index 02292a89..397aa320 100644 --- a/kmix/kmixtoolbox.cpp +++ b/kmix/kmixtoolbox.cpp @@ -142,7 +142,7 @@ void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T } mdw->setDisabled( !config->readBoolEntry("Show", true) ); - KGlobalAccel *keys=mdw->keys(); + TDEGlobalAccel *keys=mdw->keys(); if ( keys ) { TQString devgrpkeys; @@ -200,7 +200,7 @@ void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T If you think about this aspect more deeply, you will find out that this is the case already today with "kmixapplet" and "kmix main application". It would really nice to rework this. */ - KGlobalAccel *keys=mdw->keys(); + TDEGlobalAccel *keys=mdw->keys(); if (keys) { TQString devgrpkeys; devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n ); |