Visual Studio build maintenance.

* Fix compiler warnings
* Add Visual Studio 2013 solution
* Tweak .pro files
* Most importantly, rename main 'quackle' project to
  'libquackle' to avoid solution-level name conflict.  This
  only affects the VS build.

18 files changed, 97 insertions, 70 deletions

diff --git a/.gitignore b/.gitignore
index 2511c43..a345851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .sconsign
+.gitattributes
 obj
 Makefile
 Makefile.Debug
@@ -14,6 +15,8 @@ ChangeLog
 *.pfx
 *.cer
 *.dll
+*.vcxproj*
+*.*sdf
 dawginput.raw
 playabilities.raw
 smaller.raw
diff --git a/clock.cpp b/clock.cpp
index b38b0c7..3c40783 100644
--- a/clock.cpp
+++ b/clock.cpp
@@ -36,7 +36,7 @@ void Stopwatch::start()
 int Stopwatch::elapsed() const
 {
 	time_t now = time(NULL);
-	return now - m_startTime;
+	return (int) (now - m_startTime);
 }
 
 bool Stopwatch::exceeded(int seconds) const
diff --git a/datamanager.cpp b/datamanager.cpp
index ca33292..e188668 100644
--- a/datamanager.cpp
+++ b/datamanager.cpp
@@ -42,7 +42,7 @@ DataManager::DataManager()
 {
 	m_self = this;
 	setDataDirectory(".");
-    seedRandomNumbers(time(NULL));
+    seedRandomNumbers((int)time(NULL));
 
 	m_alphabetParameters = new EnglishAlphabetParameters;
 	m_evaluator = new CatchallEvaluator;
diff --git a/encodeleaves/encodeleaves.pro b/encodeleaves/encodeleaves.pro
index 72f0780..f1a51bb 100644
--- a/encodeleaves/encodeleaves.pro
+++ b/encodeleaves/encodeleaves.pro
@@ -26,13 +26,6 @@ QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug
 SOURCES += encodeleaves.cpp
 
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
diff --git a/gaddag.h b/gaddag.h
index ca15a63..1cf6319 100755
--- a/gaddag.h
+++ b/gaddag.h
@@ -47,7 +47,7 @@ GaddagNode::letter() const
 inline bool
 GaddagNode::isTerminal() const
 {
-	return data[3] & 0x40 /*0b01000000*/;
+	return (data[3] & 0x40) != 0 /*0b01000000*/;
 }
 
 inline const GaddagNode *
diff --git a/gaddagize/gaddagize.pro b/gaddagize/gaddagize.pro
index ceae937..63bfb65 100755
--- a/gaddagize/gaddagize.pro
+++ b/gaddagize/gaddagize.pro
@@ -21,13 +21,6 @@ release {
 SOURCES += gaddagize.cpp
 
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
diff --git a/generator.cpp b/generator.cpp
index 5958b72..2bfc199 100644
--- a/generator.cpp
+++ b/generator.cpp
@@ -444,8 +444,8 @@ void Generator::readFromDawg(int index, unsigned int &p, Letter &letter, bool &t
 	p = (QUACKLE_LEXICON_PARAMETERS->dawgAt(index) << 16) + (QUACKLE_LEXICON_PARAMETERS->dawgAt(index + 1) << 8) + (QUACKLE_LEXICON_PARAMETERS->dawgAt(index + 2));
 	letter = QUACKLE_LEXICON_PARAMETERS->dawgAt(index + 3);
 	
-	t = (letter & 32);
-	lastchild = (letter & 64);
+	t = (letter & 32) != 0;
+	lastchild = (letter & 64) != 0;
 	british = !(letter & 128);
 	letter = (letter & 31) + QUACKLE_FIRST_LETTER;
 
diff --git a/lexiconparameters.h b/lexiconparameters.h
index 9935f37..612c103 100644
--- a/lexiconparameters.h
+++ b/lexiconparameters.h
@@ -69,12 +69,12 @@ inline bool LexiconParameters::hasSomething() const
 
 inline bool LexiconParameters::hasDawg() const
 {
-	return m_dawg;
+	return m_dawg != NULL;
 }
 
 inline bool LexiconParameters::hasGaddag() const
 {
-	return m_gaddag;
+	return m_gaddag != NULL;
 }
 
 inline unsigned char LexiconParameters::dawgAt(int index) const
diff --git a/makeminidawg/makeminidawg.pro b/makeminidawg/makeminidawg.pro
index 1432639..8af3bb2 100644
--- a/makeminidawg/makeminidawg.pro
+++ b/makeminidawg/makeminidawg.pro
@@ -28,13 +28,6 @@ HEADERS += minidawgmaker.h
 SOURCES += minidawgmaker.cpp makeminidawgmain.cpp
 
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
diff --git a/quacker/graphicalboard.cpp b/quacker/graphicalboard.cpp
index 0b273f6..12244a1 100644
--- a/quacker/graphicalboard.cpp
+++ b/quacker/graphicalboard.cpp
@@ -1313,7 +1313,7 @@ bool TileWidget::shouldShowVerboseLabels() const
     return m_alwaysShowVerboseLabels || QuackerSettings::self()->verboseLabels;
 }
 
-QFont TileWidget::scaledFont(float multiplier)
+QFont TileWidget::scaledFont(double multiplier)
 {
     const int smallerSideLength = qMin(size().width(), size().height());
 
diff --git a/quacker/graphicalboard.h b/quacker/graphicalboard.h
index dd12430..98971d0 100644
--- a/quacker/graphicalboard.h
+++ b/quacker/graphicalboard.h
@@ -277,7 +277,7 @@ public:
 
 protected:
     QPixmap generateTilePixmap();
-    QFont scaledFont(float multiplier);
+    QFont scaledFont(double multiplier);
     static const double s_defaultLetterScale;
 
     virtual void setOurSize(const QSize &size);
diff --git a/quacker/quacker.pro b/quacker/quacker.pro
index 246a261..9906e45 100644
--- a/quacker/quacker.pro
+++ b/quacker/quacker.pro
@@ -18,10 +18,18 @@ release {
   OBJECTS_DIR = obj/release
 }
 
-QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release
-QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug
+debug {
+	QMAKE_LIBDIR += ../lib/debug ../quackleio/lib/debug
+}
+release {
+	QMAKE_LIBDIR += ../lib/release ../quackleio/lib/release
+}
 
-LIBS += -lquackleio -lquackle
+win32:!win32-g++ {
+  LIBS += -lquackleio -llibquackle
+} else {
+  LIBS += -lquackleio -lquackle
+}
 macx:LIBS += -framework CoreFoundation
 
 # Input
@@ -32,13 +40,6 @@ win32 {
 	RC_FILE = quacker.rc
 }
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx {
 	DEFINES += FORCE_SECONDARY_ARROW_GLYPHS=1
 	ICON = quacker.icns
diff --git a/quackle.pro b/quackle.pro
index ced2577..18d9a33 100644
--- a/quackle.pro
+++ b/quackle.pro
@@ -1,8 +1,12 @@
 TEMPLATE = lib
 INCLUDEPATH += .
 DEPENDPATH += .
-VERSION = 0.9
+VERSION = 0.99
 QT -= gui core
+win32:!win32-g++ { # VS solutions don't like having two projects named "quackle"
+  TARGET = libquackle
+}
+
 debug {
   OBJECTS_DIR = obj/debug
   DESTDIR = lib/debug
@@ -28,13 +32,6 @@ SOURCES -= \
 	makedawg.cpp \
 	quackletest.cpp
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
diff --git a/quackle.vs13.sln b/quackle.vs13.sln
new file mode 100644
index 0000000..d2f1c35
--- /dev/null
+++ b/quackle.vs13.sln
@@ -0,0 +1,68 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quackleio", "quackleio\quackleio.vcxproj", "{BAD88CBC-9AD2-3F72-9749-F31346BF7171}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquackle", "libquackle.vcxproj", "{C37C4456-9D28-3E48-B52C-5E37986AEC95}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quackle", "quacker\Quackle.vcxproj", "{F13F113C-BAAD-311A-8392-5F3889F76921}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C37C4456-9D28-3E48-B52C-5E37986AEC95} = {C37C4456-9D28-3E48-B52C-5E37986AEC95}
+		{BAD88CBC-9AD2-3F72-9749-F31346BF7171} = {BAD88CBC-9AD2-3F72-9749-F31346BF7171}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encodeleaves", "encodeleaves\encodeleaves.vcxproj", "{F439F9A0-CCFF-30E4-AE0F-32364A6013CC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gaddagize", "gaddagize\gaddagize.vcxproj", "{5C52596B-096D-3461-81A4-D1E2412F1ABC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makegaddag", "makegaddag\makegaddag.vcxproj", "{37612E2D-EF31-3E88-91F1-B21CB7E787A2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makeminidawg", "makeminidawg\makeminidawg.vcxproj", "{F4FD634D-4F9F-3C2D-9E01-8065A86FB956}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{A2915271-5A6A-354A-A3B1-092362594CEE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BAD88CBC-9AD2-3F72-9749-F31346BF7171}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BAD88CBC-9AD2-3F72-9749-F31346BF7171}.Debug|Win32.Build.0 = Debug|Win32
+		{BAD88CBC-9AD2-3F72-9749-F31346BF7171}.Release|Win32.ActiveCfg = Release|Win32
+		{BAD88CBC-9AD2-3F72-9749-F31346BF7171}.Release|Win32.Build.0 = Release|Win32
+		{C37C4456-9D28-3E48-B52C-5E37986AEC95}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C37C4456-9D28-3E48-B52C-5E37986AEC95}.Debug|Win32.Build.0 = Debug|Win32
+		{C37C4456-9D28-3E48-B52C-5E37986AEC95}.Release|Win32.ActiveCfg = Release|Win32
+		{C37C4456-9D28-3E48-B52C-5E37986AEC95}.Release|Win32.Build.0 = Release|Win32
+		{F13F113C-BAAD-311A-8392-5F3889F76921}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F13F113C-BAAD-311A-8392-5F3889F76921}.Debug|Win32.Build.0 = Debug|Win32
+		{F13F113C-BAAD-311A-8392-5F3889F76921}.Release|Win32.ActiveCfg = Release|Win32
+		{F13F113C-BAAD-311A-8392-5F3889F76921}.Release|Win32.Build.0 = Release|Win32
+		{F439F9A0-CCFF-30E4-AE0F-32364A6013CC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F439F9A0-CCFF-30E4-AE0F-32364A6013CC}.Debug|Win32.Build.0 = Debug|Win32
+		{F439F9A0-CCFF-30E4-AE0F-32364A6013CC}.Release|Win32.ActiveCfg = Release|Win32
+		{F439F9A0-CCFF-30E4-AE0F-32364A6013CC}.Release|Win32.Build.0 = Release|Win32
+		{5C52596B-096D-3461-81A4-D1E2412F1ABC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5C52596B-096D-3461-81A4-D1E2412F1ABC}.Debug|Win32.Build.0 = Debug|Win32
+		{5C52596B-096D-3461-81A4-D1E2412F1ABC}.Release|Win32.ActiveCfg = Release|Win32
+		{5C52596B-096D-3461-81A4-D1E2412F1ABC}.Release|Win32.Build.0 = Release|Win32
+		{37612E2D-EF31-3E88-91F1-B21CB7E787A2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37612E2D-EF31-3E88-91F1-B21CB7E787A2}.Debug|Win32.Build.0 = Debug|Win32
+		{37612E2D-EF31-3E88-91F1-B21CB7E787A2}.Release|Win32.ActiveCfg = Release|Win32
+		{37612E2D-EF31-3E88-91F1-B21CB7E787A2}.Release|Win32.Build.0 = Release|Win32
+		{F4FD634D-4F9F-3C2D-9E01-8065A86FB956}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4FD634D-4F9F-3C2D-9E01-8065A86FB956}.Debug|Win32.Build.0 = Debug|Win32
+		{F4FD634D-4F9F-3C2D-9E01-8065A86FB956}.Release|Win32.ActiveCfg = Release|Win32
+		{F4FD634D-4F9F-3C2D-9E01-8065A86FB956}.Release|Win32.Build.0 = Release|Win32
+		{A2915271-5A6A-354A-A3B1-092362594CEE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A2915271-5A6A-354A-A3B1-092362594CEE}.Debug|Win32.Build.0 = Debug|Win32
+		{A2915271-5A6A-354A-A3B1-092362594CEE}.Release|Win32.ActiveCfg = Release|Win32
+		{A2915271-5A6A-354A-A3B1-092362594CEE}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/quackleio/iotest/iotest.pro b/quackleio/iotest/iotest.pro
index d1b00f7..0bf472e 100644
--- a/quackleio/iotest/iotest.pro
+++ b/quackleio/iotest/iotest.pro
@@ -23,13 +23,6 @@ QMAKE_LFLAGS_DEBUG += -L../../lib/debug -L../../quackleio/lib/debug
 HEADERS += trademarkedboards.h
 SOURCES += iotest.cpp trademarkedboards.cpp
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro
index 44e6dd1..195b0ad 100644
--- a/quackleio/quackleio.pro
+++ b/quackleio/quackleio.pro
@@ -25,13 +25,6 @@ HEADERS += *.h
 
 SOURCES += *.cpp
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }
diff --git a/sim.cpp b/sim.cpp
index fc99629..f9e36a7 100644
--- a/sim.cpp
+++ b/sim.cpp
@@ -385,7 +385,7 @@ void Simulator::simulate(int plies)
 
 		if (m_simulatedGame.currentPosition().gameOver())
 		{
-			const float wins = spread > 0? 1 : spread == 0? 0.5 : 0;
+			const float wins = spread > 0? 1 : spread == 0? 0.5F : 0;
 			(*moveIt).wins.incorporateValue(wins);
 
 			if (isLogging())
diff --git a/test/test.pro b/test/test.pro
index df1fcd4..0284f47 100644
--- a/test/test.pro
+++ b/test/test.pro
@@ -28,13 +28,6 @@ HEADERS += testharness.h trademarkedboards.h
 SOURCES += testharness.cpp testmain.cpp trademarkedboards.cpp
 
 
-win32:!win32-g++ {
-	QMAKE_CFLAGS_DEBUG     ~= s/-MDd/-MTd/
-	QMAKE_CXXFLAGS_DEBUG   ~= s/-MDd/-MTd/
-	QMAKE_CFLAGS_RELEASE   ~= s/-MD/-MT/
-	QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/
-}
-
 macx-g++ {
     QMAKE_CXXFLAGS += -fpermissive
 }