[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdegames
From: Dirk Mueller <mueller () kde ! org>
Date: 2007-04-04 12:46:40
Message-ID: 1175690800.444865.22080.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 650394 by mueller:
pedantic--
M +1 -1 kbackgammon/engines/generic/kbgengine.h
M +1 -1 kbounce/game.h
M +1 -1 kenolaba/Board.h
M +1 -1 kenolaba/Spy.h
M +1 -1 kfouleggs/board.h
M +2 -2 kjumpingcube/kcubeboxwidget.h
M +2 -2 kjumpingcube/kjumpingcube.h
M +2 -2 kmahjongg/Background.h
M +2 -2 kmahjongg/BoardLayout.h
M +1 -1 kmahjongg/GameTimer.h
M +2 -2 kmahjongg/Preview.h
M +11 -11 kmahjongg/Tileset.h
M +3 -3 kmahjongg/boardwidget.h
M +1 -1 konquest/gameboard.h
M +6 -6 konquest/gamecore.h
M +2 -2 konquest/int_validator.h
M +4 -4 ksnake/ball.h
M +1 -1 ksnake/board.h
M +1 -1 ksnake/rattler.h
M +5 -5 ksnake/snake.h
M +4 -4 ksokoban/ImageData.cpp
M +2 -2 kwin4/kwin4/kspritecache.h
M +2 -2 kwin4/kwin4/kwin4.h
M +1 -1 libkdegames/kgame/kgame.h
M +1 -1 libksirtet/lib/mp_interface.h
M +1 -1 libksirtet/lib/pline.h
M +1 -1 libksirtet/lib/smanager.h
M +2 -2 lskat/lskat/lskatdoc.h
--- branches/KDE/3.5/kdegames/kbackgammon/engines/generic/kbgengine.h #650393:650394
@@ -125,7 +125,7 @@
*/
virtual void start ()
{
- };
+ }
/**
* Check with the engine if we can quit. This may require user
--- branches/KDE/3.5/kdegames/kbounce/game.h #650393:650394
@@ -103,7 +103,7 @@
void setPixmaps( const QPixmap &tiles, const QPixmap &background );
void emitBallCollisiton( Ball *ball, int x, int y, int tile )
- { emit ballCollision( ball, x, y, tile ); };
+ { emit ballCollision( ball, x, y, tile ); }
};
--- branches/KDE/3.5/kdegames/kenolaba/Board.h #650393:650394
@@ -47,7 +47,7 @@
public:
Board();
- ~Board() {};
+ ~Board() {}
/* different states of one field */
enum {
--- branches/KDE/3.5/kdegames/kenolaba/Spy.h #650393:650394
@@ -20,7 +20,7 @@
public:
Spy(Board&);
- ~Spy() {};
+ ~Spy() {}
enum { BoardCount = 5 };
--- branches/KDE/3.5/kdegames/kfouleggs/board.h #650393:650394
@@ -22,7 +22,7 @@
// standard methods
bool afterGlue(bool doAll, bool first);
AfterRemoveResult afterRemove(bool doAll, bool first);
- bool afterGift(bool first) { return !doFall(false, first, true); };
+ bool afterGift(bool first) { return !doFall(false, first, true); }
void removeBlock(const KGrid2D::Coord &);
bool toBeRemoved(const KGrid2D::Coord &) const;
bool toFall(const KGrid2D::Coord &) const;
--- branches/KDE/3.5/kdegames/kjumpingcube/kcubeboxwidget.h #650393:650394
@@ -107,8 +107,8 @@
*/
void checkComputerplayer(Player player);
- inline void saveGame(KConfigBase *c) { saveProperties(c); };
- inline void restoreGame(KConfigBase *c) { readProperties(c); };
+ inline void saveGame(KConfigBase *c) { saveProperties(c); }
+ inline void restoreGame(KConfigBase *c) { readProperties(c); }
public slots:
/** stops all activities like getting a hint or doing a move */
--- branches/KDE/3.5/kdegames/kjumpingcube/kjumpingcube.h #650393:650394
@@ -58,8 +58,8 @@
private slots:
void newGame();
void saveGame(bool saveAs=false);
- inline void saveAs() { saveGame(true); };
- inline void save() { saveGame(false); };
+ inline void saveAs() { saveGame(true); }
+ inline void save() { saveGame(false); }
void openGame();
void stop();
void undo();
--- branches/KDE/3.5/kdegames/kmahjongg/Background.h #650393:650394
@@ -18,8 +18,8 @@
bool load(const QString &file, short width, short height);
void sizeChanged(int newW, int newH);
void scaleModeChanged();
- QPixmap *getBackground() {return backgroundPixmap;};
- QPixmap *getShadowBackground() {return backgroundShadowPixmap;};
+ QPixmap *getBackground() {return backgroundPixmap;}
+ QPixmap *getShadowBackground() {return backgroundShadowPixmap;}
private:
void sourceToBackground();
--- branches/KDE/3.5/kdegames/kmahjongg/BoardLayout.h #650393:650394
@@ -14,7 +14,7 @@
bool loadBoardLayout(const QString from);
bool saveBoardLayout(const QString where);
- UCHAR getBoardData(short z, short y, short x) {return board[z][y][x];};
+ UCHAR getBoardData(short z, short y, short x) {return board[z][y][x];}
// is there a tile anywhere above here (top left to bot right quarter)
bool tileAbove(short z, short y, short x);
@@ -46,7 +46,7 @@
depth = 5 };
enum { maxTiles = (depth*width*height)/4 };
- QString &getFilename() {return filename;};
+ QString &getFilename() {return filename;}
protected:
--- branches/KDE/3.5/kdegames/kmahjongg/GameTimer.h #650393:650394
@@ -28,7 +28,7 @@
GameTimer( QWidget *parent=0, const char *name=0 );
int toInt();
- QString toString() {return theTimer.toString();};
+ QString toString() {return theTimer.toString();}
void fromString(const char *);
protected: // event handlers
--- branches/KDE/3.5/kdegames/kmahjongg/Preview.h #650393:650394
@@ -19,7 +19,7 @@
FrameImage(QWidget *parent=NULL, const char *name = NULL);
~FrameImage();
void setGeometry(int x, int y, int w, int h);
- QPixmap *getPreviewPixmap() {return thePixmap;};
+ QPixmap *getPreviewPixmap() {return thePixmap;}
void setRect(int x, int y, int w, int h, int ss, int type);
signals:
void mousePressed(QMouseEvent *e);
@@ -57,7 +57,7 @@
void markUnchanged();
void markChanged();
bool isChanged();
- QPixmap *getPreviewPixmap() {return m_drawFrame->getPreviewPixmap(); };
+ QPixmap *getPreviewPixmap() {return m_drawFrame->getPreviewPixmap(); }
virtual void drawPreview();
void applyChange() ;
void renderBackground(const QString &bg);
--- branches/KDE/3.5/kdegames/kmahjongg/Tileset.h #650393:650394
@@ -13,17 +13,17 @@
QRgb *createTile(short x, short y, QRgb *dst, QImage &src , QRgb *face);
QRgb *copyTileImage(short tileX, short tileY, QRgb *to, QImage &from);
- void setScaled(bool sc) {isScaled = sc; divisor = (sc) ? 2 : 1;};
+ void setScaled(bool sc) {isScaled = sc; divisor = (sc) ? 2 : 1;}
QRgb *tile(short tnum);
QRgb *selectedTile(short tnum);
- short width() {return w/divisor;};
- short height() {return h/divisor;};
- short shadowSize() {return ss/divisor;};
- short size() {return s;};
- short qWidth() {return qw/divisor;};
- short qHeight() {return qh/divisor;};
+ short width() {return w/divisor;}
+ short height() {return h/divisor;}
+ short shadowSize() {return ss/divisor;}
+ short size() {return s;}
+ short qWidth() {return qw/divisor;}
+ short qHeight() {return qh/divisor;}
QPixmap *selectedPixmaps(int num) {
@@ -31,28 +31,28 @@
return &(selectedPix[num]);
else
return &(selectedMiniPix[num]);
- };
+ }
QPixmap *unselectedPixmaps(int num) {
if (!isScaled)
return &(unselectedPix[num]);
else
return &(unselectedMiniPix[num]);
- };
+ }
QPixmap *selectedShadowPixmaps(int num) {
if (!isScaled)
return &(selectedShadowPix[num]);
else
return &(selectedShadowMiniPix[num]);
- };
+ }
QPixmap *unselectedShadowPixmaps(int num) {
if (!isScaled)
return &(unselectedShadowPix[num]);
else
return &(unselectedShadowMiniPix[num]);
- };
+ }
protected:
--- branches/KDE/3.5/kdegames/kmahjongg/boardwidget.h #650393:650394
@@ -106,9 +106,9 @@
void animateMoveList();
void setShowMatch( bool );
void tileSizeChanged();
- long getGameNum() {return gameGenerationNum;};
- QString &getBoardName(){return theBoardLayout.getFilename();};
- QString &getLayoutName() {return theBoardLayout.getFilename();};
+ long getGameNum() {return gameGenerationNum;}
+ QString &getBoardName(){return theBoardLayout.getFilename();}
+ QString &getLayoutName() {return theBoardLayout.getFilename();}
public slots:
--- branches/KDE/3.5/kdegames/konquest/gameboard.h #650393:650394
@@ -29,7 +29,7 @@
GameBoard( QWidget *parent );
virtual ~GameBoard();
- bool isGameInProgress(void) const { return gameInProgress; };
+ bool isGameInProgress(void) const { return gameInProgress; }
// virtual QSize sizeHint() const;
--- branches/KDE/3.5/kdegames/konquest/gamecore.h #650393:650394
@@ -62,7 +62,7 @@
public:
Fleet( int initialShipCount );
- virtual ~Fleet() {};
+ virtual ~Fleet() {}
int getShipCount();
void removeShips( int lostShips );
@@ -157,11 +157,11 @@
void statEnemyFleetsDestroyed( int );
void statEnemyShipsDestroyed( int );
- int getShipsBuilt() { return shipsBuilt; };
- int getPlanetsConquered() { return planetsConquered; };
- int getFleetsLaunched() { return fleetsLaunched; };
- int getEnemyFleetsDestroyed() { return enemyFleetsDestroyed; };
- int getEnemyShipsDestroyed() { return enemyShipsDestroyed; };
+ int getShipsBuilt() { return shipsBuilt; }
+ int getPlanetsConquered() { return planetsConquered; }
+ int getFleetsLaunched() { return fleetsLaunched; }
+ int getEnemyFleetsDestroyed() { return enemyFleetsDestroyed; }
+ int getEnemyShipsDestroyed() { return enemyShipsDestroyed; }
bool isAiPlayer();
};
--- branches/KDE/3.5/kdegames/konquest/int_validator.h #650393:650394
@@ -18,8 +18,8 @@
virtual void setRange( int bottom, int top );
- int bottom() const { return v_bottom; };
- int top() const { return v_top; };
+ int bottom() const { return v_bottom; }
+ int top() const { return v_top; }
private:
int v_bottom, v_top;
--- branches/KDE/3.5/kdegames/ksnake/ball.h #650393:650394
@@ -31,7 +31,7 @@
class Ball {
public:
Ball(Board *b, PixServer *p);
- virtual ~Ball(){};
+ virtual ~Ball(){}
virtual void nextMove();
void repaint();
void zero();
@@ -45,8 +45,8 @@
class KillerBall : public Ball {
public:
- KillerBall(Board *b, PixServer *p) : Ball(b, p) {};
- virtual ~KillerBall(){};
+ KillerBall(Board *b, PixServer *p) : Ball(b, p) {}
+ virtual ~KillerBall(){}
void nextMove();
protected:
virtual int getNextSquare();
@@ -54,7 +54,7 @@
class DumbKillerBall : public KillerBall {
public:
- DumbKillerBall(Board *b, PixServer *p) : KillerBall(b, p) {};
+ DumbKillerBall(Board *b, PixServer *p) : KillerBall(b, p) {}
protected:
int getNextSquare();
};
--- branches/KDE/3.5/kdegames/ksnake/board.h #650393:650394
@@ -67,7 +67,7 @@
{
public:
Board (int s);
- ~Board() {};
+ ~Board() {}
QRect rect(int i);
void set(int i, Square sq);
--- branches/KDE/3.5/kdegames/ksnake/rattler.h #650393:650394
@@ -47,7 +47,7 @@
public:
Rattler ( QWidget *parent=0, const char *name=0 );
~Rattler();
- void setActionCollection(KActionCollection *a){ actionCollection = a;};
+ void setActionCollection(KActionCollection *a){ actionCollection = a;}
void setBalls(int);
--- branches/KDE/3.5/kdegames/ksnake/snake.h #650393:650394
@@ -79,7 +79,7 @@
public:
CompuSnake(Board *b, PixServer *p);
- virtual ~CompuSnake() {};
+ virtual ~CompuSnake() {}
virtual void nextMove();
protected:
@@ -99,8 +99,8 @@
{
public:
- KillerCompuSnake(Board *b, PixServer *p) : CompuSnake(b, p) {};
- virtual ~KillerCompuSnake() {};
+ KillerCompuSnake(Board *b, PixServer *p) : CompuSnake(b, p) {}
+ virtual ~KillerCompuSnake() {}
virtual void nextMove();
private:
@@ -116,8 +116,8 @@
{
public:
- EaterCompuSnake(Board *b, PixServer *p) : CompuSnake(b, p) {};
- virtual ~EaterCompuSnake() {};
+ EaterCompuSnake(Board *b, PixServer *p) : CompuSnake(b, p) {}
+ virtual ~EaterCompuSnake() {}
virtual void nextMove();
private:
--- branches/KDE/3.5/kdegames/ksokoban/ImageData.cpp #650393:650394
@@ -56,28 +56,28 @@
ImageData::upperLarge(int index) {
assert(index >= 0);
if (indexSize_ <= index) expandIndex(index);
- return largeStone_xpm_[upperLargeIndex_[index]];
+ return largeStone_xpm_[(unsigned char)upperLargeIndex_[index]];
}
const QPixmap &
ImageData::lowerLarge(int index) {
assert(index >= 0);
if (indexSize_ <= index) expandIndex(index);
- return largeStone_xpm_[lowerLargeIndex_[index]];
+ return largeStone_xpm_[(unsigned char)lowerLargeIndex_[index]];
}
const QPixmap &
ImageData::leftSmall(int index) {
assert(index >= 0);
if (indexSize_ <= index) expandIndex(index);
- return smallStone_xpm_[leftSmallIndex_[index]];
+ return smallStone_xpm_[(unsigned char)leftSmallIndex_[index]];
}
const QPixmap &
ImageData::rightSmall(int index) {
assert(index >= 0);
if (indexSize_ <= index) expandIndex(index);
- return smallStone_xpm_[rightSmallIndex_[index]];
+ return smallStone_xpm_[(unsigned char)rightSmallIndex_[index]];
}
int
--- branches/KDE/3.5/kdegames/kwin4/kwin4/kspritecache.h #650393:650394
@@ -49,8 +49,8 @@
class KSpriteMove
{
public:
- KSpriteMove() {};
- virtual ~KSpriteMove() {};
+ KSpriteMove() {}
+ virtual ~KSpriteMove() {}
virtual bool spriteMove(double ,double ,KSprite *) {return false;}
private:
};
--- branches/KDE/3.5/kdegames/kwin4/kwin4/kwin4.h #650393:650394
@@ -68,8 +68,8 @@
void changeAction(const char *,bool);
// Enabled/Disabled menu/toolbar items
- void enableAction(const char *action) {changeAction(action, true); } ;
- void disableAction(const char *action) {changeAction(action, false); } ;
+ void enableAction(const char *action) {changeAction(action, true); }
+ void disableAction(const char *action) {changeAction(action, false); }
// Checks all menus..usually done on init programm
void checkMenus(CheckFlags menu=All);
--- branches/KDE/3.5/kdegames/libkdegames/kgame/kgame.h #650393:650394
@@ -756,7 +756,7 @@
Q_UNUSED( oldplayer );
Q_UNUSED( newplayer );
Q_UNUSED( inactivate );
- };
+ }
/**
* Save the player list to a stream. Used for network game and load/save.
--- branches/KDE/3.5/kdegames/libksirtet/lib/mp_interface.h #650393:650394
@@ -196,7 +196,7 @@
* null pointer is returned and so no option widget is shown.
* The option widget must be inherited from the @ref MPOptionWidget class.
*/
- virtual MPOptionWidget *newOptionWidget() const { return 0; };
+ virtual MPOptionWidget *newOptionWidget() const { return 0; }
/** Called when a network error occurred or when a host gets disconnected.
* The default implementation displays a message and calls singleHumans()
--- branches/KDE/3.5/kdegames/libksirtet/lib/pline.h #650393:650394
@@ -35,7 +35,7 @@
private slots:
void _typeChanged(int t)
- { emit typeChanged((MeetingCheckBox::Type)t); };
+ { emit typeChanged((MeetingCheckBox::Type)t); }
void _textChanged(const QString &text) { emit textChanged(text); }
protected:
--- branches/KDE/3.5/kdegames/libksirtet/lib/smanager.h #650393:650394
@@ -34,7 +34,7 @@
enum SocketProperty { ReadOnly, WriteOnly, ReadWrite };
/** @return the number of sockets. */
- uint size() const { return sockets.size(); };
+ uint size() const { return sockets.size(); }
const Socket *operator[](uint i) const { return sockets[i]; }
Socket *operator [](uint i) { return sockets[i]; }
--- branches/KDE/3.5/kdegames/lskat/lskat/lskatdoc.h #650393:650394
@@ -58,9 +58,9 @@
/** removes a view from the list of currently connected views */
void removeView(LSkatView *view);
/** sets the modified flag for the document after a modifying action on the view \
connected to the document.*/
- void setModified(bool _m=true){ modified=_m; };
+ void setModified(bool _m=true){ modified=_m; }
/** returns if the document is modified or not. Use this to determine if your \
document needs saving by the user on closing.*/
- bool isModified(){ return modified; };
+ bool isModified(){ return modified; }
/** "save modified" - asks the user for saving if the document is modified */
bool saveModified();
/** deletes the document's contents */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic