Merge branch 'master' of github.com:QuasarApp/Patronum

CMakeLists.txt

@@ -6,8 +6,11 @@
 #
 
 cmake_minimum_required(VERSION 3.1)
-project(Potronum)
-
+project(PotronumMain)
+if(TARGET ${PROJECT_NAME})
+  message("The ${PROJECT_NAME} arledy included in main Project")
+  return()
+endif()
 
 include(Patronum/qt-solutions/CMake/ccache.cmake)
 # Add sub directories

Patronum/CMakeLists.txt

@@ -8,6 +8,11 @@
 cmake_minimum_required(VERSION 3.1)
 
 project(Patronum LANGUAGES CXX)
+if(TARGET ${PROJECT_NAME})
+  message("The ${PROJECT_NAME} arledy included in main Project")
+  return()
+endif()
+
 add_subdirectory(qt-solutions/qtservice)
 add_subdirectory(QuasarAppLib)
 
@@ -27,10 +32,13 @@ find_package(Qt5 COMPONENTS Core REQUIRED)
 
 file(GLOB SOURCE_CPP
     "src/*.cpp"
+    "src/Private/*.cpp"
+
 )
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP})
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt-Service QuasarApp)
+target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core Qt-Service QuasarApp)
 target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
+target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/Private")
 
 setVersion(0 1 0)

Patronum/qt-solutions

@@ -1 +1 @@
-Subproject commit 2ab4c32034083a69ff7f4d471e5093d4b9ddf93b
+Subproject commit df647bcb8db4650023b9044b40ea571c423ae241

Patronum/src/IPController.cpp

@@ -0,0 +1 @@
+#include "IPController.h"

Patronum/src/IPController.h

@@ -11,7 +11,7 @@ class Feature;
 class IController
 {
 public:
-    IController();
+    IController() = default;
     virtual void handleFeatures(const QList<Feature>& features) = 0;
     virtual void handleResponce(const QVariantMap& feature) = 0;
 

Patronum/src/IPService.cpp

@@ -1,4 +1,4 @@
-#include "iservice.h"
+#include "IPService.h"
 namespace Patronum {
 
 IService::IService()

Patronum/src/PController.cpp

@@ -1,4 +1,4 @@
-#include "controller.h"
+#include "PController.h"
 #include "controllerprivate.h"
 #include <QDateTime>
 #include <QVariantMap>

Patronum/src/PController.h

@@ -1,7 +1,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 #include "Patronum_global.h"
-#include "icontroller.h"
+#include "IPController.h"
 #include <qtservice.h>
 
 namespace Patronum {
@@ -18,7 +18,7 @@ class PATRONUM_LIBRARYSHARED_EXPORT Controller : public QtServiceController, pro
 {
 public:
     /**
-     * @brief Controller
+     * @brief Controller - base constructor
      * @param name - name of you service
      */
     Controller(const QString& name);

Patronum/src/PFeature.cpp

@@ -1,4 +1,4 @@
-#include "feature.h"
+#include "PFeature.h"
 
 #include <QDataStream>
 

Patronum/src/PService.cpp

@@ -1,4 +1,4 @@
-#include "service.h"
+#include "PService.h"
 
 namespace Patronum {
 

Patronum/src/PService.h

@@ -1,12 +1,11 @@
 #ifndef SERVICE_H
 #define SERVICE_H
 #include "Patronum_global.h"
-#include "feature.h"
-#include "iservice.h"
-#include "localsocket.h"
-#include "package.h"
+#include "PFeature.h"
+#include "IPService.h"
 #include "serviceprivate.h"
 #include <qtservice.h>
+#include <quasarapp.h>
 
 namespace Patronum {
 
@@ -27,7 +26,7 @@ public:
      */
     Service(int argc, char **argv, const QString &name)
         : QtService<Application>(argc, argv, name) {
-        d_ptr = new ServicePrivate(name, nullptr, this);
+        d_ptr = new ServicePrivate(name, this);
 
     }
 // IService interface
@@ -57,8 +56,20 @@ protected:
         return d_ptr->sendCmdResult(result);
     }
 
+    /**
+     * @brief createApplication default implementation create a Application object and parse argumnts.
+     * @param argc argumnts count
+     * @param argv list of argumnts
+     */
+    void createApplication(int argc, char **argv) {
+        QuasarAppUtils::Params::parseParams(argc, argv);
+        QtService<Application>::createApplication(argc, argv);
+    }
+
 private:
     ServicePrivate *d_ptr = nullptr;
+
+
 };
 
 }

Patronum/src/Private/controllerprivate.cpp

@@ -1,5 +1,5 @@
 #include "controllerprivate.h"
-#include "icontroller.h"
+#include "IPController.h"
 #include "localsocket.h"
 #include <quasarapp.h>
 #include "package.h"

Patronum/src/Private/controllerprivate.h

@@ -1,6 +1,6 @@
 #ifndef CONTROLLERPRIVATE_H
 #define CONTROLLERPRIVATE_H
-#include <feature.h>
+#include <PFeature.h>
 
 namespace Patronum {
 

Patronum/src/Private/defines.h

@@ -0,0 +1,4 @@
+#ifndef DEFINES_H
+#define DEFINES_H
+
+#endif // DEFINES_H

Patronum/src/icontroller.cpp

@@ -1 +0,0 @@
-#include "icontroller.h"

Patronum/src/patronum.h

@@ -1,8 +1,8 @@
 #ifndef PATRONUM_H
 #define PATRONUM_H
 
-#include "controller.h"
-#include "service.h"
+#include "PController.h"
+#include "PService.h"
 
 namespace Patronum {}
 #endif // PATRONUM_H

Patronum/src/serviceprivate.cpp

@@ -1,6 +1,6 @@
 #include "serviceprivate.h"
 
-#include "iservice.h"
+#include "IPService.h"
 #include "localsocket.h"
 #include "package.h"
 #include <quasarapp.h>

Patronum/src/serviceprivate.h

@@ -1,7 +1,7 @@
 #ifndef SERVICEPRIVATE_H
 #define SERVICEPRIVATE_H
 #include <QObject>
-#include <feature.h>
+#include <PFeature.h>
 
 namespace Patronum {
 
@@ -23,6 +23,7 @@ private:
 
 private slots:
     void handleReceve(QByteArray data);
+
 };
 
 }