Rearranged includes.

GIT_SILENT

Engine.cpp

@@ -114,8 +114,12 @@
 // This makes it possible to select a random move among those with equal
 // or nearly equal value after the search is completed.
 
+#include <Engine.h>
 
-#include "Engine.h"
+#include <QVector>
+#include <QApplication>
+
+#include <KDebug>
 
 // ================================================================
 //           Classes SquareStackEntry and SquareStack

Engine.h

@@ -119,14 +119,10 @@
 #ifndef KREVERSI_ENGINE_H
 #define KREVERSI_ENGINE_H
 
-#include <QVector>
-#include <QApplication>
-
 #include <KRandomSequence>
-#include <KDebug>
 
-#include "commondefs.h"
-#include "kreversigame.h"
+#include <commondefs.h>
+#include <kreversigame.h>
 class KReversiGame;
 
 

colorscheme.cpp

@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  *
  ********************************************************************/
-#include "colorscheme.h"
+#include <colorscheme.h>
 
 #include <KColorScheme>
 

commondefs.h

@@ -26,9 +26,8 @@
 
 #include <QString>
 #include <KgDifficulty>
-#include <KLocale>
 
-#include "preferences.h"
+#include <preferences.h>
 
 // noColor = empty
 enum ChipColor {White = 0, Black = 1, NoColor = 2};

gamestartinformation.h

 #ifndef GAMESTARTINFORMATION_H
 #define GAMESTARTINFORMATION_H
 
