Temp fix

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

3 files changed, 20 insertions, 12 deletions

diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp
index 078b72af3..12d84005e 100644
--- a/src/modules/objects/class_datetimeedit.cpp
+++ b/src/modules/objects/class_datetimeedit.cpp
@@ -47,7 +47,8 @@
 	@description:
 		This widget provides a push button
 	@functions:
-		!fn: $setText([<text:string>])
+                        !fn: $setDate([<text:string>])
+                        !fn: <string> $date([<format:string>])
                 @signals:
 		!sg: $clicked()
 		This signal is emitted by the default implementation of [classfnc]$clickEvent[/classfnc]().
@@ -57,8 +58,8 @@
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_datetimeedit,"datetimeedit","widget")
 
-        /*KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setText)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,text)
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,date)
+        /*KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,text)
         KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,clickEvent)
         KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setImage)
 */
@@ -81,14 +82,21 @@ bool KviKvsObject_datetimeedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 //	connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
 	return true;
 }
-/*
-KVSO_CLASS_FUNCTION(button,text)
+
+KVSO_CLASS_FUNCTION(datetimeedit,date)
 {
-	CHECK_INTERNAL_POINTER(widget())
-	c->returnValue()->setString(((QPushButton *)widget())->text());
-	return true;
-}
 
+        CHECK_INTERNAL_POINTER(widget())
+        QString szFormat;
+        KVSO_PARAMETERS_BEGIN(c)
+                KVSO_PARAMETER("format",KVS_PT_STRING,0,szFormat)
+        KVSO_PARAMETERS_END(c)
+
+        c->returnValue()->setString(((QDateTimeEdit *)widget())->date().toString(szFormat));
+
+        return true;
+}
+/*
 KVSO_CLASS_FUNCTION(button,setText)
 {
 	CHECK_INTERNAL_POINTER(widget())
diff --git a/src/modules/objects/class_datetimeedit.h b/src/modules/objects/class_datetimeedit.h
index 842934c53..6d15beef8 100644
--- a/src/modules/objects/class_datetimeedit.h
+++ b/src/modules/objects/class_datetimeedit.h
@@ -40,8 +40,8 @@ public:
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 
-/*bool setText(KviKvsObjectFunctionCall *c);
-	bool text(KviKvsObjectFunctionCall *c);
+            bool date(KviKvsObjectFunctionCall *c);
+/*	bool text(KviKvsObjectFunctionCall *c);
 
 	bool setImage(KviKvsObjectFunctionCall *c);
 	bool clickEvent(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/class_sql.cpp
index acf36fbc1..cafab6e5e 100644
--- a/src/modules/objects/class_sql.cpp
+++ b/src/modules/objects/class_sql.cpp
@@ -133,7 +133,7 @@ while (t.hasNext())
 {
     t.next();
     QString szConnectionName=t.key();
-    connectionsDict.value(szConnectionName)->finish();
+  //  connectionsDict.value(szConnectionName)->finish();
    // delete connectionsDict.value(szConnectionName);
     QSqlDatabase::removeDatabase(szConnectionName);
 }