some fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2745 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 66 insertions, 68 deletions

diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 86549cd43..d642cfe03 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -613,6 +613,3 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock)
 	return true;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_file.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h
index 89bdb0ca9..2f1f047b8 100644
--- a/src/modules/objects/class_file.h
+++ b/src/modules/objects/class_file.h
@@ -33,7 +33,6 @@
 
 class KviKvsObject_file : public KviKvsObject_widget
 {
-	Q_OBJECT
 public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_file)
 protected:
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 86c49e2e9..80cdc01d7 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -104,22 +104,22 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_spinbox,"spinbox","widget")
 
 
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setValue", functionsetValue);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setMinValue", functionsetMinValue);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setMaxValue", functionsetMaxValue);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setLineStep", functionsetLineStep);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setSpecialValueText", functionsetSpecialValueText);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"value",functionvalue);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"minValue", functionminValue);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"maxValue", functionmaxValue);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"lineStep", functionlineStep);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"specialValueText", functionspecialValueText);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setValue);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setMinValue);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setMaxValue);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setLineStep);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setSpecialValueText);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,value);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,minValue);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,maxValue);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,lineStep);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,specialValueText);
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setPrefix", functionsetPrefix);
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"setSuffix", functionsetSuffix);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setPrefix);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,setSuffix);
 
 	
-	KVSO_REGISTER_HANDLER(KviKvsObject_spinbox,"valueChangedEvent", functionvalueChangedEvent);
+	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_spinbox,valueChangedEvent);
 KVSO_END_REGISTERCLASS(KviKvsObject_spinbox)
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_spinbox,KviKvsObject_widget)
@@ -140,114 +140,116 @@ bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 
 
 
-bool KviKvsObject_spinbox::functionsetValue(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setValue)
 {
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iValue;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("value",KVS_PT_INT,0,iValue)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QSpinBox *)widget())->setValue(iValue);
+	((QSpinBox *)widget())->setValue(iValue);
 	return true;
 }
-bool KviKvsObject_spinbox::functionsetMinValue(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setMinValue)
 {
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iMinvalue;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("min_value",KVS_PT_INT,0,iMinvalue)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QSpinBox *)widget())->setMinimum(iMinvalue);
+    ((QSpinBox *)widget())->setMinimum(iMinvalue);
 	return true;
 }
-bool KviKvsObject_spinbox::functionsetMaxValue(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setMaxValue)
 {
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iMaxvalue;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("max_value",KVS_PT_INT,0,iMaxvalue)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QSpinBox *)widget())->setMaximum(iMaxvalue);
+    ((QSpinBox *)widget())->setMaximum(iMaxvalue);
 	return true;
 }
 
-bool KviKvsObject_spinbox::functionsetLineStep(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setLineStep)
 {
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iLinestep;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("line_step",KVS_PT_INT,0,iLinestep)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QSpinBox *)widget())->setSingleStep(iLinestep);
+    ((QSpinBox *)widget())->setSingleStep(iLinestep);
 	return true;
 }
 
 
-bool KviKvsObject_spinbox::functionvalue(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,value)
 {
-	if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->value());
+	CHECK_INTERNAL_POINTER(widget())
+	c->returnValue()->setInteger(((QSpinBox *)widget())->value());
 	return true;
 }
 
-bool KviKvsObject_spinbox::functionminValue(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,minValue)
 {
-	if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->minimum());
+	CHECK_INTERNAL_POINTER(widget())
+	c->returnValue()->setInteger(((QSpinBox *)widget())->minimum());
 	return true;
 }
-bool KviKvsObject_spinbox::functionmaxValue(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,maxValue)
 {
-	if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->maximum());
+	CHECK_INTERNAL_POINTER(widget())
+	c->returnValue()->setInteger(((QSpinBox *)widget())->maximum());
 	return true;
 }
-bool KviKvsObject_spinbox::functionlineStep(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,lineStep)
 {
-	if (widget())
-	{
-			c->returnValue()->setInteger(((QSpinBox *)widget())->singleStep());
-	}
-	
+	CHECK_INTERNAL_POINTER(widget())
+	c->returnValue()->setInteger(((QSpinBox *)widget())->singleStep());
 	return true;
 }
 
 
-bool KviKvsObject_spinbox::functionspecialValueText(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,specialValueText)
 {
-	if (widget()) c->returnValue()->setString(((QSpinBox *)widget())->specialValueText());
+	CHECK_INTERNAL_POINTER(widget())
+	c->returnValue()->setString(((QSpinBox *)widget())->specialValueText());
 	return true;
 }
 
 
