1 files changed, 28 insertions, 22 deletions

diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index a55aa73..27c0a9f 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -1,13 +1,19 @@
 #include "oyatzee.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlayout.h>
 
+/* STD */
 #include <stdlib.h>
 
 OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( parent , name , fl )
 {
         QWidget *thing = new QWidget( this );
         setCentralWidget( thing );
@@ -38,13 +44,13 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow(
         vbox->addWidget( sb );
         vbox->addWidget( dw );
 }
 
 void OYatzee::slotEndRound( int item )
 {
-        qDebug( "Der User hat Nummer %d ausgewählt" , item );
+        odebug << "Der User hat Nummer " << item << " ausgewählt" << oendl; 
 
         /*
          * if the user clicked on Total, Bonus or Score and thus not on a 
          * selectable item return and do nothing
          */
         if ( item == 7 || item == 8 || item == 16 ) return;
@@ -106,13 +112,13 @@ void OYatzee::slotEndRound( int item )
                         points = getPoints ( Chance , numbers );
         }
 
         sb->nextRB(currentPlayer-1)->updateMap( item , points );
         nextPlayer();
 
-        qDebug( "Punkte: %d" , points );
+        odebug << "Punkte: " << points << "" << oendl; 
 }
 
 void OYatzee::nextPlayer()
 {
         currentPlayer++;
 
@@ -153,13 +159,13 @@ OYatzee::~OYatzee()
 {
 }
 
 void OYatzee::detectPosibilities()
 {
         posibilities.clear();
-        qDebug( "running detectPosibilities()" );
+        odebug << "running detectPosibilities()" << oendl; 
         
         Dice *d = dw->diceList.first();
 
         QValueListInt numbers;
         
         for ( ; d != 0 ; d = dw->diceList.next() )
@@ -258,53 +264,53 @@ void OYatzee::detectPosibilities()
 }
 
 void OYatzee::displayPossibilites()
 {
         //X for ( QValueListInt::Iterator it = posibilities.begin() ; it != posibilities.end(); ++it )
         //X {
-        //X     qDebug( QString::number( *it ) );
+        //X     odebug << QString::number( *it ) << oendl; 
         //X     switch ( *it )
         //X     {
         //X             case Ones:
-        //X                     qDebug( "1er" );
+        //X                     odebug << "1er" << oendl; 
         //X                     break;
         //X             case Twos:
-        //X                     qDebug( "2er" );
+        //X                     odebug << "2er" << oendl; 
         //X                     break;
         //X             case Threes:
-        //X                     qDebug( "3er" );
+        //X                     odebug << "3er" << oendl; 
         //X                     break;
         //X             case Fours:
-        //X                     qDebug( "4er" );
+        //X                     odebug << "4er" << oendl; 
         //X                     break;
         //X             case Fives:
-        //X                     qDebug( "5er" );
+        //X                     odebug << "5er" << oendl; 
         //X                     break;
         //X             case Sixes:
-        //X                     qDebug( "6er" );
+        //X                     odebug << "6er" << oendl; 
         //X                     break;
         //X             case ThreeOfAKind:
-        //X                     qDebug( "3oaK" );
+        //X                     odebug << "3oaK" << oendl; 
         //X                     break;
         //X             case FourOfAKind:
-        //X                     qDebug( "4oaK" );
+        //X                     odebug << "4oaK" << oendl; 
         //X                     break;
         //X             case FullHouse:
-        //X                     qDebug( "Full House" );
+        //X                     odebug << "Full House" << oendl; 
         //X                     break;
         //X             case SStraight:
-        //X                     qDebug( "Short S" );
+        //X                     odebug << "Short S" << oendl; 
         //X                     break;
         //X             case LStraight:
-        //X                     qDebug( "Long S" );
+        //X                     odebug << "Long S" << oendl; 
         //X                     break;
         //X             case Yatzee:
-        //X                     qDebug( "Yatzee!" );
+        //X                     odebug << "Yatzee!" << oendl; 
         //X                     break;
         //X             case Chance:
-        //X                     qDebug( "Chance" );
+        //X                     odebug << "Chance" << oendl; 
         //X                     break;
         //X     }
         //X }
 
         sb->pb->setIntlist(  posibilities );
         sb->pb->update();
@@ -332,13 +338,13 @@ void OYatzee::setRoundsNumber( const int num )
 void OYatzee::slotStartGame()
 {
 }
 
 void OYatzee::slotRollDices()
 {
-        qDebug( "Roll nummer: %d" , ps.at( currentPlayer-1 )->turn );
+        odebug << "Roll nummer: " << ps.at( currentPlayer-1 )->turn << "" << oendl; 
 
         if ( ps.at( currentPlayer-1 )->turn == 3 )
         {
                 QMessageBox::information(   this, 
                                                                         "OYatzee",
                                                                         tr( "Only three rolls per turn allowed." ) );
@@ -350,15 +356,15 @@ void OYatzee::slotRollDices()
         for ( ; d != 0 ; d = dw->diceList.next() )
         {
                 if ( !d->isSelected )
                         d->roll();
         }
         
-        //qDebug( "Roll nummer (vorher): %d" , ps.at( currentPlayer-1 )->turn );
+        //odebug << "Roll nummer (vorher): " << ps.at( currentPlayer-1 )->turn << "" << oendl; 
         ps.at(currentPlayer-1)->turn++;
-        //qDebug( "Roll nummer (nachher): %d" , ps.at( currentPlayer-1 )->turn );
+        //odebug << "Roll nummer (nachher): " << ps.at( currentPlayer-1 )->turn << "" << oendl; 
 
         detectPosibilities();
 }
 
 /*
  * Scoreboard
@@ -388,13 +394,13 @@ Scoreboard::Scoreboard( playerList ps, QWidget *parent, const char *name ) : QWi
 Resultboard* Scoreboard::nextRB( int currentPlayer )
 {
         Resultboard *b;
 
         b = rbList.at( currentPlayer );
         
-                qDebug( "Anzahl: %d" ,rbList.count() );
+        odebug << "Anzahl: " << rbList.count() << "" << oendl; 
 
         return b;
         }       
 
 void Scoreboard::createResultboards(const int num)
 {
@@ -605,13 +611,13 @@ void Resultboard::paintEvent( QPaintEvent* )
         const int cell_height = this->height()/17;
         
         pointMap::Iterator it = pMap.begin();
         for ( ; it != pMap.end() ; ++it )
         {
                 int i = it.key();
-                qDebug( "ok: %d , %d" , i , it.data() );
+                odebug << "ok: " << i << " , " << it.data() << "" << oendl; 
                 p.drawText( 0, i*cell_height , cell_width , cell_height , Qt::AlignCenter , QString::number( it.data() ) );
         }
 
         p.drawText( 0,0,cell_width,cell_height, Qt::AlignCenter , pName ); //Playername
 }