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 /kbackgammon | |
parent | 2ce15ee76fd2d9d18a63c035a0f5b00b94c60cdc (diff) | |
download | tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.tar.gz tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kbackgammon')
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibs.cpp | 48 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibs.h | 14 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibschat.cpp | 46 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibschat.h | 2 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kplayerlist.cpp | 54 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kplayerlist.h | 4 | ||||
-rw-r--r-- | kbackgammon/engines/gnubg/kbggnubg.cpp | 2 | ||||
-rw-r--r-- | kbackgammon/engines/gnubg/kbggnubg.h | 2 | ||||
-rw-r--r-- | kbackgammon/engines/nextgen/kbgng.cpp | 4 | ||||
-rw-r--r-- | kbackgammon/engines/nextgen/kbgng.h | 6 | ||||
-rw-r--r-- | kbackgammon/engines/offline/kbgoffline.cpp | 10 | ||||
-rw-r--r-- | kbackgammon/kbg.cpp | 14 | ||||
-rw-r--r-- | kbackgammon/kbg.h | 10 | ||||
-rw-r--r-- | kbackgammon/kbgboard.cpp | 2 | ||||
-rw-r--r-- | kbackgammon/kbgboard.h | 2 | ||||
-rw-r--r-- | kbackgammon/kbgtextview.cpp | 2 |
16 files changed, 111 insertions, 111 deletions
diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index 4f8282b4..531010bf 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -2159,9 +2159,9 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen /* * Initialize the FIBS submenu - this is also put in the play menu */ - conAction = new KAction(i18n("&Connect"), 0, this, TQT_SLOT( connectFIBS()), this); - newAction = new KAction(i18n("New Account"), 0, this, TQT_SLOT( newAccount()), this); - disAction = new KAction(i18n("&Disconnect"), 0, this, TQT_SLOT(disconnectFIBS()), this); + conAction = new TDEAction(i18n("&Connect"), 0, this, TQT_SLOT( connectFIBS()), this); + newAction = new TDEAction(i18n("New Account"), 0, this, TQT_SLOT( newAccount()), this); + disAction = new TDEAction(i18n("&Disconnect"), 0, this, TQT_SLOT(disconnectFIBS()), this); conAction->setEnabled(true ); conAction->plug(menu); disAction->setEnabled(false); disAction->plug(menu); @@ -2169,7 +2169,7 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen menu->insertSeparator(); - (invAction = new KAction(i18n("&Invite..."), 0, this, TQT_SLOT(inviteDialog()), this))->plug(menu); + (invAction = new TDEAction(i18n("&Invite..."), 0, this, TQT_SLOT(inviteDialog()), this))->plug(menu); /* * Create and fill the response menu. This is for all these: type this or @@ -2177,8 +2177,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen */ cmdMenuID = menu->insertItem(i18n("&Commands"), cmdMenu); { - (actAway = new KAction(i18n("Away"), 0, this, TQT_SLOT(away()), this))->plug(cmdMenu); - (actBack = new KAction(i18n("Back"), 0, this, TQT_SLOT(back()), this))->plug(cmdMenu); + (actAway = new TDEAction(i18n("Away"), 0, this, TQT_SLOT(away()), this))->plug(cmdMenu); + (actBack = new TDEAction(i18n("Back"), 0, this, TQT_SLOT(back()), this))->plug(cmdMenu); actAway->setEnabled(true); actBack->setEnabled(false); @@ -2194,14 +2194,14 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen for (int i = 0; i < NumFIBSOpt; i++) fibsOpt[i] = 0; - fibsOpt[OptReady] = new KToggleAction(i18n("Ready to Play"), + fibsOpt[OptReady] = new TDEToggleAction(i18n("Ready to Play"), 0, this, TQT_SLOT(toggle_ready()), this); - fibsOpt[OptRatings] = new KToggleAction(i18n("Show Rating Computations"), + fibsOpt[OptRatings] = new TDEToggleAction(i18n("Show Rating Computations"), 0, this, TQT_SLOT(toggle_ratings()), this); fibsOpt[OptRatings]->setCheckedState(i18n("Hide Rating Computations")); - fibsOpt[OptGreedy] = new KToggleAction(i18n("Greedy Bearoffs"), + fibsOpt[OptGreedy] = new TDEToggleAction(i18n("Greedy Bearoffs"), 0, this, TQT_SLOT(toggle_greedy()), this); - fibsOpt[OptDouble] = new KToggleAction(i18n("Ask for Doubles"), + fibsOpt[OptDouble] = new TDEToggleAction(i18n("Ask for Doubles"), 0, this, TQT_SLOT(toggle_double()), this); for (int i = 0; i < NumFIBSOpt; i++) @@ -2216,16 +2216,16 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen */ respMenuID = menu->insertItem(i18n("&Response"), respMenu); { - (actAccept = new KAction(i18n("Accept"), 0, this, TQT_SLOT(accept()), this))->plug(respMenu); - (actReject = new KAction(i18n("Reject"), 0, this, TQT_SLOT(reject()), this))->plug(respMenu); + (actAccept = new TDEAction(i18n("Accept"), 0, this, TQT_SLOT(accept()), this))->plug(respMenu); + (actReject = new TDEAction(i18n("Reject"), 0, this, TQT_SLOT(reject()), this))->plug(respMenu); actAccept->setEnabled(false); actReject->setEnabled(false); respMenu->insertSeparator(); - (actConti = new KAction(i18n("Join"), 0, this, TQT_SLOT(match_conti()), this))->plug(respMenu); - (actLeave = new KAction(i18n("Leave"), 0, this, TQT_SLOT(match_leave()), this))->plug(respMenu); + (actConti = new TDEAction(i18n("Join"), 0, this, TQT_SLOT(match_conti()), this))->plug(respMenu); + (actLeave = new TDEAction(i18n("Leave"), 0, this, TQT_SLOT(match_leave()), this))->plug(respMenu); actConti->setEnabled(false); actLeave->setEnabled(false); @@ -2238,14 +2238,14 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen joinMenuID = menu->insertItem(i18n("&Join"), joinMenu); { numJoin = -1; - actJoin[0] = new KAction("", 0, this, TQT_SLOT(join_0()), this); - actJoin[1] = new KAction("", 0, this, TQT_SLOT(join_1()), this); - actJoin[2] = new KAction("", 0, this, TQT_SLOT(join_2()), this); - actJoin[3] = new KAction("", 0, this, TQT_SLOT(join_3()), this); - actJoin[4] = new KAction("", 0, this, TQT_SLOT(join_4()), this); - actJoin[5] = new KAction("", 0, this, TQT_SLOT(join_5()), this); - actJoin[6] = new KAction("", 0, this, TQT_SLOT(join_6()), this); - actJoin[7] = new KAction("", 0, this, TQT_SLOT(join_7()), this); + actJoin[0] = new TDEAction("", 0, this, TQT_SLOT(join_0()), this); + actJoin[1] = new TDEAction("", 0, this, TQT_SLOT(join_1()), this); + actJoin[2] = new TDEAction("", 0, this, TQT_SLOT(join_2()), this); + actJoin[3] = new TDEAction("", 0, this, TQT_SLOT(join_3()), this); + actJoin[4] = new TDEAction("", 0, this, TQT_SLOT(join_4()), this); + actJoin[5] = new TDEAction("", 0, this, TQT_SLOT(join_5()), this); + actJoin[6] = new TDEAction("", 0, this, TQT_SLOT(join_6()), this); + actJoin[7] = new TDEAction("", 0, this, TQT_SLOT(join_7()), this); } menu->setItemEnabled(joinMenuID, false); @@ -2258,8 +2258,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen */ menu->insertSeparator(); - (listAct = new KToggleAction(i18n("&Player List"), 0, this, TQT_SLOT(showList()), this))->plug(menu); - (chatAct = new KToggleAction(i18n("&Chat"), 0, this, TQT_SLOT(showChat()), this))->plug(menu); + (listAct = new TDEToggleAction(i18n("&Player List"), 0, this, TQT_SLOT(showList()), this))->plug(menu); + (chatAct = new TDEToggleAction(i18n("&Chat"), 0, this, TQT_SLOT(showChat()), this))->plug(menu); connect(playerlist, TQT_SIGNAL(windowVisible(bool)), listAct, TQT_SLOT(setChecked(bool))); connect(chatWindow, TQT_SIGNAL(windowVisible(bool)), chatAct, TQT_SLOT(setChecked(bool))); diff --git a/kbackgammon/engines/fibs/kbgfibs.h b/kbackgammon/engines/fibs/kbgfibs.h index 71b75adc..a2c9e048 100644 --- a/kbackgammon/engines/fibs/kbgfibs.h +++ b/kbackgammon/engines/fibs/kbgfibs.h @@ -46,8 +46,8 @@ class TQSocket; class TQPopupMenu; class TQCheckBox; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; /** * @@ -228,11 +228,11 @@ private: bool redoPossible; int undoCounter; - KAction *conAction, *disAction, *newAction, *invAction; + TDEAction *conAction, *disAction, *newAction, *invAction; - KAction *actAccept, *actReject, *actConti, *actLeave, *actAway, *actBack; + TDEAction *actAccept, *actReject, *actConti, *actLeave, *actAway, *actBack; - KToggleAction *chatAct, *listAct; + TDEToggleAction *chatAct, *listAct; // ########################################################################### @@ -253,7 +253,7 @@ private: * is eight and this is hardcoded in a lot of places (not the least * of which are the slots join_N(). */ - KAction *actJoin[8]; + TDEAction *actJoin[8]; int numJoin; protected slots: @@ -304,7 +304,7 @@ private: */ enum FIBSOpt {OptReady, OptGreedy, OptDouble, OptAllowPip, OptAutoMove, OptCrawford, OptSilent, OptRatings, OptMoves, NumFIBSOpt}; - KToggleAction *fibsOpt[NumFIBSOpt]; + TDEToggleAction *fibsOpt[NumFIBSOpt]; public slots: diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index ece5e9ef..95fd222d 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -159,7 +159,7 @@ public: /* * Available actions */ - KAction *mAct[MaxAction]; + TDEAction *mAct[MaxAction]; /* * Context menu and invitation menu @@ -193,7 +193,7 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) : KChat(parent, false) { d = new KBgChatPrivate(); - KActionCollection* actions = new KActionCollection(this); + TDEActionCollection* actions = new TDEActionCollection(this); d->mName[0] = TQString(); d->mChat = 0; @@ -230,34 +230,34 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) /* * Define set of available actions */ - d->mAct[KBgChatPrivate::Inquire] = new KAction(i18n("Info On"), + d->mAct[KBgChatPrivate::Inquire] = new TDEAction(i18n("Info On"), TQIconSet(kapp->iconLoader()->loadIcon( "help.xpm", KIcon::Small)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInquire()), actions); - d->mAct[KBgChatPrivate::Talk] = new KAction(i18n("Talk To"), + d->mAct[KBgChatPrivate::Talk] = new TDEAction(i18n("Talk To"), TQIconSet(kapp->iconLoader()->loadIcon( PROG_NAME "-chat.png", KIcon::Small)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions); - d->mAct[KBgChatPrivate::InviteD] = new KAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInviteD()), actions); - d->mAct[KBgChatPrivate::Invite1] = new KAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite1()), actions); - d->mAct[KBgChatPrivate::Invite2] = new KAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite2()), actions); - d->mAct[KBgChatPrivate::Invite3] = new KAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite3()), actions); - d->mAct[KBgChatPrivate::Invite4] = new KAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite4()), actions); - d->mAct[KBgChatPrivate::Invite5] = new KAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite5()), actions); - d->mAct[KBgChatPrivate::Invite6] = new KAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite6()), actions); - d->mAct[KBgChatPrivate::Invite7] = new KAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite7()), actions); - d->mAct[KBgChatPrivate::InviteU] = new KAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInviteU()), actions); - d->mAct[KBgChatPrivate::InviteR] = new KAction(i18n("Resume"), 0, TQT_TQOBJECT(this), + d->mAct[KBgChatPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInviteR()), actions); d->mAct[KBgChatPrivate::InviteD]->plug(d->mInvt); @@ -277,13 +277,13 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) d->mAct[KBgChatPrivate::InviteU]->plug(d->mInvt); d->mAct[KBgChatPrivate::InviteR]->plug(d->mInvt); - d->mAct[KBgChatPrivate::Gag] = new KAction(i18n("Gag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGag()), actions); - d->mAct[KBgChatPrivate::Ungag] = new KAction(i18n("Ungag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUngag()), actions); - d->mAct[KBgChatPrivate::Cleargag] = new KAction(i18n("Clear Gag List"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleargag()), actions); + d->mAct[KBgChatPrivate::Gag] = new TDEAction(i18n("Gag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGag()), actions); + d->mAct[KBgChatPrivate::Ungag] = new TDEAction(i18n("Ungag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUngag()), actions); + d->mAct[KBgChatPrivate::Cleargag] = new TDEAction(i18n("Clear Gag List"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleargag()), actions); d->mAct[KBgChatPrivate::Copy] = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions); - d->mAct[KBgChatPrivate::Clear] = new KAction(i18n("Clear"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actions); + d->mAct[KBgChatPrivate::Clear] = new TDEAction(i18n("Clear"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actions); d->mAct[KBgChatPrivate::Close] = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions); - d->mAct[KBgChatPrivate::Silent] = new KToggleAction(i18n("Silent"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSilent()), actions); + d->mAct[KBgChatPrivate::Silent] = new TDEToggleAction(i18n("Silent"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSilent()), actions); } @@ -316,7 +316,7 @@ void KBgChat::readConfig() config->readBoolEntry("vis", false) ? show() : hide(); - ((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->setChecked(config->readBoolEntry("sil", false)); + ((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->setChecked(config->readBoolEntry("sil", false)); d->mGag = config->readListEntry("gag"); } @@ -334,7 +334,7 @@ void KBgChat::saveConfig() config->writeEntry("wdt", width()); config->writeEntry("vis", isVisible()); - config->writeEntry("sil", ((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()); + config->writeEntry("sil", ((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()); config->writeEntry("gag", d->mGag); } @@ -557,7 +557,7 @@ void KBgChat::handleData(const TQString &msg) break; case CLIP_SHOUTS: - if ((!((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) { + if ((!((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) { cMsg = i18n("<u>%1 shouts:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"black\">" + cMsg + "</font>"; } else @@ -784,7 +784,7 @@ void KBgChat::slotInquire() void KBgChat::slotSilent() { TQString msg; - if (((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) + if (((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) msg = "<font color=\"blue\">" + i18n("You will not hear what people shout.") + "</font>"; else msg = "<font color=\"blue\">" + i18n("You will hear what people shout.") + "</font>"; diff --git a/kbackgammon/engines/fibs/kbgfibschat.h b/kbackgammon/engines/fibs/kbgfibschat.h index ec009a5f..1c39aaf8 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.h +++ b/kbackgammon/engines/fibs/kbgfibschat.h @@ -37,7 +37,7 @@ class TQListBoxItem; class TQPopupMenu; class KTabCtl; -class KAction; +class TDEAction; class KBgChatPrivate; diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index d811b1f2..1c4feb47 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -72,14 +72,14 @@ public: * Extension of the TQListViewItem class that has a custom key function * that can deal with the different items of the player list. */ -class KFibsPlayerListLVI : public KListViewItem { +class KFibsPlayerListLVI : public TDEListViewItem { public: /* * Constructor */ - KFibsPlayerListLVI(KFibsPlayerList *parent) : KListViewItem(parent) { _plist = parent; } + KFibsPlayerListLVI(KFibsPlayerList *parent) : TDEListViewItem(parent) { _plist = parent; } /* * Destructor @@ -145,7 +145,7 @@ public: /* * Various actions for the context menu */ - KAction *mAct[ActionEnd]; + TDEAction *mAct[ActionEnd]; /* * All relevant information on the columns @@ -201,10 +201,10 @@ public: * Construct the playerlist and do some initial setup */ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { d = new KFibsPlayerListPrivate(); - KActionCollection* actions = new KActionCollection(this); + TDEActionCollection* actions = new TDEActionCollection(this); /* * Allocate the column information @@ -286,44 +286,44 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) /* * Create the whole set of actions */ - d->mAct[KFibsPlayerListPrivate::Info] = new KAction(i18n("Info"), + d->mAct[KFibsPlayerListPrivate::Info] = new TDEAction(i18n("Info"), TQIconSet(kapp->iconLoader()->loadIcon ("help.xpm", KIcon::Small)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actions); - d->mAct[KFibsPlayerListPrivate::Talk] = new KAction(i18n("Talk"), + d->mAct[KFibsPlayerListPrivate::Talk] = new TDEAction(i18n("Talk"), TQIconSet(kapp->iconLoader()->loadIcon (PROG_NAME "-chat.png", KIcon::Small)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions); - d->mAct[KFibsPlayerListPrivate::Look] = new KAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()), actions); - d->mAct[KFibsPlayerListPrivate::Watch] = new KAction(i18n("Watch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWatch()), actions); - d->mAct[KFibsPlayerListPrivate::Unwatch] = new KAction(i18n("Unwatch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnwatch()),actions); - d->mAct[KFibsPlayerListPrivate::BlindAct] = new KAction(i18n("Blind"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlind()), actions); - d->mAct[KFibsPlayerListPrivate::Update] = new KAction(i18n("Update"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdate()), actions); + d->mAct[KFibsPlayerListPrivate::Look] = new TDEAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()), actions); + d->mAct[KFibsPlayerListPrivate::Watch] = new TDEAction(i18n("Watch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWatch()), actions); + d->mAct[KFibsPlayerListPrivate::Unwatch] = new TDEAction(i18n("Unwatch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnwatch()),actions); + d->mAct[KFibsPlayerListPrivate::BlindAct] = new TDEAction(i18n("Blind"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlind()), actions); + d->mAct[KFibsPlayerListPrivate::Update] = new TDEAction(i18n("Update"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdate()), actions); d->mAct[KFibsPlayerListPrivate::Reload] = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(slotReload()), actions); d->mAct[KFibsPlayerListPrivate::Mail] = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actions); d->mAct[KFibsPlayerListPrivate::Close] = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions); - d->mAct[KFibsPlayerListPrivate::InviteD] = new KAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInviteD()), actions); - d->mAct[KFibsPlayerListPrivate::Invite1] = new KAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite1()), actions); - d->mAct[KFibsPlayerListPrivate::Invite2] = new KAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite2()), actions); - d->mAct[KFibsPlayerListPrivate::Invite3] = new KAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite3()), actions); - d->mAct[KFibsPlayerListPrivate::Invite4] = new KAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite4()), actions); - d->mAct[KFibsPlayerListPrivate::Invite5] = new KAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite5()), actions); - d->mAct[KFibsPlayerListPrivate::Invite6] = new KAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite6()), actions); - d->mAct[KFibsPlayerListPrivate::Invite7] = new KAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvite7()), actions); - d->mAct[KFibsPlayerListPrivate::InviteU] = new KAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInviteU()), actions); - d->mAct[KFibsPlayerListPrivate::InviteR] = new KAction(i18n("Resume"), 0, TQT_TQOBJECT(this), + d->mAct[KFibsPlayerListPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInviteR()), actions); /* @@ -363,8 +363,8 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name) /* * Right mouse button gets context menu, double click gets player info */ - connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)), - this, TQT_SLOT(showContextMenu(KListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + this, TQT_SLOT(showContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(getPlayerInfo(TQListViewItem *, const TQPoint &, int))); } @@ -562,7 +562,7 @@ void KFibsPlayerList::saveConfig() /* * Save selected player, update the menu entries and show the popup menu */ -void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPoint &p) +void KFibsPlayerList::showContextMenu(TDEListView *, TQListViewItem *i, const TQPoint &p) { /* * Get the name of the selected player @@ -849,7 +849,7 @@ int KFibsPlayerList::cIndex(int col) */ void KFibsPlayerList::showEvent(TQShowEvent *e) { - KListView::showEvent(e); + TDEListView::showEvent(e); emit windowVisible(true); } @@ -859,7 +859,7 @@ void KFibsPlayerList::showEvent(TQShowEvent *e) void KFibsPlayerList::hideEvent(TQHideEvent *e) { emit windowVisible(false); - KListView::hideEvent(e); + TDEListView::hideEvent(e); } /* diff --git a/kbackgammon/engines/fibs/kplayerlist.h b/kbackgammon/engines/fibs/kplayerlist.h index fb0bbd5f..054960a9 100644 --- a/kbackgammon/engines/fibs/kplayerlist.h +++ b/kbackgammon/engines/fibs/kplayerlist.h @@ -43,7 +43,7 @@ class KFibsPlayerListPrivate; * @author Jens Hoefkens <[email protected]> * */ -class KFibsPlayerList : public KListView +class KFibsPlayerList : public TDEListView { Q_OBJECT @@ -166,7 +166,7 @@ protected slots: /** * Display a popup menu for the current player */ - void showContextMenu(KListView *, TQListViewItem *, const TQPoint &); + void showContextMenu(TDEListView *, TQListViewItem *, const TQPoint &); /** * Reload the whole list diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index ff6f6bdb..df845f5f 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -439,7 +439,7 @@ KBgEngineGNU::KBgEngineGNU(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) /* * Setup of menu */ - resAction = new KAction(i18n("&Restart GNU Backgammon"), 0, this, TQT_SLOT(startGNU()), this); + resAction = new TDEAction(i18n("&Restart GNU Backgammon"), 0, this, TQT_SLOT(startGNU()), this); resAction->setEnabled(false); resAction->plug(menu); /* diff --git a/kbackgammon/engines/gnubg/kbggnubg.h b/kbackgammon/engines/gnubg/kbggnubg.h index b86e9130..dd4bc9b2 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.h +++ b/kbackgammon/engines/gnubg/kbggnubg.h @@ -205,7 +205,7 @@ private: int turn; - KAction *resAction; + TDEAction *resAction; protected slots: diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp index 72fe77ab..0bc1d26c 100644 --- a/kbackgammon/engines/nextgen/kbgng.cpp +++ b/kbackgammon/engines/nextgen/kbgng.cpp @@ -68,13 +68,13 @@ KBgEngineNg::KBgEngineNg(TQWidget *parent, TQString *name, TQPopupMenu *pmenu) for (int i = 0; i < MaxTypes; i++) list.append(label[i]); - _gameSelect = new KSelectAction(i18n("&Types"), 0, this, TQT_SLOT(setGame()), this); + _gameSelect = new TDESelectAction(i18n("&Types"), 0, this, TQT_SLOT(setGame()), this); _gameSelect->setItems(list); _gameSelect->plug(menu); menu->insertSeparator(); - _connectAction = new KAction(i18n("&Names..."), 0, this, TQT_SLOT(changeName()), this); + _connectAction = new TDEAction(i18n("&Names..."), 0, this, TQT_SLOT(changeName()), this); _connectAction->plug(menu); // Restore last settings diff --git a/kbackgammon/engines/nextgen/kbgng.h b/kbackgammon/engines/nextgen/kbgng.h index 4e4b8730..58d86172 100644 --- a/kbackgammon/engines/nextgen/kbgng.h +++ b/kbackgammon/engines/nextgen/kbgng.h @@ -212,9 +212,9 @@ private: enum GameTypes {None = -1, Local, NetServer, NetClient, MaxTypes}; - KSelectAction * _gameSelect; - KAction* _connectAction; - KAction* _nameAction; + TDESelectAction * _gameSelect; + TDEAction* _connectAction; + TDEAction* _nameAction; int _currGame; int _nLocalPlayers; diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp index b0b33034..57b6aa2a 100644 --- a/kbackgammon/engines/offline/kbgoffline.cpp +++ b/kbackgammon/engines/offline/kbgoffline.cpp @@ -70,8 +70,8 @@ public: /* * Game actions */ - KAction *mNew, *mSwap; - KToggleAction *mEdit; + TDEAction *mNew, *mSwap; + TDEToggleAction *mEdit; /* * Player's names @@ -120,10 +120,10 @@ KBgEngineOffline::KBgEngineOffline(TQWidget *parent, TQString *name, TQPopupMenu /* * Create engine specific actions */ - d->mNew = new KAction(i18n("&New Game..."), 0, this, TQT_SLOT(newGame()), this); - d->mSwap = new KAction(i18n("&Swap Colors"), 0, this, TQT_SLOT(swapColors()), this); + d->mNew = new TDEAction(i18n("&New Game..."), 0, this, TQT_SLOT(newGame()), this); + d->mSwap = new TDEAction(i18n("&Swap Colors"), 0, this, TQT_SLOT(swapColors()), this); - d->mEdit = new KToggleAction(i18n("&Edit Mode"), 0, this, + d->mEdit = new TDEToggleAction(i18n("&Edit Mode"), 0, this, TQT_SLOT(toggleEditMode()), this); d->mEdit->setChecked(false); diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp index f2fea097..70bff939 100644 --- a/kbackgammon/kbg.cpp +++ b/kbackgammon/kbg.cpp @@ -105,7 +105,7 @@ KBg::KBg() TQStringList list; for (int i = 0; i < MaxEngine; i++) list.append(engineString[i]); - engineSet = new KSelectAction(i18n("&Engine"), 0, TQT_TQOBJECT(this), TQT_SLOT(setupEngine()), actionCollection(), + engineSet = new TDESelectAction(i18n("&Engine"), 0, TQT_TQOBJECT(this), TQT_SLOT(setupEngine()), actionCollection(), "move_engine"); engineSet->setItems(list); @@ -121,7 +121,7 @@ KBg::KBg() rollAction->setEnabled(false); endAction = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SLOT(done()), actionCollection()); endAction->setEnabled(false); - cubeAction = new KAction(i18n("Double Cube"), TQIconSet(kapp->iconLoader()->loadIcon + cubeAction = new TDEAction(i18n("Double Cube"), TQIconSet(kapp->iconLoader()->loadIcon (PROG_NAME "-double.xpm", KIcon::Toolbar)), 0, TQT_TQOBJECT(this), TQT_SLOT(cube()), actionCollection(), "move_cube"); cubeAction->setEnabled(false); @@ -130,12 +130,12 @@ KBg::KBg() KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(setupDlg()), actionCollection()); KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveConfig()), actionCollection()); - KPopupMenu *p = (new KActionMenu(i18n("&Backgammon on the Web"), + TDEPopupMenu *p = (new TDEActionMenu(i18n("&Backgammon on the Web"), actionCollection(), "help_www"))->popupMenu(); - (new KAction(helpTopic[FIBSHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwFIBS()), + (new TDEAction(helpTopic[FIBSHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwFIBS()), actionCollection(), "help_www_fibs"))->plug(p); - (new KAction(helpTopic[RuleHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwRule()), + (new TDEAction(helpTopic[RuleHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwRule()), actionCollection(), "help_www_rule"))->plug(p); /* @@ -812,7 +812,7 @@ void KBg::allowCommand(int cmd, bool f) */ void KBg::hideEvent(TQHideEvent *e) { - KMainWindow::hideEvent(e); + TDEMainWindow::hideEvent(e); engine[currEngine]->hideEvent(); } @@ -822,7 +822,7 @@ void KBg::hideEvent(TQHideEvent *e) */ void KBg::showEvent(TQShowEvent *e) { - KMainWindow::showEvent(e); + TDEMainWindow::showEvent(e); engine[currEngine]->showEvent(); } diff --git a/kbackgammon/kbg.h b/kbackgammon/kbg.h index a0a064cf..b7daa0c8 100644 --- a/kbackgammon/kbg.h +++ b/kbackgammon/kbg.h @@ -34,8 +34,8 @@ class TQSplitter; class TQCheckBox; class TQPopupMenu; class TQLabel; -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class KLineEdit; class KDialogBase; class KDoubleNumInput; @@ -45,7 +45,7 @@ class KBgTextView; class KBgBoardSetup; -class KBg : public KMainWindow +class KBg : public TDEMainWindow { Q_OBJECT @@ -193,7 +193,7 @@ protected slots: void setupCancel(); private: - KAction *newAction, *undoAction, *redoAction, *rollAction, *cubeAction, *endAction, *loadAction; + TDEAction *newAction, *undoAction, *redoAction, *rollAction, *cubeAction, *endAction, *loadAction; /* * Each engine has its own identifier. @@ -206,7 +206,7 @@ private: TQPopupMenu *dummyPopup; enum HelpTopics {FIBSHome, RuleHome, MaxHelpTopic}; TQString helpTopic[MaxHelpTopic][2]; - KSelectAction *engineSet; + TDESelectAction *engineSet; /** * Notebook for the setup diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp index 4f6f11a3..ee50f3e8 100644 --- a/kbackgammon/kbgboard.cpp +++ b/kbackgammon/kbgboard.cpp @@ -235,7 +235,7 @@ void KBgBoardSetup::getSetupPages(KDialogBase *nb) * =================== */ w = new TQWidget(tc); - kf = new KFontChooser(w); + kf = new TDEFontChooser(w); kf->setFont(getFont()); gl = new TQGridLayout(w, 1, 1, nb->spacingHint()); gl->addWidget(kf, 0, 0); diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h index 149a9157..11988e4f 100644 --- a/kbackgammon/kbgboard.h +++ b/kbackgammon/kbgboard.h @@ -958,7 +958,7 @@ private: /** * Save settings before the user changed them */ - KFontChooser *kf; + TDEFontChooser *kf; TQRadioButton *rbMove[3]; diff --git a/kbackgammon/kbgtextview.cpp b/kbackgammon/kbgtextview.cpp index 0de7a040..61ff1d5d 100644 --- a/kbackgammon/kbgtextview.cpp +++ b/kbackgammon/kbgtextview.cpp @@ -75,7 +75,7 @@ void KBgTextView::clear() void KBgTextView::selectFont() { TQFont f = font(); - KFontDialog::getFont(f, false, this, true); + TDEFontDialog::getFont(f, false, this, true); setFont(f); } |