guhservice -> nymeaservice

server/guhapplication.cpp

@@ -30,7 +30,7 @@
     will provide a backtrace on a segmentation fault (SIGSEGV).
 
 
-    \sa GuhService
+    \sa NymeaService
 */
 
 #include "guhapplication.h"

server/main.cpp

@@ -36,7 +36,7 @@
 #include "stdio.h"
 #include "unistd.h"
 #include "nymeacore.h"
-#include "guhservice.h"
+#include "nymeaservice.h"
 #include "nymeasettings.h"
 #include "nymeadbusservice.h"
 #include "guhapplication.h"
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
         return ret;
     }
 
-    GuhService service(argc, argv);
+    NymeaService service(argc, argv);
     int ret = service.exec();
     if (s_logFile.isOpen()) {
         s_logFile.close();

server/nymeaservice.cpp

@@ -20,13 +20,13 @@
 
 
 /*!
-    \class guhserver::GuhService
+    \class guhserver::NymeaService
     \brief The daemon service reprenetation of the guh server.
 
     \ingroup core
     \inmodule server
 
-    The \l{GuhService} represents the forked nymead.
+    The \l{NymeaService} represents the forked nymead.
 
     \sa QtService
 */
@@ -36,7 +36,7 @@
 
 #include <QDir>
 
-#include "guhservice.h"
+#include "nymeaservice.h"
 #include "nymeacore.h"
 #include "nymeasettings.h"
 #include "loggingcategories.h"
@@ -45,7 +45,7 @@
 namespace guhserver {
 
 /*! Constructs the forked nymead application with the given argument count \a argc and argument vector \a argv. */
-GuhService::GuhService(int argc, char **argv):
+NymeaService::NymeaService(int argc, char **argv):
     QtService<QCoreApplication>(argc, argv, "nymea - IoT server")
 {
     application()->setOrganizationName("nymea");
@@ -59,12 +59,12 @@ GuhService::GuhService(int argc, char **argv):
 }
 
 /*! Destroyes the forked nymead application. */
-GuhService::~GuhService()
+NymeaService::~NymeaService()
 {
 }
 
 /*! Starts the forked nymead application. */
-void GuhService::start()
+void NymeaService::start()
 {
     // check if config directory for logfile exists
     if (!QDir().mkpath(NymeaSettings::settingsPath())) {

server/nymeaservice.h

@@ -18,20 +18,20 @@
  *                                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef GUHSERVICE_H
-#define GUHSERVICE_H
+#ifndef NYMEASERVICE_H
+#define NYMEASERVICE_H
 
 #include <QCoreApplication>
 #include "qtservice/qtservice.h"
 
 namespace guhserver {
 
-class GuhService : public QtService<QCoreApplication>
+class NymeaService : public QtService<QCoreApplication>
 {
 
 public:
-    explicit GuhService(int argc, char **argv);
-    ~GuhService();
+    explicit NymeaService(int argc, char **argv);
+    ~NymeaService();
 
 protected:
     void start();
@@ -39,4 +39,4 @@ protected:
 
 }
 
-#endif // GUHSERVICE_H
+#endif // NYMEASERVICE_H

server/server.pro

@@ -18,10 +18,10 @@ LIBS += -L$$top_builddir/libnymea/ -lnymea \
 include(qtservice/qtservice.pri)
 
 SOURCES += main.cpp \
-    guhservice.cpp \
+    nymeaservice.cpp \
     guhapplication.cpp
 
 HEADERS += \
-    guhservice.h \
+    nymeaservice.h \
     guhapplication.h