diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:12:46 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:12:46 -0600 |
commit | 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (patch) | |
tree | 5a2fde6842fd422cae2d8670d382be965098cc32 /libksirtet/lib | |
parent | 2ce15ee76fd2d9d18a63c035a0f5b00b94c60cdc (diff) | |
download | tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.tar.gz tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'libksirtet/lib')
-rw-r--r-- | libksirtet/lib/keys.cpp | 8 | ||||
-rw-r--r-- | libksirtet/lib/keys.h | 4 | ||||
-rw-r--r-- | libksirtet/lib/mp_interface.h | 2 | ||||
-rw-r--r-- | libksirtet/lib/mp_simple_interface.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index acf4d7ac..801d46d0 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -43,12 +43,12 @@ void KeyData::clear() void KeyData::createActionCollection(uint index, TQWidget *receiver) { Q_ASSERT( index<_cols.size() ); - _cols[index] = new KActionCollection(receiver, this); + _cols[index] = new TDEActionCollection(receiver, this); for (uint k=0; k<_data.size(); k++) { TQString label = i18n(_data[k].label); TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name); const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot); - KAction *a = new KAction(label, _keycodes[_cols.size()-1][index][k], + TDEAction *a = new TDEAction(label, _keycodes[_cols.size()-1][index][k], TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8()); a->setEnabled(false); if ( slot==0 ) { @@ -67,7 +67,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver) void KeyData::setEnabled(uint index, bool enabled) { for (uint k=0; k<_cols[index]->count(); k++) { - TQMap<KAction *, SpecialData>::Iterator it = + TQMap<TDEAction *, SpecialData>::Iterator it = _specActions.find(_cols[index]->action(k)); if ( it==_specActions.end() ) _cols[index]->action(k)->setEnabled(enabled); @@ -93,7 +93,7 @@ void KeyData::keyEvent(TQKeyEvent *e, bool pressed) if ( e->isAutoRepeat() ) return; KKey key(e); - TQMap<KAction *, SpecialData>::Iterator it = _specActions.begin(); + TQMap<TDEAction *, SpecialData>::Iterator it = _specActions.begin(); for(; it!=_specActions.end(); ++it) { if ( !it.data().enabled ) continue; if ( !it.key()->shortcut().contains(key) ) continue; diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index ff2a1c5e..83b63e49 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -29,12 +29,12 @@ class KeyData : public TQObject uint _maxNb; TQMemArray<ActionData> _data; TQMap<int, TQMap<int, TQMemArray<int> > > _keycodes; - TQMemArray<KActionCollection *> _cols; + TQMemArray<TDEActionCollection *> _cols; struct SpecialData { bool enabled; TQSignal *pressed, *released; }; - TQMap<KAction *, SpecialData> _specActions; + TQMap<TDEAction *, SpecialData> _specActions; TQString group() const { return TQString("Keys (%1 humans)").arg(_cols.size()); } diff --git a/libksirtet/lib/mp_interface.h b/libksirtet/lib/mp_interface.h index 7f61d13d..3ae8a0bc 100644 --- a/libksirtet/lib/mp_interface.h +++ b/libksirtet/lib/mp_interface.h @@ -15,7 +15,7 @@ class RemoteHostData; class KeyData; class KeyCollection; class KKeyDialog; -class KAction; +class TDEAction; struct ActionData { const char *label, *name; diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index 1b83be40..bf81d750 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -9,7 +9,7 @@ #define PAUSE_ACTION \ - ((KToggleAction *)((KMainWindow *)topLevelWidget())->action("game_pause")) + ((TDEToggleAction *)((TDEMainWindow *)topLevelWidget())->action("game_pause")) MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi, uint nbActions, const ActionData *data, |