Revision | 8db7a9ba6e05a1f925252c4f08e219fb59b50b0c (tree) |
---|---|
Time | 2009-05-06 06:08:46 |
Author | Muneyuki Noguchi <nogu@user...> |
Commiter | Muneyuki Noguchi |
replace " " with ' ' and include own header first
@@ -13,9 +13,9 @@ void AddExpression::execute() const | ||
13 | 13 | |
14 | 14 | QString AddExpression::text() const |
15 | 15 | { |
16 | - QString expr = "add " + QString::number(modifier) + " "; | |
16 | + QString expr = "add " + QString::number(modifier) + ' '; | |
17 | 17 | for (int i = 0, j = keySymList.count(); i < j; i++) { |
18 | - expr += QString::number(keySymList[i]) + " "; | |
18 | + expr += QString::number(keySymList[i]) + ' '; | |
19 | 19 | } |
20 | 20 | return expr; |
21 | 21 | } |
@@ -1,7 +1,7 @@ | ||
1 | -#include <QtCore/QCoreApplication> | |
2 | - | |
3 | 1 | #include "clearexpression.h" |
4 | 2 | |
3 | +#include <QtCore/QCoreApplication> | |
4 | + | |
5 | 5 | ClearExpression::ClearExpression(unsigned int mod) |
6 | 6 | { |
7 | 7 | modifier = mod; |
@@ -1,10 +1,11 @@ | ||
1 | +#include "expressiondialog.h" | |
2 | + | |
1 | 3 | #include <QtGui/QComboBox> |
2 | 4 | #include <QtGui/QDialogButtonBox> |
3 | 5 | #include <QtGui/QPushButton> |
4 | 6 | #include <QtGui/QStackedWidget> |
5 | 7 | #include <QtGui/QVBoxLayout> |
6 | 8 | |
7 | -#include "expressiondialog.h" | |
8 | 9 | #include "expression.h" |
9 | 10 | #include "keysymwidget.h" |
10 | 11 | #include "modifierwidget.h" |
@@ -13,9 +13,9 @@ void KeyCodeExpression::execute() const | ||
13 | 13 | |
14 | 14 | QString KeyCodeExpression::text() const |
15 | 15 | { |
16 | - QString expr = "keycode " + QString::number(number) + " "; | |
16 | + QString expr = "keycode " + QString::number(number) + ' '; | |
17 | 17 | for (int i = 0, j = keySymList.count(); i < j; i++) { |
18 | - expr += QString::number(keySymList[i]) + " "; | |
18 | + expr += QString::number(keySymList[i]) + ' '; | |
19 | 19 | } |
20 | 20 | return expr; |
21 | 21 | } |
@@ -1,3 +1,5 @@ | ||
1 | +#include "keyeventdialog.h" | |
2 | + | |
1 | 3 | #include <QtGui/QGridLayout> |
2 | 4 | #include <QtGui/QHBoxLayout> |
3 | 5 | #include <QtGui/QLabel> |
@@ -8,7 +10,6 @@ | ||
8 | 10 | |
9 | 11 | #include <X11/Xutil.h> |
10 | 12 | |
11 | -#include "keyeventdialog.h" | |
12 | 13 | #include "keyeventlineedit.h" |
13 | 14 | |
14 | 15 | KeyEventDialog::KeyEventDialog(QWidget *parent) : QDialog(parent) |
@@ -1,7 +1,7 @@ | ||
1 | -#include <QtGui/QKeyEvent> | |
2 | - | |
3 | 1 | #include "keyeventlineedit.h" |
4 | 2 | |
3 | +#include <QtGui/QKeyEvent> | |
4 | + | |
5 | 5 | KeyEventLineEdit::KeyEventLineEdit(QWidget *parent) : QLineEdit(parent) |
6 | 6 | { |
7 | 7 | setReadOnly(true); |
@@ -1,6 +1,6 @@ | ||
1 | -#include <QtGui/QX11Info> | |
1 | +#include "keysymcombobox.h" | |
2 | 2 | |
3 | -#include "keysymcombobox.h" // QComboBox | |
3 | +#include <QtGui/QX11Info> | |
4 | 4 | |
5 | 5 | #include <X11/Xlib.h> |
6 | 6 |
@@ -13,9 +13,9 @@ void KeySymExpression::execute() const | ||
13 | 13 | |
14 | 14 | QString KeySymExpression::text() const |
15 | 15 | { |
16 | - QString expr = "keysym " + QString::number(keySym) + " "; | |
16 | + QString expr = "keysym " + QString::number(keySym) + ' '; | |
17 | 17 | for (int i = 0, j = keySymList.count(); i < j; i++) { |
18 | - expr += QString::number(keySymList[i]) + " "; | |
18 | + expr += QString::number(keySymList[i]) + ' '; | |
19 | 19 | } |
20 | 20 | return expr; |
21 | 21 | } |
@@ -1,3 +1,6 @@ | ||
1 | +#include "keysymwidget.h" | |
2 | +#include "keysymcombobox.h" // QComboBox | |
3 | + | |
1 | 4 | #include <QtGui/QLabel> |
2 | 5 | #include <QtGui/QGridLayout> |
3 | 6 | #include <QtGui/QGroupBox> |
@@ -5,13 +8,10 @@ | ||
5 | 8 | #include <QtGui/QSpinBox> |
6 | 9 | #include <QtGui/QX11Info> |
7 | 10 | |
8 | -#include "keysymcombobox.h" // QComboBox | |
9 | - | |
10 | 11 | #include <X11/Xlib.h> |
11 | 12 | |
12 | 13 | #include "keycodeexpression.h" |
13 | 14 | #include "keysymexpression.h" |
14 | -#include "keysymwidget.h" | |
15 | 15 | |
16 | 16 | KeySymWidget::KeySymWidget(QWidget *parent) : ExpressionWidget(parent) |
17 | 17 | { |
@@ -1,3 +1,5 @@ | ||
1 | +#include "mainwindow.h" | |
2 | + | |
1 | 3 | #include <QtGui/QAction> |
2 | 4 | #include <QtGui/QHBoxLayout> |
3 | 5 | #include <QtGui/QListWidget> |
@@ -10,7 +12,6 @@ | ||
10 | 12 | #include "expressiondialog.h" |
11 | 13 | #include "expression.h" |
12 | 14 | #include "keyeventdialog.h" |
13 | -#include "mainwindow.h" | |
14 | 15 | |
15 | 16 | MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) |
16 | 17 | { |
@@ -1,3 +1,5 @@ | ||
1 | +#include "modifierwidget.h" | |
2 | + | |
1 | 3 | #include <QtGui/QGridLayout> |
2 | 4 | #include <QtGui/QGroupBox> |
3 | 5 | #include <QtGui/QHBoxLayout> |
@@ -12,7 +14,6 @@ | ||
12 | 14 | #include "addexpression.h" |
13 | 15 | #include "clearexpression.h" |
14 | 16 | #include "keysymcombobox.h" |
15 | -#include "modifierwidget.h" | |
16 | 17 | #include "modifiercombobox.h" |
17 | 18 | #include "removeexpression.h" |
18 | 19 |
@@ -13,9 +13,9 @@ void RemoveExpression::execute() const | ||
13 | 13 | |
14 | 14 | QString RemoveExpression::text() const |
15 | 15 | { |
16 | - QString expr = "remove " + QString::number(modifier) + " "; | |
16 | + QString expr = "remove " + QString::number(modifier) + ' '; | |
17 | 17 | for (int i = 0, j = keySymList.count(); i < j; i++) { |
18 | - expr += QString::number(keySymList[i]) + " "; | |
18 | + expr += QString::number(keySymList[i]) + ' '; | |
19 | 19 | } |
20 | 20 | return expr; |
21 | 21 | } |