From f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:16 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kpoker/betbox.cpp | 8 ++++---- kpoker/kpoker.cpp | 10 +++++----- kpoker/main.cpp | 2 +- kpoker/playerbox.cpp | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kpoker') diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index 91fcab8b..2ed453e4 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -46,10 +46,10 @@ BetBox::BetBox(TQWidget* parent, const char* name) foldButton = new TQPushButton(this); l->addWidget(foldButton, 0); - bet5Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(5))); - bet10Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(10))); - bet5Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(5))); - bet10Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(10))); + bet5Up->setText(TQString("+%1").arg(TDEGlobal::locale()->formatMoney(5))); + bet10Up->setText(TQString("+%1").arg(TDEGlobal::locale()->formatMoney(10))); + bet5Down->setText(TQString("-%1").arg(TDEGlobal::locale()->formatMoney(5))); + bet10Down->setText(TQString("-%1").arg(TDEGlobal::locale()->formatMoney(10))); adjustBet->setText(i18n("Adjust Bet")); foldButton->setText(i18n("Fold")); diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 73321bdf..7d50e198 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -269,7 +269,7 @@ void kpok::initWindow() mWonWidget = new TQWidget(this); inputLayout->addWidget(mWonWidget, 2); mWonWidget->setMinimumHeight(50); //FIXME hardcoded value for the wave - mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").arg(KGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave + mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").arg(TDEGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave TQHBoxLayout* wonLayout = new TQHBoxLayout(mWonWidget); wonLayout->setAutoAdd(true); @@ -686,7 +686,7 @@ void kpok::paintCash() for (unsigned int i = 0; i < m_numPlayers; i++) { playerBox[i]->showCash(); } - potLabel->setText(i18n("Pot: %1").arg(KGlobal::locale()->formatMoney(m_game.getPot()))); + potLabel->setText(i18n("Pot: %1").arg(TDEGlobal::locale()->formatMoney(m_game.getPot()))); } @@ -805,9 +805,9 @@ void kpok::displayWinner_Computer(PokerPlayer* winner, bool othersPassed) // Generate a string with winner info and show it. TQString label; if (winner->getHuman()) - label = i18n("You won %1").arg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("You won %1").arg(TDEGlobal::locale()->formatMoney(m_game.getPot())); else - label = i18n("%1 won %2").arg(winner->getName()).arg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("%1 won %2").arg(winner->getName()).arg(TDEGlobal::locale()->formatMoney(m_game.getPot())); wonLabel->setText(label); // Start the waving motion of the text. @@ -1072,7 +1072,7 @@ void kpok::displayWin(const TQString& hand, int cashWon) if (cashWon) { playSound("win.wav"); - buf = i18n("You won %1!").arg(KGlobal::locale()->formatMoney(cashWon)); + buf = i18n("You won %1!").arg(TDEGlobal::locale()->formatMoney(cashWon)); } else { playSound("lose.wav"); buf = i18n("Game Over"); // locale diff --git a/kpoker/main.cpp b/kpoker/main.cpp index 88017931..9ed05f9b 100644 --- a/kpoker/main.cpp +++ b/kpoker/main.cpp @@ -41,7 +41,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication myApp; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); if (myApp.isRestored()) RESTORE(PokerWindow) diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 66ffd5a7..dee8337f 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -122,7 +122,7 @@ void PlayerBox::showCash() { // Show the amount of cash the player has. m_cashLabel->setText(i18n("Cash: %1") - .arg(KGlobal::locale()->formatMoney(m_player->getCash()))); + .arg(TDEGlobal::locale()->formatMoney(m_player->getCash()))); // Show how much we have bet during this round. if (m_player->out()) @@ -130,10 +130,10 @@ void PlayerBox::showCash() else { if (m_singlePlayer) m_betLabel->setText(i18n("Cash per round: %1") - .arg(KGlobal::locale()->formatMoney(m_cashPerRound))); + .arg(TDEGlobal::locale()->formatMoney(m_cashPerRound))); else m_betLabel->setText(i18n("Bet: %1") - .arg(KGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); + .arg(TDEGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); } } -- cgit v1.2.1