src/config.h

changeset 298
f945fc8dae9e
parent 286
7a562bf3d829
child 299
db60288fc36a
--- a/src/config.h	Fri Jun 21 17:29:29 2013 +0300
+++ b/src/config.h	Fri Jun 21 17:36:50 2013 +0300
@@ -23,13 +23,16 @@
 
 // =============================================================================
 #include <QString>
-#include <qkeysequence.h>
+#include <QKeySequence>
+
+typedef QChar qchar;
+typedef QString str;
 
 #define MAX_INI_LINE 512
 #define MAX_CONFIG 512
 
 #define cfg(T, NAME, DEFAULT) \
-	T##config NAME (DEFAULT, #NAME, #T, #DEFAULT)
+	T##config NAME (DEFAULT, #NAME)
 
 #define extern_cfg(T, NAME) \
 	extern T##config NAME
@@ -47,7 +50,7 @@
 // =========================================================
 class config {
 public:
-	const char* name, *typestring, *defaultstring;
+	const char* name;
 	
 	virtual configtype_e getType () {
 		return CONFIG_none;
@@ -111,13 +114,10 @@
 #define IMPLEMENT_CONFIG(T) \
 	T value, defval; \
 	\
-	T##config (T _defval, const char* _name, const char* _typestring, \
-		const char* _defaultstring) \
+	T##config (T _defval, const char* _name) \
 	{ \
 		value = defval = _defval; \
 		name = _name; \
-		typestring = _typestring; \
-		defaultstring = _defaultstring; \
 		addConfig (this); \
 	} \
 	operator T () { \

mercurial