Commit bfdb2904 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Revert eda659a9

Laurent use Merge Requests for contributing to blinken please

CCMAIL: montel@kde.org
parent 28137e7f
cmake_minimum_required (VERSION 3.16 FATAL_ERROR)
cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
# KDE Application Version, managed by release script
set(RELEASE_SERVICE_VERSION_MAJOR "21")
......@@ -9,8 +9,8 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project(blinken VERSION ${RELEASE_SERVICE_VERSION})
# minimal Qt requirement
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.82.0")
set(QT_MIN_VERSION "5.10.0")
set(KF5_MIN_VERSION "5.55.0")
# ECM
find_package (ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
......
......@@ -25,7 +25,7 @@ target_link_libraries(blinken
KF5::I18n
KF5::XmlGui
KF5::GuiAddons
Qt::Svg
Qt5::Svg
KF5::DBusAddons
KF5::Crash
${PHONON_LIBRARIES}
......
......@@ -65,8 +65,8 @@ void blinkenGame::clicked(color c)
else
{
m_soundsPlayer -> play(all);
Q_EMIT highlight(all, true);
Q_EMIT gameEnded();
emit highlight(all, true);
emit gameEnded();
setPhase(choosingLevel);
}
}
......@@ -75,7 +75,7 @@ void blinkenGame::setPhase(gamePhase p)
{
if (p != waiting3 && p != waiting2 && p != waiting1) m_waitTimer -> stop();
m_phase = p;
Q_EMIT phaseChanged();
emit phaseChanged();
}
void blinkenGame::start(int level)
......@@ -96,13 +96,13 @@ void blinkenGame::nextSound()
c = *m_nextColor;
++m_nextColor;
m_soundsPlayer -> play(c);
Q_EMIT highlight(c, false);
emit highlight(c, false);
}
else
{
setPhase(typingTheSequence);
m_nextColor = m_sequence.constBegin();
Q_EMIT highlight(none, false);
emit highlight(none, false);
m_soundsPlayer->disconnect();
}
}
......@@ -115,7 +115,7 @@ void blinkenGame::soundEnded()
void blinkenGame::unhighlight()
{
Q_EMIT highlight(none, false);
emit highlight(none, false);
}
void blinkenGame::waiting()
......
......@@ -213,7 +213,7 @@ void highScoreManager::addScore(int level, int score, const QString &name)
}
cfg.sync();
for(highScoreManager *hsm : qAsConst(s_allHSM))
foreach(highScoreManager *hsm, s_allHSM)
{
if (hsm != this)
{
......
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