From 5e42c73356a684b0f1bc92e032418581cc65162a Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 5 Sep 2013 10:39:17 +0200
Subject: [PATCH] Better fix for unshield, comments on changes, no more
 commented out code.

---
 apps/launcher/CMakeLists.txt              |  2 --
 apps/launcher/unshieldthread.hpp          |  4 ----
 apps/opencs/model/world/refcollection.cpp |  6 ------
 apps/opencs/model/world/refcollection.hpp |  2 +-
 libs/openengine/ogre/lights.cpp           | 16 ----------------
 libs/openengine/ogre/lights.hpp           |  2 ++
 6 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 5908deb90..92cabffff 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -24,7 +24,6 @@ set(LAUNCHER_HEADER
     graphicspage.hpp
     maindialog.hpp
     playpage.hpp
-    unshieldthread.hpp
     textslotmsgbox.hpp
 
     settings/gamesettings.hpp
@@ -47,7 +46,6 @@ set(LAUNCHER_HEADER_MOC
     graphicspage.hpp
     maindialog.hpp
     playpage.hpp
-    unshieldthread.hpp
     textslotmsgbox.hpp
 
     utils/checkablemessagebox.hpp
diff --git a/apps/launcher/unshieldthread.hpp b/apps/launcher/unshieldthread.hpp
index c4e15cccd..655cb5b53 100644
--- a/apps/launcher/unshieldthread.hpp
+++ b/apps/launcher/unshieldthread.hpp
@@ -5,9 +5,7 @@
 
 #include <boost/filesystem.hpp>
 
-#ifndef _WIN32
 #include <libunshield.h>
-#endif
 
 class UnshieldThread : public QThread
 {
@@ -34,9 +32,7 @@ class UnshieldThread : public QThread
     private:
 
         void extract_cab(const boost::filesystem::path& cab, const boost::filesystem::path& output_dir, bool extract_ini = false);
-#ifndef _WIN32
         bool extract_file(Unshield* unshield, boost::filesystem::path output_dir, const char* prefix, int index);
-#endif
         
         boost::filesystem::path mMorrowindPath;
         boost::filesystem::path mTribunalPath;
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index f06cfb545..696aeefaa 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -6,12 +6,6 @@
 #include "ref.hpp"
 #include "cell.hpp"
 
-/*
-CSMWorld::RefCollection::RefCollection (Collection<Cell>& cells)
-: mCells (cells), mNextId (0)
-{}
-*/
-
 void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base)
 {
     Record<Cell> cell = mCells.getRecord (cellIndex);
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index c22f17d7b..b5f8c8064 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -16,7 +16,7 @@ namespace CSMWorld
             int mNextId;
 
         public:
-
+            // MSVC needs the constructor for a class inheriting a template to be defined in header
             RefCollection (Collection<Cell>& cells)
               : mCells (cells), mNextId (0)
             {}
diff --git a/libs/openengine/ogre/lights.cpp b/libs/openengine/ogre/lights.cpp
index ef16e0b2f..348057b84 100644
--- a/libs/openengine/ogre/lights.cpp
+++ b/libs/openengine/ogre/lights.cpp
@@ -6,15 +6,6 @@
 namespace OEngine {
 namespace Render {
 
-/*
-LightFunction::LightFunction(LightType type)
-  : ControllerFunction<Ogre::Real>(true)
-  , mType(type)
-  , mPhase(Ogre::Math::RangeRandom(-500.0f, +500.0f))
-  , mDirection(1.0f)
-{
-}
-*/
 Ogre::Real LightFunction::pulseAmplitude(Ogre::Real time)
 {
     return std::sin(time);
@@ -97,13 +88,6 @@ Ogre::Real LightFunction::calculate(Ogre::Real value)
     return brightness;
 }
 
-/*
-LightValue::LightValue(Ogre::Light *light, const Ogre::ColourValue &color)
-  : mTarget(light)
-  , mColor(color)
-{
-}
-*/
 Ogre::Real LightValue::getValue() const
 {
     return 0.0f;
diff --git a/libs/openengine/ogre/lights.hpp b/libs/openengine/ogre/lights.hpp
index 46b3ff1d0..61d09a0e6 100644
--- a/libs/openengine/ogre/lights.hpp
+++ b/libs/openengine/ogre/lights.hpp
@@ -31,6 +31,7 @@ namespace Render {
         static Ogre::Real flickerFrequency(Ogre::Real phase);
 
     public:
+        // MSVC needs the constructor for a class inheriting a template to be defined in header
         LightFunction(LightType type)
           : ControllerFunction<Ogre::Real>(true)
           , mType(type)
@@ -47,6 +48,7 @@ namespace Render {
         Ogre::ColourValue mColor;
 
     public:
+        // MSVC needs the constructor for a class inheriting a template to be defined in header
         LightValue(Ogre::Light *light, const Ogre::ColourValue &color)
           : mTarget(light)
           , mColor(color)