Small build and styleguide fixes

yurii-litvinov · yurii-litvinov · commit cfddf4fb8952 · 2014-11-27T13:33:29.000+04:00
diff --git a/qslog/QsLog.pri b/qslog/QsLog.pri
@@ -3,21 +3,23 @@ INCLUDEPATH += $$PWD
 # WARNING: QS_LOG_LINE_NUMBERS and QS_LOG_SEPARATE_THREAD were removed from repo version and made enabled by default
 #DEFINES += QS_LOG_DISABLE         # logging code is replaced with a no-op
 
-SOURCES += $$PWD/QsLogDest.cpp \
-    $$PWD/QsLog.cpp \
-    $$PWD/QsLogDestConsole.cpp \
-    $$PWD/QsLogDestFile.cpp \
-    $$PWD/QsLogDestFunctor.cpp
+SOURCES += \
+	$$PWD/QsLogDest.cpp \
+	$$PWD/QsLog.cpp \
+	$$PWD/QsLogDestConsole.cpp \
+	$$PWD/QsLogDestFile.cpp \
+	$$PWD/QsLogDestFunctor.cpp
 
-HEADERS += $$PWD/QsLogDest.h \
-    $$PWD/QsLog.h \
-    $$PWD/QsLogDestConsole.h \
-    $$PWD/QsLogLevel.h \
-    $$PWD/QsLogDestFile.h \
-    $$PWD/QsLogDisableForThisFile.h \
-    $$PWD/QsLogDestFunctor.h
+HEADERS += \
+	$$PWD/QsLogDest.h \
+	$$PWD/QsLog.h \
+	$$PWD/QsLogDestConsole.h \
+	$$PWD/QsLogLevel.h \
+	$$PWD/QsLogDestFile.h \
+	$$PWD/QsLogDisableForThisFile.h \
+	$$PWD/QsLogDestFunctor.h
 
 OTHER_FILES += \
-    $$PWD/QsLogChanges.txt \
-    $$PWD/QsLogReadme.txt \
-    $$PWD/LICENSE.txt
+	$$PWD/QsLogChanges.txt \
+	$$PWD/QsLogReadme.txt \
+	$$PWD/LICENSE.txt
diff --git a/qslog/QsLogSharedLibrary.pro b/qslog/QsLogSharedLibrary.pro
@@ -1,67 +1,16 @@
 # This pro file will build QsLog as a shared library
-include(QsLog.pri)
-
-CROSS_COMPILE = $$(CROSS_COMPILE)
-
-!isEmpty(CROSS_COMPILE) {
-	ARCHITECTURE = arm
-} else {
-	ARCHITECTURE = x86
-}
-
-CONFIG(debug, debug | release) {
-	CONFIGURATION = $$ARCHITECTURE-debug
-	CONFIGURATION_SUFFIX = -$$ARCHITECTURE-d
-} else {
-	CONFIGURATION = $$ARCHITECTURE-release
-	equals(ARCHITECTURE, "arm") {
-		CONFIGURATION_SUFFIX =
-	} else {
-		CONFIGURATION_SUFFIX = -$$ARCHITECTURE
-	}
-}
+include(../global.pri)
 
-DESTDIR = $$PWD/../bin/$$CONFIGURATION
-
-equals(TEMPLATE, app) {
-	!macx {
-		QMAKE_LFLAGS += -Wl,-O1,-rpath,.
-		QMAKE_LFLAGS += -Wl,-rpath-link,$$DESTDIR
-	}
-}
-
-OBJECTS_DIR = .build/$$CONFIGURATION/.obj
-MOC_DIR = .build/$$CONFIGURATION/.moc
-RCC_DIR = .build/$$CONFIGURATION/.rcc
-UI_DIR = .build/$$CONFIGURATION/.ui
+include(QsLog.pri)
 
 TARGET = qslog$$CONFIGURATION_SUFFIX
+
 QT -= gui
+
 CONFIG -= console
 CONFIG -= app_bundle
 CONFIG += shared
-TEMPLATE = lib
-
-QMAKE_CXXFLAGS += -std=c++11
-QMAKE_CXXFLAGS += -Wextra -Wcast-qual -Wwrite-strings -Wredundant-decls -Wunreachable-code -Wnon-virtual-dtor -Woverloaded-virtual
-
-win32 {
-	DEFINES += QSLOG_IS_SHARED_LIBRARY
-}
 
-unix:!macx {
-	# make install will install the shared object in the appropriate folders
-	headers.files = QsLog.h QsLogDest.h QsLogLevel.h
-	headers.path = /usr/include/$(QMAKE_TARGET)
-
-	other_files.files = *.txt
-	other_files.path = /usr/local/share/$(QMAKE_TARGET)
-
-	contains(QT_ARCH, x86_64) {
-		target.path = /usr/lib64
-	} else {
-		target.path = /usr/lib
-	}
+TEMPLATE = lib
 
-	INSTALLS += headers target other_files
-}
+DEFINES += QSLOG_IS_SHARED_LIBRARY
diff --git a/trikCommunicator/src/connection.cpp b/trikCommunicator/src/connection.cpp
@@ -22,7 +22,7 @@
 
 #include "src/connection.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikCommunicator;
 
diff --git a/trikControl/src/analogSensor.cpp b/trikControl/src/analogSensor.cpp
@@ -18,7 +18,7 @@
 
 #include "i2cCommunicator.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/brick.cpp b/trikControl/src/brick.cpp
@@ -27,7 +27,7 @@
 #include "configurer.h"
 #include "i2cCommunicator.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/configurer.cpp b/trikControl/src/configurer.cpp
@@ -18,7 +18,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/digitalSensor.cpp b/trikControl/src/digitalSensor.cpp
@@ -16,7 +16,7 @@
 
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/gamepad.cpp b/trikControl/src/gamepad.cpp
@@ -18,7 +18,7 @@
 
 #include "tcpConnector.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/led.cpp b/trikControl/src/led.cpp
@@ -16,7 +16,7 @@
 
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/linux/abstractVirtualSensorWorker.cpp b/trikControl/src/linux/abstractVirtualSensorWorker.cpp
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
@@ -180,8 +180,10 @@ void AbstractVirtualSensorWorker::openFifos()
 
 	mReady = true;
 
-	QLOG_INFO() << sensorName() << "initialization completed";
-	qDebug() << sensorName() << "initialization completed";
+	QString const message = sensorName() + " initialization completed";
+
+	QLOG_INFO() << message;
+	qDebug() << message;
 
 	sync();
 }
@@ -200,18 +202,22 @@ void AbstractVirtualSensorWorker::deinitialize()
 	}
 
 	if (::close(mOutputFileDescriptor) != 0) {
-		QLOG_ERROR() << mOutputFile.fileName() << ": fifo close failed: " << errno;
-		qDebug() << mOutputFile.fileName() << ": fifo close failed: " << errno;
+		QString const message = QString("%1: fifo close failed: %2").arg(mOutputFile.fileName()).arg(errno);
+		QLOG_ERROR() << message;
+		qDebug() << message;
 	}
 
 	mOutputFileDescriptor = -1;
 	mInputFile.close();
 
 	if (!launchSensorScript("stop")) {
-		QLOG_ERROR() << "Failed to stop" << sensorName() << "sensor!";
-		qDebug() << "Failed to stop" << sensorName() << "sensor!";
+		QString const message = QString("Failed to stop %1 sensor!").arg(sensorName());
+		QLOG_ERROR() << message;
+		qDebug() << message;
 	} else {
-		qDebug() << "Successfully stopped" << sensorName() << "sensor";
+		QString const message = QString("Successfully stopped %1 sensor").arg(sensorName());
+		QLOG_INFO() << message;
+		qDebug() << message;
 	}
 
 	emit stopped();
diff --git a/trikControl/src/linux/i2cCommunicator.cpp b/trikControl/src/linux/i2cCommunicator.cpp
@@ -22,7 +22,7 @@
 #include <linux/i2c.h>
 #include <unistd.h>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/linux/keysWorker.cpp b/trikControl/src/linux/keysWorker.cpp
@@ -19,7 +19,7 @@
 #include <fcntl.h>
 #include <linux/input.h>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/linux/sensor3dWorker.cpp b/trikControl/src/linux/sensor3dWorker.cpp
@@ -26,7 +26,7 @@
 #include <linux/ioctl.h>
 #include <linux/input.h>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/mailboxConnection.cpp b/trikControl/src/mailboxConnection.cpp
