From cc7d194e14531bd9bed3dc2f79a810e918837f65 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Sun, 8 May 2016 11:51:58 +0200
Subject: Fix some warnings

---
 src/CRSMStats.hpp       |  2 +-
 src/ClientInfo.hpp      | 18 +++++++++++-------
 src/GreetingSetting.hpp |  3 ++-
 src/crsm.cpp            | 10 +++++-----
 src/crsm.hpp            |  4 ++--
 src/qt-config           |  2 +-
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/CRSMStats.hpp b/src/CRSMStats.hpp
index bed5e26..5124348 100644
--- a/src/CRSMStats.hpp
+++ b/src/CRSMStats.hpp
@@ -38,9 +38,9 @@ struct CommandStats {
 };
 
 struct FailCommandStats {
-    int Sum = 0;
     QString Command = "";
     QMap<ClientInfo, int> Users;
+    int Sum = 0;
 };
 
 template<>
diff --git a/src/ClientInfo.hpp b/src/ClientInfo.hpp
index cdd8ff4..4a4ef0b 100644
--- a/src/ClientInfo.hpp
+++ b/src/ClientInfo.hpp
@@ -21,19 +21,23 @@ class ClientInfo
 {
 
 public:
-    ClientInterface interface = Clonk;
+
     QString nick = "";
 
-    bool dcc = false;
 
-    int CUID = 0;
+    QList<QDateTime> antiFloodList;
+    QString target = "";
+
+    ManagementConnection management;
     QString pcName = "";
+
+    ClientInterface interface = Clonk;
+    int CUID = 0;
     bool activated = false;
 
-    QList<QDateTime> antiFloodList;
+    bool dcc = false;
+
 
-    QString target = "";
-    ManagementConnection management;
 
 
     static inline ClientInfo ircClient(QString nick, QString target = "")
@@ -151,7 +155,7 @@ public:
             {
                 if(parts.length() != 5) throw ConfigException("Cannot read corrupt ClientInfo with Clonk-ClientInterface: " + string.toStdString());
                 info.pcName = parts.at(1);
-                info.CUID = parts.at(2).toUInt();
+                info.CUID = parts.at(2).toInt();
                 info.nick = parts.at(3);
                 info.activated = ConfigValueBase::getValue<bool>(parts.at(4));
                 break;
diff --git a/src/GreetingSetting.hpp b/src/GreetingSetting.hpp
index d3d6617..933d4c5 100644
--- a/src/GreetingSetting.hpp
+++ b/src/GreetingSetting.hpp
@@ -2,13 +2,14 @@
 
 #include <QString>
 
+#include "qt-config/ConfigBase.hpp"
 #include "ClientInterface.hpp"
 
 class GreetingSetting {
 public:
     ClientInterface interface;
-    QString target = "";
     bool negative = false;
+    QString target = "";
 
     GreetingSetting() { }
     inline bool operator==(const GreetingSetting& other)
diff --git a/src/crsm.cpp b/src/crsm.cpp
index efd58b8..55b18e6 100644
--- a/src/crsm.cpp
+++ b/src/crsm.cpp
@@ -14,7 +14,7 @@
 CRSM::CRSM(QObject *parent) :
     QObject(parent), Session(this)
 {
-    qsrand(QDateTime::currentMSecsSinceEpoch());
+    qsrand((uint)QDateTime::currentMSecsSinceEpoch());
     codec = QTextCodec::codecForName("Windows-1252");
 
     outputBuffer.setFileName(MGMT_BUFFER_FILENAME);
@@ -506,7 +506,7 @@ void CRSM::greet(QString pcName)
     writeToServer(QString("Hallo, " + info.nick + "!\n"));
     if(Session.Clonk.LeaveAdmins.contains(info))
     {
-        int timeGone;
+        qint64 timeGone;
         if((timeGone = Session.Clonk.LeaveAdmins.value(info).secsTo(QDateTime::currentDateTime())) < Config.Clonk.Chat.RegainAdminTime && !Session.Clonk.Admin.empty())
         {
             writeToServer(info.nick + "! Der Rundenadmin wurde freigegeben, weil du das Spiel verlassen hast.\nDu hast noch " + QString::number(Config.Clonk.Chat.RegainAdminTime - timeGone) + "s Zeit um den Rundenadmin zurückzuholen.\n");
@@ -1204,7 +1204,7 @@ void CRSM::ircSetIngameChannelTopic()
                 case CRSMSession::Running:
                     statusText = "Läuft";
                     break;
-                default:
+                case CRSMSession::None: // is handled above
                     break;
             }
             connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, "Aktuelles Szenario: " + Session.Scenario.name + " | " + statusText + " | Ingamechat ist " + (Session.IRC.UseIngameChat ? "" : "de") + "aktviert."));
@@ -2255,7 +2255,7 @@ CMD_FUNCTION_IMPL(admin)
         respond(client, "Solange nichts gehostet ist, kann es keinen Rundenadmin geben.\n");
         return RightsFail;
     }
-    ClientInfo *interfaceAdminPtr;
+    ClientInfo *interfaceAdminPtr = nullptr;
     switch(client.interface)
     {
         case Clonk:
@@ -2269,7 +2269,7 @@ CMD_FUNCTION_IMPL(admin)
         case IRC:
             interfaceAdminPtr = &Session.IRC.Admin;
             break;
-        default:
+        case Auto: case Management: // no interface specific admin allowed for these interfaces
             return Success;
     }
     ClientInfo& interfaceAdmin = *interfaceAdminPtr;
diff --git a/src/crsm.hpp b/src/crsm.hpp
index 0a23d7a..3d482a7 100644
--- a/src/crsm.hpp
+++ b/src/crsm.hpp
@@ -47,12 +47,12 @@ using IrcCheckCallback = void (CRSM::*)(const ClientInfo&, int, const ClientInfo
 class ScenarioSettings {
 public:
     QString name;
+    ClientInfo wishClient;
     bool league = false;
     bool randomLeague = false;
-    ClientInfo wishClient;
 
     ScenarioSettings(const QString& name, bool league = false) : name(name), league(league) {}
-    ScenarioSettings(const QString& name, const ClientInfo& client, bool league = false) : name(name), league(league), wishClient(client) {}
+    ScenarioSettings(const QString& name, const ClientInfo& client, bool league = false) : name(name), wishClient(client), league(league) {}
     ScenarioSettings() {}
     inline bool operator ==(const ScenarioSettings& other) const
     {
diff --git a/src/qt-config b/src/qt-config
index 808350d..0035a12 160000
--- a/src/qt-config
+++ b/src/qt-config
@@ -1 +1 @@
-Subproject commit 808350db57eebf8e6a5517a74c5c7b0c71a5d250
+Subproject commit 0035a128ba00259cf6a5ada68e05c0efaf9f95a4
-- 
cgit v1.2.3-54-g00ecf