From 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:46 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- libtdegames/highscore/kexthighscore_gui.cpp | 6 +- libtdegames/highscore/kexthighscore_gui.h | 4 +- libtdegames/highscore/kexthighscore_tab.cpp | 4 +- libtdegames/highscore/kexthighscore_tab.h | 4 +- libtdegames/kchatdialog.cpp | 8 +- libtdegames/kgame/dialogs/kgamedebugdialog.cpp | 24 ++-- libtdegames/kgame/dialogs/kgamedialogconfig.cpp | 4 +- libtdegames/kstdgameaction.cpp | 168 ++++++++++++------------ libtdegames/kstdgameaction.h | 110 ++++++++-------- 9 files changed, 166 insertions(+), 166 deletions(-) (limited to 'libtdegames') diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp index a66050a6..19f9c004 100644 --- a/libtdegames/highscore/kexthighscore_gui.cpp +++ b/libtdegames/highscore/kexthighscore_gui.cpp @@ -46,7 +46,7 @@ namespace KExtHighscore //----------------------------------------------------------------------------- ShowItem::ShowItem(TQListView *list, bool highlight) - : KListViewItem(list), _highlight(highlight) + : TDEListViewItem(list), _highlight(highlight) {} void ShowItem::paintCell(TQPainter *p, const TQColorGroup &cg, @@ -54,12 +54,12 @@ void ShowItem::paintCell(TQPainter *p, const TQColorGroup &cg, { TQColorGroup cgrp(cg); if (_highlight) cgrp.setColor(TQColorGroup::Text, red); - KListViewItem::paintCell(p, cgrp, column, width, align); + TDEListViewItem::paintCell(p, cgrp, column, width, align); } //----------------------------------------------------------------------------- ScoresList::ScoresList(TQWidget *parent) - : KListView(parent) + : TDEListView(parent) { setSelectionMode(TQListView::NoSelection); setItemMargin(3); diff --git a/libtdegames/highscore/kexthighscore_gui.h b/libtdegames/highscore/kexthighscore_gui.h index c1d2a35c..fbd1422c 100644 --- a/libtdegames/highscore/kexthighscore_gui.h +++ b/libtdegames/highscore/kexthighscore_gui.h @@ -42,7 +42,7 @@ class Score; class AdditionalTab; //----------------------------------------------------------------------------- -class ShowItem : public KListViewItem +class ShowItem : public TDEListViewItem { public: ShowItem(TQListView *, bool highlight); @@ -55,7 +55,7 @@ class ShowItem : public KListViewItem bool _highlight; }; -class ScoresList : public KListView +class ScoresList : public TDEListView { Q_OBJECT diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp index 55f96e6b..94e87f23 100644 --- a/libtdegames/highscore/kexthighscore_tab.cpp +++ b/libtdegames/highscore/kexthighscore_tab.cpp @@ -211,7 +211,7 @@ HistogramTab::HistogramTab(TQWidget *parent) // construct GUI TQVBoxLayout *top = static_cast(layout()); - _list = new KListView(this); + _list = new TDEListView(this); _list->setSelectionMode(TQListView::NoSelection); _list->setItemMargin(3); _list->setAllColumnsShowFocus(true); @@ -235,7 +235,7 @@ HistogramTab::HistogramTab(TQWidget *parent) TQString s2; if ( k==sh.size() ) s2 = "..."; else if ( sh[k]!=sh[k-1]+1 ) s2 = sitem->pretty(0, sh[k]); - (void)new KListViewItem(_list, s1, s2); + (void)new TDEListViewItem(_list, s1, s2); } } diff --git a/libtdegames/highscore/kexthighscore_tab.h b/libtdegames/highscore/kexthighscore_tab.h index 7ad91a91..bb84f155 100644 --- a/libtdegames/highscore/kexthighscore_tab.h +++ b/libtdegames/highscore/kexthighscore_tab.h @@ -24,7 +24,7 @@ #include class TQLabel; -class KListView; +class TDEListView; namespace KExtHighscore @@ -111,7 +111,7 @@ class HistogramTab : public AdditionalTab private: TQMemArray _counts; TQMemArray _data; - KListView *_list; + TDEListView *_list; void display(uint i); }; diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp index 538bb334..cb2ae837 100644 --- a/libtdegames/kchatdialog.cpp +++ b/libtdegames/kchatdialog.cpp @@ -133,28 +133,28 @@ void KChatDialog::init() void KChatDialog::slotGetNameFont() { TQFont font = nameFont(); - KFontDialog::getFont(font); + TDEFontDialog::getFont(font); setNameFont(font); } void KChatDialog::slotGetTextFont() { TQFont font = textFont(); - KFontDialog::getFont(font); + TDEFontDialog::getFont(font); setTextFont(font); } void KChatDialog::slotGetSystemNameFont() { TQFont font = systemNameFont(); - KFontDialog::getFont(font); + TDEFontDialog::getFont(font); setSystemNameFont(font); } void KChatDialog::slotGetSystemTextFont() { TQFont font = systemTextFont(); - KFontDialog::getFont(font); + TDEFontDialog::getFont(font); setSystemTextFont(font); } diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp index ca95226e..e9ff7232 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp @@ -86,7 +86,7 @@ public: const KGame* mGame; TQFrame* mGamePage; - KListView* mGameProperties; + TDEListView* mGameProperties; TQListViewItem* mGameAddress; TQListViewItem* mGameId; TQListViewItem* mGameCookie; @@ -100,8 +100,8 @@ public: TQListViewItem* mGamePlayerCount; TQFrame* mPlayerPage; - KListBox* mPlayerList; - KListView* mPlayerProperties; + TDEListBox* mPlayerList; + TDEListView* mPlayerProperties; TQListViewItem* mPlayerAddress; TQListViewItem* mPlayerId; TQListViewItem* mPlayerName; @@ -116,8 +116,8 @@ public: TQListViewItem* mPlayerNetworkPriority; TQFrame* mMessagePage; - KListView* mMessageList; - KListBox* mHideIdList; + TDEListView* mMessageList; + TDEListBox* mHideIdList; }; KGameDebugDialog::KGameDebugDialog(KGame* g, TQWidget* parent, bool modal) : @@ -144,12 +144,12 @@ void KGameDebugDialog::initGamePage() TQVBoxLayout* topLayout = new TQVBoxLayout(d->mGamePage, marginHint(), spacingHint()); TQHBoxLayout* layout = new TQHBoxLayout(topLayout); - KListView* v = new KListView(d->mGamePage); + TDEListView* v = new TDEListView(d->mGamePage); v->addColumn(i18n("Data")); v->addColumn(i18n("Value")); layout->addWidget(v); - d->mGameProperties = new KListView(d->mGamePage); + d->mGameProperties = new TDEListView(d->mGamePage); d->mGameProperties->addColumn(i18n("Property")); d->mGameProperties->addColumn(i18n("Value")); d->mGameProperties->addColumn(i18n("Policy")); @@ -183,17 +183,17 @@ void KGameDebugDialog::initPlayerPage() TQVBoxLayout* listLayout = new TQVBoxLayout(layout); TQLabel* listLabel = new TQLabel(i18n("Available Players"), d->mPlayerPage); listLayout->addWidget(listLabel); - d->mPlayerList = new KListBox(d->mPlayerPage); + d->mPlayerList = new TDEListBox(d->mPlayerPage); connect(d->mPlayerList, TQT_SIGNAL(executed(TQListBoxItem*)), this, TQT_SLOT(slotUpdatePlayerData(TQListBoxItem*))); listLayout->addWidget(d->mPlayerList); d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); - KListView* v = new KListView(d->mPlayerPage); + TDEListView* v = new TDEListView(d->mPlayerPage); layout->addWidget(v); v->addColumn(i18n("Data")); v->addColumn(i18n("Value")); - d->mPlayerProperties = new KListView(d->mPlayerPage); + d->mPlayerProperties = new TDEListView(d->mPlayerPage); d->mPlayerProperties->addColumn(i18n("Property")); d->mPlayerProperties->addColumn(i18n("Value")); d->mPlayerProperties->addColumn(i18n("Policy")); @@ -221,7 +221,7 @@ void KGameDebugDialog::initMessagePage() { d->mMessagePage = addPage(i18n("Debug &Messages")); TQGridLayout* layout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint()); - d->mMessageList = new KListView(d->mMessagePage); + d->mMessageList = new TDEListView(d->mMessagePage); layout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3); d->mMessageList->addColumn(i18n("Time")); d->mMessageList->addColumn(i18n("ID")); @@ -239,7 +239,7 @@ void KGameDebugDialog::initMessagePage() TQLabel* l = new TQLabel(i18n("Do not show IDs:"), d->mMessagePage); layout->addMultiCellWidget(l, 0, 0, 5, 6); - d->mHideIdList = new KListBox(d->mMessagePage); + d->mHideIdList = new TDEListBox(d->mMessagePage); layout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6); TQPushButton* clear = new KPushButton(KStdGuiItem::clear(), d->mMessagePage); diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp index 11fc94d5..fee9a48b 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -596,7 +596,7 @@ public: } TQPtrDict mItem2Player; - KListBox* mPlayerBox; + TDEListBox* mPlayerBox; }; KGameDialogConnectionConfig::KGameDialogConnectionConfig(TQWidget* parent) @@ -607,7 +607,7 @@ KGameDialogConnectionConfig::KGameDialogConnectionConfig(TQWidget* parent) TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); topLayout->setAutoAdd(true); TQHGroupBox* b = new TQHGroupBox(i18n("Connected Players"), this); - d->mPlayerBox = new KListBox(b); + d->mPlayerBox = new TDEListBox(b); setMinimumHeight(100); } diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp index 368b26ff..0f7ec346 100644 --- a/libtdegames/kstdgameaction.cpp +++ b/libtdegames/kstdgameaction.cpp @@ -32,8 +32,8 @@ KStdGameAction::KStdGameAction() KStdGameAction::~KStdGameAction() {} -KAction *KStdGameAction::action(StdGameAction act_enum, const TQObject *recvr, - const char *slot, KActionCollection *parent, +TDEAction *KStdGameAction::action(StdGameAction act_enum, const TQObject *recvr, + const char *slot, TDEActionCollection *parent, const char *name) { return create( act_enum, name, recvr, slot, parent ); @@ -47,7 +47,7 @@ const char* KStdGameAction::stdName(StdGameAction act_enum) struct KStdGameActionInfo { KStdGameAction::StdGameAction id; - KStdAccel::StdAccel globalAccel; // if we reuse a global accel + TDEStdAccel::StdAccel globalAccel; // if we reuse a global accel int shortcut; // specific shortcut (NH: should be configurable) const char* psName; const char* psLabel; @@ -57,32 +57,32 @@ struct KStdGameActionInfo const KStdGameActionInfo g_rgActionInfo[] = { // "game" menu - { KStdGameAction::New, KStdAccel::New, 0, "game_new", I18N_NOOP2("new game", "&New"), 0, "filenew" }, - { KStdGameAction::Load, KStdAccel::Open, 0, "game_load", I18N_NOOP("&Load..."), 0, "fileopen" }, - { KStdGameAction::LoadRecent, KStdAccel::AccelNone, 0, "game_load_recent", I18N_NOOP("Load &Recent"), 0, 0 }, - { KStdGameAction::Restart, KStdAccel::Reload, 0, "game_restart", I18N_NOOP("Restart &Game"), 0, "reload" }, - { KStdGameAction::Save, KStdAccel::Save, 0, "game_save", I18N_NOOP("&Save"), 0, "filesave" }, - { KStdGameAction::SaveAs, KStdAccel::AccelNone, 0, "game_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" }, - { KStdGameAction::End, KStdAccel::End, 0, "game_end", I18N_NOOP("&End Game"), 0, "fileclose" }, - { KStdGameAction::Pause, KStdAccel::AccelNone, TQt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "player_pause" }, - { KStdGameAction::Highscores, KStdAccel::AccelNone, TQt::CTRL+TQt::Key_H, "game_highscores", I18N_NOOP("Show &Highscores"), 0, "highscore" }, - { KStdGameAction::Print, KStdAccel::Print, 0, "game_print", I18N_NOOP("&Print..."), 0, "fileprint" }, - { KStdGameAction::Quit, KStdAccel::Quit, 0, "game_quit", I18N_NOOP("&Quit"), 0, "exit" }, + { KStdGameAction::New, TDEStdAccel::New, 0, "game_new", I18N_NOOP2("new game", "&New"), 0, "filenew" }, + { KStdGameAction::Load, TDEStdAccel::Open, 0, "game_load", I18N_NOOP("&Load..."), 0, "fileopen" }, + { KStdGameAction::LoadRecent, TDEStdAccel::AccelNone, 0, "game_load_recent", I18N_NOOP("Load &Recent"), 0, 0 }, + { KStdGameAction::Restart, TDEStdAccel::Reload, 0, "game_restart", I18N_NOOP("Restart &Game"), 0, "reload" }, + { KStdGameAction::Save, TDEStdAccel::Save, 0, "game_save", I18N_NOOP("&Save"), 0, "filesave" }, + { KStdGameAction::SaveAs, TDEStdAccel::AccelNone, 0, "game_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" }, + { KStdGameAction::End, TDEStdAccel::End, 0, "game_end", I18N_NOOP("&End Game"), 0, "fileclose" }, + { KStdGameAction::Pause, TDEStdAccel::AccelNone, TQt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "player_pause" }, + { KStdGameAction::Highscores, TDEStdAccel::AccelNone, TQt::CTRL+TQt::Key_H, "game_highscores", I18N_NOOP("Show &Highscores"), 0, "highscore" }, + { KStdGameAction::Print, TDEStdAccel::Print, 0, "game_print", I18N_NOOP("&Print..."), 0, "fileprint" }, + { KStdGameAction::Quit, TDEStdAccel::Quit, 0, "game_quit", I18N_NOOP("&Quit"), 0, "exit" }, // "move" menu - { KStdGameAction::Repeat, KStdAccel::AccelNone, 0, "move_repeat", I18N_NOOP("Repeat"), 0, 0 }, - { KStdGameAction::Undo, KStdAccel::Undo, 0, "move_undo", I18N_NOOP("Und&o"), 0, "undo" }, - { KStdGameAction::Redo, KStdAccel::Redo, 0, "move_redo", I18N_NOOP("Re&do"), 0, "redo" }, - { KStdGameAction::Roll, KStdAccel::AccelNone, TQt::CTRL+TQt::Key_R, "move_roll", I18N_NOOP("&Roll Dice"), 0, "roll" }, - { KStdGameAction::EndTurn, KStdAccel::AccelNone, 0, "move_end_turn", I18N_NOOP("End Turn"), 0, "endturn" }, - { KStdGameAction::Hint, KStdAccel::AccelNone, TQt::Key_H, "move_hint", I18N_NOOP("&Hint"), 0, "idea" }, - { KStdGameAction::Demo, KStdAccel::AccelNone, TQt::Key_D, "move_demo", I18N_NOOP("&Demo"), 0, "1rightarrow" }, - { KStdGameAction::Solve, KStdAccel::AccelNone, 0, "move_solve", I18N_NOOP("&Solve"), 0, "wizard" }, + { KStdGameAction::Repeat, TDEStdAccel::AccelNone, 0, "move_repeat", I18N_NOOP("Repeat"), 0, 0 }, + { KStdGameAction::Undo, TDEStdAccel::Undo, 0, "move_undo", I18N_NOOP("Und&o"), 0, "undo" }, + { KStdGameAction::Redo, TDEStdAccel::Redo, 0, "move_redo", I18N_NOOP("Re&do"), 0, "redo" }, + { KStdGameAction::Roll, TDEStdAccel::AccelNone, TQt::CTRL+TQt::Key_R, "move_roll", I18N_NOOP("&Roll Dice"), 0, "roll" }, + { KStdGameAction::EndTurn, TDEStdAccel::AccelNone, 0, "move_end_turn", I18N_NOOP("End Turn"), 0, "endturn" }, + { KStdGameAction::Hint, TDEStdAccel::AccelNone, TQt::Key_H, "move_hint", I18N_NOOP("&Hint"), 0, "idea" }, + { KStdGameAction::Demo, TDEStdAccel::AccelNone, TQt::Key_D, "move_demo", I18N_NOOP("&Demo"), 0, "1rightarrow" }, + { KStdGameAction::Solve, TDEStdAccel::AccelNone, 0, "move_solve", I18N_NOOP("&Solve"), 0, "wizard" }, // "settings" menu - { KStdGameAction::ChooseGameType, KStdAccel::AccelNone, 0, "options_choose_game_type", I18N_NOOP("Choose Game &Type"), 0, 0 }, - { KStdGameAction::Carddecks, KStdAccel::AccelNone, 0, "options_configure_carddecks", I18N_NOOP("Configure &Carddecks..."), 0, 0 }, - { KStdGameAction::ConfigureHighscores, KStdAccel::AccelNone, 0, "options_configure_highscores", I18N_NOOP("Configure &Highscores..."), 0, 0 }, + { KStdGameAction::ChooseGameType, TDEStdAccel::AccelNone, 0, "options_choose_game_type", I18N_NOOP("Choose Game &Type"), 0, 0 }, + { KStdGameAction::Carddecks, TDEStdAccel::AccelNone, 0, "options_configure_carddecks", I18N_NOOP("Configure &Carddecks..."), 0, 0 }, + { KStdGameAction::ConfigureHighscores, TDEStdAccel::AccelNone, 0, "options_configure_highscores", I18N_NOOP("Configure &Highscores..."), 0, 0 }, - { KStdGameAction::ActionNone, KStdAccel::AccelNone, 0, 0, 0, 0, 0 } + { KStdGameAction::ActionNone, TDEStdAccel::AccelNone, 0, 0, 0, 0, 0 } }; static const KStdGameActionInfo* infoPtr( KStdGameAction::StdGameAction id ) @@ -95,35 +95,35 @@ static const KStdGameActionInfo* infoPtr( KStdGameAction::StdGameAction id ) } -KAction* KStdGameAction::create(StdGameAction id, const char *name, +TDEAction* KStdGameAction::create(StdGameAction id, const char *name, const TQObject *recvr, const char *slot, - KActionCollection* parent ) + TDEActionCollection* parent ) { - KAction* pAction = 0; + TDEAction* pAction = 0; const KStdGameActionInfo* pInfo = infoPtr( id ); kdDebug(125) << "KStdGameAction::create( " << id << "=" << (pInfo ? pInfo->psName : (const char*)0) << ", " << parent << ", " << name << " )" << endl; if( pInfo ) { TQString sLabel = i18n(pInfo->psLabel); - KShortcut cut = (pInfo->globalAccel==KStdAccel::AccelNone - ? KShortcut(pInfo->shortcut) - : KStdAccel::shortcut(pInfo->globalAccel)); + TDEShortcut cut = (pInfo->globalAccel==TDEStdAccel::AccelNone + ? TDEShortcut(pInfo->shortcut) + : TDEStdAccel::shortcut(pInfo->globalAccel)); const char *n = name ? name : pInfo->psName; switch( id ) { case LoadRecent: pAction = - new KRecentFilesAction(sLabel, cut, recvr, slot, parent, n); + new TDERecentFilesAction(sLabel, cut, recvr, slot, parent, n); break; case Pause: case Demo: - pAction = new KToggleAction( sLabel, pInfo->psIconName, cut, + pAction = new TDEToggleAction( sLabel, pInfo->psIconName, cut, recvr, slot, parent, n); break; case ChooseGameType: - pAction = new KSelectAction( sLabel, pInfo->psIconName, cut, + pAction = new TDESelectAction( sLabel, pInfo->psIconName, cut, recvr, slot, parent, n); break; default: - pAction = new KAction( sLabel, pInfo->psIconName, cut, + pAction = new TDEAction( sLabel, pInfo->psIconName, cut, recvr, slot, parent, n); break; } @@ -137,73 +137,73 @@ const char* KStdGameAction::name( StdGameAction id ) return (pInfo) ? pInfo->psName : 0; } -KAction *KStdGameAction::gameNew(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::gameNew(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(New, name, recvr, slot, parent); } -KAction *KStdGameAction::load(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::load(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Load, name, recvr, slot, parent); } -KRecentFilesAction *KStdGameAction::loadRecent(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) -{ return static_cast(KStdGameAction::create(LoadRecent, name, recvr, slot, parent)); } -KAction *KStdGameAction::save(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDERecentFilesAction *KStdGameAction::loadRecent(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) +{ return static_cast(KStdGameAction::create(LoadRecent, name, recvr, slot, parent)); } +TDEAction *KStdGameAction::save(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Save, name, recvr, slot, parent); } -KAction *KStdGameAction::saveAs(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::saveAs(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(SaveAs, name, recvr, slot, parent); } -KAction *KStdGameAction::end(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::end(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(End, name, recvr, slot, parent); } -KToggleAction *KStdGameAction::pause(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) -{ return static_cast(KStdGameAction::create(Pause, name, recvr, slot, parent)); } -KAction *KStdGameAction::highscores(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEToggleAction *KStdGameAction::pause(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) +{ return static_cast(KStdGameAction::create(Pause, name, recvr, slot, parent)); } +TDEAction *KStdGameAction::highscores(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Highscores, name, recvr, slot, parent); } -KAction *KStdGameAction::print(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::print(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Print, name, recvr, slot, parent); } -KAction *KStdGameAction::quit(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::quit(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Quit, name, recvr, slot, parent); } -KAction *KStdGameAction::repeat(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::repeat(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Repeat, name, recvr, slot, parent); } -KAction *KStdGameAction::undo(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::undo(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Undo, name, recvr, slot, parent); } -KAction *KStdGameAction::redo(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::redo(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Redo, name, recvr, slot, parent); } -KAction *KStdGameAction::roll(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::roll(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Roll, name, recvr, slot, parent); } -KAction *KStdGameAction::endTurn(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::endTurn(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(EndTurn, name, recvr, slot, parent); } -KAction *KStdGameAction::carddecks(const TQObject *recvr, const char *slot, - KActionCollection *parent, const char *name ) +TDEAction *KStdGameAction::carddecks(const TQObject *recvr, const char *slot, + TDEActionCollection *parent, const char *name ) { return KStdGameAction::create(Carddecks, name, recvr, slot, parent); } -KAction *KStdGameAction::configureHighscores(const TQObject*recvr, const char *slot, - KActionCollection *parent, const char *name) +TDEAction *KStdGameAction::configureHighscores(const TQObject*recvr, const char *slot, + TDEActionCollection *parent, const char *name) { return KStdGameAction::create(ConfigureHighscores, name, recvr, slot, parent); } -KAction *KStdGameAction::hint(const TQObject*recvr, const char *slot, - KActionCollection *parent, const char *name) +TDEAction *KStdGameAction::hint(const TQObject*recvr, const char *slot, + TDEActionCollection *parent, const char *name) { return KStdGameAction::create(Hint, name, recvr, slot, parent); } -KToggleAction *KStdGameAction::demo(const TQObject*recvr, const char *slot, - KActionCollection *parent, const char *name) -{ return static_cast(KStdGameAction::create(Demo, name, recvr, slot, parent)); } -KAction *KStdGameAction::solve(const TQObject*recvr, const char *slot, - KActionCollection *parent, const char *name) +TDEToggleAction *KStdGameAction::demo(const TQObject*recvr, const char *slot, + TDEActionCollection *parent, const char *name) +{ return static_cast(KStdGameAction::create(Demo, name, recvr, slot, parent)); } +TDEAction *KStdGameAction::solve(const TQObject*recvr, const char *slot, + TDEActionCollection *parent, const char *name) { return KStdGameAction::create(Solve, name, recvr, slot, parent); } -KSelectAction *KStdGameAction::chooseGameType(const TQObject*recvr, const char *slot, - KActionCollection *parent, const char *name) -{ return static_cast(KStdGameAction::create(ChooseGameType, name, recvr, slot, parent)); } -KAction *KStdGameAction::restart(const TQObject*recvr, const char *slot, - KActionCollection *parent, const char *name) +TDESelectAction *KStdGameAction::chooseGameType(const TQObject*recvr, const char *slot, + TDEActionCollection *parent, const char *name) +{ return static_cast(KStdGameAction::create(ChooseGameType, name, recvr, slot, parent)); } +TDEAction *KStdGameAction::restart(const TQObject*recvr, const char *slot, + TDEActionCollection *parent, const char *name) { return KStdGameAction::create(Restart, name, recvr, slot, parent); } diff --git a/libtdegames/kstdgameaction.h b/libtdegames/kstdgameaction.h index 8b408b74..f0d809b2 100644 --- a/libtdegames/kstdgameaction.h +++ b/libtdegames/kstdgameaction.h @@ -21,12 +21,12 @@ #ifndef KSTDGAMEACTION_H #define KSTDGAMEACTION_H -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class TQObject; -class KActionCollection; -class KRecentFilesAction; -class KSelectAction; +class TDEActionCollection; +class TDERecentFilesAction; +class TDESelectAction; #include //----------------------------------------------------------------------------- @@ -77,16 +77,16 @@ public: * KStdAction::StdAction enum. * @since 3.2 */ - static KAction* create( StdGameAction id, const char *name, + static TDEAction* create( StdGameAction id, const char *name, const TQObject *recvr, const char *slot, - KActionCollection* parent ); + TDEActionCollection* parent ); /** * @since 3.2 */ - static KAction* create( StdGameAction id, + static TDEAction* create( StdGameAction id, const TQObject *recvr, const char *slot, - KActionCollection* parent ) + TDEActionCollection* parent ) { return create( id, 0, recvr, slot, parent ); } @@ -95,8 +95,8 @@ public: * KStdGameAction::StdGameAction enum. * @deprecated */ - static KAction *action(StdGameAction act_enum, const TQObject *recvr = 0, - const char *slot = 0, KActionCollection *parent = 0, + static TDEAction *action(StdGameAction act_enum, const TQObject *recvr = 0, + const char *slot = 0, TDEActionCollection *parent = 0, const char *name = 0L ); /** @@ -114,147 +114,147 @@ public: /** * Start a new game **/ - static KAction *gameNew(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *gameNew(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Load a previousely saved game */ - static KAction *load(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *load(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Load a recently loaded game. */ - static KRecentFilesAction *loadRecent(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDERecentFilesAction *loadRecent(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Save the current game. */ - static KAction *save(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *save(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Save the current game under a different filename. */ - static KAction *saveAs(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *saveAs(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Pause the game **/ - static KToggleAction *pause(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEToggleAction *pause(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Show the highscores. */ - static KAction *highscores(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *highscores(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * End the current game, but do not quit the program. Think of a "close" * entry. */ - static KAction *end(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *end(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Print the current screen? Game? Whatever - hardly used in games but there * is at least one example (ktuberling) */ - static KAction *print(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *print(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Quit the game. */ - static KAction *quit(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *quit(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Repeat the last move. **/ - static KAction *repeat(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *repeat(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Undo the last move **/ - static KAction *undo(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *undo(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Redo the last move (which has been undone) **/ - static KAction *redo(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *redo(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Roll die or dice **/ - static KAction *roll(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *roll(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * End the current turn (not the game). Usually to let the next player * start **/ - static KAction *endTurn(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *endTurn(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Display configure carddecks dialog. */ - static KAction *carddecks(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *carddecks(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Display configure highscores dialog. * @since 3.2 */ - static KAction *configureHighscores(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *configureHighscores(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Give an advice/hint. * @since 3.2 */ - static KAction *hint(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *hint(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Show a demo. * @since 3.2 */ - static KToggleAction *demo(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEToggleAction *demo(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Solve the game. * @since 3.2 */ - static KAction *solve(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *solve(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Choose game type. * @since 3.2 */ - static KSelectAction *chooseGameType(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDESelectAction *chooseGameType(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); /** * Restart game. * @since 3.2 */ - static KAction *restart(const TQObject *recvr = 0, const char *slot = 0, - KActionCollection *parent = 0, const char *name = 0L ); + static TDEAction *restart(const TQObject *recvr = 0, const char *slot = 0, + TDEActionCollection *parent = 0, const char *name = 0L ); }; -- cgit v1.2.1