Use forward declarations more to avoid excessive includes

4 files changed, 20 insertions, 9 deletions

diff --git a/src/localbrowser/LocalBrowserModel.cpp b/src/localbrowser/LocalBrowserModel.cpp
index 10290cc..c9fb0d9 100644
--- a/src/localbrowser/LocalBrowserModel.cpp
+++ b/src/localbrowser/LocalBrowserModel.cpp
@@ -7,8 +7,9 @@
 
 #include "LocalBrowserModel.h"
 #include "LocalBrowserView.h"
-#include "client/Client.h"
 #include "LocalBrowserModelException.h"
+#include "client/Client.h"
+#include "client/SaveFile.h"
 
 LocalBrowserModel::LocalBrowserModel():
 	stamp(NULL),
diff --git a/src/localbrowser/LocalBrowserModel.h b/src/localbrowser/LocalBrowserModel.h
index 531cc9b..a0a2956 100644
--- a/src/localbrowser/LocalBrowserModel.h
+++ b/src/localbrowser/LocalBrowserModel.h
@@ -11,11 +11,12 @@
 #include <vector>
 #include <string>
 #include <cmath>
-#include "client/SaveFile.h"
+
+class SaveFile;
 
 class LocalBrowserView;
 class LocalBrowserModel {
-	vector<std::string> selected;
+	std::vector<std::string> selected;
 	SaveFile * stamp;
 	std::vector<std::string> stampIDs;
 	std::vector<SaveFile*> savesList;
@@ -26,14 +27,14 @@ class LocalBrowserModel {
 	void notifySelectedChanged();
 public:
 	LocalBrowserModel();
-	int GetPageCount() { return max(1, (int)(ceil(stampIDs.size()/16))); }
+	int GetPageCount() { return std::max(1, (int)(std::ceil(stampIDs.size()/16))); }
 	int GetPageNum() { return currentPage; }
 	void AddObserver(LocalBrowserView * observer);
 	std::vector<SaveFile *> GetSavesList();
 	void UpdateSavesList(int pageNumber);
 	SaveFile * GetSave();
 	void SetSave(SaveFile * newStamp);
-	vector<std::string> GetSelected() { return selected; }
+	std::vector<std::string> GetSelected() { return selected; }
 	void ClearSelected() { selected.clear(); notifySelectedChanged(); }
 	void SelectSave(std::string stampID);
 	void DeselectSave(std::string stampID);
diff --git a/src/localbrowser/LocalBrowserView.cpp b/src/localbrowser/LocalBrowserView.cpp
index 82182f4..448b5c5 100644
--- a/src/localbrowser/LocalBrowserView.cpp
+++ b/src/localbrowser/LocalBrowserView.cpp
@@ -9,6 +9,12 @@
 #include "client/Client.h"
 #include "LocalBrowserView.h"
 
+#include "interface/Button.h"
+#include "interface/Textbox.h"
+#include "interface/Label.h"
+#include "interface/SaveButton.h"
+#include "interface/Keys.h"
+ 
 #include "dialogues/ErrorMessage.h"
 #include "LocalBrowserController.h"
 #include "LocalBrowserModel.h"
diff --git a/src/localbrowser/LocalBrowserView.h b/src/localbrowser/LocalBrowserView.h
index 3f197e0..71c20ee 100644
--- a/src/localbrowser/LocalBrowserView.h
+++ b/src/localbrowser/LocalBrowserView.h
@@ -10,10 +10,13 @@
 
 #include <vector>
 #include "interface/Window.h"
-#include "interface/Button.h"
-#include "interface/Textbox.h"
-#include "interface/Label.h"
-#include "interface/SaveButton.h"
+
+namespace ui
+{
+	class Label;
+	class Button;
+	class SaveButton;
+}
 
 class LocalBrowserController;
 class LocalBrowserModel;