1 files changed, 35 insertions, 35 deletions
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);
   }
 }