convert to Opie Debugging Framework

13 files changed, 75 insertions, 57 deletions

diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index 51020a0..bdb1c78 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -1,20 +1,24 @@
 #include "backgammon.h"
-
 #include "aidialog.h"
 #include "filedialog.h"
 #include "playerdialog.h"
 #include "rulesdialog.h"
 #include "themedialog.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
 #include <qmenubar.h>
-#include <qpe/resource.h>
 
 #include <stdlib.h>
 
 
@@ -32,9 +36,9 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
     //load the default theme
     Config conf("backgammon");
     if(!conf.isValid())
     {
-        qDebug("config file does not exist");
+        odebug << "config file does not exist" << oendl; 
         conf.setGroup("general");
         conf.writeEntry("theme","default");
         conf.setGroup("rules");
         conf.writeEntry("move_with_pieces_out",false);
@@ -77,9 +81,9 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
     //get the theme component names
     Config theme(theme_file,Config::File);   
     if(!theme.isValid())
     {
-      qDebug("theme file does not exist");
+      odebug << "theme file does not exist" << oendl; 
       theme.setGroup("theme");
       theme.writeEntry("board","casino_board_1");
       theme.writeEntry("pieces1","casino_pieces_blue");
       theme.writeEntry("pieces2","casino_pieces_white");
diff --git a/noncore/games/backgammon/moveengine.cpp b/noncore/games/backgammon/moveengine.cpp
index 7de7147..a4145cc 100644
--- a/noncore/games/backgammon/moveengine.cpp
+++ b/noncore/games/backgammon/moveengine.cpp
@@ -456,9 +456,9 @@ int MoveEngine::getPossibleMoves()
 }
 
 void MoveEngine::move(const int& from, int to, const int& dice)
 {
-    //qDebug("%d moves from %d to %d (%d) with dice %d",player,from,to,to-from,dice);
+    //odebug << "" << player << " moves from " << from << " to " << to << " (" << to-from << ") with dice " << dice << "" << oendl; 
 
     if(player==1 && to==25)
         to=26;
     if(player==2 && to==0)
diff --git a/noncore/games/bounce/bounce.pro b/noncore/games/bounce/bounce.pro
index ba745c8..56a325c 100644
--- a/noncore/games/bounce/bounce.pro
+++ b/noncore/games/bounce/bounce.pro
@@ -1,10 +1,9 @@
-#CONFIG		= qt warn_on 
-CONFIG		= qt warn_on  quick-app
+CONFIG		= qt warn_on quick-app
 HEADERS		= game.h kbounce.h
 SOURCES		= game.cpp kbounce.cpp main.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS        += -lqpe -lopiecore2
+LIBS            += -lqpe -lopiecore2
 TARGET		= bounce
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/bounce/game.cpp b/noncore/games/bounce/game.cpp
index 1f1f8cd..bbd3d0b 100644
--- a/noncore/games/bounce/game.cpp
+++ b/noncore/games/bounce/game.cpp
@@ -16,13 +16,20 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 
-#include <stdlib.h>
-#include <qtimer.h>
+#include "game.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
-#include "game.h"
+/* QT */
+#include <qtimer.h>
+
+/* STD */
+#include <stdlib.h>
 
 #define TILE_SIZE 9 
 
 #define TILE_FIRST ((FIELD_WIDTH-2)*(FIELD_HEIGHT-2))
@@ -366,9 +373,9 @@ JezzGame::~JezzGame()
 }
 
 void JezzGame::display( QString text, int size )
 {
-    qDebug("This function \"display\" shouldn't be called!!!");
+    odebug << "This function \"display\" shouldn't be called!!!" << oendl; 
     if ( !text.isEmpty() )
     {
         QFont font( "Helvetica", size, QFont::Bold );
         font.setStyleHint( QFont::Helvetica );
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index b73bbb0..72425a5 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -1,19 +1,18 @@
-CONFIG		= qt warn_on  quick-app
+CONFIG		= qt warn_on quick-app
 HEADERS		= amigo.h \
 		  go.h \
 		  goplayutils.h \
 		  gowidget.h
 SOURCES		= amigo.c \
-		goplayer.c \
-		goplayutils.c \
-		killable.c \
-		gowidget.cpp \
-		main.cpp
-INCLUDEPATH += $(OPIEDIR)/include
+		  goplayer.c \
+		  goplayutils.c \
+		  killable.c \
+		  gowidget.cpp \
+		  main.cpp
+INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
 TARGET		= go
 
 
-
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index d134540..ec03c1d 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -19,21 +19,22 @@
 **********************************************************************/
 
 #include "gowidget.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qpainter.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qapplication.h> //processEvents()
 #include <qlabel.h>
 
-//#include <stdio.h>
-
-
 static const enum bVal computer_color = BLACK;
 
 static int current_handicap = 1;
 
@@ -447,9 +448,9 @@ void	placestone (enum bVal c, short x, short y )
 }
 
 void	intrMoveReport(enum bVal c ,char *coord ,char *reason )
 {
-    qDebug( "intrMoveReport colour %d, %s %s", c, coord, reason );
+    odebug << "intrMoveReport colour " << c << ", " << coord << " " << reason << "" << oendl; 
 }
 
 void	intrPrisonerReport( short blackcnt, short whitecnt )
 {
diff --git a/noncore/games/kpacman/kpacman.pro b/noncore/games/kpacman/kpacman.pro
index 8453f78..45314f9 100644
--- a/noncore/games/kpacman/kpacman.pro
+++ b/noncore/games/kpacman/kpacman.pro
@@ -1,8 +1,6 @@
 TEMPLATE	= app
-#CONFIG		= qt warn_on 
 CONFIG		= qt warn_on 
-#TMAKE_CXXFLAGS	+= 
 HEADERS		= kpacmanwidget.h \
 		    referee.h \
 		    status.h \
 		    painter.h \
@@ -33,9 +31,9 @@ SOURCES		= kpacmanwidget.cpp \
 		    kpacman.cpp \
 		    main.cpp 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 DESTDIR         = $(OPIEDIR)/bin
 TARGET		= kpacman
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp
index 9631495..b59dd02 100644
--- a/noncore/games/kpacman/kpacmanwidget.cpp
+++ b/noncore/games/kpacman/kpacmanwidget.cpp
@@ -12,9 +12,10 @@
 #include <qpe/config.h>
 #include "kpacmanwidget.h"
 #endif
 
-
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
 KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name)
         : QWidget( parent, name )
 {
@@ -138,9 +139,9 @@ void KpacmanWidget::setScheme(int Scheme, int Mode)
 }
 
 void KpacmanWidget::resizeEvent( QResizeEvent * )
 {
-    qWarning("Resize");
+    owarn << "Resize" << oendl; 
     referee->setGeometry(0, bitfont->height()*3, referee->width(), referee->height());
     referee->setBackgroundColor(BLACK);
 
     if(!status ) return;
diff --git a/noncore/games/kpacman/status.cpp b/noncore/games/kpacman/status.cpp
index 02ff63d..db6938e 100644
--- a/noncore/games/kpacman/status.cpp
+++ b/noncore/games/kpacman/status.cpp
@@ -12,16 +12,19 @@
 #include <qpe/config.h>
 #include "status.h"
 #endif
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #include <qbitmap.h>
 #include <qmsgbox.h>
 #include <qfileinfo.h>
 
 Status::Status( QWidget *parent, const char *name, int Scheme, int Mode ) :
     QWidget( parent, name )
 {
-    qWarning("Status::Status");
+    owarn << "Status::Status" << oendl; 
     actualLifes = 0;
     actualLevel = 0;
 
     lifesPix = NULL;
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp
index 2b924c6..1f554d2 100644
--- a/noncore/games/mindbreaker/mindbreaker.cpp
+++ b/noncore/games/mindbreaker/mindbreaker.cpp
@@ -89,9 +89,9 @@ static void setupBoardSize(int w, int h)
 
     adjusted_board_height = adjusted_title_height + (adjusted_panel_height * 9);
     adjusted_board_width = adjusted_panel_width + (adjusted_bin_margin * 2) + adjusted_peg_size;
 
-//    qDebug("Adjusted width %d height %d", adjusted_board_width, adjusted_board_height);
+//    odebug << "Adjusted width " << adjusted_board_width << " height " << adjusted_board_height << "" << oendl; 
 }
 
 
 /* helper class,  */
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,11 +1,17 @@
 #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 )
 {
@@ -40,9 +46,9 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow(
 }
 
 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
@@ -108,9 +114,9 @@ void OYatzee::slotEndRound( int item )
 
 	sb->nextRB(currentPlayer-1)->updateMap( item , points );
 	nextPlayer();
 
-	qDebug( "Punkte: %d" , points );
+	odebug << "Punkte: " << points << "" << oendl; 
 }
 
 void OYatzee::nextPlayer()
 {
@@ -155,9 +161,9 @@ OYatzee::~OYatzee()
 
 void OYatzee::detectPosibilities()
 {
 	posibilities.clear();
-	qDebug( "running detectPosibilities()" );
+	odebug << "running detectPosibilities()" << oendl; 
 	
 	Dice *d = dw->diceList.first();
 
 	QValueListInt numbers;
@@ -260,49 +266,49 @@ 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 	}
 
@@ -334,9 +340,9 @@ 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, 
@@ -352,11 +358,11 @@ void OYatzee::slotRollDices()
 		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();
 }
 
@@ -390,9 +396,9 @@ Resultboard* Scoreboard::nextRB( int currentPlayer )
 	Resultboard *b;
 
 	b = rbList.at( currentPlayer );
 	
-	qDebug( "Anzahl: %d" ,	rbList.count() );
+	odebug << "Anzahl: " << rbList.count() << "" << oendl; 
 
 	return b;
 }		
 
@@ -607,9 +613,9 @@ void Resultboard::paintEvent( QPaintEvent* )
 	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
diff --git a/noncore/games/oyatzee/oyatzee.pro b/noncore/games/oyatzee/oyatzee.pro
index 754abd2..f505c66 100644
--- a/noncore/games/oyatzee/oyatzee.pro
+++ b/noncore/games/oyatzee/oyatzee.pro
@@ -5,7 +5,7 @@ HEADERS		= oyatzee.h
 SOURCES		= main.cpp oyatzee.cpp
 TARGET		= oyatzee
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp
index a80bd35..47d6725 100644
--- a/noncore/games/wordgame/wordgame.cpp
+++ b/noncore/games/wordgame/wordgame.cpp
@@ -674,9 +674,9 @@ void ComputerPlayer::noteChoice(const Tile** tiles, int n, const QPoint& d, cons
 if (s>0 || current==QPoint(5,1)){
 QString st;
 for ( int i=0; i<n; i++ )
     st += tiles[i]->text();
-qDebug("%d,%d: %s (%d) for %d",current.x(),current.y(),st.latin1(),n,s);
+odebug << "" << current.x() << "," << current.y() << ": " << st.latin1() << " (" << n << ") for " << s << "" << oendl; 
 }
 */
     if ( s > best_score ) {
 	int i;