From d082f7f280d276a36e4db8e390b734cc64259cad Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Wed, 28 Jul 2010 02:36:46 +0200
Subject: [PATCH] Minimize namespace pollution in MenuSetting class hierarchy.

This should be done for all source files, but it is too much to do all at once.
---
 src/menusetting.cpp            |  2 ++
 src/menusetting.h              | 15 ++++++---------
 src/menusettingbool.cpp        | 14 ++++++++++----
 src/menusettingbool.h          | 14 ++++++++------
 src/menusettingdir.cpp         |  5 +++--
 src/menusettingdir.h           |  6 ++----
 src/menusettingfile.cpp        |  5 +++--
 src/menusettingfile.h          | 10 ++++------
 src/menusettingimage.cpp       |  2 +-
 src/menusettingimage.h         | 10 ++++------
 src/menusettingint.cpp         |  7 +++++--
 src/menusettingint.h           | 13 +++++--------
 src/menusettingmultistring.cpp |  8 ++++++--
 src/menusettingmultistring.h   | 12 ++++++------
 src/menusettingrgba.cpp        | 14 ++++++++++----
 src/menusettingrgba.h          | 11 ++++++-----
 src/menusettingstring.cpp      |  5 +++--
 src/menusettingstring.h        | 12 +++++-------
 src/menusettingstringbase.cpp  |  4 ++--
 src/menusettingstringbase.h    | 14 ++++++--------
 20 files changed, 97 insertions(+), 86 deletions(-)

diff --git a/src/menusetting.cpp b/src/menusetting.cpp
index 97ff1f4..5cdc54c 100644
--- a/src/menusetting.cpp
+++ b/src/menusetting.cpp
@@ -18,6 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusetting.h"
+#include "asfont.h"
+#include "gmenu2x.h"
 
 MenuSetting::MenuSetting(GMenu2X *gmenu2x, const string &name,
 		const string &description)
diff --git a/src/menusetting.h b/src/menusetting.h
index 32b7864..ceb8b54 100644
--- a/src/menusetting.h
+++ b/src/menusetting.h
@@ -20,14 +20,9 @@
 #ifndef MENUSETTING_H
 #define MENUSETTING_H
 
-#ifdef TARGET_GP2X
-#include "inputmanager.h"
-#endif
-
-#include "gmenu2x.h"
 #include "buttonbox.h"
 
-using std::string;
+#include <string>
 
 /**
 Base class for different kind of option
@@ -40,10 +35,12 @@ protected:
 
 	ButtonBox buttonBox;
 
-	string name, description;
+	std::string name, description;
 
 public:
-	MenuSetting(GMenu2X *gmenu2x, const string &name, const string &description);
+	MenuSetting(
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description);
 	virtual ~MenuSetting();
 
 	virtual void draw(int y);
@@ -54,7 +51,7 @@ public:
 	virtual void drawSelected(int y);
 	virtual bool edited() = 0;
 
-	const string &getDescription() { return description; }
+	const std::string &getDescription() { return description; }
 };
 
 #endif
diff --git a/src/menusettingbool.cpp b/src/menusettingbool.cpp
index ff3faaa..d25f527 100644
--- a/src/menusettingbool.cpp
+++ b/src/menusettingbool.cpp
@@ -18,13 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingbool.h"
+#include "gmenu2x.h"
 #include "utilities.h"
+
 #include <sstream>
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using fastdelegate::MakeDelegate;
 
-MenuSettingBool::MenuSettingBool(GMenu2X *gmenu2x, const string &name, const string &description, int *value)
+MenuSettingBool::MenuSettingBool(
+		GMenu2X *gmenu2x, const string &name,
+		const string &description, int *value)
 	: MenuSetting(gmenu2x, name, description)
 {
 	_ivalue = value;
@@ -34,7 +38,9 @@ MenuSettingBool::MenuSettingBool(GMenu2X *gmenu2x, const string &name, const str
 	initButton();
 }
 
-MenuSettingBool::MenuSettingBool(GMenu2X *gmenu2x, const string &name, const string &description, bool *value)
+MenuSettingBool::MenuSettingBool(
+		GMenu2X *gmenu2x, const string &name,
+		const string &description, bool *value)
 	: MenuSetting(gmenu2x, name, description)
 {
 	_value = value;
diff --git a/src/menusettingbool.h b/src/menusettingbool.h
index 9b5a3d8..65738d1 100644
--- a/src/menusettingbool.h
+++ b/src/menusettingbool.h
@@ -20,10 +20,8 @@
 #ifndef MENUSETTINGBOOL_H
 #define MENUSETTINGBOOL_H
 
-#include "iconbutton.h"
 #include "menusetting.h"
 
-using std::string;
 class GMenu2X;
 
 class MenuSettingBool : public MenuSetting {
@@ -34,12 +32,16 @@ private:
 	bool originalValue;
 	bool *_value;
 	int *_ivalue;
-	string strvalue;
+	std::string strvalue;
 
 public:
-	MenuSettingBool(GMenu2X *gmenu2x, const string &name, const string &description, bool *value);
-	MenuSettingBool(GMenu2X *gmenu2x, const string &name, const string &description, int *value);
-	virtual ~MenuSettingBool() {};
+	MenuSettingBool(
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, bool *value);
+	MenuSettingBool(
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, int *value);
+	virtual ~MenuSettingBool() {}
 
 	virtual void draw(int y);
 	virtual void manageInput();
diff --git a/src/menusettingdir.cpp b/src/menusettingdir.cpp
index 0e6c6d2..6a410b2 100644
--- a/src/menusettingdir.cpp
+++ b/src/menusettingdir.cpp
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingdir.h"
+#include "iconbutton.h"
 #include "dirdialog.h"
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using fastdelegate::MakeDelegate;
 
 MenuSettingDir::MenuSettingDir(
 		GMenu2X *gmenu2x, const string &name,
diff --git a/src/menusettingdir.h b/src/menusettingdir.h
index 0f287bb..01d82c0 100644
--- a/src/menusettingdir.h
+++ b/src/menusettingdir.h
@@ -22,16 +22,14 @@
 
 #include "menusettingstringbase.h"
 
-using std::string;
-
 class MenuSettingDir : public MenuSettingStringBase {
 protected:
 	virtual void edit();
 
 public:
 	MenuSettingDir(
-			GMenu2X *gmenu2x, const string &name,
-			const string &description, string *value);
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, std::string *value);
 	virtual ~MenuSettingDir() {}
 };
 
diff --git a/src/menusettingfile.cpp b/src/menusettingfile.cpp
index 2907a19..cad6bd5 100644
--- a/src/menusettingfile.cpp
+++ b/src/menusettingfile.cpp
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingfile.h"
+#include "iconbutton.h"
 #include "filedialog.h"
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using fastdelegate::MakeDelegate;
 
 MenuSettingFile::MenuSettingFile(
 		GMenu2X *gmenu2x, const string &name,
diff --git a/src/menusettingfile.h b/src/menusettingfile.h
index 9ae10e3..0ad5cdb 100644
--- a/src/menusettingfile.h
+++ b/src/menusettingfile.h
@@ -22,19 +22,17 @@
 
 #include "menusettingstringbase.h"
 
-using std::string;
-
 class MenuSettingFile : public MenuSettingStringBase {
 protected:
 	virtual void edit();
 
-	string filter;
+	std::string filter;
 
 public:
 	MenuSettingFile(
-			GMenu2X *gmenu2x, const string &name,
-			const string &description, string *value,
-			const string &filter = "");
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, std::string *value,
+			const std::string &filter = "");
 	virtual ~MenuSettingFile() {}
 };
 
diff --git a/src/menusettingimage.cpp b/src/menusettingimage.cpp
index 1a2df52..d6738f1 100644
--- a/src/menusettingimage.cpp
+++ b/src/menusettingimage.cpp
@@ -21,7 +21,7 @@
 #include "imagedialog.h"
 #include "utilities.h"
 
-using namespace std;
+using std::string;
 
 MenuSettingImage::MenuSettingImage(GMenu2X *gmenu2x, const string &name, const string &description, string *value, const string &filter)
 	: MenuSettingFile(gmenu2x, name, description, value, filter)
diff --git a/src/menusettingimage.h b/src/menusettingimage.h
index 6aa7546..a99bddf 100644
--- a/src/menusettingimage.h
+++ b/src/menusettingimage.h
@@ -22,19 +22,17 @@
 
 #include "menusettingfile.h"
 
-using std::string;
-
 class MenuSettingImage : public MenuSettingFile {
 protected:
 	virtual void edit();
 
 public:
-	MenuSettingImage(GMenu2X *gmenu2x, const string &name,
-					 const string &description, string *value,
-					 const string &filter = "");
+	MenuSettingImage(GMenu2X *gmenu2x, const std::string &name,
+					 const std::string &description, std::string *value,
+					 const std::string &filter = "");
 	virtual ~MenuSettingImage() {}
 
-	virtual void setValue(const string &value);
+	virtual void setValue(const std::string &value);
 };
 
 #endif
diff --git a/src/menusettingint.cpp b/src/menusettingint.cpp
index 957aafd..b7faad7 100644
--- a/src/menusettingint.cpp
+++ b/src/menusettingint.cpp
@@ -18,11 +18,14 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingint.h"
+#include "gmenu2x.h"
 #include "utilities.h"
+
 #include <sstream>
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using std::stringstream;
+using fastdelegate::MakeDelegate;
 
 MenuSettingInt::MenuSettingInt(GMenu2X *gmenu2x, const string &name, const string &description, int *value, int min, int max)
 	: MenuSetting(gmenu2x,name,description)
diff --git a/src/menusettingint.h b/src/menusettingint.h
index 529d357..153c800 100644
--- a/src/menusettingint.h
+++ b/src/menusettingint.h
@@ -20,26 +20,23 @@
 #ifndef MENUSETTINGINT_H
 #define MENUSETTINGINT_H
 
-#include "iconbutton.h"
 #include "menusetting.h"
-#include "FastDelegate.h"
-
-using std::string;
-class GMenu2X;
 
 class MenuSettingInt : public MenuSetting {
 private:
 	int originalValue;
 	int *_value;
-	string strvalue;
+	std::string strvalue;
 	int min, max;
 
 	void inc();
 	void dec();
 
 public:
-	MenuSettingInt(GMenu2X *gmenu2x, const string &name, const string &description, int *value, int min, int max);
-	virtual ~MenuSettingInt() {};
+	MenuSettingInt(
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, int *value, int min, int max);
+	virtual ~MenuSettingInt() {}
 
 	virtual void manageInput();
 	virtual void adjustInput();
diff --git a/src/menusettingmultistring.cpp b/src/menusettingmultistring.cpp
index ca499e2..dd3d8a9 100644
--- a/src/menusettingmultistring.cpp
+++ b/src/menusettingmultistring.cpp
@@ -18,9 +18,13 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingmultistring.h"
+#include "gmenu2x.h"
+#include "iconbutton.h"
+#include "FastDelegate.h"
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using std::vector;
+using fastdelegate::MakeDelegate;
 
 MenuSettingMultiString::MenuSettingMultiString(
 		GMenu2X *gmenu2x, const string &name,
diff --git a/src/menusettingmultistring.h b/src/menusettingmultistring.h
index b46ed00..4340c9b 100644
--- a/src/menusettingmultistring.h
+++ b/src/menusettingmultistring.h
@@ -22,7 +22,7 @@
 
 #include "menusettingstringbase.h"
 
-using std::string;
+#include <vector>
 
 class MenuSettingMultiString : public MenuSettingStringBase {
 private:
@@ -30,8 +30,8 @@ private:
 		/* never called because manageInput() is overridden */
 	}
 
