ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guhapplication -> nymeaapplication

Browse Source
This commit is contained in:
Michael Zanetti 2018-01-30 11:49:02 +01:00
parent ba3e527a05
commit 1442691029
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/main.cpp
View File

@ -39,7 +39,7 @@
#include "nymeaservice.h" #include "nymeaservice.h"
#include "nymeasettings.h" #include "nymeasettings.h"
#include "nymeadbusservice.h" #include "nymeadbusservice.h"
#include "guhapplication.h" #include "nymeaapplication.h"
#include "loggingcategories.h" #include "loggingcategories.h"
static QHash<QString, bool> s_loggingFilters; static QHash<QString, bool> s_loggingFilters;
@ -103,7 +103,7 @@ int main(int argc, char *argv[])
{ {
qInstallMessageHandler(consoleLogHandler); qInstallMessageHandler(consoleLogHandler);
GuhApplication application(argc, argv); NymeaApplication application(argc, argv);
application.setOrganizationName("nymea"); application.setOrganizationName("nymea");
application.setApplicationName("nymead"); application.setApplicationName("nymead");
application.setApplicationVersion(NYMEA_VERSION_STRING); application.setApplicationVersion(NYMEA_VERSION_STRING);

14
server/guhapplication.cpp → server/nymeaapplication.cpp
View File

@ -19,13 +19,13 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*! /*!
\class guhserver::GuhApplication \class guhserver::NymeaApplication
\brief Application class of the guh server. \brief Application class of the guh server.
\ingroup core \ingroup core
\inmodule server \inmodule server
The \l{GuhApplication} is a subclass of the \{http://doc.qt.io/qt-5/qcoreapplication.html}{QCoreApplication} The \l{NymeaApplication} is a subclass of the \{http://doc.qt.io/qt-5/qcoreapplication.html}{QCoreApplication}
and is responsable to catch system signals like SIGQUIT, SIGINT, SIGTERM, SIGHUP, SIGSEGV. This class and is responsable to catch system signals like SIGQUIT, SIGINT, SIGTERM, SIGHUP, SIGSEGV. This class
will provide a backtrace on a segmentation fault (SIGSEGV). will provide a backtrace on a segmentation fault (SIGSEGV).
@ -33,7 +33,7 @@
\sa NymeaService \sa NymeaService
*/ */
#include "guhapplication.h" #include "nymeaapplication.h"
#include "loggingcategories.h" #include "loggingcategories.h"
#include "nymeacore.h" #include "nymeacore.h"
@ -178,7 +178,7 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
break; break;
default: default:
qCCritical(dcApplication()) << "Fuck this shit. I'm out..."; qCCritical(dcApplication()) << "Fuck this shit. I'm out...";
GuhApplication::quit(); NymeaApplication::quit();
break; break;
} }
s_shutdownCounter++; s_shutdownCounter++;
@ -195,7 +195,7 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
if (s_multipleShutdownDetected) if (s_multipleShutdownDetected)
qCDebug(dcApplication) << "Ok, ok, I'm done! :)"; qCDebug(dcApplication) << "Ok, ok, I'm done! :)";
GuhApplication::quit(); NymeaApplication::quit();
}; };
// all these signals will be ignored. // all these signals will be ignored.
@ -207,8 +207,8 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
} }
/*! Constructs a GuhApplication with the given argument count \a argc and argument vector \a argv. */ /*! Constructs a NymeaApplication with the given argument count \a argc and argument vector \a argv. */
GuhApplication::GuhApplication(int &argc, char **argv) : NymeaApplication::NymeaApplication(int &argc, char **argv) :
QCoreApplication(argc, argv) QCoreApplication(argc, argv)
{ {
catchUnixSignals({SIGQUIT, SIGINT, SIGTERM, SIGHUP, SIGSEGV}); catchUnixSignals({SIGQUIT, SIGINT, SIGTERM, SIGHUP, SIGSEGV});

10
server/guhapplication.h → server/nymeaapplication.h
View File

@ -18,8 +18,8 @@
* * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef GUHAPPLICATION_H #ifndef NYMEAAPPLICATION_H
#define GUHAPPLICATION_H #define NYMEAAPPLICATION_H
#include <QObject> #include <QObject>
#include <QSocketNotifier> #include <QSocketNotifier>
@ -27,11 +27,11 @@
namespace guhserver { namespace guhserver {
class GuhApplication : public QCoreApplication class NymeaApplication : public QCoreApplication
{ {
public: public:
GuhApplication(int &argc, char **argv); NymeaApplication(int &argc, char **argv);
}; };
} }
#endif // GUHAPPLICATION_H #endif // NYMEAAPPLICATION_H

4
server/server.pro
View File

@ -19,9 +19,9 @@ include(qtservice/qtservice.pri)
SOURCES += main.cpp \ SOURCES += main.cpp \
nymeaservice.cpp \ nymeaservice.cpp \
guhapplication.cpp nymeaapplication.cpp
HEADERS += \ HEADERS += \
nymeaservice.h \ nymeaservice.h \
guhapplication.h nymeaapplication.h