diff options
Diffstat (limited to 'kpoker')
| -rw-r--r-- | kpoker/TODO | 2 | ||||
| -rw-r--r-- | kpoker/betbox.cpp | 12 | ||||
| -rw-r--r-- | kpoker/betbox.h | 2 | ||||
| -rw-r--r-- | kpoker/kpaint.cpp | 2 | ||||
| -rw-r--r-- | kpoker/kpaint.h | 4 | ||||
| -rw-r--r-- | kpoker/kpoker.cpp | 70 | ||||
| -rw-r--r-- | kpoker/kpoker.h | 2 | ||||
| -rw-r--r-- | kpoker/newgamedlg.cpp | 14 | ||||
| -rw-r--r-- | kpoker/newgamedlg.h | 2 | ||||
| -rw-r--r-- | kpoker/optionsdlg.h | 2 | ||||
| -rw-r--r-- | kpoker/playerbox.cpp | 4 | ||||
| -rw-r--r-- | kpoker/playerbox.h | 2 | ||||
| -rw-r--r-- | kpoker/sound.cpp | 2 | ||||
| -rw-r--r-- | kpoker/top.cpp | 72 | ||||
| -rw-r--r-- | kpoker/top.h | 2 |
15 files changed, 97 insertions, 97 deletions
diff --git a/kpoker/TODO b/kpoker/TODO index fb954169..34fe1f7d 100644 --- a/kpoker/TODO +++ b/kpoker/TODO @@ -18,7 +18,7 @@ - Separate the waving motion into the winner box widget. - - CardImages shouldn't inherit QWidget. + - CardImages shouldn't inherit TQWidget. - Make CardWidget::heldLabel private. diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index 01d6fe3c..f8d80ea7 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -54,12 +54,12 @@ BetBox::BetBox(TQWidget* parent, const char* name) foldButton->setText(i18n("Fold")); //connects - connect(bet5Up, TQT_SIGNAL(clicked()), TQT_SLOT(bet5UpClicked())); - connect(bet10Up, TQT_SIGNAL(clicked()), TQT_SLOT(bet10UpClicked())); - connect(bet5Down, TQT_SIGNAL(clicked()), TQT_SLOT(bet5DownClicked())); - connect(bet10Down, TQT_SIGNAL(clicked()), TQT_SLOT(bet10DownClicked())); - connect(foldButton, TQT_SIGNAL(clicked()), TQT_SLOT(foldClicked())); - connect(adjustBet, TQT_SIGNAL(clicked()), TQT_SLOT(adjustBetClicked())); + connect(bet5Up, TQ_SIGNAL(clicked()), TQ_SLOT(bet5UpClicked())); + connect(bet10Up, TQ_SIGNAL(clicked()), TQ_SLOT(bet10UpClicked())); + connect(bet5Down, TQ_SIGNAL(clicked()), TQ_SLOT(bet5DownClicked())); + connect(bet10Down, TQ_SIGNAL(clicked()), TQ_SLOT(bet10DownClicked())); + connect(foldButton, TQ_SIGNAL(clicked()), TQ_SLOT(foldClicked())); + connect(adjustBet, TQ_SIGNAL(clicked()), TQ_SLOT(adjustBetClicked())); stopRaise(); } diff --git a/kpoker/betbox.h b/kpoker/betbox.h index 2fbb892c..37bee0b2 100644 --- a/kpoker/betbox.h +++ b/kpoker/betbox.h @@ -32,7 +32,7 @@ class TQPushButton; **/ class BetBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index 29e11608..f061bc1c 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -115,7 +115,7 @@ CardWidget::CardWidget( TQWidget *parent, const char *name ) m_held = false; setBackgroundMode( NoBackground ); // disables flickering - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(ownClick())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(ownClick())); setFixedSize(cardWidth, cardHeight); } diff --git a/kpoker/kpaint.h b/kpoker/kpaint.h index 119a2ba9..a003339d 100644 --- a/kpoker/kpaint.h +++ b/kpoker/kpaint.h @@ -35,7 +35,7 @@ class TQLabel; class CardImages : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class CardImages : public TQWidget **/ class CardWidget : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 29da61d8..2d7e53f0 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -28,7 +28,7 @@ #include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdelocale.h> @@ -182,7 +182,7 @@ kpok::kpok(TQWidget *parent, const char *name) lastHandText = ""; - version = kapp->caption() + " " + KPOKER_VERSION; + version = tdeApp->caption() + " " + KPOKER_VERSION; setCaption( version ); mOptions = 0; @@ -208,7 +208,7 @@ kpok::~kpok() // cashPerRound = mOptions->getCashPerRound(); // NOT(!) configurable } - TDEConfig* conf = kapp->config(); + TDEConfig* conf = tdeApp->config(); conf->setGroup("General"); conf->writeEntry("MinBet", m_game.getMinBet()); conf->writeEntry("MaxBet", m_game.getMaxBet()); @@ -255,7 +255,7 @@ void kpok::initWindow() // The draw button drawButton = new TQPushButton(this); drawButton->setText(i18n("&Deal")); - connect(drawButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(drawClick())); + connect(drawButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(drawClick())); inputLayout->addWidget(drawButton); inputLayout->addStretch(1); @@ -291,20 +291,20 @@ void kpok::initWindow() // Timers blinkTimer = new TQTimer(this); - connect( blinkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(bTimerEvent()) ); + connect( blinkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(bTimerEvent()) ); waveTimer = new TQTimer(this); - connect( waveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(waveTimerEvent()) ); + connect( waveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(waveTimerEvent()) ); drawTimer = new TQTimer(this); - connect (drawTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawCardsEvent()) ); + connect (drawTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawCardsEvent()) ); // and now the betUp/Down Buttons betBox = new BetBox(this, 0); betLayout->addWidget(betBox); - connect(betBox, TQT_SIGNAL(betChanged(int)), this, TQT_SLOT(betChange(int))); - connect(betBox, TQT_SIGNAL(betAdjusted()), this, TQT_SLOT(adjustBet())); - connect(betBox, TQT_SIGNAL(fold()), this, TQT_SLOT(out())); + connect(betBox, TQ_SIGNAL(betChanged(int)), this, TQ_SLOT(betChange(int))); + connect(betBox, TQ_SIGNAL(betAdjusted()), this, TQ_SLOT(adjustBet())); + connect(betBox, TQ_SIGNAL(fold()), this, TQ_SLOT(out())); // some tips TQToolTip::add(drawButton, i18n("Continue the round")); @@ -314,7 +314,7 @@ void kpok::initWindow() cardImages = new CardImages(this, 0); // The configuration - TDEConfig* conf = kapp->config(); + TDEConfig* conf = tdeApp->config(); conf->setGroup("General"); // Load the card deck. @@ -438,7 +438,7 @@ void kpok::newRound() paintCash(); - drawTimer->start(drawDelay, TRUE); + drawTimer->start(drawDelay, true); } @@ -606,16 +606,16 @@ void kpok::initPoker(unsigned int numPlayers) PokerGameType gametype = (numPlayers == 1) ? SinglePlayer : MultiPlayer; // Read some defaults. - kapp->config()->setGroup("General"); - int minBet = kapp->config()->readNumEntry("MinBet", MIN_BET); - int maxBet = kapp->config()->readNumEntry("MaxBet", MAX_BET); + tdeApp->config()->setGroup("General"); + int minBet = tdeApp->config()->readNumEntry("MinBet", MIN_BET); + int maxBet = tdeApp->config()->readNumEntry("MaxBet", MAX_BET); // Start a new poker game using the data found out above. m_game.newGame(gametype, m_numPlayers, m_players, minBet, maxBet); // Not (yet) configurable cashPerRound = CASH_PER_ROUND; - drawDelay = kapp->config()->readNumEntry("DrawDelay", DRAWDELAY); + drawDelay = tdeApp->config()->readNumEntry("DrawDelay", DRAWDELAY); m_blinkingBox = 0; currentMustBet = m_game.getMinBet(); @@ -644,7 +644,7 @@ void kpok::initPoker(unsigned int numPlayers) // // FIXME: Make CardWidget::toggleHeld() work. playerBox[0]->activateToggleHeld(); - connect(playerBox[0], TQT_SIGNAL(toggleHeld()), this, TQT_SLOT(toggleHeld())); + connect(playerBox[0], TQ_SIGNAL(toggleHeld()), this, TQ_SLOT(toggleHeld())); // hide some things playerBox[0]->showHelds(false); @@ -763,9 +763,9 @@ void kpok::drawClick() } if (playerBox[0]->getHeld(0)) - drawTimer->start(0, TRUE); + drawTimer->start(0, true); else - drawTimer->start(drawDelay, TRUE); + drawTimer->start(drawDelay, true); } else if (m_game.getState() == StateBet2) { // raise setBetButtonEnabled(false); @@ -905,9 +905,9 @@ void kpok::drawCardsEvent() drawStat++; // look at next card and if it is held instantly call drawCardEvent again if (playerBox[0]->getHeld(drawStat)) - drawTimer->start(0,TRUE); + drawTimer->start(0,true); else - drawTimer->start(drawDelay,TRUE); + drawTimer->start(drawDelay,true); } } @@ -1028,7 +1028,7 @@ void kpok::stopWave() { waveTimer->stop(); fCount = -1; /* clear image */ - repaint ( FALSE ); + repaint ( false ); waveActive = false; } @@ -1042,7 +1042,7 @@ void kpok::stopDrawing() void kpok::waveTimerEvent() { fCount = (fCount + 1) & 15; - repaint( FALSE ); + repaint( false ); } @@ -1215,7 +1215,7 @@ PokerPlayer* kpok::findHumanPlayer() bool kpok::readEntriesAndInitPoker() { NewGameDlg *newGameDlg = NULL; - TDEConfig *conf = kapp->config(); + TDEConfig *conf = tdeApp->config(); int numPlayers = DEFAULT_PLAYERS; conf->setGroup("NewGameDlg"); @@ -1293,8 +1293,8 @@ void kpok::betChange(int betChange) void kpok::saveGame() { - kapp->config()->setGroup("Save"); - saveGame(kapp->config()); + tdeApp->config()->setGroup("Save"); + saveGame(tdeApp->config()); } @@ -1393,8 +1393,8 @@ void kpok::readOptions() bool kpok::loadGame() { - kapp->config()->setGroup("Save"); - return loadGame(kapp->config()); + tdeApp->config()->setGroup("Save"); + return loadGame(tdeApp->config()); } @@ -1450,9 +1450,9 @@ void kpok::exchangeCard5() { playerBox[0]->cardClicked(5); } void kpok::slotCardDeck() { - kapp->config()->setGroup("General"); - TQString deckPath = kapp->config()->readPathEntry("DeckPath", 0); - TQString cardPath = kapp->config()->readPathEntry("CardPath", 0); + tdeApp->config()->setGroup("General"); + TQString deckPath = tdeApp->config()->readPathEntry("DeckPath", 0); + TQString cardPath = tdeApp->config()->readPathEntry("CardPath", 0); bool randomDeck, randomCardDir; // Show the "Select Card Deck" dialog and load the images for the @@ -1473,10 +1473,10 @@ void kpok::slotCardDeck() } // Save selected stuff in the configuration. - kapp->config()->writePathEntry("DeckPath", deckPath); - kapp->config()->writeEntry("RandomDeck", randomDeck); - kapp->config()->writePathEntry("CardPath", cardPath); - kapp->config()->writeEntry("RandomCardDir", randomCardDir); + tdeApp->config()->writePathEntry("DeckPath", deckPath); + tdeApp->config()->writeEntry("RandomDeck", randomDeck); + tdeApp->config()->writePathEntry("CardPath", cardPath); + tdeApp->config()->writeEntry("RandomCardDir", randomCardDir); } } diff --git a/kpoker/kpoker.h b/kpoker/kpoker.h index d15e7814..0d158f9a 100644 --- a/kpoker/kpoker.h +++ b/kpoker/kpoker.h @@ -169,7 +169,7 @@ public: class kpok : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index 21023ccd..962c239d 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -41,7 +41,7 @@ NewGameDlg::NewGameDlg(TQWidget* parent) TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); TQHBoxLayout *l = new TQHBoxLayout(topLayout); - TDEConfig* conf = kapp->config(); + TDEConfig* conf = tdeApp->config(); conf->setGroup("NewGameDlg"); bool showNewGameDlg = conf->readBoolEntry("showNewGameDlgOnStartup", SHOWNEWGAME_DEFAULT); @@ -60,8 +60,8 @@ NewGameDlg::NewGameDlg(TQWidget* parent) readFromConfigLabel->hide(); readFromConfigLabel->adjustSize(); l->addWidget(readFromConfigLabel); - connect(readFromConfig, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(changeReadFromConfig(bool))); + connect(readFromConfig, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(changeReadFromConfig(bool))); players = new KIntNumInput(playerNr, plainPage()); players->setRange(1, MAX_PLAYERS); @@ -100,7 +100,7 @@ NewGameDlg::NewGameDlg(TQWidget* parent) NewGameDlg::~NewGameDlg() { if (result() == Accepted) { - TDEConfig* conf = kapp->config(); + TDEConfig* conf = tdeApp->config(); conf->setGroup("NewGameDlg"); // defaults for the newGameDlg only conf->writeEntry("showNewGameDlgOnStartup", showOnStartup()); conf->writeEntry("readFromConfig", readFromConfigFile()); // just a default! @@ -123,11 +123,11 @@ NewGameDlg::~NewGameDlg() void NewGameDlg::setPlayerNames(int no, TQString playerName) { if (no < 0) { - kapp->config()->setGroup("Save"); - player1Name->setText(kapp->config()->readEntry("Name_0", i18n("You"))); + tdeApp->config()->setGroup("Save"); + player1Name->setText(tdeApp->config()->readEntry("Name_0", i18n("You"))); computerNames->clear(); for (int i = 1; i < MAX_PLAYERS; i++) { - computerNames->insertItem(kapp->config()->readEntry(TQString("Name_%1").arg(i), i18n("Computer %1").arg(i))); + computerNames->insertItem(tdeApp->config()->readEntry(TQString("Name_%1").arg(i), i18n("Computer %1").arg(i))); } } else if (no == 0) { player1Name->setText(playerName); diff --git a/kpoker/newgamedlg.h b/kpoker/newgamedlg.h index 05df1a31..46440095 100644 --- a/kpoker/newgamedlg.h +++ b/kpoker/newgamedlg.h @@ -38,7 +38,7 @@ class TQComboBox; **/ class NewGameDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/optionsdlg.h b/kpoker/optionsdlg.h index c9fcb908..3109fa9e 100644 --- a/kpoker/optionsdlg.h +++ b/kpoker/optionsdlg.h @@ -38,7 +38,7 @@ class KIntNumInput; **/ class OptionsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 8076554f..5bd4b939 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -176,8 +176,8 @@ void PlayerBox::paintCard(int nr) void PlayerBox::activateToggleHeld() { for (int i = 0; i < PokerHandSize; i++) { - connect(m_cardWidgets[i], TQT_SIGNAL(pClicked(CardWidget*)), - this, TQT_SLOT(cardClicked(CardWidget*))); + connect(m_cardWidgets[i], TQ_SIGNAL(pClicked(CardWidget*)), + this, TQ_SLOT(cardClicked(CardWidget*))); } } diff --git a/kpoker/playerbox.h b/kpoker/playerbox.h index 755bcb1f..652d86a3 100644 --- a/kpoker/playerbox.h +++ b/kpoker/playerbox.h @@ -31,7 +31,7 @@ class CardWidget; class PlayerBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpoker/sound.cpp b/kpoker/sound.cpp index 3835c3fb..ba80e2e2 100644 --- a/kpoker/sound.cpp +++ b/kpoker/sound.cpp @@ -16,7 +16,7 @@ #include <tqstring.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // sound support #include <kaudioplayer.h> diff --git a/kpoker/top.cpp b/kpoker/top.cpp index 76e4029e..95229081 100644 --- a/kpoker/top.cpp +++ b/kpoker/top.cpp @@ -50,14 +50,14 @@ PokerWindow::PokerWindow() LHLabel = new TQLabel(statusBar()); LHLabel->adjustSize(); - connect(m_kpok, TQT_SIGNAL(changeLastHand(const TQString &, bool)), - this, TQT_SLOT(setHand(const TQString &, bool))); - connect(m_kpok, TQT_SIGNAL(showClickToHold(bool)), - this, TQT_SLOT(showClickToHold(bool))); - connect(m_kpok, TQT_SIGNAL(clearStatusBar()), - this, TQT_SLOT(clearStatusBar())); - connect(m_kpok, TQT_SIGNAL(statusBarMessage(TQString)), - this, TQT_SLOT(statusBarMessage(TQString))); + connect(m_kpok, TQ_SIGNAL(changeLastHand(const TQString &, bool)), + this, TQ_SLOT(setHand(const TQString &, bool))); + connect(m_kpok, TQ_SIGNAL(showClickToHold(bool)), + this, TQ_SLOT(showClickToHold(bool))); + connect(m_kpok, TQ_SIGNAL(clearStatusBar()), + this, TQ_SLOT(clearStatusBar())); + connect(m_kpok, TQ_SIGNAL(statusBarMessage(TQString)), + this, TQ_SLOT(statusBarMessage(TQString))); statusBar()->addWidget(LHLabel, 0, true); m_kpok->updateLHLabel(); @@ -79,47 +79,47 @@ PokerWindow::~PokerWindow() void PokerWindow::initTDEAction() { //Game - KStdGameAction::gameNew(TQT_TQOBJECT(m_kpok), TQT_SLOT(newGame()), actionCollection()); - KStdGameAction::save(TQT_TQOBJECT(m_kpok), TQT_SLOT(saveGame()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdGameAction::gameNew(m_kpok, TQ_SLOT(newGame()), actionCollection()); + KStdGameAction::save(m_kpok, TQ_SLOT(saveGame()), actionCollection()); + KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); //Settings showMenubarAction = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); - soundAction = new TDEToggleAction(i18n("Soun&d"), 0, TQT_TQOBJECT(m_kpok), - TQT_SLOT(toggleSound()), actionCollection(), "options_sound"); + soundAction = new TDEToggleAction(i18n("Soun&d"), 0, m_kpok, + TQ_SLOT(toggleSound()), actionCollection(), "options_sound"); if (m_kpok->getSound()) m_kpok->toggleSound(); - blinkingAction = new TDEToggleAction(i18n("&Blinking Cards"), 0, TQT_TQOBJECT(m_kpok), - TQT_SLOT(toggleBlinking()), actionCollection(), "options_blinking"); + blinkingAction = new TDEToggleAction(i18n("&Blinking Cards"), 0, m_kpok, + TQ_SLOT(toggleBlinking()), actionCollection(), "options_blinking"); if (m_kpok->getBlinking()) m_kpok->toggleBlinking(); adjustAction = new TDEToggleAction(i18n("&Adjust Bet is Default"), 0, - TQT_TQOBJECT(m_kpok), TQT_SLOT(toggleAdjust()), actionCollection(), "options_adjust"); + m_kpok, TQ_SLOT(toggleAdjust()), actionCollection(), "options_adjust"); if (m_kpok->getAdjust()) m_kpok->toggleAdjust(); showStatusbarAction = - KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusbar()), actionCollection()); + KStdAction::showStatusbar(this, TQ_SLOT(toggleStatusbar()), actionCollection()); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), actionCollection()); - KStdGameAction::carddecks(TQT_TQOBJECT(m_kpok), TQT_SLOT(slotCardDeck()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(m_kpok), TQT_SLOT(slotPreferences()), actionCollection()); + KStdAction::saveOptions(this, TQ_SLOT(saveOptions()), actionCollection()); + KStdGameAction::carddecks(m_kpok, TQ_SLOT(slotCardDeck()), actionCollection()); + KStdAction::preferences(m_kpok, TQ_SLOT(slotPreferences()), actionCollection()); // Keyboard shortcuts. - (void)new TDEAction(i18n("Draw"), TDEShortcut(TQt::Key_Return), TQT_TQOBJECT(m_kpok), - TQT_SLOT(drawClick()), actionCollection(), "draw"); - (void)new TDEAction(i18n("Exchange Card 1"), TDEShortcut(TQt::Key_1), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard1()), actionCollection(), "exchange_card_1"); - (void)new TDEAction(i18n("Exchange Card 2"), TDEShortcut(TQt::Key_2), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard2()), actionCollection(), "exchange_card_2"); - (void)new TDEAction(i18n("Exchange Card 3"), TDEShortcut(TQt::Key_3), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard3()), actionCollection(), "exchange_card_3"); - (void)new TDEAction(i18n("Exchange Card 4"), TDEShortcut(TQt::Key_4), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard4()), actionCollection(), "exchange_card_4"); - (void)new TDEAction(i18n("Exchange Card 5"), TDEShortcut(TQt::Key_5), TQT_TQOBJECT(m_kpok), - TQT_SLOT(exchangeCard5()), actionCollection(), "exchange_card_5"); + (void)new TDEAction(i18n("Draw"), TDEShortcut(TQt::Key_Return), m_kpok, + TQ_SLOT(drawClick()), actionCollection(), "draw"); + (void)new TDEAction(i18n("Exchange Card 1"), TDEShortcut(TQt::Key_1), m_kpok, + TQ_SLOT(exchangeCard1()), actionCollection(), "exchange_card_1"); + (void)new TDEAction(i18n("Exchange Card 2"), TDEShortcut(TQt::Key_2), m_kpok, + TQ_SLOT(exchangeCard2()), actionCollection(), "exchange_card_2"); + (void)new TDEAction(i18n("Exchange Card 3"), TDEShortcut(TQt::Key_3), m_kpok, + TQ_SLOT(exchangeCard3()), actionCollection(), "exchange_card_3"); + (void)new TDEAction(i18n("Exchange Card 4"), TDEShortcut(TQt::Key_4), m_kpok, + TQ_SLOT(exchangeCard4()), actionCollection(), "exchange_card_4"); + (void)new TDEAction(i18n("Exchange Card 5"), TDEShortcut(TQt::Key_5), m_kpok, + TQ_SLOT(exchangeCard5()), actionCollection(), "exchange_card_5"); setupGUI( TDEMainWindow::Save | StatusBar | Keys | Create); } @@ -127,7 +127,7 @@ void PokerWindow::initTDEAction() void PokerWindow::readOptions() { - TDEConfig* conf = kapp->config(); + TDEConfig* conf = tdeApp->config(); conf->setGroup("General"); if (m_kpok->getSound() != conf->readBoolEntry("Sound", true)) @@ -235,7 +235,7 @@ void PokerWindow::clearStatusBar() void PokerWindow::saveOptions() { - TDEConfig* conf = kapp->config(); + TDEConfig* conf = tdeApp->config(); conf->setGroup("General"); conf->writeEntry("Sound", soundAction->isChecked()); @@ -250,7 +250,7 @@ bool PokerWindow::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - if (((TQMouseEvent*)e)->button() == Qt::RightButton) { + if (((TQMouseEvent*)e)->button() == TQt::RightButton) { TQPopupMenu* popup = (TQPopupMenu*) factory()->container("popup", this); if (popup) popup->popup(TQCursor::pos()); diff --git a/kpoker/top.h b/kpoker/top.h index 9653e955..750bfb97 100644 --- a/kpoker/top.h +++ b/kpoker/top.h @@ -29,7 +29,7 @@ class kpok; class PokerWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: |
