Merge branch 'master' of github.com:neundorf/CuteCom into feature/control-panel-ui-redesign

Author: Meinhard Ritscher

counterplugin.cpp

@@ -28,7 +28,7 @@
     } else                                                                                                             \
         qDebug()
 
-static bool debug = true;
+static bool debug = false;
 static CounterPlugin *m_counter = NULL;
 static int processCmd(const QString *text, QString *new_text);
 
@@ -46,8 +46,8 @@ CounterPlugin::CounterPlugin(QFrame *parent, Settings *settings)
     ui->m_lbl_mrx_value->setText("0");
     ui->m_lbl_mtx_value->setText("0");
 
-    connect(ui->m_bt_unload, SIGNAL(clicked(bool)), this, SLOT(removePlugin(bool)));
-    connect(ui->m_bt_help, SIGNAL(clicked(bool)), this, SLOT(helpMsg()));
+    connect(ui->m_bt_unload, &QPushButton::clicked, this, &CounterPlugin::removePlugin);
+    connect(ui->m_bt_help, &QPushButton::clicked, this, &CounterPlugin::helpMsg);
     connect(ui->m_bt_clear, &QPushButton::clicked, this, [=]() {
         ui->m_lbl_rx_value->setText("0");
         ui->m_lbl_tx_value->setText("0");

macroplugin.cpp

@@ -53,7 +53,7 @@ MacroPlugin::MacroPlugin(QFrame *parent, Settings *settings)
     /* Load the macro settings file that is pointed in the current session */
     m_macroSettings->loadFile(m_settings->getCurrentSession().macroFile);
     /* event to show the macro dialog */
-    connect(ui->m_bt_set_macros, SIGNAL(clicked(bool)), m_macroSettings, SLOT(show()));
+    connect(ui->m_bt_set_macros, &QPushButton::clicked, m_macroSettings, &MacroSettings::show);
     /* event for when session changes and a new file needs to be loaded */
     connect(m_macroSettings, &MacroSettings::fileChanged, m_settings, [=]() {
         /* get the new macro settings file */
@@ -65,9 +65,9 @@ MacroPlugin::MacroPlugin(QFrame *parent, Settings *settings)
         //                 << ", sfname: " << m_settings->getCurrentSession().macroFile;
     });
     /* send serial string */
-    connect(m_macroSettings, SIGNAL(sendCmd(QByteArray)), this, SIGNAL(sendCmd(QByteArray)));
+    connect(m_macroSettings, &MacroSettings::sendCmd, this, &MacroPlugin::sendCmd);
     /* unload */
-    connect(ui->m_bt_unload, SIGNAL(clicked(bool)), this, SLOT(removePlugin(bool)));
+    connect(ui->m_bt_unload, &QPushButton::clicked, this, &MacroPlugin::removePlugin);
 }
 
 MacroPlugin::~MacroPlugin()

macrosettings.cpp

@@ -78,7 +78,7 @@ MacroSettings::MacroSettings(QPushButton **mainButtons, QWidget *parent)
     /* Setup signal/slots */
     for (size_t i = 0; i < NUM_OF_BUTTONS; i++) {
         /* Click events from the panel in the main menu */
-        connect(mainButtons[i], SIGNAL(clicked(bool)), this, SLOT(macroPress()));
+        connect(mainButtons[i], &QPushButton::clicked, this, &MacroSettings::macroPress);
         /* events to change this dialog's buttons text */
         connect(m_macros[i]->name, &QLineEdit::textChanged, this,
                 [=]() { m_macros[i]->button->setText(m_macros[i]->name->text()); });
@@ -179,8 +179,8 @@ void MacroSettings::loadFile(QString fname)
 
 void MacroSettings::openFile()
 {
-    QString fname = QFileDialog::getOpenFileName(this, tr("Open a bray's terminal macro settings file"), QDir::homePath(),
-                                                 "Macros (*.tmf)");
+    QString fname = QFileDialog::getOpenFileName(this, tr("Open a bray's terminal macro settings file"),
+                                                 QDir::homePath(), "Macros (*.tmf)");
     if (!fname.isEmpty())
         loadFile(fname);
 }
@@ -214,8 +214,7 @@ bool MacroSettings::parseFile(QTextStream &in)
 void MacroSettings::saveFile()
 {
     QDir dir(QDir::homePath());
-    QString fname = QFileDialog::getSaveFileName(this,
-                                                 tr("Open a bray's terminal macro settings file"),
+    QString fname = QFileDialog::getSaveFileName(this, tr("Open a bray's terminal macro settings file"),
                                                  dir.filePath(m_macroFilename), "Macros (*.tmf)");
     if (fname.isEmpty())
         return;
@@ -244,19 +243,19 @@ void MacroSettings::saveFile()
 void MacroSettings::helpMsg(void)
 {
     QString help_str = tr("In order to use macros you need to need to\n"
-                       "fill the serial command you want to send in\n"
-                       "the first column. Then you can name the macro\n"
-                       "in the second column. This name will also be\n"
-                       "applied on the button label.\n\n"
-                       "To trigger the macro you can press the button\n"
-                       "on this dialog or in the main interface.\n\n"
-                       "If you want to auto-trigger the macro on time\n"
-                       "intervals then you can set the (msec) timer\n"
-                       "interval and then enable/disable the macro timer\n"
-                       "using the checkbox. Note that each timer is\n"
-                       "autonomous.\n\n"
-                       "The macro format is compatible with the tmf\n"
-                       "format of Bray's terminal.");
+                          "fill the serial command you want to send in\n"
+                          "the first column. Then you can name the macro\n"
+                          "in the second column. This name will also be\n"
+                          "applied on the button label.\n\n"
+                          "To trigger the macro you can press the button\n"
+                          "on this dialog or in the main interface.\n\n"
+                          "If you want to auto-trigger the macro on time\n"
+                          "intervals then you can set the (msec) timer\n"
+                          "interval and then enable/disable the macro timer\n"
+                          "using the checkbox. Note that each timer is\n"
+                          "autonomous.\n\n"
+                          "The macro format is compatible with the tmf\n"
+                          "format of Bray's terminal.");
 
     QMessageBox::information(this, tr("How to use"), help_str);
 }

netproxyplugin.cpp

@@ -48,19 +48,18 @@ NetProxyPlugin::NetProxyPlugin(QFrame *parent, Settings *settings)
 
     m_proxySettings = new NetProxySettings(settings, this);
     /* event to show the macro dialog */
-    connect(ui->m_bt_settings, SIGNAL(clicked(bool)), m_proxySettings, SLOT(show()));
+    connect(ui->m_bt_settings, &QPushButton::clicked, m_proxySettings, &NetProxySettings::show);
     /* unload */
-    connect(ui->m_bt_unload, SIGNAL(clicked(bool)), this, SLOT(removePlugin(bool)));
+    connect(ui->m_bt_unload, &QPushButton::clicked, this, &NetProxyPlugin::removePlugin);
     /* handle LEDs */
-    connect(m_proxySettings, SIGNAL(ledSetValue(NetProxySettings::en_led, bool)), this,
-            SLOT(ledSetValue(NetProxySettings::en_led, bool)));
+    connect(m_proxySettings, &NetProxySettings::ledSetValue, this, &NetProxyPlugin::ledSetValue);
     /* data from netproxy -> plugin manager*/
-    connect(m_proxySettings, SIGNAL(sendCmd(QByteArray)), this, SIGNAL(sendCmd(QByteArray)));
+    connect(m_proxySettings, &NetProxySettings::sendCmd, this, &NetProxyPlugin::sendCmd);
     /* data from plugin manager -> netproxy */
-    connect(this, SIGNAL(proxyCmd(QByteArray)), m_proxySettings, SLOT(proxyCmd(QByteArray)));
+    connect(this, &NetProxyPlugin::proxyCmd, m_proxySettings, &NetProxySettings::proxyCmd);
     /* connect status labels */
-    connect(m_proxySettings, SIGNAL(udpStatus(bool, QString)), this, SLOT(setUdpStatusText(bool, QString)));
-    connect(m_proxySettings, SIGNAL(tcpStatus(bool, QString)), this, SLOT(setTcpStatusText(bool, QString)));
+    connect(m_proxySettings, &NetProxySettings::udpStatus, this, &NetProxyPlugin::setUdpStatusText);
+    connect(m_proxySettings, &NetProxySettings::tcpStatus, this, &NetProxyPlugin::setTcpStatusText);
     ui->m_lbl_udp_status->setText(tr("Not used"));
     ui->m_lbl_tcp_status->setText(tr("Not used"));
 
@@ -78,7 +77,7 @@ NetProxyPlugin::NetProxyPlugin(QFrame *parent, Settings *settings)
         if ((m_leds[i]->m_index != NetProxySettings::en_led::LED_UDP_EN)
             && (m_leds[i]->m_index != NetProxySettings::en_led::LED_TCP_EN)) {
             m_leds[i]->m_tmr = new QTimer(m_leds[i]);
-            connect(m_leds[i]->m_tmr, SIGNAL(timeout()), this, SLOT(tmrInterrupt()));
+            connect(m_leds[i]->m_tmr, &QTimer::timeout, this, &NetProxyPlugin::tmrInterrupt);
         }
     }
     /* Checkbox enable event for UDP */

netproxysettings.cpp

@@ -44,8 +44,8 @@ NetProxySettings::NetProxySettings(Settings *settings, QWidget *parent)
     });
     connect(ui->m_bt_udp_help, &QPushButton::clicked, this, &NetProxySettings::helpMsgUdp);
     connect(ui->m_bt_tcp_help, &QPushButton::clicked, this, &NetProxySettings::helpMsgTcp);
