From 89860a73d0a65bd47a28002dbad6087292b2615d Mon Sep 17 00:00:00 2001 From: Erik Prabowo Kamal Date: Tue, 27 Aug 2019 09:54:38 +0800 Subject: Removed Kelakon namespace for NetworkWorker --- main.cxx | 2 +- networkworker.cxx | 19 ++++++++----------- networkworker.hxx | 17 +++++++---------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/main.cxx b/main.cxx index 0108135..41b25af 100644 --- a/main.cxx +++ b/main.cxx @@ -9,7 +9,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - Kelakon::NetworkWorker worker{}; + NetworkWorker worker{}; QThread thread; worker.moveToThread(&thread); diff --git a/networkworker.cxx b/networkworker.cxx index 928e4e8..3487d4c 100644 --- a/networkworker.cxx +++ b/networkworker.cxx @@ -1,16 +1,13 @@ #include "rtclient.h" #include "networkworker.hxx" -namespace Kelakon { - - NetworkWorker::NetworkWorker(QObject* parent) - : QObject{parent} - { - rtclient_init(); - } +NetworkWorker::NetworkWorker(QObject* parent) : + QObject{parent} +{ + rtclient_init(); +} - NetworkWorker::~NetworkWorker() - { - rtclient_cleanup(); - } +NetworkWorker::~NetworkWorker() +{ + rtclient_cleanup(); } diff --git a/networkworker.hxx b/networkworker.hxx index c08743f..05124d5 100644 --- a/networkworker.hxx +++ b/networkworker.hxx @@ -3,15 +3,12 @@ #include -namespace Kelakon { - - class NetworkWorker : public QObject - { - Q_OBJECT - public: - explicit NetworkWorker(QObject* parent = Q_NULLPTR); - virtual ~NetworkWorker(); - }; -} +class NetworkWorker : public QObject +{ + Q_OBJECT + public: + explicit NetworkWorker(QObject* parent = nullptr); + virtual ~NetworkWorker(); +}; #endif // NETWORKWORKER_HXX -- cgit v1.2.3