gmenu2x

gmenu2x Commit Details

Date:	2010-07-28 02:36:46 (13 years 4 months ago)
Author:	Maarten ter Huurne
Commit:	d082f7f280d276a36e4db8e390b734cc64259cad
Message:	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.
Files:	src/menusetting.cpp (1 diff) src/menusetting.h (3 diffs) src/menusettingbool.cpp (2 diffs) src/menusettingbool.h (2 diffs) src/menusettingdir.cpp (1 diff) src/menusettingdir.h (1 diff) src/menusettingfile.cpp (1 diff) src/menusettingfile.h (1 diff) src/menusettingimage.cpp (1 diff) src/menusettingimage.h (1 diff) src/menusettingint.cpp (1 diff) src/menusettingint.h (1 diff) src/menusettingmultistring.cpp (1 diff) src/menusettingmultistring.h (3 diffs) src/menusettingrgba.cpp (1 diff) src/menusettingrgba.h (2 diffs) src/menusettingstring.cpp (1 diff) src/menusettingstring.h (1 diff) src/menusettingstringbase.cpp (1 diff) src/menusettingstringbase.h (1 diff)

Change Details

src/menusetting.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusetting.h"
	21	#include "asfont.h"
	22	#include "gmenu2x.h"
21	23
22	24	MenuSetting::MenuSetting(GMenu2X *gmenu2x, const string &name,
23	25	const string &description)

src/menusetting.h
20	20	#ifndef MENUSETTING_H
21	21	#define MENUSETTING_H
22	22
23		#ifdef TARGET_GP2X
24		#include "inputmanager.h"
25		#endif
26
27		#include "gmenu2x.h"
28	23	#include "buttonbox.h"
29	24
30		using std::string;
	25	#include <string>
31	26
32	27	/**
33	28	Base class for different kind of option
...	...
40	35
41	36	ButtonBox buttonBox;
42	37
43		string name, description;
	38	std::string name, description;
44	39
45	40	public:
46		MenuSetting(GMenu2X *gmenu2x, const string &name, const string &description);
	41	MenuSetting(
	42	GMenu2X *gmenu2x, const std::string &name,
	43	const std::string &description);
47	44	virtual ~MenuSetting();
48	45
49	46	virtual void draw(int y);
...	...
54	51	virtual void drawSelected(int y);
55	52	virtual bool edited() = 0;
56	53
57		const string &getDescription() { return description; }
	54	const std::string &getDescription() { return description; }
58	55	};
59	56
60	57	#endif

src/menusettingbool.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingbool.h"
	21	#include "gmenu2x.h"
21	22	#include "utilities.h"
	23
22	24	#include <sstream>
23	25
24		using namespace std;
25		using namespace fastdelegate;
	26	using std::string;
	27	using fastdelegate::MakeDelegate;
26	28
27		MenuSettingBool::MenuSettingBool(GMenu2X gmenu2x, const string &name, const string &description, int value)
	29	MenuSettingBool::MenuSettingBool(
	30	GMenu2X *gmenu2x, const string &name,
	31	const string &description, int *value)
28	32	: MenuSetting(gmenu2x, name, description)
29	33	{
30	34	_ivalue = value;
...	...
34	38	initButton();
35	39	}
36	40
37		MenuSettingBool::MenuSettingBool(GMenu2X gmenu2x, const string &name, const string &description, bool value)
	41	MenuSettingBool::MenuSettingBool(
	42	GMenu2X *gmenu2x, const string &name,
	43	const string &description, bool *value)
38	44	: MenuSetting(gmenu2x, name, description)
39	45	{
40	46	_value = value;

src/menusettingbool.h
20	20	#ifndef MENUSETTINGBOOL_H
21	21	#define MENUSETTINGBOOL_H
22	22
23		#include "iconbutton.h"
24	23	#include "menusetting.h"
25	24
26		using std::string;
27	25	class GMenu2X;
28	26
29	27	class MenuSettingBool : public MenuSetting {
...	...
34	32	bool originalValue;
35	33	bool *_value;
36	34	int *_ivalue;
37		string strvalue;
	35	std::string strvalue;
38	36
39	37	public:
40		MenuSettingBool(GMenu2X gmenu2x, const string &name, const string &description, bool value);
41		MenuSettingBool(GMenu2X gmenu2x, const string &name, const string &description, int value);
42		virtual ~MenuSettingBool() {};
	38	MenuSettingBool(
	39	GMenu2X *gmenu2x, const std::string &name,
	40	const std::string &description, bool *value);
	41	MenuSettingBool(
	42	GMenu2X *gmenu2x, const std::string &name,
	43	const std::string &description, int *value);
	44	virtual ~MenuSettingBool() {}
43	45
44	46	virtual void draw(int y);
45	47	virtual void manageInput();

src/menusettingdir.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingdir.h"
	21	#include "iconbutton.h"
21	22	#include "dirdialog.h"
22	23
23		using namespace std;
24		using namespace fastdelegate;
	24	using std::string;
	25	using fastdelegate::MakeDelegate;
25	26
26	27	MenuSettingDir::MenuSettingDir(
27	28	GMenu2X *gmenu2x, const string &name,

src/menusettingdir.h
22	22
23	23	#include "menusettingstringbase.h"
24	24
25		using std::string;
26
27	25	class MenuSettingDir : public MenuSettingStringBase {
28	26	protected:
29	27	virtual void edit();
30	28
31	29	public:
32	30	MenuSettingDir(
33		GMenu2X *gmenu2x, const string &name,
34		const string &description, string *value);
	31	GMenu2X *gmenu2x, const std::string &name,
	32	const std::string &description, std::string *value);
35	33	virtual ~MenuSettingDir() {}
36	34	};
37	35

src/menusettingfile.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingfile.h"
	21	#include "iconbutton.h"
21	22	#include "filedialog.h"
22	23
23		using namespace std;
24		using namespace fastdelegate;
	24	using std::string;
	25	using fastdelegate::MakeDelegate;
25	26
26	27	MenuSettingFile::MenuSettingFile(
27	28	GMenu2X *gmenu2x, const string &name,

src/menusettingfile.h
22	22
23	23	#include "menusettingstringbase.h"
24	24
25		using std::string;
26
27	25	class MenuSettingFile : public MenuSettingStringBase {
28	26	protected:
29	27	virtual void edit();
30	28
31		string filter;
	29	std::string filter;
32	30
33	31	public:
34	32	MenuSettingFile(
35		GMenu2X *gmenu2x, const string &name,
36		const string &description, string *value,
37		const string &filter = "");
	33	GMenu2X *gmenu2x, const std::string &name,
	34	const std::string &description, std::string *value,
	35	const std::string &filter = "");
38	36	virtual ~MenuSettingFile() {}
39	37	};
40	38

src/menusettingimage.cpp
21	21	#include "imagedialog.h"
22	22	#include "utilities.h"
23	23
24		using namespace std;
	24	using std::string;
25	25
26	26	MenuSettingImage::MenuSettingImage(GMenu2X gmenu2x, const string &name, const string &description, string value, const string &filter)
27	27	: MenuSettingFile(gmenu2x, name, description, value, filter)

src/menusettingimage.h
22	22
23	23	#include "menusettingfile.h"
24	24
25		using std::string;
26
27	25	class MenuSettingImage : public MenuSettingFile {
28	26	protected:
29	27	virtual void edit();
30	28
31	29	public:
32		MenuSettingImage(GMenu2X *gmenu2x, const string &name,
33		const string &description, string *value,
34		const string &filter = "");
	30	MenuSettingImage(GMenu2X *gmenu2x, const std::string &name,
	31	const std::string &description, std::string *value,
	32	const std::string &filter = "");
35	33	virtual ~MenuSettingImage() {}
36	34
37		virtual void setValue(const string &value);
	35	virtual void setValue(const std::string &value);
38	36	};
39	37
40	38	#endif

src/menusettingint.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingint.h"
	21	#include "gmenu2x.h"
21	22	#include "utilities.h"
	23
22	24	#include <sstream>
23	25
24		using namespace std;
25		using namespace fastdelegate;
	26	using std::string;
	27	using std::stringstream;
	28	using fastdelegate::MakeDelegate;
26	29
27	30	MenuSettingInt::MenuSettingInt(GMenu2X gmenu2x, const string &name, const string &description, int value, int min, int max)
28	31	: MenuSetting(gmenu2x,name,description)

src/menusettingint.h
20	20	#ifndef MENUSETTINGINT_H
21	21	#define MENUSETTINGINT_H
22	22
23		#include "iconbutton.h"
24	23	#include "menusetting.h"
25		#include "FastDelegate.h"
26
27		using std::string;
28		class GMenu2X;
29	24
30	25	class MenuSettingInt : public MenuSetting {
31	26	private:
32	27	int originalValue;
33	28	int *_value;
34		string strvalue;
	29	std::string strvalue;
35	30	int min, max;
36	31
37	32	void inc();
38	33	void dec();
39	34
40	35	public:
41		MenuSettingInt(GMenu2X gmenu2x, const string &name, const string &description, int value, int min, int max);
42		virtual ~MenuSettingInt() {};
	36	MenuSettingInt(
	37	GMenu2X *gmenu2x, const std::string &name,
	38	const std::string &description, int *value, int min, int max);
	39	virtual ~MenuSettingInt() {}
43	40
44	41	virtual void manageInput();
45	42	virtual void adjustInput();

src/menusettingmultistring.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingmultistring.h"
	21	#include "gmenu2x.h"
	22	#include "iconbutton.h"
	23	#include "FastDelegate.h"
21	24
22		using namespace std;
23		using namespace fastdelegate;
	25	using std::string;
	26	using std::vector;
	27	using fastdelegate::MakeDelegate;
24	28
25	29	MenuSettingMultiString::MenuSettingMultiString(
26	30	GMenu2X *gmenu2x, const string &name,

src/menusettingmultistring.h
22	22
23	23	#include "menusettingstringbase.h"
24	24
25		using std::string;
	25	#include <vector>
26	26
27	27	class MenuSettingMultiString : public MenuSettingStringBase {
28	28	private:
...	...
30	30	/* never called because manageInput() is overridden */
31	31	}
32	32
33		const vector<string> *choices;
34		uint selected;
	33	const std::vector<std::string> *choices;
	34	int selected;
