From: Andrey Paskal <apaskal@gmail.com>
Date: Thu, 24 Dec 2009 16:29:02 +0000 (+0300)
Subject: Change OpenForm slot signature to suit his return type with qtscript
X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=7142ed9492f19778f49e1967737981737d38eb7e;p=projects%2Fananas-labs-qt4.git

Change OpenForm slot signature to suit his return type with qtscript
engine requirements.
Added  /usr/lib/ananas  path for plugins search.
---

diff --git a/src/plugins/aform.cpp b/src/plugins/aform.cpp
index 38ba41f..f82507c 100644
--- a/src/plugins/aform.cpp
+++ b/src/plugins/aform.cpp
@@ -258,13 +258,14 @@ aForm::init()
 			//--form = QWidgetFactory::create( &b );
 			QFormBuilder fb;
 			fb.addPluginPath(QCoreApplication::applicationDirPath() /*"/plugins/designer"*/);
-			/*QList<QDesignerCustomWidgetInterface*> l = fb.customWidgets();
+                        fb.addPluginPath("/usr/lib/ananas/");
+                        /*QList<QDesignerCustomWidgetInterface*> l = fb.customWidgets();
 			int i;
 			for (i=0; i<l.size(); i++)
 			{
 			    aLog::print(aLog::Info, l[i]->name());
 			}*/
-            form = fb.load(&b);
+                        form = fb.load(&b);
 			aLog::print(aLog::Info, tr("aForm form create from ui ok"));
 			b.close();
 		}
diff --git a/src/plugins/engine.cpp b/src/plugins/engine.cpp
index cf4cc8e..cec310b 100644
--- a/src/plugins/engine.cpp
+++ b/src/plugins/engine.cpp
@@ -690,18 +690,18 @@ void aEngine::execAction( aCfgItem &act, QObject *context )
  *\return \~english link on new form or 0 if form not created.
  			\~russian ссылку на новую форму или 0, если форма не создана.\~
  */
-aForm*
+bool
 aEngine::OpenForm(QString fname, int mode, aObject* selecter)//Q_ULLONG ido)
 {
 	aCfgItem object, form;
 
 	form = md->find(fname);
-        if(form.isNull()) return 0;
+        if(form.isNull()) return false;
         object = md->parent(md->parent(form));
-        if(object.isNull()) return 0;
+        if(object.isNull()) return false;
         qulonglong ido =0;
         if(selecter) ido = selecter->sysValue("id").toULongLong();
-        return openForm(atoi(md->attr(object,mda_id)), atoi(md->attr(form,mda_id)), mode, mode, ido);
+        return (0 != openForm(atoi(md->attr(object,mda_id)), atoi(md->attr(form,mda_id)), mode, mode, ido));
 }
 
 
diff --git a/src/plugins/engine.h b/src/plugins/engine.h
index 0208e99..66ef482 100644
--- a/src/plugins/engine.h
+++ b/src/plugins/engine.h
@@ -179,7 +179,7 @@ public slots:
 	void Message(int n, const QString &msg );
 	void StatusMessage( const QString &msg );
 	void settimer(int sec, QString proc);
-	aForm * OpenForm(QString fname, int mode=0, aObject * selecter=0);//Q_ULLONG ido=0);
+        bool OpenForm(QString fname, int mode=0, aObject * selecter=0);//Q_ULLONG ido=0);
 	QVariant value( const QString &name );
 	void setValue( const QString &name, QVariant value = QVariant::Invalid );