Commit c68dbf79 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compiles with strict compile flags

parent 328f7f36
......@@ -26,20 +26,10 @@ include(FeatureSummary)
include(ECMAddAppIcon)
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(ECMAddTests)
add_definitions(
-DQT_USE_FAST_CONCATENATION
-DQT_USE_FAST_OPERATOR_PLUS
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_NO_URL_CAST_FROM_STRING
-DQT_USE_QSTRINGBUILDER
)
add_subdirectory(src)
add_subdirectory(doc)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
......@@ -46,7 +46,7 @@ public:
void acknowledgeMove(int x1, int y1, int x2, int y2);
public slots:
public Q_SLOTS:
/**
* Add the line to the scene so it shows up in the view
* @param index the line-index of the line
......@@ -131,7 +131,7 @@ protected:
void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) Q_DECL_OVERRIDE;
void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) Q_DECL_OVERRIDE;
signals:
Q_SIGNALS:
///Emits the index of the closet (undrawn) line when a click is detected
void lineDrawn(int);
};
......
......@@ -44,7 +44,7 @@ public:
return qobject_cast<GameBoardScene *>(scene())->minimumSizeHint();
}
}
public slots:
public Q_SLOTS:
///Automatically resizes the board according to the users preferences. Deprecated for a bit
void setBoardSize();
protected:
......
......@@ -33,10 +33,10 @@ public:
///Constructor
KSquaresDemoWindow();
public slots:
public Q_SLOTS:
void gameNew();
private slots:
private Q_SLOTS:
void aiChooseLine();
void playerTakeTurn(KSquaresPlayer *currentPlayer);
void gameOver(const QVector<KSquaresPlayer> & /*playerList*/);
......
......@@ -173,7 +173,7 @@ protected:
bool gameInProgress;
/// last line added
int lastLine;
signals:
Q_SIGNALS:
///A player's turn has started. This allows you to use AI/networking etc.
void takeTurnSig(KSquaresPlayer *); //emit the new curent player
///emitted when the game board is completed. Allows you to construct a scoreboard
......
......@@ -36,7 +36,7 @@ public:
KSquaresWindow();
~KSquaresWindow();
public slots:
public Q_SLOTS:
void showHighscores();
//void configureHighscores();
///Launch the new game dialog and create a new game
......@@ -44,7 +44,7 @@ public slots:
///Start a new game with the same settings (read from KConfig Settings)
void gameReset();
private slots:
private Q_SLOTS:
void aiChooseLine(); // testing only
void initObject();
void optionsPreferences();
......
......@@ -20,7 +20,7 @@ class NewGameDialog : public QDialog, public Ui::NewGameWidget
public:
explicit NewGameDialog(QWidget *parent = 0);
public slots:
public Q_SLOTS:
void adjustEnabledUsers(int);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment