From de163f013416dc6a55f04eba5b23a7f8a9002c74 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Tue, 23 Sep 2014 12:39:09 +0200
Subject: [PATCH] QtBiomeVisualiser: Fixed confusion about Globals.h.

---
 Tools/QtBiomeVisualiser/ChunkSource.cpp       |  6 ++---
 Tools/QtBiomeVisualiser/GeneratorSetup.cpp    |  2 +-
 Tools/QtBiomeVisualiser/Globals.h             | 24 +++++++++----------
 Tools/QtBiomeVisualiser/MainWindow.cpp        |  6 ++---
 Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index f7174b624..28d184615 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -1,10 +1,10 @@
 #include "Globals.h"
 #include "ChunkSource.h"
 #include <QThread>
-#include "Generating/BioGen.h"
+#include "src/Generating/BioGen.h"
 #include "inifile/iniFile.h"
-#include "StringCompression.h"
-#include "WorldStorage/FastNBT.h"
+#include "src/StringCompression.h"
+#include "src/WorldStorage/FastNBT.h"
 
 
 
diff --git a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
index 239965409..f5412404c 100644
--- a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
+++ b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
@@ -2,7 +2,7 @@
 #include "GeneratorSetup.h"
 #include <QLabel>
 #include <QLineEdit>
-#include "Generating/BioGen.h"
+#include "src/Generating/BioGen.h"
 #include "inifile/iniFile.h"
 
 
diff --git a/Tools/QtBiomeVisualiser/Globals.h b/Tools/QtBiomeVisualiser/Globals.h
index d3c7f0675..8d2e913b7 100644
--- a/Tools/QtBiomeVisualiser/Globals.h
+++ b/Tools/QtBiomeVisualiser/Globals.h
@@ -238,14 +238,14 @@ template class SizeChecker<UInt16, 2>;
 
 #ifndef TEST_GLOBALS
 	// Common headers (part 1, without macros):
-	#include "StringUtils.h"
-	#include "OSSupport/Sleep.h"
-	#include "OSSupport/CriticalSection.h"
-	#include "OSSupport/Semaphore.h"
-	#include "OSSupport/Event.h"
-	#include "OSSupport/Thread.h"
-	#include "OSSupport/File.h"
-	#include "Logger.h"
+	#include "src/StringUtils.h"
+	#include "src/OSSupport/Sleep.h"
+	#include "src/OSSupport/CriticalSection.h"
+	#include "src/OSSupport/Semaphore.h"
+	#include "src/OSSupport/Event.h"
+	#include "src/OSSupport/Thread.h"
+	#include "src/OSSupport/File.h"
+	#include "src/Logger.h"
 #else
 	// Logging functions
 void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1, 2);
@@ -375,10 +375,10 @@ T Clamp(T a_Value, T a_Min, T a_Max)
 
 
 // Common headers (part 2, with macros):
-#include "ChunkDef.h"
-#include "BiomeDef.h"
-#include "BlockID.h"
-#include "BlockInfo.h"
+#include "src/ChunkDef.h"
+#include "src/BiomeDef.h"
+#include "src/BlockID.h"
+#include "src/BlockInfo.h"
 
 
 
diff --git a/Tools/QtBiomeVisualiser/MainWindow.cpp b/Tools/QtBiomeVisualiser/MainWindow.cpp
index a2cfa7794..eb45690c1 100644
--- a/Tools/QtBiomeVisualiser/MainWindow.cpp
+++ b/Tools/QtBiomeVisualiser/MainWindow.cpp
@@ -9,9 +9,9 @@
 #include <QDirIterator>
 #include "inifile/iniFile.h"
 #include "ChunkSource.h"
-#include "Generating/BioGen.h"
-#include "StringCompression.h"
-#include "WorldStorage/FastNBT.h"
+#include "src/Generating/BioGen.h"
+#include "src/StringCompression.h"
+#include "src/WorldStorage/FastNBT.h"
 #include "GeneratorSetup.h"
 
 
diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
index 4275f73eb..d6630bd34 100644
--- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
+++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
@@ -83,8 +83,8 @@ HEADERS  += MainWindow.h \
     GeneratorSetup.h
 
 INCLUDEPATH += $$_PRO_FILE_PWD_ \
-	$$_PRO_FILE_PWD_/../../src \
-	$$_PRO_FILE_PWD_/../../lib
+	$$_PRO_FILE_PWD_/../../lib \
+	$$_PRO_FILE_PWD_/../../
 
 
 CONFIG += C++11