From 6127ac4ef5796ddb33435b7b7d2932bc9312fc44 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sat, 6 Jul 2013 00:25:46 +0200 Subject: [PATCH] Refs #41: - Changed: Qt5 has a different method to connect signals and slots together based on C++x11 Migrated the first bunch of occurences to the new method. - Fixed: CDebug singleton was not created yet in BlackD. Crashed the application. --- samples/com_client/client.cpp | 8 +++++--- samples/com_server/server.cpp | 3 ++- src/blackbox/blackbox.cpp | 6 ++++-- src/blackbox/dialog_connect.cpp | 9 ++++++--- src/blackd/blackd.cpp | 4 ++-- src/blackd/main.cpp | 3 +++ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/samples/com_client/client.cpp b/samples/com_client/client.cpp index ce56654b0..4fdb3e1aa 100644 --- a/samples/com_client/client.cpp +++ b/samples/com_client/client.cpp @@ -6,8 +6,10 @@ using namespace BlackMisc; Client::Client(QObject *parent) : QObject(parent), comclient(IContext::getInstance()) { - connect(&comclient, SIGNAL(doError(QAbstractSocket::SocketError,QString)), this, SLOT(onError(QAbstractSocket::SocketError,QString))); - connect(&comclient, SIGNAL(doConnected()), this, SLOT(onClientConnected())); + connect(&comclient, &BlackMisc::CComClient::doError, + this, &Client::onError); + connect(&comclient, &BlackMisc::CComClient::doConnected, + this, &Client::onClientConnected); QString address = "127.0.0.1"; comclient.connectTo(address, 6809); @@ -33,4 +35,4 @@ void Client::onClientConnected() comclient.sendMessage(testmsg->getID(), message_data); delete testmsg; -} \ No newline at end of file +} diff --git a/samples/com_server/server.cpp b/samples/com_server/server.cpp index 31141e034..e47a9aa87 100644 --- a/samples/com_server/server.cpp +++ b/samples/com_server/server.cpp @@ -9,7 +9,8 @@ Server::Server(QObject *parent) : QObject(parent), server(IContext::getInstance( server.Host(local, 6809); - connect(&server, SIGNAL(doMessageReceived(QString &, QByteArray&)), this, SLOT(onData(QString &, QByteArray&))); + connect(&server, static_cast(&BlackMisc::CComServer::doMessageReceived), + this, &Server::onData); CMessageSystem myMessageSystem; diff --git a/src/blackbox/blackbox.cpp b/src/blackbox/blackbox.cpp index 4cddd2798..89a748a6d 100644 --- a/src/blackbox/blackbox.cpp +++ b/src/blackbox/blackbox.cpp @@ -21,8 +21,10 @@ BlackBox::BlackBox(QWidget *parent) : m_dlg_chat = new CDialogChat(); m_dlg_chat->hide(); - connect(ui->bt_Connect, SIGNAL(clicked()), this, SLOT(onConnect())); - connect(ui->bt_Chat, SIGNAL(clicked()), this, SLOT(onButtonChat())); + connect(ui->bt_Connect, &QPushButton::clicked, + this, &BlackBox::onConnect); + connect(ui->bt_Chat, &QPushButton::clicked, + this, &BlackBox::onButtonChat); } BlackBox::~BlackBox() diff --git a/src/blackbox/dialog_connect.cpp b/src/blackbox/dialog_connect.cpp index 49357850a..956288dd4 100644 --- a/src/blackbox/dialog_connect.cpp +++ b/src/blackbox/dialog_connect.cpp @@ -18,9 +18,12 @@ CDialogConnect::CDialogConnect(QWidget *parent) : { ui->setupUi(this); - connect(&comclient, SIGNAL(doError(QAbstractSocket::SocketError,QString)), this, SLOT(onError(QAbstractSocket::SocketError,QString))); - connect(&comclient, SIGNAL(doConnected()), this, SLOT(onClientConnected())); - connect(ui->bt_FSDConnect, SIGNAL(clicked()), this, SLOT(onFSDConnect())); + connect(&comclient, &BlackMisc::CComClient::doError, + this, &CDialogConnect::onError); + connect(&comclient, &BlackMisc::CComClient::doConnected, + this, &CDialogConnect::onClientConnected); + connect(ui->bt_FSDConnect, &QPushButton::clicked, + this, &CDialogConnect::onFSDConnect); QString address = "127.0.0.1"; comclient.connectTo(address, 42000); diff --git a/src/blackd/blackd.cpp b/src/blackd/blackd.cpp index 49084e9af..02e539e42 100644 --- a/src/blackd/blackd.cpp +++ b/src/blackd/blackd.cpp @@ -29,8 +29,8 @@ BlackD::BlackD(QWidget *parent) : createActions(); createTrayIcon(); - connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), - this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason))); + connect(trayIcon, &QSystemTrayIcon::activated, + this, &BlackD::iconActivated); setWindowTitle(tr("BlackD")); diff --git a/src/blackd/main.cpp b/src/blackd/main.cpp index fc213adbc..ac7f6ade7 100644 --- a/src/blackd/main.cpp +++ b/src/blackd/main.cpp @@ -4,6 +4,7 @@ //! file, You can obtain one at http://mozilla.org/MPL/2.0/ #include "blackmisc/context.h" +#include "blackmisc/debug.h" #include "blackd.h" #include @@ -17,6 +18,8 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); BlackMisc::CApplicationContext myBlackApp; + BlackMisc::IContext::getInstance().setSingleton(new BlackMisc::CDebug()); + if (!QSystemTrayIcon::isSystemTrayAvailable()) { QMessageBox::critical(0, QObject::tr("Systray"), QObject::tr("I couldn't detect any system tray "