[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegames/kpat/patsolve
From: Stephan Kulow <coolo () kde ! org>
Date: 2006-11-16 13:11:37
Message-ID: 1163682697.188028.5883.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 605349 by coolo:
coverity insists I leave out the dummy return
M +1 -2 freecell.cpp
M +1 -1 freecell.h
M +1 -2 idiot.cpp
M +1 -1 idiot.h
M +1 -2 klondike.cpp
M +1 -1 klondike.h
M +2 -2 patsolve.cpp
M +1 -1 patsolve.h
M +1 -5 simon.cpp
M +1 -1 simon.h
M +2 -5 spider.cpp
M +1 -1 spider.h
M +5 -10 yukon.cpp
M +1 -1 yukon.h
--- trunk/KDE/kdegames/kpat/patsolve/freecell.cpp #605348:605349
@@ -493,7 +493,7 @@
return k;
}
-bool FreecellSolver::print_layout()
+void FreecellSolver::print_layout()
{
int i, t, w, o;
@@ -512,5 +512,4 @@
printcard(O[o] + Osuit[o], stderr);
}
fprintf(stderr, "\nprint-layout-end\n");
- return true;
}
--- trunk/KDE/kdegames/kpat/patsolve/freecell.h #605348:605349
@@ -18,7 +18,7 @@
virtual void unpack_cluster( int k );
virtual MoveHint *translateMove( const MOVE &m);
- virtual bool print_layout();
+ virtual void print_layout();
int Nwpiles; /* the numbers we're actually using */
int Ntpiles;
--- trunk/KDE/kdegames/kpat/patsolve/idiot.cpp #605348:605349
@@ -257,7 +257,7 @@
return new MoveHint( card, target, m.pri );
}
-bool IdiotSolver::print_layout()
+void IdiotSolver::print_layout()
{
int i, w;
@@ -275,7 +275,6 @@
fputc('\n', stderr);
}
fprintf(stderr, "\nprint-layout-end\n");
- return true;
}
inline bool higher( const card_t &c1, const card_t &c2)
--- trunk/KDE/kdegames/kpat/patsolve/idiot.h #605348:605349
@@ -16,7 +16,7 @@
virtual void unpack_cluster( int k );
virtual MoveHint *translateMove( const MOVE &m);
- virtual bool print_layout();
+ virtual void print_layout();
bool canMoveAway( int pile ) const;
--- trunk/KDE/kdegames/kpat/patsolve/klondike.cpp #605348:605349
@@ -559,7 +559,7 @@
}
}
-bool KlondikeSolver::print_layout()
+void KlondikeSolver::print_layout()
{
int i, w, o;
@@ -581,5 +581,4 @@
printcard(O[o] + Osuit[o], stderr);
}
fprintf(stderr, "\nprint-layout-end\n");
- return true;
}
--- trunk/KDE/kdegames/kpat/patsolve/klondike.h #605348:605349
@@ -17,7 +17,7 @@
virtual void unpack_cluster( int k );
virtual MoveHint *translateMove( const MOVE &m);
- virtual bool print_layout();
+ virtual void print_layout();
/* Names of the cards. The ordering is defined in pat.h. */
--- trunk/KDE/kdegames/kpat/patsolve/patsolve.cpp #605348:605349
@@ -89,6 +89,7 @@
if (alln == 0) {
if ( isWon() ) {
Status = WIN;
+ Q_ASSERT(parent); // it just is never called with a won game
win(parent);
return true;
}
@@ -932,9 +933,8 @@
return Status;
}
-bool Solver::print_layout()
+void Solver::print_layout()
{
- return true;
}
void Solver::setNumberPiles( int p )
--- trunk/KDE/kdegames/kpat/patsolve/patsolve.h #605348:605349
@@ -83,7 +83,7 @@
void free_buckets(void);
void printcard(card_t card, FILE *outfile);
int translate_pile(const Pile *pile, card_t *w, int size);
- virtual bool print_layout();
+ virtual void print_layout();
void pilesort(void);
void hash_layout( void );
--- trunk/KDE/kdegames/kpat/patsolve/simon.cpp #605348:605349
@@ -387,7 +387,7 @@
return k;
}
-bool SimonSolver::print_layout()
+void SimonSolver::print_layout()
{
int i, w, o;
@@ -406,10 +406,6 @@
printcard( O[o] + PS_KING, stderr);
}
fprintf(stderr, "\nprint-layout-end\n");
- bool broke = false;
- if ( broke )
- exit( 1 );
- return broke;
}
MoveHint *SimonSolver::translateMove( const MOVE &m )
--- trunk/KDE/kdegames/kpat/patsolve/simon.h #605348:605349
@@ -16,7 +16,7 @@
virtual void unpack_cluster( int k );
virtual MoveHint *translateMove( const MOVE &m);
- virtual bool print_layout();
+ virtual void print_layout();
/* Names of the cards. The ordering is defined in pat.h. */
--- trunk/KDE/kdegames/kpat/patsolve/spider.cpp #605348:605349
@@ -493,7 +493,7 @@
return k;
}
-bool SpiderSolver::print_layout()
+void SpiderSolver::print_layout()
{
int i, w, o;
@@ -515,10 +515,7 @@
printcard( O[o] + PS_KING, stderr);
}
fprintf(stderr, "\nprint-layout-end\n");
- bool broke = false;
- if ( broke )
- exit( 1 );
- return broke;
+ return;
}
MoveHint *SpiderSolver::translateMove( const MOVE &m )
--- trunk/KDE/kdegames/kpat/patsolve/spider.h #605348:605349
@@ -16,7 +16,7 @@
virtual void unpack_cluster( int k );
virtual MoveHint *translateMove( const MOVE &m);
- virtual bool print_layout();
+ virtual void print_layout();
/* Names of the cards. The ordering is defined in pat.h. */
--- trunk/KDE/kdegames/kpat/patsolve/yukon.cpp #605348:605349
@@ -288,14 +288,10 @@
mp->turn_index = -1;
if ( Wlen[i] > l+1 && DOWN( W[i][Wlen[i]-l-2] ) )
mp->turn_index = 1;
- if ( i == 7 )
- mp->pri = 40;
- else {
- if ( mp->turn_index > 0 || Wlen[i] == l+1)
- mp->pri = 30;
- else
- mp->pri = 1;
- }
+ if ( mp->turn_index > 0 || Wlen[i] == l+1)
+ mp->pri = 30;
+ else
+ mp->pri = 1;
n++;
mp++;
}
@@ -417,7 +413,7 @@
}
}
-bool YukonSolver::print_layout()
+void YukonSolver::print_layout()
{
int i, w, o;
@@ -434,5 +430,4 @@
printcard(O[o] + Osuit[o], stderr);
}
fprintf(stderr, "\nprint-layout-end\n");
- return true;
}
--- trunk/KDE/kdegames/kpat/patsolve/yukon.h #605348:605349
@@ -17,7 +17,7 @@
virtual void unpack_cluster( int k );
virtual MoveHint *translateMove( const MOVE &m);
- virtual bool print_layout();
+ virtual void print_layout();
/* Names of the cards. The ordering is defined in pat.h. */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic