codeformating, change to log4cxx

1 files changed, 29 insertions, 22 deletions

diff --git a/src/fbgui/main.cpp b/src/fbgui/main.cpp
index a187d01..d733b43 100644
--- a/src/fbgui/main.cpp
+++ b/src/fbgui/main.cpp
@@ -4,12 +4,19 @@
 #include <getopt.h>
 #include <cstdlib>
 #include <iostream>
-#include "loggerengine.h"
+
+#include <log4cxx/logger.h>
+#include "qlog4cxx.h"
+
 #include "fbgui.h"
 #include "ndgui.h"
 
 #include "../common/fbgui.h"
 
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+LoggerPtr logger(Logger::getLogger("fbgui"));
+
 void printHelp() {
    QTextStream qout(stdout);
    qout << QObject::tr("Usage: ./fbgui [OPTIONS]") << endl;
@@ -108,11 +115,11 @@ int main(int argc, char *argv[]) {
    if (clOpts.contains("debug")) {
       debugMode = clOpts.value("debug").toInt();
       // start basic debug output on terminal
-      qxtLog->disableLoggerEngine("DEFAULT");
-      qxtLog->enableLogLevels(QxtLogger::DebugLevel);
-      qxtLog->addLoggerEngine("std_logger", new LoggerEngine_std);
-      qxtLog->initLoggerEngine("std_logger");
-      qxtLog->setMinimumLevel("std_logger", QxtLogger::DebugLevel);
+//      qxtLog->disableLoggerEngine("DEFAULT");
+//      qxtLog->enableLogLevels(QxtLogger::DebugLevel);
+//      qxtLog->addLoggerEngine("std_logger", new LoggerEngine_std);
+//      qxtLog->initLoggerEngine("std_logger");
+//      qxtLog->setMinimumLevel("std_logger", QxtLogger::DebugLevel);
    } else
       debugMode = -1;
 
@@ -230,24 +237,24 @@ int main(int argc, char *argv[]) {
    // // activate file logger if debug mode activated.
    // if (debugMode > -1) {
       // start debug logging to file.
-      qxtLog->addLoggerEngine("file_logger", new LoggerEngine_file(logFilePath));
-      qxtLog->setMinimumLevel("file_logger", QxtLogger::DebugLevel);
+//      qxtLog->addLoggerEngine("file_logger", new LoggerEngine_file(logFilePath));
+//      qxtLog->setMinimumLevel("file_logger", QxtLogger::DebugLevel);
    // }
 
    // print config
-   qxtLog->debug() << "*************   CONFIG INFO   *************";
-   qxtLog->debug() << "configFilePath:   " << configFilePath.toUtf8();
-   qxtLog->debug() << "logFilePath:      " << logFilePath.toUtf8();
-   qxtLog->debug() << "ipConfigFilePath: " << ipConfigFilePath.toUtf8();
-   qxtLog->debug() << "baseURL:          " << baseURL.toString().toUtf8();
-   qxtLog->debug() << "downloadDir :     " << downloadPath.toUtf8();
-   qxtLog->debug() << "trigger:          " << fileToTriggerURL.toUtf8();
-   qxtLog->debug() << "serialLocation:   " << serialLocation.toUtf8();
-   qxtLog->debug() << "server:   		 " << gServerIp.toUtf8();
-   qxtLog->debug() << "autoup:   		 " << gAutoUp;
-   qxtLog->debug() << "socketserverpath: " << gSocketServerPath.toUtf8();
-   qxtLog->debug() << "pathtoexe:        " << gPathToDhcpExe.toUtf8();
-   qxtLog->debug() << "*******************************************";
+   LOG4CXX_DEBUG(logger, "*************   CONFIG INFO   *************");
+   LOG4CXX_DEBUG(logger, "configFilePath:   " << configFilePath);
+   LOG4CXX_DEBUG(logger, "logFilePath:      " << logFilePath);
+   LOG4CXX_DEBUG(logger, "ipConfigFilePath: " << ipConfigFilePath);
+   LOG4CXX_DEBUG(logger, "baseURL:          " << baseURL.toString());
+   LOG4CXX_DEBUG(logger, "downloadDir :     " << downloadPath);
+   LOG4CXX_DEBUG(logger, "trigger:          " << fileToTriggerURL);
+   LOG4CXX_DEBUG(logger, "serialLocation:   " << serialLocation);
+   LOG4CXX_DEBUG(logger, "server:           " << gServerIp);
+   LOG4CXX_DEBUG(logger, "autoup:           " << gAutoUp);
+   LOG4CXX_DEBUG(logger, "socketserverpath: " << gSocketServerPath);
+   LOG4CXX_DEBUG(logger, "pathtoexe:        " << gPathToDhcpExe);
+   LOG4CXX_DEBUG(logger, "*******************************************");
 
    // set invisible cursor
    //QWSServer::instance()->setCursorVisible(false);
@@ -258,7 +265,7 @@ int main(int argc, char *argv[]) {
 
 
    // start ndgui
-   qxtLog->debug() << "Initializing ndgui...";
+   LOG4CXX_DEBUG(logger, "Initializing ndgui...");
    ndgui ngui;
    fbgui gui;