DownloadDCJsonFiles.pro

@@ -61,11 +61,9 @@ contains( CONFIG, DesktopLinux ) {
 }
 
 SOURCES += \
-        main.cpp \
+        main.cpp
-        message_handler.cpp
 
-HEADERS += \
+# HEADERS +=
-        message_handler.h
 
 OTHER_FILES += \
     ATBDownloadDCJsonFiles.ini

main.cpp

@@ -1,41 +1,9 @@
 
 #include <QtGlobal>
-#include <QCoreApplication>
-#include <QByteArray>
-
-#include "message_handler.h"
-
-#if defined (__unix__) || defined (__linux__)
-#include <unistd.h>
-#include <errno.h>
-#endif
-
-#ifdef PTU5
-#define SERIAL_PORT "ttymxc2"
-#else
-#define SERIAL_PORT "ttyUSB0"
-#endif
 
 int main(int argc, char **argv) {
     Q_UNUSED(argc);
     Q_UNUSED(argv);
 
-    QByteArray const value = qgetenv("LC_ALL");
+    return 0;
-    if (value != "C") {
-        qputenv("LC_ALL", "C");
-    }
-    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
-
-    openlog("ATB-DL-JSON", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
-
-    QCoreApplication a(argc, argv);
-    QCoreApplication::setApplicationName("ATBDownloadDCJsonFiles");
-    QCoreApplication::setApplicationVersion(APP_VERSION);
-
-    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
-        atbInstallMessageHandler(atbDebugOutput);
-        setDebugLevel(LOG_NOTICE);
-    }
-
-    return a.exec();
 }

message_handler.cpp

@@ -1,97 +0,0 @@
-#include "message_handler.h"
-
-#include <QDateTime>
-#include <cstring>
-#include <QString>
-#include <QFileInfo>
-#include <QMessageLogContext>
-
-
-static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
-static bool installedMsgHandler = false;
-static int debugLevel = LOG_NOTICE;
-
-int getDebugLevel() { return debugLevel; }
-void setDebugLevel(int newDebugLevel) {
-    debugLevel = newDebugLevel;
-}
-
-bool messageHandlerInstalled() {
-    return installedMsgHandler;
-}
-
-QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
-    installedMsgHandler = (handler != 0);
-    static QtMessageHandler prevHandler = nullptr;
-    if (handler) {
-        prevHandler = qInstallMessageHandler(handler);
-        return prevHandler;
-    } else {
-        return qInstallMessageHandler(prevHandler);
-    }
-}
-
-///
-/// \brief Print message according to given debug level.
-///
-/// \note Install this function using qInstallMsgHandler().
-///
-///  int main(int argc, char **argv) {
-///     installMsgHandler(atbDebugOutput);
-///     QApplication app(argc, argv);
-///     ...
-///     return app.exec();
-///  }
-///
-#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
-    Q_UNUSED(context);
-    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
-
-    switch (debugLevel) {
-        case LOG_DEBUG: { // debug-level message
-            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-        } break;
-        case LOG_INFO: { // informational message
-            if (type != QtDebugMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        case LOG_NOTICE: { // normal, but significant, condition
-            if (type != QtDebugMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        case LOG_WARNING: { // warning conditions
-            if (type != QtInfoMsg && type != QtDebugMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        case LOG_ERR: { // error conditions
-            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        case LOG_CRIT: { // critical conditions
-            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        case LOG_ALERT: { // action must be taken immediately
-            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        case LOG_EMERG: { // system is unusable
-            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
-                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
-            }
-        } break;
-        default: {
-            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
-            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
-        }
-    }
-}
-#endif
-

message_handler.h

@@ -1,23 +0,0 @@
-#ifndef MESSAGE_HANDLER_H_INCLUDED
-#define MESSAGE_HANDLER_H_INCLUDED
-
-#include <QtGlobal>
-#ifdef __linux__
-#include <syslog.h>
-#endif
-
-int getDebugLevel();
-void setDebugLevel(int newDebugLevel);
-
-bool messageHandlerInstalled();
-QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// typedef void (*QtMessageHandler)(QtMsgType, const char *);
-void atbDebugOutput(QtMsgType type, const char *msg);
-#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
-void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
-#endif
-
-#endif // MESSAGE_HANDLER_H_INCLUDED