Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Education
Blinken
Commits
eda659a9
Commit
eda659a9
authored
May 18, 2021
by
Laurent Montel
😁
Browse files
Time to increase version + add Q_EMIT, port foreach
parent
33430975
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
eda659a9
cmake_minimum_required
(
VERSION 3.
5
FATAL_ERROR
)
cmake_minimum_required
(
VERSION 3.
16
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.1
0
.0"
)
set
(
KF5_MIN_VERSION
"5.
55
.0"
)
set
(
QT_MIN_VERSION
"5.1
5
.0"
)
set
(
KF5_MIN_VERSION
"5.
82
.0"
)
# ECM
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
...
...
src/CMakeLists.txt
View file @
eda659a9
...
...
@@ -25,7 +25,7 @@ target_link_libraries(blinken
KF5::I18n
KF5::XmlGui
KF5::GuiAddons
Qt
5
::Svg
Qt::Svg
KF5::DBusAddons
KF5::Crash
${
PHONON_LIBRARIES
}
...
...
src/blinkengame.cpp
View file @
eda659a9
...
...
@@ -65,8 +65,8 @@ void blinkenGame::clicked(color c)
else
{
m_soundsPlayer
->
play
(
all
);
emit
highlight
(
all
,
true
);
emit
gameEnded
();
Q_EMIT
highlight
(
all
,
true
);
Q_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
;
emit
phaseChanged
();
Q_EMIT
phaseChanged
();
}
void
blinkenGame
::
start
(
int
level
)
...
...
@@ -96,13 +96,13 @@ void blinkenGame::nextSound()
c
=
*
m_nextColor
;
++
m_nextColor
;
m_soundsPlayer
->
play
(
c
);
emit
highlight
(
c
,
false
);
Q_EMIT
highlight
(
c
,
false
);
}
else
{
setPhase
(
typingTheSequence
);
m_nextColor
=
m_sequence
.
constBegin
();
emit
highlight
(
none
,
false
);
Q_EMIT
highlight
(
none
,
false
);
m_soundsPlayer
->
disconnect
();
}
}
...
...
@@ -115,7 +115,7 @@ void blinkenGame::soundEnded()
void
blinkenGame
::
unhighlight
()
{
emit
highlight
(
none
,
false
);
Q_EMIT
highlight
(
none
,
false
);
}
void
blinkenGame
::
waiting
()
...
...
src/highscoredialog.cpp
View file @
eda659a9
...
...
@@ -213,7 +213,7 @@ void highScoreManager::addScore(int level, int score, const QString &name)
}
cfg
.
sync
();
foreach
(
highScoreManager
*
hsm
,
s_allHSM
)
for
(
highScoreManager
*
hsm
:
qAsConst
(
s_allHSM
)
)
{
if
(
hsm
!=
this
)
{
...
...
Albert Astals Cid
@aacid
mentioned in commit
bfdb2904
·
May 18, 2021
mentioned in commit
bfdb2904
mentioned in commit bfdb2904d2b0da5a2fe6962d8488c669d34a22d2
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment