change including order

diff --git a/src/addexpression.h b/src/addexpression.h
index a4b41b9..e98f380 100644 (file)
--- a/src/addexpression.h
+++ b/src/addexpression.h
@@ -1,13 +1,13 @@
 #ifndef ADD_EXPRESSION_INCLUDED
 #define ADD_EXPRESSION_INCLUDED
 
-#include "expression.h"
-
 #include <QtCore/QList>
 #include <QtCore/QString>
 
 #include <X11/Xlib.h>
 
+#include "expression.h"
+
 class AddExpression : public Expression
 {
        public:

diff --git a/src/clearexpression.cpp b/src/clearexpression.cpp
index c4be9d3..e3cde4d 100644 (file)
--- a/src/clearexpression.cpp
+++ b/src/clearexpression.cpp
@@ -1,7 +1,7 @@
-#include "clearexpression.h"
-
 #include <QtCore/QCoreApplication>
 
+#include "clearexpression.h"
+
 ClearExpression::ClearExpression(unsigned int mod)
 {
        modifier = mod;

diff --git a/src/expressiondialog.cpp b/src/expressiondialog.cpp
index 98ad210..c85a5de 100644 (file)
--- a/src/expressiondialog.cpp
+++ b/src/expressiondialog.cpp
@@ -1,14 +1,14 @@
-#include "expressiondialog.h"
-#include "expression.h"
-#include "keysymwidget.h"
-#include "modifierwidget.h"
-
 #include <QtGui/QComboBox>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QPushButton>
 #include <QtGui/QStackedWidget>
 #include <QtGui/QVBoxLayout>
 
+#include "expressiondialog.h"
+#include "expression.h"
+#include "keysymwidget.h"
+#include "modifierwidget.h"
+
 ExpressionDialog::ExpressionDialog(QWidget *parent) : QDialog(parent)
 {
        KeySymWidget *keySymWidget = new KeySymWidget;

diff --git a/src/keycodeexpression.h b/src/keycodeexpression.h
index 2094454..dc2ee68 100644 (file)
--- a/src/keycodeexpression.h
+++ b/src/keycodeexpression.h
@@ -1,13 +1,13 @@
 #ifndef KEY_CODE_EXPRESSION_INCLUDED
 #define KEY_CODE_EXPRESSION_INCLUDED
 
-#include "expression.h"
-
 #include <QtCore/QList>
 #include <QtCore/QString>
 
 #include <X11/Xlib.h>
 
+#include "expression.h"
+
 class KeyCodeExpression : public Expression
 {
        public:

diff --git a/src/keyeventdialog.cpp b/src/keyeventdialog.cpp
index 801c80f..d1d663a 100644 (file)
--- a/src/keyeventdialog.cpp
+++ b/src/keyeventdialog.cpp
@@ -1,5 +1,3 @@
-#include "keyeventdialog.h"
-#include "keyeventlineedit.h"
 #include <QtGui/QGridLayout>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QLabel>
@@ -10,6 +8,9 @@
 
 #include <X11/Xutil.h>
 
+#include "keyeventdialog.h"
+#include "keyeventlineedit.h"
+
 KeyEventDialog::KeyEventDialog(QWidget *parent) : QDialog(parent)
 {
        KeyEventLineEdit *keyEventLineEdit = new KeyEventLineEdit;

diff --git a/src/keyeventlineedit.cpp b/src/keyeventlineedit.cpp
index 10793f4..5a0a34b 100644 (file)
--- a/src/keyeventlineedit.cpp
+++ b/src/keyeventlineedit.cpp
@@ -1,6 +1,7 @@
-#include "keyeventlineedit.h"
 #include <QtGui/QKeyEvent>
 
+#include "keyeventlineedit.h"
+
 KeyEventLineEdit::KeyEventLineEdit(QWidget *parent) : QLineEdit(parent)
 {
        setReadOnly(true);

diff --git a/src/keysymcombobox.cpp b/src/keysymcombobox.cpp
index b04bbb0..843a705 100644 (file)
--- a/src/keysymcombobox.cpp
+++ b/src/keysymcombobox.cpp
@@ -1,8 +1,10 @@
-#include "keysymcombobox.h"
 #include <QtGui/QX11Info>
 
+#include "keysymcombobox.h" // QComboBox
+
 #include <X11/Xlib.h>
 
+
 QStringList KeySymComboBox::keySymList;
 
 KeySymComboBox::KeySymComboBox(QWidget *parent) : QComboBox(parent)

diff --git a/src/keysymexpression.h b/src/keysymexpression.h
index 4b1ddc3..c6cbf1e 100644 (file)
--- a/src/keysymexpression.h
+++ b/src/keysymexpression.h
@@ -1,13 +1,13 @@
 #ifndef KEY_SYM_EXPRESSION_INCLUDED
 #define KEY_SYM_EXPRESSION_INCLUDED
 
-#include "expression.h"
-
 #include <QtCore/QList>
 #include <QtCore/QString>
 
 #include <X11/Xlib.h>
 
+#include "expression.h"
+
 class KeySymExpression : public Expression
 {
        public:

diff --git a/src/keysymwidget.cpp b/src/keysymwidget.cpp
index 716a0a5..069bfe5 100644 (file)
--- a/src/keysymwidget.cpp
+++ b/src/keysymwidget.cpp
@@ -1,6 +1,3 @@
-#include "keysymwidget.h"
-#include "keysymcombobox.h"
-
 #include <QtGui/QLabel>
 #include <QtGui/QGridLayout>
 #include <QtGui/QGroupBox>
@@ -8,11 +5,14 @@
 #include <QtGui/QSpinBox>
 #include <QtGui/QX11Info>
 
-#include "keycodeexpression.h"
-#include "keysymexpression.h"
+#include "keysymcombobox.h" // QComboBox
 
 #include <X11/Xlib.h>
 
+#include "keycodeexpression.h"
+#include "keysymexpression.h"
+#include "keysymwidget.h"
+
 KeySymWidget::KeySymWidget(QWidget *parent) : ExpressionWidget(parent)
 {
        numberRadioButton = new QRadioButton;

diff --git a/src/keysymwidget.h b/src/keysymwidget.h
index 4a88e0c..7df0ca9 100644 (file)
--- a/src/keysymwidget.h
+++ b/src/keysymwidget.h
@@ -1,10 +1,10 @@
 #ifndef KEY_SYM_WIDGET_INCLUDED
 #define KEY_SYM_WIDGET_INCLUDED
 
-#include "expressionwidget.h"
-
 #include <QtCore/QList>
 
+#include "expressionwidget.h"
+
 class QRadioButton;
 class QSpinBox;
 

diff --git a/src/main.cpp b/src/main.cpp
index 92bbf60..8b403ef 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
-#include "mainwindow.h"
 #include <QtGui/QApplication>
 
+#include "mainwindow.h"
+
 int main(int argc, char *argv[])
 {
        QApplication app(argc, argv);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d4b3f9d..d4d36f4 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,7 +1,3 @@
-#include "expressiondialog.h"
-#include "expression.h"
-#include "keyeventdialog.h"
-#include "mainwindow.h"
 #include <QtGui/QAction>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QListWidget>
@@ -11,6 +7,11 @@
 #include <QtGui/QTabWidget>
 #include <QtGui/QVBoxLayout>
 
+#include "expressiondialog.h"
+#include "expression.h"
+#include "keyeventdialog.h"
+#include "mainwindow.h"
+
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
        QPushButton *addPushButton = new QPushButton;

diff --git a/src/modifierwidget.cpp b/src/modifierwidget.cpp
index 29a132d..7cb85d5 100644 (file)
--- a/src/modifierwidget.cpp
+++ b/src/modifierwidget.cpp
@@ -1,7 +1,3 @@
-#include "modifierwidget.h"
-#include "modifiercombobox.h"
-#include "keysymcombobox.h"
-
 #include <QtGui/QGridLayout>
 #include <QtGui/QGroupBox>
 #include <QtGui/QHBoxLayout>
@@ -11,12 +7,15 @@
 #include <QtGui/QRadioButton>
 #include <QtGui/QVBoxLayout>
 
+#include <X11/Xlib.h>
+
 #include "addexpression.h"
 #include "clearexpression.h"
+#include "keysymcombobox.h"
+#include "modifierwidget.h"
+#include "modifiercombobox.h"
 #include "removeexpression.h"
 
-#include <X11/Xlib.h>
-
 ModifierWidget::ModifierWidget(QWidget *parent) : ExpressionWidget(parent)
 {
        addRadioButton = new QRadioButton;

diff --git a/src/removeexpression.h b/src/removeexpression.h
index bc652f3..c7ca0b6 100644 (file)
--- a/src/removeexpression.h
+++ b/src/removeexpression.h
@@ -1,13 +1,13 @@
 #ifndef REMOVE_EXPRESSION_INCLUDED
 #define REMOVE_EXPRESSION_INCLUDED
 
-#include "expression.h"
-
 #include <QtCore/QList>
 #include <QtCore/QString>
 
 #include <X11/Xlib.h>
 
+#include "expression.h"
+
 class RemoveExpression : public Expression
 {
        public: