From 73131c8064365014173fca0cdf1e40da5fce8e06 Mon Sep 17 00:00:00 2001
From: "Xawotihs@gmail.com"
 <Xawotihs@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Mon, 28 Jan 2013 22:37:01 +0000
Subject: [PATCH] Removed unused variables

---
 projects/mtg/src/MTGRules.cpp    |  4 ++--
 projects/mtg/src/TestSuiteAI.cpp |  2 +-
 projects/mtg/wagic-qt.pro        | 31 ++++++++++++++++++++++++-------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp
index de48a903a..6222ed377 100644
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -60,7 +60,7 @@ int MTGEventBonus::receiveEvent(WEvent * event)
     //only spells going to the stack are counted.
 	if(game->turn <2)//this shouldnt trigger on first turn, chances are they are cheating.
 		return 0;
-    if (WEventCardTappedForMana* e = dynamic_cast<WEventCardTappedForMana*>(event))
+    if (dynamic_cast<WEventCardTappedForMana*>(event))
     {
 
         if(chain[currentPlayer->getId()]/5 > 0)
@@ -1500,7 +1500,7 @@ PermanentAbility(observer, _id)
 
 int MTGBlockRule::receiveEvent(WEvent *e)
 {
-    if (WEventBlockersChosen * event = dynamic_cast<WEventBlockersChosen*>(e))
+    if (dynamic_cast<WEventBlockersChosen*>(e))
     {
 
         Player * p = game->currentPlayer;
diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp
index cd89949de..fd15883b8 100644
--- a/projects/mtg/src/TestSuiteAI.cpp
+++ b/projects/mtg/src/TestSuiteAI.cpp
@@ -557,7 +557,7 @@ int TestSuite::loadNext()
 
         size_t thread_count = 1;
 #ifdef QT_CONFIG
-        thread_count = QThread::idealThreadCount();
+        thread_count = 1;//QThread::idealThreadCount();
 #elif defined(IOS)
         thread_count = 6;
 #else
diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro
index 39d50d341..e1cd118f4 100644
--- a/projects/mtg/wagic-qt.pro
+++ b/projects/mtg/wagic-qt.pro
@@ -1,12 +1,10 @@
 # Add more folders to ship with the application, here
 folder_01.source = qml/QmlWagic
-folder_01.target = qml
+folder_01.target = /usr/share
 DEPLOYMENTFOLDERS = folder_01
 
-TARGET = wagic
-
 QT += core gui opengl network
-!android:!symbian:QT += phonon
+#!android:!symbian:QT += phonon
 maemo5:QT += dbus
 
 TARGET = wagic
@@ -19,10 +17,12 @@ windows:DEFINES += _CRT_SECURE_NO_WARNINGS
 unix|macx:DEFINES += LINUX
 CONFIG(debug, debug|release):DEFINES += _DEBUG
 DEFINES += QT_CONFIG
-!android:!symbian:DEFINES += USE_PHONON
+#!android:!symbian:DEFINES += USE_PHONON
 android:INCLUDEPATH += $$ANDROID_NDK_ROOT/platforms/android-9/arch-arm/usr/include
 #DEFINES += QT_NO_DEBUG_OUTPUT
-maemo5:DEFINES += QT_WIDGET
+#maemo5:DEFINES += QT_WIDGET
+DEFINES += QT_WIDGET
+DEFINES += NETWORK_SUPPORT
 
 windows:INCLUDEPATH += ../../JGE/Dependencies/include
 windows{
@@ -304,6 +304,8 @@ SOURCES += \
         ../../JGE/src/JParticleSystem.cpp\
         ../../JGE/src/JResourceManager.cpp\
         ../../JGE/src/JSpline.cpp\
+        ../../JGE/src/JNetwork.cpp\
+        ../../JGE/src/pc/JSocket.cpp\
         ../../JGE/src/JSprite.cpp\
         ../../JGE/src/Vector2D.cpp\
         ../../JGE/src/tinyxml/tinystr.cpp\
@@ -406,7 +408,6 @@ maemo5: {
 
 # Meego/maemo 6 packaging (no launcher)
 } else:contains(MEEGO_EDITION,harmattan): {
-
     # Variables
     BINDIR = /opt/wagic/bin
     RESDIR = /opt/wagic/Res
@@ -457,11 +458,27 @@ maemo5: {
     DEFINES += RESDIR=\\\"$$RESDIR\\\"
     DEFINES += USERDIR=\\\"$$USERDIR\\\"
 } else:unix {
+    # Variables
+    BINDIR = /usr/bin
+    ICONDIR = /usr/share
     RESDIR = Res
     USERDIR = .Wagic
+
     DEFINES += RESDIR=\\\"$$RESDIR\\\"
     DEFINES += USERDIR=\\\"$$USERDIR\\\"
 
+    target.path = $$BINDIR
+
+    desktop.path = $$ICONDIR/applications
+    desktop.files += wagic.desktop
+
+    icon.path = $$ICONDIR/icons/hicolor/64x64/apps
+    icon.files += wagic-64x64.png
+
+    INSTALLS += target \
+        desktop \
+        icon
+
 } else:windows {
     RESDIR = ./Res
     USERDIR = .Wagic