-bool KviKvsObject_spinbox::functionsetSpecialValueText(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setSpecialValueText)
 {
-	
+	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
 	KVSO_PARAMETERS_END(c)
-	if(widget())
-		((QSpinBox *)widget())->setSpecialValueText(szText);
+	((QSpinBox *)widget())->setSpecialValueText(szText);
 	return true;
 }
-bool KviKvsObject_spinbox::functionsetPrefix(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setPrefix)
 {
-	
+	CHECK_INTERNAL_POINTER(widget())	
 	QString szPrefix;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szPrefix)
 	KVSO_PARAMETERS_END(c)
-	if(widget())
-		((QSpinBox *)widget())->setPrefix(szPrefix);
+	((QSpinBox *)widget())->setPrefix(szPrefix);
 	return true;
 }
-bool KviKvsObject_spinbox::functionsetSuffix(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,setSuffix)
 {
-	
+	CHECK_INTERNAL_POINTER(widget())	
 	QString szSuffix;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szSuffix)
 	KVSO_PARAMETERS_END(c)
-	if(widget())
-		((QSpinBox *)widget())->setSuffix(szSuffix);
+	((QSpinBox *)widget())->setSuffix(szSuffix);
 	return true;
 }
 
-bool KviKvsObject_spinbox::functionvalueChangedEvent(KviKvsObjectFunctionCall *c)
+KVSO_CLASS_FUNCTION(spinbox,valueChangedEvent)
 {
 	emitSignal("valueChanged",c,c->params());
 	return true;
diff --git a/src/modules/objects/class_spinbox.h b/src/modules/objects/class_spinbox.h
index 8f20a3496..f7493dd5a 100644
--- a/src/modules/objects/class_spinbox.h
+++ b/src/modules/objects/class_spinbox.h
@@ -40,22 +40,22 @@ public:
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 
-	bool functionsetTracking(KviKvsObjectFunctionCall *c);
+	bool setTracking(KviKvsObjectFunctionCall *c);
 
-	bool functionsetValue(KviKvsObjectFunctionCall *c);
-	bool functionsetMinValue(KviKvsObjectFunctionCall *c);
-	bool functionsetMaxValue(KviKvsObjectFunctionCall *c);
-	bool functionsetLineStep(KviKvsObjectFunctionCall *c);
-	bool functionsetPrefix(KviKvsObjectFunctionCall *c);
-	bool functionsetSuffix(KviKvsObjectFunctionCall *c);
-	bool functionvalue(KviKvsObjectFunctionCall *c);
-	bool functionminValue(KviKvsObjectFunctionCall *c);
-	bool functionmaxValue(KviKvsObjectFunctionCall *c);
-	bool functionlineStep(KviKvsObjectFunctionCall *c);
-	bool functionsetSpecialValueText(KviKvsObjectFunctionCall *c);
-	bool functionspecialValueText(KviKvsObjectFunctionCall *c);
+	bool setValue(KviKvsObjectFunctionCall *c);
+	bool setMinValue(KviKvsObjectFunctionCall *c);
+	bool setMaxValue(KviKvsObjectFunctionCall *c);
+	bool setLineStep(KviKvsObjectFunctionCall *c);
+	bool setPrefix(KviKvsObjectFunctionCall *c);
+	bool setSuffix(KviKvsObjectFunctionCall *c);
+	bool value(KviKvsObjectFunctionCall *c);
+	bool minValue(KviKvsObjectFunctionCall *c);
+	bool maxValue(KviKvsObjectFunctionCall *c);
+	bool lineStep(KviKvsObjectFunctionCall *c);
+	bool setSpecialValueText(KviKvsObjectFunctionCall *c);
+	bool specialValueText(KviKvsObjectFunctionCall *c);
 	
-	bool functionvalueChangedEvent(KviKvsObjectFunctionCall *c);
+	bool valueChangedEvent(KviKvsObjectFunctionCall *c);
 	
 protected slots:
 	void valueChanged(int);
diff --git a/src/modules/objects/objects_QT4_vc05.vcproj b/src/modules/objects/objects_QT4_vc05.vcproj
index a088a7175..982ec0071 100644
--- a/src/modules/objects/objects_QT4_vc05.vcproj
+++ b/src/modules/objects/objects_QT4_vc05.vcproj
@@ -521,8 +521,8 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\m_$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"
-						Outputs="$(InputDir)\m_$(InputName).moc"
+						CommandLine=""
+						Outputs=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration