- Fix character encoding with VC11

- Simplify VC11 ifdefing
- Fix unreferenced parameter warning

diff --git a/Anyanka.pro b/Anyanka.pro
index 07ede8ea6f803e70bb7111b7aa4229c18147bd1f..aebc60b335ad02f2d2deb1f31cf0dd2588ac0e94 100644 (file)
--- a/Anyanka.pro
+++ b/Anyanka.pro
@@ -16,12 +16,10 @@ unix {
         QMAKE_CXXFLAGS += -std=c++11 -Wall -Wextra
 }
 win32 {
-        SOURCES += windows_defines.h
+        # Add project root directory to work around VC11 include path scheme
+        INCLUDEPATH += "./"
 }
 
-# Add project root directory to work around VC11 include path scheme
-INCLUDEPATH += "./"
-
 SOURCES += main.cpp\
     datafilesloader.cpp \
     datamanager.cpp \
@@ -76,7 +74,6 @@ HEADERS  += \
     integrationtablemodel.h \
     gui/aboutanyanka.h \
     globalinfo.h \
-    windows_defines.h \
     gui/exportrawdatadialog.h \
     datafileexporter.h \
     datawriterbackend.h \

diff --git a/gui/graphview.cpp b/gui/graphview.cpp
index 986a40f00d70622fdedcc69ad5f43046417a69d1..5d7a06d858c8de8bd95ef9369edd4a6642b8a102 100644 (file)
--- a/gui/graphview.cpp
+++ b/gui/graphview.cpp
@@ -186,6 +186,8 @@ void GraphView::mousePressEvent(QMouseEvent* ev)
 
 void GraphView::paintEvent(QPaintEvent* ev)
 {
+  Q_UNUSED(ev);
+
   QPainter p(this);
   if (m_pixmap != nullptr)
     p.drawPixmap(0, 0, dwidth(), dheight(), *m_pixmap);

diff --git a/main.cpp b/main.cpp
index 3773fd33886ed5d9e3f53fc596ca40839e61dda1..2efeba2e67f3c48cd6b9458a901d2607489a93a6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -25,16 +25,13 @@
 #include "logger.h"
 #include <QApplication>
 #include <QtWidgets/QMessageBox>
-#ifdef Q_OS_WIN
-#include "windows_defines.h"
-#endif
 
 int main(int argc, char *argv[])
 {
   int ret;
   QApplication a(argc, argv);
 
-#ifndef COMPILER_MSVC11
+#ifndef _MSC_VER
 #warning Revisit the metatype shared_ptr<SignalView> registration
 #endif
   qRegisterMetaType<std::shared_ptr<SignalView>>();

diff --git a/signal.cpp b/signal.cpp
index 8fee612b1cb589f43ded05a7b950b718e9536543..6d8aadf8c2bf39a2d79c995002211c737a685c35 100644 (file)
--- a/signal.cpp
+++ b/signal.cpp
@@ -19,10 +19,17 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-
 #include "signal.h"
 #include <cfloat>
 
+#ifdef _MSC_VER
+#define DEGREES_CELSIUS_STRING QString::fromWCharArray(L"\u00B0C")
+#define MICROAMPERES_STRING QString::fromWCharArray(L"\u03BCA")
+#else
+#define DEGREES_CELSIUS_STRING QString::fromUtf8(u8"\u00B0C")
+#define MICROAMPERES_STRING QString::fromUtf8(u8"\u03BCA")
+#endif
+
 const QString Signal::RES_CCD("CCD");
 const QString Signal::RES_CURRENT("Current");
 const QString Signal::RES_DAD("Absorbance");
@@ -30,9 +37,9 @@ const QString Signal::RES_POWER("Power");
 const QString Signal::RES_PRESSURE("Pressure");
 const QString Signal::RES_TEMPERATURE("Temperature");
 const QString Signal::RES_VOLTAGE("Voltage");
-const QString Signal::DEGREES_CELSIUS_SI("\u00B0C");
+const QString Signal::DEGREES_CELSIUS_SI = DEGREES_CELSIUS_STRING;
 const QString Signal::KILOVOTLS_SI("KV");
-const QString Signal::MICROAMPERES_SI("\u03BCA");
+const QString Signal::MICROAMPERES_SI = MICROAMPERES_STRING;
 const QString Signal::MILLIAU_SI("mAU");
 const QString Signal::MILLIBARS_SI("mbar");
 const QString Signal::MILLIVOLTS_SI("mV");

diff --git a/windows_defines.h b/windows_defines.h
deleted file mode 100644 (file)
index 2acce4c..0000000
--- a/windows_defines.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  Copyright (c) 2013 Michal Malý <madcatxster@prifuk.cz>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-
-#ifndef WINDOWS_DEFINES_H
-#define WINDOWS_DEFINES_H
-
-#define COMPILER_MSVC11
-
-#endif // WINDOWS_DEFINES_H