@@ -4,7 +4,7 @@
 
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/mailboxServer.cpp b/trikControl/src/mailboxServer.cpp
@@ -5,7 +5,7 @@
 #include <QtNetwork/QNetworkInterface>
 #include <QtCore/QSettings>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/pwmCapture.cpp b/trikControl/src/pwmCapture.cpp
@@ -18,7 +18,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QTextStream>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/servoMotor.cpp b/trikControl/src/servoMotor.cpp
@@ -16,7 +16,7 @@
 
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikControl/src/tcpConnector.cpp b/trikControl/src/tcpConnector.cpp
@@ -16,7 +16,7 @@
 
 #include <QtCore/QDataStream>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikControl;
 
diff --git a/trikGui/main.cpp b/trikGui/main.cpp
@@ -30,7 +30,7 @@
 
 #include "trikGuiApplication.h"
 #include "backgroundWidget.h"
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikGui;
 
diff --git a/trikGui/rcReader.cpp b/trikGui/rcReader.cpp
@@ -16,7 +16,7 @@
 
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 RcReader::RcReader(const QString &rcFilePath, QObject *parent)
 	: QObject(parent)
diff --git a/trikGui/wiFiInitWidget.cpp b/trikGui/wiFiInitWidget.cpp
@@ -22,7 +22,7 @@
 
 #include "trikGuiMessageBox.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikGui;
 
diff --git a/trikGui/wiFiModeWidget.cpp b/trikGui/wiFiModeWidget.cpp
@@ -21,7 +21,7 @@
 #include "wiFiAPWidget.h"
 #include "wiFiInitWidget.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikGui;
 
diff --git a/trikKernel/src/connection.cpp b/trikKernel/src/connection.cpp
@@ -18,7 +18,7 @@
 #include "connection.h"
 #include "version.h"
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikKernel;
 
diff --git a/trikKernel/src/fileUtils.cpp b/trikKernel/src/fileUtils.cpp
@@ -18,7 +18,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikKernel;
 
diff --git a/trikKernel/src/trikServer.cpp b/trikKernel/src/trikServer.cpp
@@ -18,7 +18,7 @@
 
 #include <QtCore/QDebug>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 using namespace trikKernel;
 
diff --git a/trikRun/main.cpp b/trikRun/main.cpp
@@ -29,7 +29,7 @@
 #include <trikControl/brick.h>
 #include <trikScriptRunner/trikScriptRunner.h>
 
-#include "QsLog.h"
+#include <QsLog.h>
 
 void printUsage()
 {
diff --git a/trikRuntime.pro b/trikRuntime.pro
@@ -24,13 +24,15 @@ SUBDIRS = \
 	trikGui \
 	trikWiFi \
 	trikTelemetry \
-	qslog/QsLogSharedLibrary.pro \
+	qslog \
 
-trikScriptRunner.depends = trikControl trikKernel qslog/QsLogSharedLibrary.pro
-trikCommunicator.depends = trikScriptRunner qslog/QsLogSharedLibrary.pro
-trikRun.depends = trikScriptRunner trikKernel qslog/QsLogSharedLibrary.pro
-trikServer.depends = trikCommunicator qslog/QsLogSharedLibrary.pro
-trikGui.depends = trikCommunicator trikScriptRunner trikWiFi trikKernel trikTelemetry qslog/QsLogSharedLibrary.pro
-trikTelemetry.depends = trikControl trikKernel qslog/QsLogSharedLibrary.pro
-trikControl.depends = qslog/QsLogSharedLibrary.pro
-trikKernel.depends = qslog/QsLogSharedLibrary.pro
+qslog.file = qslog/QsLogSharedLibrary.pro
+
+trikScriptRunner.depends = trikControl trikKernel qslog
+trikCommunicator.depends = trikScriptRunner qslog
+trikRun.depends = trikScriptRunner trikKernel qslog
+trikServer.depends = trikCommunicator qslog
+trikGui.depends = trikCommunicator trikScriptRunner trikWiFi trikKernel trikTelemetry qslog
+trikTelemetry.depends = trikControl trikKernel qslog
+trikControl.depends = qslog
+trikKernel.depends = qslog
diff --git a/trikScriptRunner/src/scriptEngineWorker.cpp b/trikScriptRunner/src/scriptEngineWorker.cpp
diff --git a/trikScriptRunner/src/trikScriptRunner.cpp b/trikScriptRunner/src/trikScriptRunner.cpp
diff --git a/trikServer/main.cpp b/trikServer/main.cpp
