summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius ┼átikonas <[email protected]>2017-04-29 17:05:42 +0100
committerAndrius ┼átikonas <[email protected]>2017-04-29 17:05:42 +0100
commitf4e05527ca9ade71fb1aac6fa1d41b3a087d8f7c (patch)
tree8081217b7fc2fc083c37c023224d66da45d07e9a
parent03262b5fd39e323d222634a3883165c62798f07e (diff)
Convert QT,KF5 includes to camelCase and sort.
-rw-r--r--src/generator/dlxsolver.h2
-rw-r--r--src/generator/state.cpp2
-rw-r--r--src/generator/sudokuboard.cpp5
-rw-r--r--src/generator/sudokuboard.h2
-rw-r--r--src/gui/config.h2
-rw-r--r--src/gui/gamevariants.h6
-rw-r--r--src/gui/history.h6
-rw-r--r--src/gui/ksudoku.h2
-rw-r--r--src/gui/ksudoku_client.cpp7
-rw-r--r--src/gui/ksudokugame.cpp4
-rw-r--r--src/gui/ksudokugame.h2
-rw-r--r--src/gui/puzzleprinter.cpp3
-rw-r--r--src/gui/serializer.cpp1
-rw-r--r--src/gui/symbols.cpp2
-rw-r--r--src/gui/views/ArcBall.cpp2
-rw-r--r--src/gui/views/gameactions.cpp8
-rw-r--r--src/gui/views/gameactions.h2
-rw-r--r--src/gui/views/ksview.cpp5
-rw-r--r--src/gui/views/renderer.cpp8
-rw-r--r--src/gui/views/renderer.h3
-rw-r--r--src/gui/views/roxdokuview.cpp6
-rw-r--r--src/gui/views/roxdokuview.h11
-rw-r--r--src/gui/views/valuelistwidget.h2
-rw-r--r--src/gui/views/view2d.cpp2
-rw-r--r--src/gui/welcomescreen.cpp5
-rw-r--r--src/logic/puzzle.cpp1
-rw-r--r--src/logic/skgraph.cpp2
-rw-r--r--src/logic/skgraph.h2
-rw-r--r--src/main.cpp6
29 files changed, 49 insertions, 62 deletions
diff --git a/src/generator/dlxsolver.h b/src/generator/dlxsolver.h
index c29ab3a..ca70fd2 100644
--- a/src/generator/dlxsolver.h
+++ b/src/generator/dlxsolver.h
@@ -18,8 +18,8 @@
#ifndef DLXSOLVER_H
#define DLXSOLVER_H
-#include <QObject>
#include <QList>
+#include <QObject>
#include "globals.h"
diff --git a/src/generator/state.cpp b/src/generator/state.cpp
index f701444..813062d 100644
--- a/src/generator/state.cpp
+++ b/src/generator/state.cpp
@@ -17,7 +17,7 @@
#include "state.h"
-#include <stdio.h>
+#include <cstdio>
State::State (QObject * parent,
const GuessesList & guesses,
diff --git a/src/generator/sudokuboard.cpp b/src/generator/sudokuboard.cpp
index ee00d45..ae1bb7d 100644
--- a/src/generator/sudokuboard.cpp
+++ b/src/generator/sudokuboard.cpp
@@ -23,16 +23,15 @@
#include "sudokuboard.h"
#include "state.h"
#include "mathdokugenerator.h"
-#include <QDebug>
#include <KLocalizedString>
#include <KMessageBox>
+#include <QDebug>
#include <QMultiMap>
-
#include <QTime>
-#include <stdio.h>
+#include <cstdio>
#include <ctime>
SudokuBoard::SudokuBoard (SKGraph * graph)
diff --git a/src/generator/sudokuboard.h b/src/generator/sudokuboard.h
index 9f927c8..4568ac1 100644
--- a/src/generator/sudokuboard.h
+++ b/src/generator/sudokuboard.h
@@ -23,8 +23,8 @@
#include "globals.h"
#include "skgraph.h"
-#include <QObject>
#include <QList>
+#include <QObject>
#include <QStack>
typedef qint32 Pair; // Two small integers packed into one.
diff --git a/src/gui/config.h b/src/gui/config.h
index a968e2b..b942f4a 100644
--- a/src/gui/config.h
+++ b/src/gui/config.h
@@ -20,9 +20,9 @@
#ifndef _KSUDOKUCONFIG_H_
#define _KSUDOKUCONFIG_H_
-#include <QWidget>
#include <QList>
#include <QListWidget>
+#include <QWidget>
#include "ui_configgame.h"
diff --git a/src/gui/gamevariants.h b/src/gui/gamevariants.h
index 9ef9f7f..fa2955b 100644
--- a/src/gui/gamevariants.h
+++ b/src/gui/gamevariants.h
@@ -21,11 +21,11 @@
#ifndef _KSUDOKUGAMEVARIANTS_H_
#define _KSUDOKUGAMEVARIANTS_H_
-#include <QObject>
+#include <QAbstractListModel>
+#include <QItemDelegate>
#include <QList>
+#include <QObject>
#include <QUrl>
-#include <QItemDelegate>
-#include <QAbstractListModel>
class SKGraph;
namespace ksudoku {
diff --git a/src/gui/history.h b/src/gui/history.h
index 1e30cdc..9c5a6f8 100644
--- a/src/gui/history.h
+++ b/src/gui/history.h
@@ -20,10 +20,10 @@
#ifndef _KSUDOKUHISTORY_H_
#define _KSUDOKUHISTORY_H_
-#include <qbitarray.h>
+#include <QBitArray>
+#include <QDateTime>
+#include <QObject>
#include <QVector>
-#include <qobject.h>
-#include <qdatetime.h>
#include "globals.h"
#include "ksudoku_types.h"
diff --git a/src/gui/ksudoku.h b/src/gui/ksudoku.h
index 7d0503d..db194b4 100644
--- a/src/gui/ksudoku.h
+++ b/src/gui/ksudoku.h
@@ -26,7 +26,7 @@
#include <QUrl>
-#include <kxmlguiwindow.h>
+#include <KXmlGuiWindow>
#if 0
#include <knewstuff/knewstuff.h>
#endif
diff --git a/src/gui/ksudoku_client.cpp b/src/gui/ksudoku_client.cpp
index 7cfe67d..45b748d 100644
--- a/src/gui/ksudoku_client.cpp
+++ b/src/gui/ksudoku_client.cpp
@@ -18,11 +18,10 @@
***************************************************************************/
-
-#include <dcopclient.h>
-#include <qdatastream.h>
-#include <qstring.h>
#include <QApplication>
+#include <QDataStream>
+#include <QString>
+
#include <KAboutData>
#include <KLocalizedString>
diff --git a/src/gui/ksudokugame.cpp b/src/gui/ksudokugame.cpp
index 490f2d5..6e5c6e3 100644
--- a/src/gui/ksudokugame.cpp
+++ b/src/gui/ksudokugame.cpp
@@ -32,10 +32,8 @@
#include <KMessageBox>
#include <KLocalizedString>
-#include <QList>
-
#include <QDebug>
-
+#include <QList>
#include <QUrl>
class QWidget;
diff --git a/src/gui/ksudokugame.h b/src/gui/ksudokugame.h
index 66e65c5..a58c933 100644
--- a/src/gui/ksudokugame.h
+++ b/src/gui/ksudokugame.h
@@ -23,7 +23,7 @@
#ifndef _KSUDOKUGAME_H_
#define _KSUDOKUGAME_H_
-#include <qobject.h>
+#include <QObject>
#include <QUrl>
#include "history.h"
diff --git a/src/gui/puzzleprinter.cpp b/src/gui/puzzleprinter.cpp
index ed9f2b3..16666a0 100644
--- a/src/gui/puzzleprinter.cpp
+++ b/src/gui/puzzleprinter.cpp
@@ -29,6 +29,7 @@
#include <QLine>
#include <KLocalizedString>
+#include <KMessageBox>
#include "puzzle.h"
#include "skgraph.h"
@@ -37,8 +38,6 @@
#include "settings.h"
-#include <KMessageBox>
-
PuzzlePrinter::PuzzlePrinter(QWidget * parent)
:
QObject(parent),
diff --git a/src/gui/serializer.cpp b/src/gui/serializer.cpp
index 54c3b8f..e5c4265 100644
--- a/src/gui/serializer.cpp
+++ b/src/gui/serializer.cpp
@@ -34,7 +34,6 @@
#include <KIO/FileCopyJob>
#include <KJobWidgets>
#include <KLocalizedString>
-#include <KMessageBox>
#include "ksudoku.h"
#include "symbols.h"
diff --git a/src/gui/symbols.cpp b/src/gui/symbols.cpp
index 6deb8ed..56c7ea8 100644
--- a/src/gui/symbols.cpp
+++ b/src/gui/symbols.cpp
@@ -22,7 +22,7 @@
#include "symbols.h"
#include "globals.h"
-#include <QtCore/QChar>
+#include <QChar>
namespace ksudoku {
diff --git a/src/gui/views/ArcBall.cpp b/src/gui/views/ArcBall.cpp
index 0dfc6b4..0b9e8e3 100644
--- a/src/gui/views/ArcBall.cpp
+++ b/src/gui/views/ArcBall.cpp
@@ -19,7 +19,7 @@
#include "ArcBall.h" // ArcBall header
-#include <stdio.h>
+#include <cstdio>
//Arcball sphere constants:
//Diameter is 2.0f
diff --git a/src/gui/views/gameactions.cpp b/src/gui/views/gameactions.cpp
index 52904b3..e302b4f 100644
--- a/src/gui/views/gameactions.cpp
+++ b/src/gui/views/gameactions.cpp
@@ -20,11 +20,13 @@
#include "gameactions.h"
-#include <KLocalizedString>
#include <QAction>
-#include <KActionCollection>
-#include <QSignalMapper>
#include <QKeySequence>
+#include <QSignalMapper>
+
+#include <KActionCollection>
+#include <KLocalizedString>
+
namespace ksudoku {
GameActions::GameActions(KActionCollection* collection) {
diff --git a/src/gui/views/gameactions.h b/src/gui/views/gameactions.h
index 0462999..3c3b57d 100644
--- a/src/gui/views/gameactions.h
+++ b/src/gui/views/gameactions.h
@@ -20,8 +20,8 @@
#ifndef _KSUDOKU_GAMEACTIONS_H_
#define _KSUDOKU_GAMEACTIONS_H_
-#include <QVector>
#include <QObject>
+#include <QVector>
class QAction;
class KActionCollection;
diff --git a/src/gui/views/ksview.cpp b/src/gui/views/ksview.cpp
index 4be151d..30c0e20 100644
--- a/src/gui/views/ksview.cpp
+++ b/src/gui/views/ksview.cpp
@@ -25,9 +25,8 @@
#include "ksudokugame.h"
#include "settings.h"
-#include <qpixmap.h>
-#include <qpainter.h>
-
+#include <QPainter>
+#include <QPixmap>
#include "puzzle.h"
diff --git a/src/gui/views/renderer.cpp b/src/gui/views/renderer.cpp
index 1a56494..0814f4d 100644
--- a/src/gui/views/renderer.cpp
+++ b/src/gui/views/renderer.cpp
@@ -21,6 +21,9 @@
#include "ksudoku_logging.h"
#include "renderer.h"
+#include <QDebug>
+#include <QPainter>
+#include <QPixmap>
#include <QSvgRenderer>
#define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API
@@ -28,11 +31,6 @@
#include "settings.h"
-#include <QPixmap>
-#include <QPainter>
-
-#include <QDebug>
-
namespace ksudoku {
Renderer* Renderer::instance() {
diff --git a/src/gui/views/renderer.h b/src/gui/views/renderer.h
index 47e312c..b92eded 100644
--- a/src/gui/views/renderer.h
+++ b/src/gui/views/renderer.h
@@ -23,9 +23,8 @@
#include <KImageCache>
-#include <QVector>
-// #include <QPixmap>
#include <QString>
+#include <QVector>
class QPixmap;
class QSize;
diff --git a/src/gui/views/roxdokuview.cpp b/src/gui/views/roxdokuview.cpp
index aa25deb..b5cf8b4 100644
--- a/src/gui/views/roxdokuview.cpp
+++ b/src/gui/views/roxdokuview.cpp
@@ -26,11 +26,9 @@
#include "ksudoku.h"
#include "skgraph.h"
-#include <kmessagebox.h>
-#include <qcursor.h>
-//Added by qt3to4:
-#include <QPixmap>
+#include <QCursor>
#include <QMouseEvent>
+#include <QPixmap>
#include <KLocalizedString>
#include "settings.h"
diff --git a/src/gui/views/roxdokuview.h b/src/gui/views/roxdokuview.h
index 213a617..28e16a9 100644
--- a/src/gui/views/roxdokuview.h
+++ b/src/gui/views/roxdokuview.h
@@ -23,14 +23,13 @@
#ifndef ROXDOKUVIEW_h
#define ROXDOKUVIEW_h
-#include <qgl.h>
-#include <qpixmap.h>
-#include <qpainter.h>
-#include <qimage.h>
-//Added by qt3to4:
-#include <QWheelEvent>
+#include <QGL>
+#include <QImage>
#include <QMouseEvent>
+#include <QPainter>
+#include <QPixmap>
#include <QTimer>
+#include <QWheelEvent>
#include "ArcBall.h"
diff --git a/src/gui/views/valuelistwidget.h b/src/gui/views/valuelistwidget.h
index 7e62801..30787ae 100644
--- a/src/gui/views/valuelistwidget.h
+++ b/src/gui/views/valuelistwidget.h
@@ -20,8 +20,8 @@
#ifndef _KSUDOKUVALUELISTWIDGET_H_
#define _KSUDOKUVALUELISTWIDGET_H_
-#include <QGraphicsView>
#include <QGraphicsItem>
+#include <QGraphicsView>
#include <QList>
#include "symbols.h"
diff --git a/src/gui/views/view2d.cpp b/src/gui/views/view2d.cpp
index 700745c..fa4d05b 100644
--- a/src/gui/views/view2d.cpp
+++ b/src/gui/views/view2d.cpp
@@ -24,9 +24,9 @@
+#include <QDebug>
#include <QGraphicsPixmapItem>
#include <QGraphicsSceneEvent>
-#include <QDebug>
#include "puzzle.h"
#include "gameactions.h"
diff --git a/src/gui/welcomescreen.cpp b/src/gui/welcomescreen.cpp
index 527d9f1..28b8dbb 100644
--- a/src/gui/welcomescreen.cpp
+++ b/src/gui/welcomescreen.cpp
@@ -19,9 +19,10 @@
***************************************************************************/
#include "welcomescreen.h"
-#include <KMessageBox>
-#include <KConfigGroup>
#include <QDebug>
+
+#include <KConfigGroup>
+#include <KMessageBox>
#include <KSharedConfig>
#include "ksudokugame.h"
diff --git a/src/logic/puzzle.cpp b/src/logic/puzzle.cpp
index 905d469..d190fac 100644
--- a/src/logic/puzzle.cpp
+++ b/src/logic/puzzle.cpp
@@ -24,7 +24,6 @@
#include <cstdlib>
#include <QString>
-#include <QtDebug>
#include "sudokuboard.h"
#include "mathdokugenerator.h"
diff --git a/src/logic/skgraph.cpp b/src/logic/skgraph.cpp
index 8f703fb..ba531ac 100644
--- a/src/logic/skgraph.cpp
+++ b/src/logic/skgraph.cpp
@@ -23,9 +23,9 @@
#include "skgraph.h"
+#include <QMultiMap>
#include <QString>
#include <QStringList>
-#include <QMultiMap>
SKGraph::SKGraph(int order, ksudoku::GameType type)
{
diff --git a/src/logic/skgraph.h b/src/logic/skgraph.h
index 2eee67b..6a9899e 100644
--- a/src/logic/skgraph.h
+++ b/src/logic/skgraph.h
@@ -24,9 +24,9 @@
#ifndef SKGRAPH_H
#define SKGRAPH_H
+#include <QList>
#include <QString>
#include <QVector>
-#include <QList>
#include "ksudoku_types.h"
#include "globals.h"
diff --git a/src/main.cpp b/src/main.cpp
index b1e6b89..394706b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,18 +22,16 @@
#include "ksudoku.h"
-//#include <dcopclient.h>
#include <KAboutData>
#include <KCrash>
-
#include <KLocalizedString>
-#include <kconfigdialogmanager.h>
-#include <QUrl>
+#include <KConfigDialogManager>
#include <QApplication>
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QDir>
+#include <QUrl>
#include <cstdlib>
#include <ctime>