Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Games
KReversi
Commits
cbd27e0b
Commit
cbd27e0b
authored
Jan 30, 2015
by
Laurent Montel
Browse files
Port to new connect api
parent
11ce83ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
kreversiview.cpp
View file @
cbd27e0b
...
...
@@ -42,6 +42,7 @@ KReversiView::KReversiView(KReversiGame* game, QWidget *parent, KgThemeProvider
connect
(
m_qml_root
,
SIGNAL
(
cellClicked
(
int
,
int
)),
this
,
SLOT
(
onPlayerMove
(
int
,
int
)));
setGame
(
game
);
}
...
...
@@ -50,22 +51,22 @@ void KReversiView::setGame(KReversiGame *game)
// disconnect signals from previous game if they exist,
// we are not interested in them anymore
if
(
m_game
)
{
disconnect
(
m_game
,
SIGNAL
(
boardChanged
())
,
this
,
SLOT
(
updateBoard
())
);
disconnect
(
m_game
,
SIGNAL
(
moveFinished
())
,
this
,
SLOT
(
gameMoveFinished
())
);
disconnect
(
m_game
,
SIGNAL
(
gameOver
())
,
this
,
SLOT
(
gameOver
())
);
disconnect
(
m_game
,
SIGNAL
(
whitePlayerCantMove
())
,
this
,
SLOT
(
whitePlayerCantMove
())
);
disconnect
(
m_game
,
SIGNAL
(
blackPlayerCantMove
())
,
this
,
SLOT
(
blackPlayerCantMove
())
);
disconnect
(
m_game
,
&
KReversiGame
::
boardChanged
,
this
,
&
KReversiView
::
updateBoard
);
disconnect
(
m_game
,
&
KReversiGame
::
moveFinished
,
this
,
&
KReversiView
::
gameMoveFinished
);
disconnect
(
m_game
,
&
KReversiGame
::
gameOver
,
this
,
&
KReversiView
::
gameOver
);
disconnect
(
m_game
,
&
KReversiGame
::
whitePlayerCantMove
,
this
,
&
KReversiView
::
whitePlayerCantMove
);
disconnect
(
m_game
,
&
KReversiGame
::
blackPlayerCantMove
,
this
,
&
KReversiView
::
blackPlayerCantMove
);
delete
m_game
;
}
m_game
=
game
;
if
(
m_game
)
{
connect
(
m_game
,
SIGNAL
(
boardChanged
())
,
this
,
SLOT
(
updateBoard
())
);
connect
(
m_game
,
SIGNAL
(
moveFinished
())
,
this
,
SLOT
(
gameMoveFinished
())
);
connect
(
m_game
,
SIGNAL
(
gameOver
())
,
this
,
SLOT
(
gameOver
())
);
connect
(
m_game
,
SIGNAL
(
whitePlayerCantMove
())
,
this
,
SLOT
(
whitePlayerCantMove
())
);
connect
(
m_game
,
SIGNAL
(
blackPlayerCantMove
())
,
this
,
SLOT
(
blackPlayerCantMove
())
);
connect
(
m_game
,
&
KReversiGame
::
boardChanged
,
this
,
&
KReversiView
::
updateBoard
);
connect
(
m_game
,
&
KReversiGame
::
moveFinished
,
this
,
&
KReversiView
::
gameMoveFinished
);
connect
(
m_game
,
&
KReversiGame
::
gameOver
,
this
,
&
KReversiView
::
gameOver
);
connect
(
m_game
,
&
KReversiGame
::
whitePlayerCantMove
,
this
,
&
KReversiView
::
whitePlayerCantMove
);
connect
(
m_game
,
&
KReversiGame
::
blackPlayerCantMove
,
this
,
&
KReversiView
::
blackPlayerCantMove
);
m_game
->
setDelay
(
m_delay
);
}
...
...
mainwindow.cpp
View file @
cbd27e0b
...
...
@@ -85,7 +85,7 @@ KReversiMainWindow::KReversiMainWindow(QWidget* parent, bool startDemo)
// initialise dialog handler
m_startDialog
=
new
StartGameDialog
(
this
,
m_provider
);
connect
(
m_startDialog
,
SIGNAL
(
startGame
())
,
this
,
SLOT
(
slotDialogReady
())
);
connect
(
m_startDialog
,
&
StartGameDialog
::
startGame
,
this
,
&
KReversiMainWindow
::
slotDialogReady
);
// initialise actions
setupActionsInit
();
...
...
@@ -121,12 +121,12 @@ void KReversiMainWindow::setupActionsInit()
// Last move
m_showLast
=
new
KToggleAction
(
QIcon
::
fromTheme
(
QLatin1String
(
"lastmoves"
)),
i18n
(
"Show Last Move"
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"show_last_move"
),
m_showLast
);
connect
(
m_showLast
,
SIGNAL
(
triggered
(
bool
))
,
m_view
,
SLOT
(
setShowLastMove
(
bool
))
);
connect
(
m_showLast
,
&
KToggleAction
::
triggered
,
m_view
,
&
KReversiView
::
setShowLastMove
);
// Legal moves
m_showLegal
=
new
KToggleAction
(
QIcon
::
fromTheme
(
QLatin1String
(
"legalmoves"
)),
i18n
(
"Show Legal Moves"
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"show_legal_moves"
),
m_showLegal
);
connect
(
m_showLegal
,
SIGNAL
(
triggered
(
bool
))
,
m_view
,
SLOT
(
setShowLegalMoves
(
bool
))
);
connect
(
m_showLegal
,
&
KToggleAction
::
triggered
,
m_view
,
&
KReversiView
::
setShowLegalMoves
);
// Animation speed
m_animSpeedAct
=
new
KSelectAction
(
i18n
(
"Animation Speed"
),
this
);
...
...
@@ -135,18 +135,18 @@ void KReversiMainWindow::setupActionsInit()
QStringList
acts
;
acts
<<
i18n
(
"Slow"
)
<<
i18n
(
"Normal"
)
<<
i18n
(
"Fast"
);
m_animSpeedAct
->
setItems
(
acts
);
connect
(
m_animSpeedAct
,
SIGNAL
(
triggered
(
int
)),
SLOT
(
slotAnimSpeedChanged
(
int
))
);
connect
(
m_animSpeedAct
,
static_cast
<
void
(
KSelectAction
::*
)(
int
)
>
(
&
KSelectAction
::
triggered
),
this
,
&
KReversiMainWindow
::
slotAnimSpeedChanged
);
// Chip's color
m_coloredChipsAct
=
new
KToggleAction
(
i18n
(
"Use Colored Chips"
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"use_colored_chips"
),
m_coloredChipsAct
);
connect
(
m_coloredChipsAct
,
SIGNAL
(
triggered
(
bool
)),
SLOT
(
slotUseColoredChips
(
bool
))
);
connect
(
m_coloredChipsAct
,
&
KToggleAction
::
triggered
,
this
,
&
KReversiMainWindow
::
slotUseColoredChips
);
// Move history
// NOTE: read/write this from/to config file? Or not necessary?
m_showMovesAct
=
new
KToggleAction
(
QIcon
::
fromTheme
(
QLatin1String
(
"view-history"
)),
i18n
(
"Show Move History"
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"show_moves"
),
m_showMovesAct
);
connect
(
m_showMovesAct
,
SIGNAL
(
triggered
(
bool
)),
SLOT
(
slotShowMovesHistory
(
bool
))
);
connect
(
m_showMovesAct
,
&
KToggleAction
::
triggered
,
this
,
&
KReversiMainWindow
::
slotShowMovesHistory
);
}
void
KReversiMainWindow
::
loadSettings
()
...
...
@@ -404,8 +404,8 @@ void KReversiMainWindow::receivedGameStartInformation(GameStartInformation info)
m_view
->
setGame
(
m_game
);
connect
(
m_game
,
SIGNAL
(
gameOver
()),
SLOT
(
slotGameOver
())
);
connect
(
m_game
,
SIGNAL
(
moveFinished
()),
SLOT
(
slotMoveFinished
())
);
connect
(
m_game
,
&
KReversiGame
::
gameOver
,
this
,
&
KReversiMainWindow
::
slotGameOver
);
connect
(
m_game
,
&
KReversiGame
::
moveFinished
,
this
,
&
KReversiMainWindow
::
slotMoveFinished
);
for
(
int
i
=
0
;
i
<
2
;
i
++
)
// iterating white to black
if
(
info
.
type
[
i
]
==
GameStartInformation
::
Human
)
...
...
startgamedialog.cpp
View file @
cbd27e0b
...
...
@@ -54,8 +54,8 @@ StartGameDialog::StartGameDialog(QWidget *parent, KgThemeProvider *provider) :
QPushButton
*
okButton
=
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
okButton
->
setDefault
(
true
);
okButton
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
Key_Return
);
connect
(
buttonBox
,
SIGNAL
(
accepted
())
,
this
,
SLOT
(
slotAccepted
())
);
connect
(
buttonBox
,
SIGNAL
(
rejected
())
,
this
,
SLOT
(
reject
())
);
connect
(
buttonBox
,
&
QDialogButtonBox
::
accepted
,
this
,
&
StartGameDialog
::
slotAccepted
);
connect
(
buttonBox
,
&
QDialogButtonBox
::
rejected
,
this
,
&
StartGameDialog
::
reject
);
okButton
->
setText
(
i18n
(
"Start game"
));
okButton
->
setToolTip
(
i18n
(
"Let's start playing!"
));
buttonBox
->
button
(
QDialogButtonBox
::
Close
)
->
setText
(
i18n
(
"Quit"
));
...
...
@@ -90,8 +90,8 @@ StartGameDialog::StartGameDialog(QWidget *parent, KgThemeProvider *provider) :
}
}
connect
(
ui
->
blackTypeGroup
,
SIGNAL
(
buttonClicked
(
int
)
),
this
,
SLOT
(
slotUpdateBlack
(
int
))
);
connect
(
ui
->
whiteTypeGroup
,
SIGNAL
(
buttonClicked
(
int
)
),
this
,
SLOT
(
slotUpdateWhite
(
int
))
);
connect
(
ui
->
blackTypeGroup
,
static_cast
<
void
(
QButtonGroup
::*
)(
int
)
>
(
&
QButtonGroup
::
buttonClicked
),
this
,
&
StartGameDialog
::
slotUpdateBlack
);
connect
(
ui
->
whiteTypeGroup
,
static_cast
<
void
(
QButtonGroup
::*
)(
int
)
>
(
&
QButtonGroup
::
buttonClicked
),
this
,
&
StartGameDialog
::
slotUpdateWhite
);
slotUpdateBlack
(
GameStartInformation
::
Human
);
slotUpdateWhite
(
GameStartInformation
::
AI
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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