+#include <QString>
+
 class GameStartInformation {
 
 public:

highscores.cpp

@@ -16,7 +16,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "highscores.h"
+#include <highscores.h>
+
+#include <QVector>
+#include <QDateTime>
+
+#include <kdemacros.h>
+#include <KGlobal>
+#include <KLocale>
+#include <KConfigGroup>
+#include <KConfig>
 
 namespace KExtHighscore
 {

highscores.h

@@ -18,17 +18,8 @@
 #ifndef HIGHSCORES_H
 #define HIGHSCORES_H
 
-#include <QVector>
-#include <QDateTime>
 #include <QStringList>
-
 #include <KExtHighscore>
-#include <kdemacros.h>
-#include <KGlobal>
-#include <KLocale>
-#include <KConfigGroup>
-#include <KConfig>
-
 
 namespace KExtHighscore
 {

kreversicomputerplayer.cpp

@@ -21,7 +21,7 @@
  *
  ********************************************************************/
 
-#include "kreversicomputerplayer.h"
+#include <kreversicomputerplayer.h>
 
 KReversiComputerPlayer::KReversiComputerPlayer(ChipColor color, QString name):
     KReversiPlayer(color, name, false, false), m_lowestSkill(100) // setting it big enough

kreversicomputerplayer.h

@@ -24,8 +24,7 @@
 #ifndef KREVERSICOMPUTERPLAYER_H
 #define KREVERSICOMPUTERPLAYER_H
 
-#include "kreversigame.h"
-#include "kreversiplayer.h"
+#include <kreversiplayer.h>
 
 class KReversiComputerPlayer : public KReversiPlayer
 {

kreversigame.cpp

@@ -21,7 +21,9 @@
  * Boston, MA 02110-1301, USA.
  *
  ********************************************************************/
-#include "kreversigame.h"
+#include <kreversigame.h>
+
+#include <KDebug>
 
 const int KReversiGame::DX[KReversiGame::DIRECTIONS_COUNT] = {0, 0, 1, 1, 1, -1, -1, -1};
 const int KReversiGame::DY[KReversiGame::DIRECTIONS_COUNT] = {1, -1, 1, 0, -1, 1, 0, -1};

kreversigame.h

@@ -26,13 +26,12 @@
 
 #include <QObject>
 #include <QStack>
-#include <KDebug>
 #include <QTimer>
 
-#include "Engine.h"
+#include <Engine.h>
 class Engine;
-#include "commondefs.h"
-#include "kreversiplayer.h"
+#include <commondefs.h>
+#include <kreversiplayer.h>
 class KReversiPlayer;
 
 /**

kreversihumanplayer.cpp

@@ -21,7 +21,7 @@
  *
  ********************************************************************/
 
-#include "kreversihumanplayer.h"
+#include <kreversihumanplayer.h>
 
 KReversiHumanPlayer::KReversiHumanPlayer(ChipColor color, QString name):
     KReversiPlayer(color, name, true, true)

kreversihumanplayer.h

@@ -24,8 +24,7 @@
 #ifndef KREVERSIHUMANPLAYER_H
 #define KREVERSIHUMANPLAYER_H
 
-#include "kreversigame.h"
-#include "kreversiplayer.h"
+#include <kreversiplayer.h>
 
 class KReversiHumanPlayer : public KReversiPlayer
 {

kreversiplayer.cpp

@@ -21,7 +21,7 @@
  *
  ********************************************************************/
 
-#include "kreversiplayer.h"
+#include <kreversiplayer.h>
 
 KReversiPlayer::KReversiPlayer(ChipColor color, QString name,
                                bool hintAllowed, bool undoAllowed):

kreversiplayer.h

@@ -24,7 +24,7 @@
 #ifndef KREVERSI_PLAYER_H
 #define KREVERSI_PLAYER_H
 
-#include "kreversigame.h"
+#include <kreversigame.h>
 #include <QString>
 
 class KReversiGame;

kreversiview.cpp

@@ -17,7 +17,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "kreversiview.h"
+#include <kreversiview.h>
+
+#include <KLocalizedString>
+#include <KStandardDirs>
+
+#include <colorscheme.h>
 
 KReversiView::KReversiView(KReversiGame* game, QWidget *parent, KgThemeProvider *provider) :
     KgDeclarativeView(parent), m_delay(ANIMATION_SPEED_NORMAL), m_game(0),

kreversiview.h

@@ -21,13 +21,10 @@
 
 #include <QTimer>
 
-#include <KLocalizedString>
 #include <KgDeclarativeView>
-#include <KStandardDirs>
 #include <KgThemeProvider>
 
-#include "colorscheme.h"
-#include "kreversigame.h"
+#include <kreversigame.h>
 
 /**
  *  This class provides graphical representation of KReversiGame

main.cpp

@@ -22,14 +22,13 @@
  *******************************************************************
  */
 
-
 #include <KApplication>
 #include <KLocale>
 #include <KCmdLineArgs>
 #include <KAboutData>
 
-#include "highscores.h"
-#include "mainwindow.h"
+#include <highscores.h>
+#include <mainwindow.h>
 
 static const char description[] = I18N_NOOP("KDE Reversi Board Game");
 

mainwindow.cpp

@@ -22,14 +22,25 @@
  * Boston, MA 02110-1301, USA.
  *
  ********************************************************************/
-#include "mainwindow.h"
+#include <mainwindow.h>
+
+#include <KDebug>
+#include <KIcon>
+#include <KLocale>
+#include <KMessageBox>
+#include <KStandardDirs>
+#include <KStatusBar>
+#include <KActionCollection>
+#include <KStandardGameAction>
+#include <KExtHighscore>
+
+#include <kreversihumanplayer.h>
+#include <kreversicomputerplayer.h>
 
 static const int BLACK_STATUSBAR_ID = 1;
 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),

mainwindow.h

@@ -24,37 +24,21 @@
 #ifndef KREVERSI_MAIN_WINDOW_H
 #define KREVERSI_MAIN_WINDOW_H
 
-#include <kxmlguiwindow.h>
-#include "preferences.h"
+#include <KXmlGuiWindow>
+#include <preferences.h>
 
 #include <QApplication>
 #include <QListWidget>
 #include <QDockWidget>
-#include <QLabel>
-#include <QDesktopWidget>
 
 #include <KAction>
-#include <kactioncollection.h>
-#include <ktoggleaction.h>
-#include <kdebug.h>
-#include <kexthighscore.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kstatusbar.h>
-#include <kstandardaction.h>
-#include <kstandardgameaction.h>
-#include <kselectaction.h>
-#include <ktoolinvocation.h>
-#include <KgDifficulty>
-#include "kreversihumanplayer.h"
-#include "kreversicomputerplayer.h"
+#include <KToggleAction>
+#include <KSelectAction>
 
-#include "startgamedialog.h"
+#include <startgamedialog.h>
 
-#include "kreversigame.h"
-#include "kreversiview.h"
+#include <kreversigame.h>
+#include <kreversiview.h>
 
 class KReversiGame;
 class KReversiView;

startgamedialog.cpp

-#include "startgamedialog.h"
-#include "ui_startgamedialog.h"
+#include <startgamedialog.h>
+#include <ui_startgamedialog.h>
 
 #include <QMessageBox>
 #include <QCloseEvent>
 #include <KgDifficulty>
-#include <kdebug.h>
+#include <KDebug>
 #include <QSvgRenderer>
 #include <QPainter>
-#include <KColorScheme>
 
 StartGameDialog::StartGameDialog(QWidget *parent, KgThemeProvider *provider) :
     KDialog(parent),

startgamedialog.h

 #ifndef STARTGAMEDIALOG_H
 #define STARTGAMEDIALOG_H
 
+#include <gamestartinformation.h>
+#include <commondefs.h>
+
 #include <KDialog>
-#include "gamestartinformation.h"
-#include "commondefs.h"
 #include <KUser>
 #include <KgThemeProvider>
 
 namespace Ui {
-class StartGameDialog;
+    class StartGameDialog;
 }
 
 class StartGameDialog : public KDialog