From ba3e527a055acf7175256d8e6774be43a60bebf9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 30 Jan 2018 11:36:08 +0100 Subject: [PATCH] guhservice -> nymeaservice --- server/guhapplication.cpp | 2 +- server/main.cpp | 4 ++-- server/{guhservice.cpp => nymeaservice.cpp} | 12 ++++++------ server/{guhservice.h => nymeaservice.h} | 12 ++++++------ server/server.pro | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) rename server/{guhservice.cpp => nymeaservice.cpp} (92%) rename server/{guhservice.h => nymeaservice.h} (88%) diff --git a/server/guhapplication.cpp b/server/guhapplication.cpp index bfb24480..1338aa5d 100644 --- a/server/guhapplication.cpp +++ b/server/guhapplication.cpp @@ -30,7 +30,7 @@ will provide a backtrace on a segmentation fault (SIGSEGV). - \sa GuhService + \sa NymeaService */ #include "guhapplication.h" diff --git a/server/main.cpp b/server/main.cpp index 4905ef1b..e889e2fc 100644 --- a/server/main.cpp +++ b/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(); diff --git a/server/guhservice.cpp b/server/nymeaservice.cpp similarity index 92% rename from server/guhservice.cpp rename to server/nymeaservice.cpp index 7ff6e855..633ee7ac 100644 --- a/server/guhservice.cpp +++ b/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 -#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(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())) { diff --git a/server/guhservice.h b/server/nymeaservice.h similarity index 88% rename from server/guhservice.h rename to server/nymeaservice.h index ad9964d6..94a7094f 100644 --- a/server/guhservice.h +++ b/server/nymeaservice.h @@ -18,20 +18,20 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef GUHSERVICE_H -#define GUHSERVICE_H +#ifndef NYMEASERVICE_H +#define NYMEASERVICE_H #include #include "qtservice/qtservice.h" namespace guhserver { -class GuhService : public QtService +class NymeaService : public QtService { 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 diff --git a/server/server.pro b/server/server.pro index 4031a1d5..c8be0548 100644 --- a/server/server.pro +++ b/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