MasscollabsGamingStudios/kigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Q_EMIT instead of emit

Browse source 
GIT_SILENT
This commit is contained in:
Friedrich W. H. Kossebau 2021-01-23 05:54:37 +01:00
parent 79b3c29a61
commit b0dd60ef0e
6 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -47,12 +47,12 @@ include(ECMSetupVersion)
add_definitions(
-DQT_NO_FOREACH
-DQT_NO_KEYWORDS
# -DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_NO_URL_CAST_FROM_STRING
-DQT_USE_QSTRINGBUILDER
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_STRICT_ITERATORS
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
)

40
src/game/game.cpp
View file

@ -134,7 +134,7 @@ bool Game::init()
m_movesList.clear();
m_undoStack.clear();
emit boardChanged();
Q_EMIT boardChanged();
return true;
} else {
return false;
@ -176,8 +176,8 @@ bool Game::init(const QString &fileName, int moveNumber)
m_movesList.clear();
m_undoStack.clear();
emit boardSizeChanged(m_boardSize);
emit boardChanged(); // All done, tell the world!
Q_EMIT boardSizeChanged(m_boardSize);
Q_EMIT boardChanged(); // All done, tell the world!
return true;
} else {
return false;
@ -211,8 +211,8 @@ bool Game::setBoardSize(int size)
m_currentMove = 0;
m_movesList.clear();
m_undoStack.clear();
emit boardSizeChanged(size);
emit boardChanged();
Q_EMIT boardSizeChanged(size);
Q_EMIT boardChanged();
return true;
} else {
return false;
@ -249,7 +249,7 @@ bool Game::setFixedHandicap(int handicap)
// which means, white is next.
setCurrentPlayer(m_whitePlayer);
m_fixedHandicap = handicap;
emit boardChanged();
Q_EMIT boardChanged();
return true;
} else {
return false;
@ -316,9 +316,9 @@ bool Game::playMove(const Player &player, const Stone &stone, bool undoable)
m_consecutivePassMoveNumber = 0;
} else { // And pass move handling
m_movesList.append(Move(tmp, Stone::Pass));
emit passMovePlayed(*m_currentPlayer);
Q_EMIT passMovePlayed(*m_currentPlayer);
if (m_consecutivePassMoveNumber > 0) {
emit consecutivePassMovesPlayed(m_consecutivePassMoveNumber);
Q_EMIT consecutivePassMovesPlayed(m_consecutivePassMoveNumber);
}
m_consecutivePassMoveNumber++;
}
@ -357,7 +357,7 @@ bool Game::playMove(const Player &player, const Stone &stone, bool undoable)
setCurrentPlayer(m_whitePlayer);
}
emit boardChanged();
Q_EMIT boardChanged();
return true;
} else {
return false;
@ -397,9 +397,9 @@ bool Game::generateMove(const Player &player, bool undoable)
}
if (m_response == QLatin1String("PASS")) {
m_currentMove++;
emit passMovePlayed(*m_currentPlayer);
Q_EMIT passMovePlayed(*m_currentPlayer);
if (m_consecutivePassMoveNumber > 0) {
emit consecutivePassMovesPlayed(m_consecutivePassMoveNumber);
Q_EMIT consecutivePassMovesPlayed(m_consecutivePassMoveNumber);
m_gameFinished = true;
}
m_consecutivePassMoveNumber++;
@ -410,7 +410,7 @@ bool Game::generateMove(const Player &player, bool undoable)
undoStr = i18n("Black passed");
}
} else if (m_response == QLatin1String("resign")) {
emit resigned(*m_currentPlayer);
Q_EMIT resigned(*m_currentPlayer);
m_gameFinished = true;
moveType = UndoCommand::MoveType::Resigned;
if (tmp->isWhite()) {
@ -441,7 +441,7 @@ bool Game::generateMove(const Player &player, bool undoable)
setCurrentPlayer(m_whitePlayer);
}
if (boardChange) {
emit boardChanged();
Q_EMIT boardChanged();
}
return true;
} else {
@ -479,7 +479,7 @@ bool Game::undoMove()
//TODO: What happens with pass moves deeper in the history?
m_undoStack.undo();
emit boardChanged();
Q_EMIT boardChanged();
return true;
} else {
return false;
@ -503,9 +503,9 @@ bool Game::redoMove()
// Note: Although it is possible to undo after a resign and redo it,
// it is a bit questionable whether this makes sense logically.
//qCDebug(KIGO_LOG) << "Redo a resign for" << player << undoCmd->text();
emit resigned(*player);
Q_EMIT resigned(*player);
m_gameFinished = true;
//emit resigned(*m_currentPlayer);
//Q_EMIT resigned(*m_currentPlayer);
} else {
//qCDebug(KIGO_LOG) << "Redo a normal move for" << player << undoCmd->text();
playMove(*player, Stone(undoCmd->text()), false);
@ -740,7 +740,7 @@ bool Game::waitResponse(bool nonBlocking)
}
if (nonBlocking) {
emit waiting(true);
Q_EMIT waiting(true);
}
// Wait for finished command execution. We have to do this untill '\n\n' (or '\r\n\r\n' or
@ -765,7 +765,7 @@ bool Game::waitResponse(bool nonBlocking)
!m_response.endsWith(QLatin1String("\r\n\r\n")));
if (nonBlocking) {
emit waiting(false);
Q_EMIT waiting(false);
}
if (m_response.size() < 1) {
@ -779,7 +779,7 @@ bool Game::waitResponse(bool nonBlocking)
void Game::gameSetup()
{
emit boardInitialized();
Q_EMIT boardInitialized();
}
void Game::readyRead()
@ -795,7 +795,7 @@ void Game::undoIndexChanged(int index)
void Game::setCurrentPlayer(Player &player)
{
m_currentPlayer = &player;
emit currentPlayerChanged(*m_currentPlayer);
Q_EMIT currentPlayerChanged(*m_currentPlayer);
}
} // End of namespace Kigo

4
src/gui/graphicsview/gamescene.cpp
View file

@ -317,11 +317,11 @@ void GameScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
} else if (m_game->currentPlayer().isBlack()) {
map = ThemeRenderer::self()->renderElement(ThemeRenderer::Element::BlackStoneTransparent, m_stonePixmapSize);
}
emit cursorPixmapChanged(map);
Q_EMIT cursorPixmapChanged(map);
}
} else {
m_placementMarkerItem->setVisible(false);
emit cursorPixmapChanged(map);
Q_EMIT cursorPixmapChanged(map);
}
}

2
src/gui/graphicsview/themerenderer.cpp
View file

@ -79,7 +79,7 @@ bool ThemeRenderer::loadTheme(const QString &themeName)
//qCDebug(KIGO_LOG) << "Discarding cache";
QPixmapCache::clear();
}
emit themeChanged(m_currentTheme);
Q_EMIT themeChanged(m_currentTheme);
return true;
}

2
src/gui/widgets/errorwidget.cpp
View file

@ -36,7 +36,7 @@ ErrorWidget::ErrorWidget(QWidget *parent)
void ErrorWidget::on_configureButton_clicked()
{
emit configureClicked();
Q_EMIT configureClicked();
}
} // End of namespace Kigo

2
src/gui/widgets/gamewidget.cpp
View file

@ -104,7 +104,7 @@ void GameWidget::update()
void GameWidget::finishButtonClicked()
{
finishButton->setEnabled(false);
emit finishClicked();
Q_EMIT finishClicked();
}
void GameWidget::enableFinishButton()