use Q_SIGNALS, Q_SLOTS and Q_EMIT

diff --git a/src/keyeventdialog.h b/src/keyeventdialog.h
index dca3381..eeae19a 100644 (file)
--- a/src/keyeventdialog.h
+++ b/src/keyeventdialog.h
@@ -14,7 +14,7 @@ class KeyEventDialog : public QDialog
        public:
                KeyEventDialog(QWidget *parent = 0);
 
-       private slots:
+       private Q_SLOTS:
                void changeValue(quint32 keyCode, quint32 keySym, quint32 modifier);
 
        private:

diff --git a/src/keyeventlineedit.cpp b/src/keyeventlineedit.cpp
index 5a0a34b..08315e4 100644 (file)
--- a/src/keyeventlineedit.cpp
+++ b/src/keyeventlineedit.cpp
@@ -10,6 +10,6 @@ KeyEventLineEdit::KeyEventLineEdit(QWidget *parent) : QLineEdit(parent)
 
 void KeyEventLineEdit::keyPressEvent(QKeyEvent *event)
 {
-       emit keyPressed(event->nativeScanCode(), event->nativeVirtualKey(),
+       Q_EMIT keyPressed(event->nativeScanCode(), event->nativeVirtualKey(),
                        event->nativeModifiers());
 }

diff --git a/src/keyeventlineedit.h b/src/keyeventlineedit.h
index 7988a97..fa7126d 100644 (file)
--- a/src/keyeventlineedit.h
+++ b/src/keyeventlineedit.h
@@ -10,7 +10,7 @@ class KeyEventLineEdit : public QLineEdit
        public:
                KeyEventLineEdit(QWidget *parent = 0);
 
-       signals:
+       Q_SIGNALS:
                void keyPressed(quint32 keyCode, quint32 keySym, quint32 modifier);
 
        private:

diff --git a/src/keysymwidget.h b/src/keysymwidget.h
index 7df0ca9..a31e8ca 100644 (file)
--- a/src/keysymwidget.h
+++ b/src/keysymwidget.h
@@ -19,7 +19,7 @@ class KeySymWidget : public ExpressionWidget
 
                const Expression &expression() const;
        
-       private slots:
+       private Q_SLOTS:
                void setKeyCode(int keyCode);
                void setKeyCode(bool checked);
                void setKeySym(const QString &text);

diff --git a/src/mainwindow.h b/src/mainwindow.h
index a708e15..a4df1a0 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -11,7 +11,7 @@ class MainWindow : public QMainWindow {
        public:
                explicit MainWindow(QWidget *parent = 0);
        
-       private slots:
+       private Q_SLOTS:
                void add();
                void keyEvent();
 

diff --git a/src/modifierwidget.h b/src/modifierwidget.h
index c659191..0be83e5 100644 (file)
--- a/src/modifierwidget.h
+++ b/src/modifierwidget.h
@@ -18,7 +18,7 @@ class ModifierWidget : public ExpressionWidget {
 
                const Expression &expression() const;
 
-       private slots:
+       private Q_SLOTS:
                void addModifier();
                void deleteModifier();
                void checkText(const QString &text);