-	const vector<string> *choices;
-	uint selected;
+	const std::vector<std::string> *choices;
+	int selected;
 
 	void incSel();
 	void decSel();
@@ -39,9 +39,9 @@ private:
 
 public:
 	MenuSettingMultiString(
-			GMenu2X *gmenu2x, const string &name,
-			const string &description, string *value,
-			const vector<string> *choices);
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, std::string *value,
+			const std::vector<std::string> *choices);
 	virtual ~MenuSettingMultiString() {};
 
 	virtual void manageInput();
diff --git a/src/menusettingrgba.cpp b/src/menusettingrgba.cpp
index 959192a..8ebaf76 100644
--- a/src/menusettingrgba.cpp
+++ b/src/menusettingrgba.cpp
@@ -18,13 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingrgba.h"
+#include "gmenu2x.h"
+
 #include <sstream>
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using std::stringstream;
+using fastdelegate::MakeDelegate;
 
-MenuSettingRGBA::MenuSettingRGBA(GMenu2X *gmenu2x, const string &name, const string &description, RGBAColor *value)
-	: MenuSetting(gmenu2x,name,description) {
+MenuSettingRGBA::MenuSettingRGBA(
+		GMenu2X *gmenu2x, const string &name,
+		const string &description, RGBAColor *value)
+	: MenuSetting(gmenu2x,name,description)
+{
 	IconButton *btn;
 
 	selPart = 0;
diff --git a/src/menusettingrgba.h b/src/menusettingrgba.h
index 0592e92..72453db 100644
--- a/src/menusettingrgba.h
+++ b/src/menusettingrgba.h
@@ -20,17 +20,16 @@
 #ifndef MENUSETTINGRGBA_H
 #define MENUSETTINGRGBA_H
 
-#include "gmenu2x.h"
 #include "menusetting.h"
-#include "utilities.h"
+#include "surface.h"
 
-using std::string;
+class GMenu2X;
 
 class MenuSettingRGBA : public MenuSetting {
 private:
 	unsigned short selPart;
 	int y;
-	string strR, strG, strB, strA;
+	std::string strR, strG, strB, strA;
 	RGBAColor originalValue;
 	RGBAColor *_value;
 
@@ -40,7 +39,9 @@ private:
 	void rightComponent();
 
 public:
-	MenuSettingRGBA(GMenu2X *gmenu2x, const string &name, const string &description, RGBAColor *value);
+	MenuSettingRGBA(
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, RGBAColor *value);
 	virtual ~MenuSettingRGBA() {};
 
 	virtual void draw(int y);
diff --git a/src/menusettingstring.cpp b/src/menusettingstring.cpp
index 6befd6d..095354c 100644
--- a/src/menusettingstring.cpp
+++ b/src/menusettingstring.cpp
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingstring.h"
+#include "iconbutton.h"
 #include "inputdialog.h"
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
+using fastdelegate::MakeDelegate;
 
 MenuSettingString::MenuSettingString(
 		GMenu2X *gmenu2x, const string &name,
diff --git a/src/menusettingstring.h b/src/menusettingstring.h
index 5b7f3af..acf03f7 100644
--- a/src/menusettingstring.h
+++ b/src/menusettingstring.h
@@ -22,19 +22,17 @@
 
 #include "menusettingstringbase.h"
 
-using std::string;
-
 class MenuSettingString : public MenuSettingStringBase {
 protected:
 	virtual void edit();
 
-	string diagTitle, diagIcon;
+	std::string diagTitle, diagIcon;
 
 public:
-	MenuSettingString(GMenu2X *gmenu2x, const string &name,
-					  const string &description, string *value,
-					  const string &diagTitle = "",
-					  const string &diagIcon = "");
+	MenuSettingString(GMenu2X *gmenu2x, const std::string &name,
+					  const std::string &description, std::string *value,
+					  const std::string &diagTitle = "",
+					  const std::string &diagIcon = "");
 	virtual ~MenuSettingString() {}
 };
 
diff --git a/src/menusettingstringbase.cpp b/src/menusettingstringbase.cpp
index 9aeb34c..245ce77 100644
--- a/src/menusettingstringbase.cpp
+++ b/src/menusettingstringbase.cpp
@@ -18,9 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "menusettingstringbase.h"
+#include "gmenu2x.h"
 
-using namespace std;
-using namespace fastdelegate;
+using std::string;
 
 MenuSettingStringBase::MenuSettingStringBase(
 		GMenu2X *gmenu2x, const string &name,
diff --git a/src/menusettingstringbase.h b/src/menusettingstringbase.h
index 979441b..396bab8 100644
--- a/src/menusettingstringbase.h
+++ b/src/menusettingstringbase.h
@@ -22,28 +22,26 @@
 
 #include "menusetting.h"
 
-using std::string;
-
 class MenuSettingStringBase : public MenuSetting {
 protected:
-	string originalValue;
-	string *_value;
+	std::string originalValue;
+	std::string *_value;
 
 	virtual void edit() = 0;
 	void clear();
 
 public:
 	MenuSettingStringBase(
-			GMenu2X *gmenu2x, const string &name,
-			const string &description, string *value);
+			GMenu2X *gmenu2x, const std::string &name,
+			const std::string &description, std::string *value);
 	virtual ~MenuSettingStringBase();
 
 	virtual void draw(int y);
 	virtual void manageInput();
 	virtual bool edited();
 
-	void setValue(const string &value) { *_value = value; }
-	const string &value() { return *_value; }
+	void setValue(const std::string &value) { *_value = value; }
+	const std::string &value() { return *_value; }
 };
 
 #endif