From 8c9f9f944d42c25504c94647741235efd295b560 Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Tue, 20 Jun 2017 22:02:55 +0200 Subject: [PATCH] feat(App): coding style on Single App and move component --- CMakeLists.txt | 11 ++++----- src/app/App.hpp | 2 +- .../single-application/SingleApplication.cpp | 0 .../single-application/SingleApplication.hpp | 6 ++--- .../SingleApplicationDBus.cpp | 24 +++++++------------ .../SingleApplicationDBusPrivate.hpp | 14 +++++------ .../SingleApplicationPrivate.hpp | 6 ++--- 7 files changed, 27 insertions(+), 36 deletions(-) rename src/{externals => app}/single-application/SingleApplication.cpp (100%) rename src/{externals => app}/single-application/SingleApplication.hpp (97%) rename src/{externals => app}/single-application/SingleApplicationPrivate.hpp (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1df906fe8..f99bf50fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,9 +77,9 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_ # ------------------------------------------------------------------------------ set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network) -if(ENABLE_DBUS) - list(APPEND QT5_PACKAGES DBus) -endif() +if (ENABLE_DBUS) + list(APPEND QT5_PACKAGES DBus) +endif () set(QT5_PACKAGES_OPTIONAL TextToSpeech) if (LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) @@ -194,7 +194,6 @@ set(HEADERS src/components/telephone-numbers/TelephoneNumbersModel.hpp src/components/timeline/TimelineModel.hpp src/components/url-handlers/UrlHandlers.hpp - src/externals/single-application/SingleApplication.hpp src/utils/LinphoneUtils.hpp src/utils/Utils.hpp ) @@ -203,8 +202,8 @@ if(ENABLE_DBUS) list(APPEND SOURCES src/app/single-application/SingleApplicationDBus.cpp) list(APPEND HEADERS src/app/single-application/SingleApplicationDBusPrivate.hpp) else() - list(APPEND SOURCES src/externals/single-application/SingleApplication.cpp) - list(APPEND HEADERS src/externals/single-application/SingleApplicationPrivate.hpp) + list(APPEND SOURCES src/app/single-application/SingleApplication.cpp) + list(APPEND HEADERS src/app/single-application/SingleApplicationPrivate.hpp) endif() set(QRC_RESOURCES resources.qrc) diff --git a/src/app/App.hpp b/src/app/App.hpp index 9c0c04e8d..b35737018 100644 --- a/src/app/App.hpp +++ b/src/app/App.hpp @@ -28,7 +28,7 @@ #include "../components/notifier/Notifier.hpp" #include "../components/other/colors/Colors.hpp" -#include "../externals/single-application/SingleApplication.hpp" +#include "single-application/SingleApplication.hpp" #define APP_CODE_RESTART 1000 diff --git a/src/externals/single-application/SingleApplication.cpp b/src/app/single-application/SingleApplication.cpp similarity index 100% rename from src/externals/single-application/SingleApplication.cpp rename to src/app/single-application/SingleApplication.cpp diff --git a/src/externals/single-application/SingleApplication.hpp b/src/app/single-application/SingleApplication.hpp similarity index 97% rename from src/externals/single-application/SingleApplication.hpp rename to src/app/single-application/SingleApplication.hpp index e57150a5b..ade709624 100644 --- a/src/externals/single-application/SingleApplication.hpp +++ b/src/app/single-application/SingleApplication.hpp @@ -22,8 +22,8 @@ // See: https://github.com/itay-grudev/SingleApplication/ -#ifndef SINGLE_APPLICATION_H -#define SINGLE_APPLICATION_H +#ifndef SINGLE_APPLICATION_H_ +#define SINGLE_APPLICATION_H_ #include #include @@ -123,4 +123,4 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options) -#endif // SINGLE_APPLICATION_H +#endif // SINGLE_APPLICATION_H_ diff --git a/src/app/single-application/SingleApplicationDBus.cpp b/src/app/single-application/SingleApplicationDBus.cpp index 96ca63cab..88f581b18 100644 --- a/src/app/single-application/SingleApplicationDBus.cpp +++ b/src/app/single-application/SingleApplicationDBus.cpp @@ -26,9 +26,7 @@ #include #include -#include "../../utils/Utils.hpp" - -#include "../../externals/single-application/SingleApplication.hpp" +#include "SingleApplication.hpp" #include "SingleApplicationDBusPrivate.hpp" // ============================================================================= @@ -36,24 +34,18 @@ const char *SERVICE_NAME = "org.linphone.SingleApplication"; SingleApplicationPrivate::SingleApplicationPrivate (SingleApplication *q_ptr) - : QDBusAbstractAdaptor(q_ptr), q_ptr(q_ptr) { -} - -SingleApplicationPrivate::~SingleApplicationPrivate () { -} + : QDBusAbstractAdaptor(q_ptr), q_ptr(q_ptr) {} QDBusConnection SingleApplicationPrivate::getBus () const { - if (options & SingleApplication::Mode::User) { + if (options & SingleApplication::Mode::User) return QDBusConnection::sessionBus(); - } else { - return QDBusConnection::systemBus(); - } + + return QDBusConnection::systemBus(); } void SingleApplicationPrivate::startPrimary () { - if (getBus().registerObject("/", this, QDBusConnection::ExportAllSlots) == false) { - qWarning() << "Failed to register single application object on DBus"; - } + if (!getBus().registerObject("/", this, QDBusConnection::ExportAllSlots)) + qWarning() << QStringLiteral("Failed to register single application object on DBus."); instanceNumber = 0; } @@ -69,7 +61,7 @@ SingleApplication::SingleApplication (int &argc, char *argv[], bool allowSeconda d->options = options; if (!d->getBus().isConnected()) { - qWarning() << "Cannot connect to the D-Bus session bus."; + qWarning() << QStringLiteral("Cannot connect to the D-Bus session bus."); delete d; ::exit(EXIT_FAILURE); } diff --git a/src/app/single-application/SingleApplicationDBusPrivate.hpp b/src/app/single-application/SingleApplicationDBusPrivate.hpp index 14e2aaecb..f377c5690 100644 --- a/src/app/single-application/SingleApplicationDBusPrivate.hpp +++ b/src/app/single-application/SingleApplicationDBusPrivate.hpp @@ -20,13 +20,13 @@ * Author: Ghislain MARY */ -#ifndef SINGLE_APPLICATION_DBUS_PRIVATE_H -#define SINGLE_APPLICATION_DBUS_PRIVATE_H - -#include "../../externals/single-application/SingleApplication.hpp" +#ifndef SINGLE_APPLICATION_DBUS_PRIVATE_H_ +#define SINGLE_APPLICATION_DBUS_PRIVATE_H_ #include +#include "SingleApplication.hpp" + // ============================================================================= struct InstancesInfo { @@ -40,7 +40,7 @@ class SingleApplicationPrivate : public QDBusAbstractAdaptor { public: Q_DECLARE_PUBLIC(SingleApplication) SingleApplicationPrivate (SingleApplication *q_ptr); - ~SingleApplicationPrivate (); + ~SingleApplicationPrivate () = default; QDBusConnection getBus () const; @@ -52,7 +52,7 @@ public: quint32 instanceNumber; public Q_SLOTS: - void messageReceived(quint32 instanceId, QByteArray message); + void messageReceived (quint32 instanceId, QByteArray message); }; -#endif // SINGLE_APPLICATION_DBUS_PRIVATE_H +#endif // SINGLE_APPLICATION_DBUS_PRIVATE_H_ diff --git a/src/externals/single-application/SingleApplicationPrivate.hpp b/src/app/single-application/SingleApplicationPrivate.hpp similarity index 95% rename from src/externals/single-application/SingleApplicationPrivate.hpp rename to src/app/single-application/SingleApplicationPrivate.hpp index cc8c8dc50..d0dfc10ea 100644 --- a/src/externals/single-application/SingleApplicationPrivate.hpp +++ b/src/app/single-application/SingleApplicationPrivate.hpp @@ -29,8 +29,8 @@ // version without notice, or may even be removed. // -#ifndef SINGLE_APPLICATION_PRIVATE_H -#define SINGLE_APPLICATION_PRIVATE_H +#ifndef SINGLE_APPLICATION_PRIVATE_H_ +#define SINGLE_APPLICATION_PRIVATE_H_ #include #include @@ -79,4 +79,4 @@ public Q_SLOTS: void slotClientConnectionClosed(QLocalSocket *, quint32); }; -#endif // SINGLE_APPLICATION_PRIVATE_H +#endif // SINGLE_APPLICATION_PRIVATE_H_