Merge branch 'dev' into 'master'

Dev

Converted to compile on Qt5, I'm not sure if it's qt4 compatible. Let's test it first before merge.

QWClient.cpp

@@ -21,9 +21,12 @@ along with this program.  If not, see < http://www.gnu.org/licenses/ >.
 #include "QWClientPrivate.h"
 #include <stdio.h>
 
+
+
 QWClient::QWClient():
   myImplementation(new QWClientPrivate(this))
 {
+
 }
 
 void QWClient::connect(const char *host, quint16 port)
@@ -76,6 +79,7 @@ void QWClient::setSpectator(bool spectate)
 	myImplementation->setSpectator(spectate);
 }
 
+
 void QWClient::stripColor(char *string)
 {
 	QWClientPrivate::stripColor(string);
@@ -105,7 +109,7 @@ void QWClient::reconnect()
 const char* QWClient::host() const
 {
   static char host[255];
-  memcpy(host, myImplementation->host().toAscii().data(), myImplementation->host().toAscii().size()+1);
+  memcpy(host, myImplementation->host().toLatin1().data(), myImplementation->host().toLatin1().size()+1);
   return host;
 }
 

QWTables.cc

@@ -21,44 +21,44 @@ along with this program.  If not, see < http://www.gnu.org/licenses/ >.
 #include <QString>
 
 const QWTables::OriginalChecksumTable QWTables::ourOriginalChecksumTable[] = {
-  { "maps/start.bsp", 493454459 },
-  { "maps/e1m1.bsp", 2902972546 },
-  { "maps/e1m2.bsp", 1729102119 },
-  { "maps/e1m3.bsp", 893792842 },
-  { "maps/e1m4.bsp", 3990488693 },
-  { "maps/e1m5.bsp", 2821463178 },
-  { "maps/e1m6.bsp", 738207971 },
-  { "maps/e1m7.bsp", 2547448602 },
-  { "maps/e1m8.bsp", 79095617 },
-  { "maps/e2m1.bsp", 3707072562 },
-  { "maps/e2m2.bsp", 2945850701 },
-  { "maps/e2m3.bsp", 4237894993 },
-  { "maps/e2m4.bsp", 3273038793 },
-  { "maps/e2m5.bsp", 3204615999 },
-  { "maps/e2m6.bsp", 2443393921 },
-  { "maps/e2m7.bsp", 2051006488 },
-  { "maps/e3m1.bsp", 2427587873 },
-  { "maps/e3m2.bsp", 2624353592 },
-  { "maps/e3m3.bsp", 3285212440 },
-  { "maps/e3m4.bsp", 2977500344 },
-  { "maps/e3m5.bsp", 2440693297 },
-  { "maps/e3m6.bsp", 767655416 },
-  { "maps/e3m7.bsp", 272220593 },
-  { "maps/e4m1.bsp", 3153093456 },
-  { "maps/e4m2.bsp", 4294495000 },
-  { "maps/e4m3.bsp", 1505685644 },
-  { "maps/e4m4.bsp", 758847551 },
-  { "maps/e4m5.bsp", 1771890676 },
-  { "maps/e4m6.bsp", 102825880 },
-  { "maps/e4m7.bsp", 2649489836 },
-  { "maps/e4m8.bsp", 1018457175 },
-  { "maps/end.bsp", 3151279269 },
-  { "maps/dm1.bsp", 3318209203 },
-  { "maps/dm2.bsp", 1710634548 },
-  { "maps/dm3.bsp", 367136248 },
-  { "maps/dm4.bsp", 2624578751 },
-  { "maps/dm5.bsp", 2955757821 },
-  { "maps/dm6.bsp", 1376311851 },
+  { "maps/start.bsp", 493454459ll },
+  { "maps/e1m1.bsp", 2902972546ll },
+  { "maps/e1m2.bsp", 1729102119ll },
+  { "maps/e1m3.bsp", 893792842ll },
+  { "maps/e1m4.bsp", 3990488693ll },
+  { "maps/e1m5.bsp", 2821463178ll },
+  { "maps/e1m6.bsp", 738207971ll },
+  { "maps/e1m7.bsp", 2547448602ll },
+  { "maps/e1m8.bsp", 79095617ll },
+  { "maps/e2m1.bsp", 3707072562ll },
+  { "maps/e2m2.bsp", 2945850701ll },
+  { "maps/e2m3.bsp", 4237894993ll },
+  { "maps/e2m4.bsp", 3273038793ll },
+  { "maps/e2m5.bsp", 3204615999ll },
+  { "maps/e2m6.bsp", 2443393921ll },
+  { "maps/e2m7.bsp", 2051006488ll },
+  { "maps/e3m1.bsp", 2427587873ll },
+  { "maps/e3m2.bsp", 2624353592ll },
+  { "maps/e3m3.bsp", 3285212440ll },
+  { "maps/e3m4.bsp", 2977500344ll },
+  { "maps/e3m5.bsp", 2440693297ll },
+  { "maps/e3m6.bsp", 767655416ll },
+  { "maps/e3m7.bsp", 272220593ll },
+  { "maps/e4m1.bsp", 3153093456ll },
+  { "maps/e4m2.bsp", 4294495000ll },
+  { "maps/e4m3.bsp", 1505685644ll },
+  { "maps/e4m4.bsp", 758847551ll },
+  { "maps/e4m5.bsp", 1771890676ll},
+  { "maps/e4m6.bsp", 102825880ll },
+  { "maps/e4m7.bsp", 2649489836ll },
+  { "maps/e4m8.bsp", 1018457175ll },
+  { "maps/end.bsp", 3151279269ll },
+  { "maps/dm1.bsp", 3318209203ll },
+  { "maps/dm2.bsp", 1710634548ll },
+  { "maps/dm3.bsp", 367136248ll },
+  { "maps/dm4.bsp", 2624578751ll },
+  { "maps/dm5.bsp", 2955757821ll },
+  { "maps/dm6.bsp", 1376311851ll },
   { NULL, 0 }
 };