From 66c292188f8ab6951b32c07f13dc93cce847a688 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 17 Jun 2011 22:37:33 +0000
Subject: Fix kdegames/Qt3 FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1237329 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kbackgammon/kbgboard.cpp | 26 +++++++++++++-------------
 kbackgammon/kbgboard.h   | 14 +++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kbackgammon')

diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp
index b47c6192..85c0a3a9 100644
--- a/kbackgammon/kbgboard.cpp
+++ b/kbackgammon/kbgboard.cpp
@@ -362,8 +362,8 @@ void KBgBoard::queryCube()
 {
 	KBgtqStatus *st = new KBgtqStatus();
 	getState(st);
-	KBgBoardTQCube *dlg =
-		new KBgBoardTQCube(abs(st->cube()), (st->cube(US) > 0), (st->cube(THEM) > 0));
+	KBgBoardQCube *dlg =
+		new KBgBoardQCube(abs(st->cube()), (st->cube(US) > 0), (st->cube(THEM) > 0));
 	if (dlg->exec()) {
 		bool u = ((dlg->getCubeValue() == 0) || (dlg->getCubeOwner() == US  ));
 		bool t = ((dlg->getCubeValue() == 0) || (dlg->getCubeOwner() == THEM));
@@ -377,7 +377,7 @@ void KBgBoard::queryCube()
 /*
  * Constructor, creates the dialog but does not show nor execute it.
  */
-KBgBoardTQCube::KBgBoardTQCube(int val, bool us, bool them)
+KBgBoardQCube::KBgBoardQCube(int val, bool us, bool them)
 	: TQDialog(0, 0, true)
 {
 	setCaption(i18n("Set Cube Values"));
@@ -481,7 +481,7 @@ KBgBoardTQCube::KBgBoardTQCube(int val, bool us, bool them)
 /*
  * Deconstructor, empty.
  */
-KBgBoardTQCube::~KBgBoardTQCube()
+KBgBoardQCube::~KBgBoardQCube()
 {
 	// nothing
 }
@@ -489,7 +489,7 @@ KBgBoardTQCube::~KBgBoardTQCube()
 /*
  * Get the face value of the cube
  */
-int KBgBoardTQCube::getCubeValue()
+int KBgBoardQCube::getCubeValue()
 {
 	return cb[0]->currentItem();
 }
@@ -497,7 +497,7 @@ int KBgBoardTQCube::getCubeValue()
 /*
  * Get the owner of the cube
  */
-int KBgBoardTQCube::getCubeOwner()
+int KBgBoardQCube::getCubeOwner()
 {
 	return cb[1]->currentItem();
 }
@@ -505,7 +505,7 @@ int KBgBoardTQCube::getCubeOwner()
 /*
  * If the cube is open, the value can only be 1
  */
-void KBgBoardTQCube::changeValue(int player)
+void KBgBoardQCube::changeValue(int player)
 {
 	if (player == BOTH)
 		cb[0]->setCurrentItem(0);
@@ -516,7 +516,7 @@ void KBgBoardTQCube::changeValue(int player)
  * If the value is 1, the cube has to be open; and if the value
  * becomes bigger than 1, the player cannot stay open.
  */
-void KBgBoardTQCube::changePlayer(int val)
+void KBgBoardQCube::changePlayer(int val)
 {
 	if (val == 0)
 		cb[1]->setCurrentItem(BOTH);
@@ -527,7 +527,7 @@ void KBgBoardTQCube::changePlayer(int val)
 /*
  * Constructor, creates the dialog but does not show nor execute it.
  */
-KBgBoardTQDice::KBgBoardTQDice(const char *name)
+KBgBoardQDice::KBgBoardQDice(const char *name)
 	: TQDialog(0, name, true)
 {
 	setCaption(i18n("Set Dice Values"));
@@ -590,7 +590,7 @@ KBgBoardTQDice::KBgBoardTQDice(const char *name)
 /*
  * Deconstructor, empty.
  */
-KBgBoardTQDice::~KBgBoardTQDice()
+KBgBoardQDice::~KBgBoardQDice()
 {
 	// nothing
 }
@@ -598,7 +598,7 @@ KBgBoardTQDice::~KBgBoardTQDice()
 /*
  * Get the face value of the dice
  */
-int KBgBoardTQDice::getDice(int n)
+int KBgBoardQDice::getDice(int n)
 {
 	return sb[n]->value();
 }
@@ -1335,7 +1335,7 @@ void KBgBoardHome::mouseDoubleClickEvent(TQMouseEvent * e)
 			if (r.tqcontains(e->pos())) {
 				if (board->getEditMode()) {
 
-					KBgBoardTQDice *dlg = new KBgBoardTQDice();
+					KBgBoardQDice *dlg = new KBgBoardQDice();
 					if (dlg->exec()) {
 						KBgtqStatus *st = new KBgtqStatus();
 						board->getState(st);
@@ -2164,7 +2164,7 @@ void KBgBoardCell::mouseMoveEvent(TQMouseEvent *)
 		pix.setMask(pix.createHeuristicMask());
 		TQBitmap tqmask = *(pix.tqmask());
 		TQBitmap newCursor;
-		newCursor = TQBitmap(pix);
+		newCursor = pix;
 		board->replaceCursor(TQCursor(newCursor, tqmask));
 		if (board->getEditMode())
 			board->storeTurn(pcs);
diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h
index 04cac55f..20626825 100644
--- a/kbackgammon/kbgboard.h
+++ b/kbackgammon/kbgboard.h
@@ -87,7 +87,7 @@ class KBgBoardMove;
 class KBgBoardHome;
 class KBgBoardBar;
 class KBgBoardField;
-class KBgBoardTQDice;
+class KBgBoardQDice;
 
 
 /**
@@ -821,7 +821,7 @@ class KBgBoardMove
  *
  * A very simple dialog with two SpinBoxes and two buttons.
  */
-class KBgBoardTQDice : public TQDialog
+class KBgBoardQDice : public TQDialog
 {
 	Q_OBJECT
   TQ_OBJECT
@@ -831,8 +831,8 @@ public:
 	/**
 	 * Constructor and destructor
 	 */
-	KBgBoardTQDice(const char *name = 0);
-	virtual ~KBgBoardTQDice();
+	KBgBoardQDice(const char *name = 0);
+	virtual ~KBgBoardQDice();
 
 protected:
 
@@ -855,7 +855,7 @@ public slots:
 /**
  * Simple dialog that allows to query the user for the cube value.
  */
-class KBgBoardTQCube : public TQDialog
+class KBgBoardQCube : public TQDialog
 {
 	Q_OBJECT
   TQ_OBJECT
@@ -865,8 +865,8 @@ public:
 	/**
 	 * Constructor and destructor
 	 */
-	KBgBoardTQCube(int val, bool us, bool them);
-	virtual ~KBgBoardTQCube();
+	KBgBoardQCube(int val, bool us, bool them);
+	virtual ~KBgBoardQCube();
 
 protected:
 
-- 
cgit v1.2.1