[Kde-bindings] KDE/kdebindings/csharp/qyoto

[Arno Rehn]

SVN commit 698994 by arnorehn:

* Fixed generation of ToolBarArea and DockWidgetArea related stuff in
  uics.

CCMAIL: kde-bindings at kde.org



 M  +4 -1      ChangeLog  
 M  +6 -8      tools/uics/cs/cswriteinitialization.cpp  


--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #698993:698994
@@ -1,7 +1,10 @@
 2007-08-11  Arno Rehn  <arno at arnorehn.de>
 
-	* Check for a GCHandle being zero before freeing it.
+	* If a marshaller is given a zero pointer, return zero and don't free
+	  the GCHandle.
 	* Added implicit type conversions for QUrl.
+	* Fixed generation of ToolBarArea and DockWidgetArea related stuff in
+	  uics.
 
 2007-08-09  Richard Dale  <rdale at foton.es>
 
--- trunk/KDE/kdebindings/csharp/qyoto/tools/uics/cs/cswriteinitialization.cpp #698993:698994
@@ -535,12 +535,11 @@
         } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBar"))) {
             QString area;
             if (const DomProperty *pstyle = attributes.value(QLatin1String("toolBarArea"))) {
-                area += QLatin1String("(Qt.ToolBarArea)(");
-                area += QString::number(pstyle->elementNumber());
-                area += "), ";
+                   area += QLatin1String("Qt.ToolBarArea.");
+                   area += pstyle->elementEnum();
             }
 
-            m_output << m_option.indent << parentWidget << ".AddToolBar(" << area << varName << ");\n";
+            m_output << m_option.indent << parentWidget << ".AddToolBar(" << area << ", " << varName << ");\n";
 
             if (const DomProperty *pbreak = attributes.value(QLatin1String("toolBarBreak"))) {
                 if (pbreak->elementBool() == QLatin1String("true")) {
@@ -551,12 +550,11 @@
         } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QDockWidget"))) {
             QString area;
             if (const DomProperty *pstyle = attributes.value(QLatin1String("dockWidgetArea"))) {
-                area += QLatin1String("(Qt.DockWidgetArea)(");
-                area += QString::number(pstyle->elementNumber());
-                area += "), ";
+                area += QLatin1String("Qt.DockWidgetArea.");
+                area += pstyle->elementEnum();
             }
 
-            m_output << m_option.indent << parentWidget << ".AddDockWidget(" << area << varName << ");\n";
+            m_output << m_option.indent << parentWidget << ".AddDockWidget(" << area << ", " << varName << ");\n";
         } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) {
             m_output << m_option.indent << parentWidget << ".SetStatusBar(" << varName << ");\n";
         } else if (className == QLatin1String("QWidget")) {