1 files changed, 14 insertions, 15 deletions

diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp
index 0ff4fdf..d74c433 100644
--- a/src/fbgui/ndgui.cpp
+++ b/src/fbgui/ndgui.cpp
@@ -55,7 +55,6 @@ ndgui::~ndgui() {
  * @brief initialize all variables and prepare everything for a successful run
  */
 void ndgui::init() {
-	_tag = "[nd:ndgui]";
 
 	_started = false;
 	_userChoice = false;
@@ -220,7 +219,7 @@ void ndgui::setUserChoiceTrue() {
  */
 void ndgui::startSingleShot() {
 
-	LOG4CXX_DEBUG(ndLogger, _tag << "start singel shot");
+	LOG4CXX_DEBUG(ndLogger, "start singel shot");
 	QTimer::singleShot(3000, this, SLOT(startNetworkDiscovery()));
 }
 
@@ -241,7 +240,7 @@ void ndgui::startNetworkDiscovery() {
 		_networkDiscovery->initAndRun(gServerIp, _userChoice, gAutoUp,
 				logFilePath, gSocketServerPath, gPathToDhcpExe);
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << "NetworkDiscovery already started");
+		LOG4CXX_DEBUG(ndLogger, "NetworkDiscovery already started");
 	}
 }
 
@@ -272,7 +271,7 @@ void ndgui::handleConnectionEstablished(QString ifName) {
  * handleConnectionEstablished)).
  */
 void ndgui::handleAllProcessesFinished() {
-	LOG4CXX_DEBUG(ndLogger, _tag << "all Processes finished");
+	LOG4CXX_DEBUG(ndLogger, "all Processes finished");
 	_allowUserChoice->setEnabled(false);
 	if (_ifNameList.size() > 0) {
 		if (_userChoice) {
@@ -292,8 +291,8 @@ void ndgui::handleAllProcessesFinished() {
 			}
 		}
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << " No usable interfaces found!: " << _networkDiscovery->GetErrorStr());
-		LOG4CXX_DEBUG(ndLogger, _tag << " list is empty");
+		LOG4CXX_DEBUG(ndLogger, " No usable interfaces found!: " << _networkDiscovery->GetErrorStr());
+		LOG4CXX_DEBUG(ndLogger, " list is empty");
 		abortBoot("No usable interfaces found!"
 				+ _networkDiscovery->GetErrorStr());
 	}
@@ -313,7 +312,7 @@ void ndgui::restartSystem() {
 		file.write("b");
 		file.close();
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << "Could not open /proc/sysrq-trigger");
+		LOG4CXX_DEBUG(ndLogger, "Could not open /proc/sysrq-trigger");
 	}
 }
 
@@ -331,7 +330,7 @@ void ndgui::shutDownSystem() {
 		file.write("o");
 		file.close();
 	} else {
-		LOG4CXX_DEBUG(ndLogger, _tag << "Could not open /proc/sysrq-trigger");
+		LOG4CXX_DEBUG(ndLogger, "Could not open /proc/sysrq-trigger");
 	}
 }
 
@@ -347,7 +346,7 @@ void ndgui::shutDownSystem() {
 //void ndgui::continueBoot(QString ifName, int userChoice) {
 void ndgui::continueBoot(QString ifName) {
 	if (_networkDiscovery->checkConnectivity(ifName)) {
-		LOG4CXX_DEBUG(ndLogger, _tag << " continue with interface: " << ifName);
+		LOG4CXX_DEBUG(ndLogger, " continue with interface: " << ifName);
 		emit initFbgui();
 		this->close();
 	} else {
@@ -363,7 +362,7 @@ void ndgui::continueBoot(QString ifName) {
  * @brief continue the boot sequence without further checking if the connection is still possible.
  */
 void ndgui::continueBootWithoutCheck(QString ifName) {
-	LOG4CXX_DEBUG(ndLogger, _tag << " continue with interface: " << ifName);
+	LOG4CXX_DEBUG(ndLogger, " continue with interface: " << ifName);
 	emit initFbgui();
 	this->close();
 }
@@ -374,7 +373,7 @@ void ndgui::continueBootWithoutCheck(QString ifName) {
  * @brief read the log file. Log File will be presented inside of a dialog.
  */
 QString ndgui::readLogFile() {
-	LOG4CXX_DEBUG(ndLogger, _tag << "show log");
+	LOG4CXX_DEBUG(ndLogger, "show log");
 	return _networkDiscovery->readLogFile();
 }
 
@@ -384,7 +383,7 @@ QString ndgui::readLogFile() {
  * @brief starts the whole application again.
  */
 void ndgui::tryAgain() {
-	LOG4CXX_DEBUG(ndLogger, _tag << " try again ");
+	LOG4CXX_DEBUG(ndLogger, " try again ");
 	_networkDiscovery->prepareTryAgain();
 	if(debugMode > -1) {
 		delete _splitter;
@@ -409,7 +408,7 @@ void ndgui::tryAgain() {
  * dialog.
  */
 QVariantList ndgui::getManualConfInterfaces() {
-	LOG4CXX_DEBUG(ndLogger, _tag << "call getManualConfInterfaces");
+	LOG4CXX_DEBUG(ndLogger, "call getManualConfInterfaces");
 	QVariantList jsonArr;
 	QString debugOut;
 	foreach (QString s, _manConfList) {
@@ -417,7 +416,7 @@ QVariantList ndgui::getManualConfInterfaces() {
 		jsonArr << e;
 		debugOut += s + "; ";
 	}
-	LOG4CXX_DEBUG(ndLogger, _tag << "value of jsonArr:" << debugOut);
+	LOG4CXX_DEBUG(ndLogger, "value of jsonArr:" << debugOut);
 	return jsonArr;
 }
 
@@ -594,5 +593,5 @@ void ndgui::addInterface(const QString &ifName) {
  * @brief just for debugging.
  */
 void ndgui::notifyCall(QString msg){
-	LOG4CXX_DEBUG(ndLogger, _tag << "------ called:" << msg);
+	LOG4CXX_DEBUG(ndLogger, "------ called:" << msg);
 }