some style fixes

4 files changed, 7 insertions, 15 deletions

diff --git a/api/plugin-support.hpp b/api/plugin-support.hpp
index 8b94c9d3..b9d2d503 100644
--- a/api/plugin-support.hpp
+++ b/api/plugin-support.hpp
@@ -40,7 +40,7 @@ extern "C" typedef Metadata* (*OPENTRACK_METADATA_FUNPTR)(void);
 
 struct dylib final
 {
-    enum Type { Filter = 0xdeadbabe, Tracker = 0xcafebeef, Protocol = 0xdeadf00d, Invalid = 0xcafebabe };
+    enum Type : unsigned { Filter = 0xdeadbabeu, Tracker = 0xcafebeefu, Protocol = 0xdeadf00du, Invalid = 0xcafebabeu };
 
     dylib(const QString& filename_, Type t) :
         type(Invalid),
diff --git a/csv/csv.cpp b/csv/csv.cpp
index ee18e910..31548f78 100644
--- a/csv/csv.cpp
+++ b/csv/csv.cpp
@@ -20,8 +20,6 @@
 #include <utility>
 #include <algorithm>
 
-using std::move;
-
 const QTextCodec* CSV::m_codec = QTextCodec::codecForName("System");
 const QRegExp CSV::m_rx = QRegExp(QString("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)?\\n?"));
 const QRegExp CSV::m_rx2 = QRegExp(QString("(?:\"([^\"]*)\";?)|(?:([^;]*);?)?"));
@@ -79,7 +77,7 @@ bool CSV::parseLine(QStringList& ret)
             else if (m_rx2.cap(2).size() > 0)
                 col = m_rx2.cap(2);
 
-            list << move(col);
+            list << col;
 
             if (col.size())
                 pos2 += m_rx2.matchedLength();
@@ -87,7 +85,7 @@ bool CSV::parseLine(QStringList& ret)
                 pos2++;
         }
     }
-    ret = move(list);
+    ret = std::move(list);
     return true;
 }
 
@@ -135,8 +133,8 @@ bool CSV::getGameData(int id, unsigned char* table, QString& gamename)
         {
             if (gameLine.at(6).compare(id_str, Qt::CaseInsensitive) == 0)
             {
-                const QString proto(move(gameLine.at(3)));
-                const QString name(move(gameLine.at(1)));
+                const QString proto(std::move(gameLine.at(3)));
+                const QString name(std::move(gameLine.at(1)));
 
                 const QByteArray id_cstr = gameLine.at(7).toLatin1();
 
@@ -169,7 +167,7 @@ bool CSV::getGameData(int id, unsigned char* table, QString& gamename)
                         table[i] = t(tmp[i]);
                     }
                 }
-                gamename = move(name);
+                gamename = std::move(name);
                 return true;
             }
         }
diff --git a/options/value.hpp b/options/value.hpp
index cdaffcaf..be4ff367 100644
--- a/options/value.hpp
+++ b/options/value.hpp
@@ -31,12 +31,6 @@
 
 namespace options {
 
-namespace detail {
-
-OTR_OPTIONS_EXPORT void acct_lookup(bool is_fresh);
-
-} // ns detail
-
 template<typename t>
 class value final : public base_value
 {
diff --git a/proto-simconnect/ftnoir-protocol-sc.rc b/proto-simconnect/ftnoir-protocol-sc.rc
index 5f47a5c9..f1a7b531 100644
--- a/proto-simconnect/ftnoir-protocol-sc.rc
+++ b/proto-simconnect/ftnoir-protocol-sc.rc
@@ -1,4 +1,4 @@
-#include <winuser.h>
+#define RT_MANIFEST 24
 142 RT_MANIFEST fsx_rtm.manifest
 143 RT_MANIFEST fsx_sp1.manifest
 144 RT_MANIFEST fsx_sp2.manifest