summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-03-21 20:34:50 +0100
committerSlávek Banko <slavek.banko@axis.cz>2017-03-21 20:37:33 +0100
commit9f2d40bba0a57d4a28f8bb47b5a5dde4e8742444 (patch)
treee5380f491a05668cd468a0071bebd7232c986264
parent32b39efd3f74ce7af44d456d0016edadc7706a39 (diff)
downloadtdegames-9f2d40bb.tar.gz
tdegames-9f2d40bb.zip
Fix forward classes declaration in kpat/dealer.h
This resolves FTBFS for cmake build with clang Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kpat/dealer.cpp36
-rw-r--r--kpat/dealer.h37
2 files changed, 36 insertions, 37 deletions
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index ff6889a1..43bca4c5 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -679,42 +679,6 @@ void Dealer::enlargeCanvas(TQCanvasRectangle *c)
resizeEvent(0);
}
-class CardState {
-public:
- Card *it;
- Pile *source;
- double x;
- double y;
- double z;
- bool faceup;
- bool tookdown;
- int source_index;
- CardState() {}
-public:
- // as every card is only once we can sort after the card.
- // < is the same as <= in that context. == is different
- bool operator<(const CardState &rhs) const { return it < rhs.it; }
- bool operator<=(const CardState &rhs) const { return it <= rhs.it; }
- bool operator>(const CardState &rhs) const { return it > rhs.it; }
- bool operator>=(const CardState &rhs) const { return it > rhs.it; }
- bool operator==(const CardState &rhs) const {
- return (it == rhs.it && source == rhs.source && x == rhs.x &&
- y == rhs.y && z == rhs.z && faceup == rhs.faceup
- && source_index == rhs.source_index && tookdown == rhs.tookdown);
- }
- void fillNode(TQDomElement &e) const {
- e.setAttribute("value", it->rank());
- e.setAttribute("suit", it->suit());
- e.setAttribute("source", source->index());
- e.setAttribute("x", x);
- e.setAttribute("y", y);
- e.setAttribute("z", z);
- e.setAttribute("faceup", faceup);
- e.setAttribute("tookdown", tookdown);
- e.setAttribute("source_index", source_index);
- }
-};
-
typedef class TQValueList<CardState> CardStateList;
bool operator==( const State & st1, const State & st2) {
diff --git a/kpat/dealer.h b/kpat/dealer.h
index 7dfc5825..0704433b 100644
--- a/kpat/dealer.h
+++ b/kpat/dealer.h
@@ -3,6 +3,7 @@
#include "pile.h"
#include "hint.h"
+#include <tqdom.h>
#include <krandomsequence.h>
class TQDomDocument;
@@ -38,7 +39,41 @@ public:
virtual Dealer *createGame(TDEMainWindow *parent) = 0;
};
-class CardState;
+class CardState {
+public:
+ Card *it;
+ Pile *source;
+ double x;
+ double y;
+ double z;
+ bool faceup;
+ bool tookdown;
+ int source_index;
+ CardState() {}
+public:
+ // as every card is only once we can sort after the card.
+ // < is the same as <= in that context. == is different
+ bool operator<(const CardState &rhs) const { return it < rhs.it; }
+ bool operator<=(const CardState &rhs) const { return it <= rhs.it; }
+ bool operator>(const CardState &rhs) const { return it > rhs.it; }
+ bool operator>=(const CardState &rhs) const { return it > rhs.it; }
+ bool operator==(const CardState &rhs) const {
+ return (it == rhs.it && source == rhs.source && x == rhs.x &&
+ y == rhs.y && z == rhs.z && faceup == rhs.faceup
+ && source_index == rhs.source_index && tookdown == rhs.tookdown);
+ }
+ void fillNode(TQDomElement &e) const {
+ e.setAttribute("value", it->rank());
+ e.setAttribute("suit", it->suit());
+ e.setAttribute("source", source->index());
+ e.setAttribute("x", x);
+ e.setAttribute("y", y);
+ e.setAttribute("z", z);
+ e.setAttribute("faceup", faceup);
+ e.setAttribute("tookdown", tookdown);
+ e.setAttribute("source_index", source_index);
+ }
+};
typedef TQValueList<CardState> CardStateList;