diff options
Diffstat (limited to 'src/server/numerickeyboard')
| -rw-r--r-- | src/server/numerickeyboard/numerickeyboard.cpp | 31 | ||||
| -rw-r--r-- | src/server/numerickeyboard/numerickeyboard.h | 2 |
2 files changed, 14 insertions, 19 deletions
diff --git a/src/server/numerickeyboard/numerickeyboard.cpp b/src/server/numerickeyboard/numerickeyboard.cpp index d819a58..e6677aa 100644 --- a/src/server/numerickeyboard/numerickeyboard.cpp +++ b/src/server/numerickeyboard/numerickeyboard.cpp @@ -1,10 +1,5 @@ -#include "src/server/numerickeyboard/numerickeyboard.h" +#include "numerickeyboard.h" #include "ui_numerickeyboard.h" -#include <iostream> - -using std::cout; -using std::endl; - NumericKeyboard::NumericKeyboard(QWidget *parent) : QGroupBox(parent), @@ -12,20 +7,20 @@ NumericKeyboard::NumericKeyboard(QWidget *parent) : { ui->setupUi(this); /* das geht leider nicht ? */ -// connect(ui->button_0, SIGNAL (clicked(bool)), this, SLOT (relayDigit(0))); +// connect(ui->button_0, &QPushButton::clicked, this, &NumericKeyboard::relayDigit); - connect(ui->button_0, SIGNAL (clicked(bool)), this, SLOT (relayDigit0())); - connect(ui->button_1, SIGNAL (clicked(bool)), this, SLOT (relayDigit1())); - connect(ui->button_2, SIGNAL (clicked(bool)), this, SLOT (relayDigit2())); - connect(ui->button_3, SIGNAL (clicked(bool)), this, SLOT (relayDigit3())); - connect(ui->button_4, SIGNAL (clicked(bool)), this, SLOT (relayDigit4())); - connect(ui->button_5, SIGNAL (clicked(bool)), this, SLOT (relayDigit5())); - connect(ui->button_6, SIGNAL (clicked(bool)), this, SLOT (relayDigit6())); - connect(ui->button_7, SIGNAL (clicked(bool)), this, SLOT (relayDigit7())); - connect(ui->button_8, SIGNAL (clicked(bool)), this, SLOT (relayDigit8())); - connect(ui->button_9, SIGNAL (clicked(bool)), this, SLOT (relayDigit9())); + connect(ui->button_0, &QPushButton::clicked, this, &NumericKeyboard::relayDigit0); + connect(ui->button_1, &QPushButton::clicked, this, &NumericKeyboard::relayDigit1); + connect(ui->button_2, &QPushButton::clicked, this, &NumericKeyboard::relayDigit2); + connect(ui->button_3, &QPushButton::clicked, this, &NumericKeyboard::relayDigit3); + connect(ui->button_4, &QPushButton::clicked, this, &NumericKeyboard::relayDigit4); + connect(ui->button_5, &QPushButton::clicked, this, &NumericKeyboard::relayDigit5); + connect(ui->button_6, &QPushButton::clicked, this, &NumericKeyboard::relayDigit6); + connect(ui->button_7, &QPushButton::clicked, this, &NumericKeyboard::relayDigit7); + connect(ui->button_8, &QPushButton::clicked, this, &NumericKeyboard::relayDigit8); + connect(ui->button_9, &QPushButton::clicked, this, &NumericKeyboard::relayDigit9); - connect(ui->button_del, SIGNAL (clicked(bool)), this, SLOT(relayDelete())); + connect(ui->button_del, &QPushButton::clicked, this, &NumericKeyboard::relayDelete); } NumericKeyboard::~NumericKeyboard() diff --git a/src/server/numerickeyboard/numerickeyboard.h b/src/server/numerickeyboard/numerickeyboard.h index 3ece99c..6db3de3 100644 --- a/src/server/numerickeyboard/numerickeyboard.h +++ b/src/server/numerickeyboard/numerickeyboard.h @@ -14,7 +14,7 @@ class NumericKeyboard : public QGroupBox public: explicit NumericKeyboard(QWidget *parent = 0); - ~NumericKeyboard(); + ~NumericKeyboard() override; private: Ui::NumericKeyboard *ui; |