-    connect(m_udp, SIGNAL(error(QAbstractSocket::SocketError)), this,
-            SLOT(errorUdpSocket(QAbstractSocket::SocketError)));
+    connect(m_udp, static_cast<void (QUdpSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error), this,
+            &NetProxySettings::errorUdpSocket);
 
     /* Initialise TCP socket */
     m_tcp = new QTcpServer(this);
@@ -57,16 +57,15 @@ NetProxySettings::NetProxySettings(Settings *settings, QWidget *parent)
             startTcpServer();
         }
     });
-    connect(m_tcp, SIGNAL(newConnection()), this, SLOT(addTcpClient()));
-    connect(m_tcp, SIGNAL(acceptError(QAbstractSocket::SocketError)), this,
-            SLOT(errorTcpSocket(QAbstractSocket::SocketError)));
+    connect(m_tcp, &QTcpServer::newConnection, this, &NetProxySettings::addTcpClient);
+    connect(m_tcp, &QTcpServer::acceptError, this, &NetProxySettings::errorTcpSocket);
 
     /* update controls with the saved settings */
     ui->m_sb_udp_port_local->setValue(m_settings->getCurrentSession().udpLocalPort);
     ui->m_le_udp_remote_host->setText(m_settings->getCurrentSession().udpRemoteHost);
     ui->m_sb_udp_port_remote->setValue(m_settings->getCurrentSession().udpRemotePort);
     ui->m_sb_tcp_port_local->setValue(m_settings->getCurrentSession().tcpLocalPort);