35	35
36	36	void incSel();
37	37	void decSel();
...	...
39	39
40	40	public:
41	41	MenuSettingMultiString(
42		GMenu2X *gmenu2x, const string &name,
43		const string &description, string *value,
44		const vector<string> *choices);
	42	GMenu2X *gmenu2x, const std::string &name,
	43	const std::string &description, std::string *value,
	44	const std::vector<std::string> *choices);
45	45	virtual ~MenuSettingMultiString() {};
46	46
47	47	virtual void manageInput();

src/menusettingrgba.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingrgba.h"
	21	#include "gmenu2x.h"
	22
21	23	#include <sstream>
22	24
23		using namespace std;
24		using namespace fastdelegate;
	25	using std::string;
	26	using std::stringstream;
	27	using fastdelegate::MakeDelegate;
25	28
26		MenuSettingRGBA::MenuSettingRGBA(GMenu2X gmenu2x, const string &name, const string &description, RGBAColor value)
27		: MenuSetting(gmenu2x,name,description) {
	29	MenuSettingRGBA::MenuSettingRGBA(
	30	GMenu2X *gmenu2x, const string &name,
	31	const string &description, RGBAColor *value)
	32	: MenuSetting(gmenu2x,name,description)
	33	{
28	34	IconButton *btn;
29	35
30	36	selPart = 0;

src/menusettingrgba.h
20	20	#ifndef MENUSETTINGRGBA_H
21	21	#define MENUSETTINGRGBA_H
22	22
23		#include "gmenu2x.h"
24	23	#include "menusetting.h"
25		#include "utilities.h"
	24	#include "surface.h"
26	25
27		using std::string;
	26	class GMenu2X;
28	27
29	28	class MenuSettingRGBA : public MenuSetting {
30	29	private:
31	30	unsigned short selPart;
32	31	int y;
33		string strR, strG, strB, strA;
	32	std::string strR, strG, strB, strA;
34	33	RGBAColor originalValue;
35	34	RGBAColor *_value;
36	35
...	...
40	39	void rightComponent();
41	40
42	41	public:
43		MenuSettingRGBA(GMenu2X gmenu2x, const string &name, const string &description, RGBAColor value);
	42	MenuSettingRGBA(
	43	GMenu2X *gmenu2x, const std::string &name,
	44	const std::string &description, RGBAColor *value);
44	45	virtual ~MenuSettingRGBA() {};
45	46
46	47	virtual void draw(int y);

src/menusettingstring.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingstring.h"
	21	#include "iconbutton.h"
21	22	#include "inputdialog.h"
22	23
23		using namespace std;
24		using namespace fastdelegate;
	24	using std::string;
	25	using fastdelegate::MakeDelegate;
25	26
26	27	MenuSettingString::MenuSettingString(
27	28	GMenu2X *gmenu2x, const string &name,

src/menusettingstring.h
22	22
23	23	#include "menusettingstringbase.h"
24	24
25		using std::string;
26
27	25	class MenuSettingString : public MenuSettingStringBase {
28	26	protected:
29	27	virtual void edit();
30	28
31		string diagTitle, diagIcon;
	29	std::string diagTitle, diagIcon;
32	30
33	31	public:
34		MenuSettingString(GMenu2X *gmenu2x, const string &name,
35		const string &description, string *value,
36		const string &diagTitle = "",
37		const string &diagIcon = "");
	32	MenuSettingString(GMenu2X *gmenu2x, const std::string &name,
	33	const std::string &description, std::string *value,
	34	const std::string &diagTitle = "",
	35	const std::string &diagIcon = "");
38	36	virtual ~MenuSettingString() {}
39	37	};
40	38

src/menusettingstringbase.cpp
18	18	* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
19	19	***************************************************************************/
20	20	#include "menusettingstringbase.h"
	21	#include "gmenu2x.h"
21	22
22		using namespace std;
23		using namespace fastdelegate;
	23	using std::string;
24	24
25	25	MenuSettingStringBase::MenuSettingStringBase(
26	26	GMenu2X *gmenu2x, const string &name,

src/menusettingstringbase.h
22	22
23	23	#include "menusetting.h"
24	24
25		using std::string;
26
27	25	class MenuSettingStringBase : public MenuSetting {
28	26	protected:
29		string originalValue;
30		string *_value;
	27	std::string originalValue;
	28	std::string *_value;
31	29
32	30	virtual void edit() = 0;
33	31	void clear();
34	32
35	33	public:
36	34	MenuSettingStringBase(
37		GMenu2X *gmenu2x, const string &name,
38		const string &description, string *value);
	35	GMenu2X *gmenu2x, const std::string &name,
	36	const std::string &description, std::string *value);
39	37	virtual ~MenuSettingStringBase();
40	38
41	39	virtual void draw(int y);
42	40	virtual void manageInput();
43	41	virtual bool edited();
44	42
45		void setValue(const string &value) { *_value = value; }
46		const string &value() { return *_value; }
	43	void setValue(const std::string &value) { *_value = value; }
	44	const std::string &value() { return *_value; }
47	45	};
48	46
49	47	#endif

Download the corresponding diff file

Branches:
install_locations
master
opkrun
packages

gmenu2x

gmenu2x Commit Details

Change Details

interactive