[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kreversi/frameworks] /: Fix initialization order.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 11:32:13
Message-ID: E1aOOKb-0002VC-Lk () scm ! kde ! org
[Download RAW message or body]

Git commit c91ac5d6988166db2c88ca892852aba92548ae03 by Frederik Schwarzer.
Committed on 27/01/2016 at 11:32.
Pushed by schwarzer into branch 'frameworks'.

Fix initialization order.

M  +1    -1    kreversigame.cpp
M  +8    -4    kreversiview.cpp
M  +10   -4    mainwindow.cpp

http://commits.kde.org/kreversi/c91ac5d6988166db2c88ca892852aba92548ae03

diff --git a/kreversigame.cpp b/kreversigame.cpp
index 9136212..60fcd62 100644
--- a/kreversigame.cpp
+++ b/kreversigame.cpp
@@ -28,7 +28,7 @@ const int KReversiGame::DX[KReversiGame::DIRECTIONS_COUNT] = {0, 0, 1, 1, 1, -1,
 const int KReversiGame::DY[KReversiGame::DIRECTIONS_COUNT] = {1, -1, 1, 0, -1, 1, 0, -1};
 
 KReversiGame::KReversiGame(KReversiPlayer *blackPlayer, KReversiPlayer *whitePlayer)
-    : m_curPlayer(Black), m_delay(300)
+    : m_delay(300), m_curPlayer(Black)
 {
     m_isReady[White] = m_isReady[Black] = false;
 
diff --git a/kreversiview.cpp b/kreversiview.cpp
index 3cd4770..fc8bc42 100644
--- a/kreversiview.cpp
+++ b/kreversiview.cpp
@@ -25,10 +25,14 @@
 #include <colorscheme.h>
 #include <QStandardPaths>
 
-KReversiView::KReversiView(KReversiGame* game, QWidget *parent, KgThemeProvider *provider) :
-    KgDeclarativeView(parent), m_delay(ANIMATION_SPEED_NORMAL), m_game(0),
-    m_showLastMove(false), m_showLegalMoves(false),
-    m_showLabels(false), m_provider(provider)
+KReversiView::KReversiView(KReversiGame* game, QWidget *parent, KgThemeProvider *provider)
+    : KgDeclarativeView(parent),
+    m_provider(provider),
+    m_delay(ANIMATION_SPEED_NORMAL),
+    m_game(0),
+    m_showLastMove(false),
+    m_showLegalMoves(false),
+    m_showLabels(false)
 {
     m_provider->setDeclarativeEngine(QStringLiteral("themeProvider"), engine());
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5fb2121..e78b6c0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -43,10 +43,16 @@ static const int WHITE_STATUSBAR_ID = 2;
 static const int COMMON_STATUSBAR_ID = 0;
 
 KReversiMainWindow::KReversiMainWindow(QWidget* parent, bool startDemo)
-    : KXmlGuiWindow(parent), m_view(0), m_game(0),
-      m_historyDock(0), m_historyView(0),
-      m_firstShow(true), m_startInDemoMode(startDemo),
-      m_undoAct(0), m_hintAct(0), m_startDialog(0)
+    : KXmlGuiWindow(parent),
+    m_startDialog(0),
+    m_view(0),
+    m_game(0),
+    m_historyDock(0),
+    m_historyView(0),
+    m_firstShow(true),
+    m_startInDemoMode(startDemo),
+    m_undoAct(0),
+    m_hintAct(0)
 {
     memset(m_player, 0, sizeof(m_player));
 
[prev in list] [next in list] [prev in thread] [next in thread]