-    connect(this, SIGNAL(rejected()), this, SLOT(formClose()));
+    connect(this, &NetProxySettings::rejected, this, &NetProxySettings::formClose);
 }
 
 NetProxySettings::~NetProxySettings() { delete ui; }
@@ -161,9 +160,7 @@ void NetProxySettings::bindUdp()
     }
 
     if (m_udp->bind(l_addr, l_port)) {
-        connect(m_udp, SIGNAL(readyRead()), this, SLOT(recvUDP()));
-        connect(m_udp, SIGNAL(error(QAbstractSocket::SocketError)), this,
-                SLOT(errorUdpSocket(QAbstractSocket::SocketError)));
+        connect(m_udp, &QUdpSocket::readyRead, this, &NetProxySettings::recvUDP);
         ui->m_btn_udp->setText("Close");
         /* store udp details */
         m_udp_remote_addr = r_addr;
@@ -247,8 +244,8 @@ void NetProxySettings::stopTcpServer()
 void NetProxySettings::addTcpClient()
 {
     QTcpSocket *client = m_tcp->nextPendingConnection();
-    connect(client, SIGNAL(disconnected()), this, SLOT(removeTcpClient()));
-    connect(client, SIGNAL(readyRead()), this, SLOT(recvTCP()));
+    connect(client, &QTcpSocket::disconnected, this, &NetProxySettings::removeTcpClient);
+    connect(client, &QTcpSocket::readyRead, this, &NetProxySettings::recvTCP);
     /* add client to the list */
     m_tcpClients.append(client);
     TRACE << "Connected: " << client->localAddress();

pluginmanager.cpp

@@ -25,7 +25,7 @@
     if (!debug) {                                                                                                      \
     } else                                                                                                             \
         qDebug()
-static bool debug = true;
+static bool debug = false;
 
 PluginManager::PluginManager(QFrame *parent, QVBoxLayout *layout, Settings *settings)
     : m_parent(parent)
@@ -54,21 +54,21 @@ void PluginManager::addPluginType(en_plugin_type type)
     if (type == en_plugin_type::PLUGIN_TYPE_MACROS) {
         /* specific plugin initialization */
         MacroPlugin *macro = new MacroPlugin(m_parent, m_settings);
-        connect(macro, SIGNAL(unload(Plugin *)), this, SLOT(removePlugin(Plugin *)));
-        connect(macro, SIGNAL(sendCmd(QByteArray)), this, SIGNAL(sendCmd(QByteArray)));
+        connect(macro, &MacroPlugin::unload, this, &PluginManager::removePlugin);
+        connect(macro, &MacroPlugin::sendCmd, this, &PluginManager::sendCmd);
         /* common plugin initialization */
         addPlugin((Plugin *)macro->plugin());
     } else if (type == en_plugin_type::PLUGIN_TYPE_NET_PROXY) {
         NetProxyPlugin *proxy = new NetProxyPlugin(m_parent, m_settings);
-        connect(proxy, SIGNAL(unload(Plugin *)), this, SLOT(removePlugin(Plugin *)));
-        connect(proxy, SIGNAL(sendCmd(QByteArray)), this, SIGNAL(sendCmd(QByteArray)));
-        connect(this, SIGNAL(recvCmd(QByteArray)), proxy, SIGNAL(proxyCmd(QByteArray)));
+        connect(proxy, &NetProxyPlugin::unload, this, &PluginManager::removePlugin);
+        connect(proxy, &NetProxyPlugin::sendCmd, this, &PluginManager::sendCmd);
+        connect(this, &PluginManager::recvCmd, proxy, &NetProxyPlugin::proxyCmd);
         /* common plugin initialization */
         addPlugin((Plugin *)proxy->plugin());
     } else if (type == en_plugin_type::PLUGIN_TYPE_BYTE_COUNTER) {
         CounterPlugin *counter = new CounterPlugin(m_parent, m_settings);
-        connect(counter, SIGNAL(unload(Plugin *)), this, SLOT(removePlugin(Plugin *)));
-        connect(this, SIGNAL(recvCmd(QByteArray)), counter, SLOT(rxBytes(QByteArray)));
+        connect(counter, &CounterPlugin::unload, this, &PluginManager::removePlugin);
+        connect(this, &PluginManager::recvCmd, counter, &CounterPlugin::rxBytes);
         /* common plugin initialization */
         addPlugin((Plugin *)counter->plugin());
     }