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

[Richard Dale]

SVN commit 677063 by rdale:

* Removed the various commented out QAbstractItemModel methods as they
  aren't needed
* Fix the code generation for QWizard.cs so it has a C# List for the
  'const QList<QWizard::WizardButton>&', although it doesn't have a
  corresponding marshaller yet

CCMAIL: kde-bindings at kde.org



 M  +8 -0      ChangeLog  
 M  +3 -1      gui/QWizard.cs  
 M  +0 -71     src/qyoto.cpp  


--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #677062:677063
@@ -1,3 +1,11 @@
+2007-06-18  Richard Dale  <rdale at foton.es>
+
+	* Removed the various commented out QAbstractItemModel methods as they
+	  aren't needed
+	* Fix the code generation for QWizard.cs so it has a C# List for the
+	  'const QList<QWizard::WizardButton>&', although it doesn't have a
+	  corresponding marshaller yet
+
 2007-06-13  Richard Dale  <rdale at foton.es>
 
 	* Finished fixing the virtual method callback code
--- trunk/KDE/kdebindings/csharp/qyoto/gui/QWizard.cs #677062:677063
@@ -89,7 +89,6 @@
 			get { return (int) interceptor.Invoke("currentId", "currentId()", typeof(int)); }
 			set { interceptor.Invoke("currentIdChanged$", "currentIdChanged(int)", typeof(void), typeof(int), value); }
 		}
-		// void setButtonLayout(const QList<QWizard::WizardButton>& arg1); >>>> NOT CONVERTED
 		public QWizard(QWidget parent, int flags) : this((Type) null) {
 			CreateProxy();
 			interceptor.Invoke("QWizard#$", "QWizard(QWidget*, Qt::WindowFlags)", typeof(void), typeof(QWidget), parent, typeof(int), flags);
@@ -149,6 +148,9 @@
 		public string ButtonText(QWizard.WizardButton which) {
 			return (string) interceptor.Invoke("buttonText$", "buttonText(QWizard::WizardButton) const", typeof(string), typeof(QWizard.WizardButton), which);
 		}
+		public void SetButtonLayout(List<QWizard.WizardButton> layout) {
+			interceptor.Invoke("setButtonLayout?", "setButtonLayout(const QList<QWizard::WizardButton>&)", typeof(void), typeof(List<QWizard.WizardButton>), layout);
+		}
 		public void SetButton(QWizard.WizardButton which, QAbstractButton button) {
 			interceptor.Invoke("setButton$#", "setButton(QWizard::WizardButton, QAbstractButton*)", typeof(void), typeof(QWizard.WizardButton), which, typeof(QAbstractButton), button);
 		}
--- trunk/KDE/kdebindings/csharp/qyoto/src/qyoto.cpp #677062:677063
@@ -1386,77 +1386,6 @@
 	return (*CreateInstance)("Qyoto.QVariant", ret);
 }
 
-// These are virtual and not pure virtual, so callable methods are generated in C#.
-// Do we still need to override them in our QItemModel class?
-// commented out for now
-/*bool
-QAbstractItemModelSetData(void* obj, void * modelIndex, void * value, int role)
-{
-	smokeqyoto_object *o = (smokeqyoto_object*) (*GetSmokeObject)(obj);
-	smokeqyoto_object *i = (smokeqyoto_object*) (*GetSmokeObject)(modelIndex);
-	smokeqyoto_object *v = (smokeqyoto_object*) (*GetSmokeObject)(value);
-	bool result = ((QAbstractItemModel*) o->ptr)->setData(*(((QModelIndex*) i->ptr)), *((QVariant*) v->ptr), role);
-	(*FreeGCHandle)(obj);
-	(*FreeGCHandle)(modelIndex);
-	(*FreeGCHandle)(value);
-	return result;
-}
-
-int
-QAbstractItemModelFlags(void* obj, void * modelIndex)
-{
-	smokeqyoto_object *o = (smokeqyoto_object*) (*GetSmokeObject)(obj);
-	smokeqyoto_object *i = (smokeqyoto_object*) (*GetSmokeObject)(modelIndex);
-	int result = ((QAbstractItemModel*) o->ptr)->flags(*(((QModelIndex*) i->ptr)));
-	(*FreeGCHandle)(obj);
-	(*FreeGCHandle)(modelIndex);
-	return result;
-}
-
-bool
-QAbstractItemModelInsertRows(void* obj, int row, int count, void * modelIndex)
-{
-	smokeqyoto_object *o = (smokeqyoto_object*) (*GetSmokeObject)(obj);
-	smokeqyoto_object *i = (smokeqyoto_object*) (*GetSmokeObject)(modelIndex);
-	bool result = ((QAbstractItemModel*) o->ptr)->insertRows(row, count, *(((QModelIndex*) i->ptr)));
-	(*FreeGCHandle)(obj);
-	(*FreeGCHandle)(modelIndex);
-	return result;
-}
-
-bool
-QAbstractItemModelInsertColumns(void* obj, int column, int count, void * modelIndex)
-{
-	smokeqyoto_object *o = (smokeqyoto_object*) (*GetSmokeObject)(obj);
-	smokeqyoto_object *i = (smokeqyoto_object*) (*GetSmokeObject)(modelIndex);
-	bool result = ((QAbstractItemModel*) o->ptr)->insertColumns(column, count, *(((QModelIndex*) i->ptr)));
-	(*FreeGCHandle)(obj);
-	(*FreeGCHandle)(modelIndex);
-	return result;
-}
-
-bool
-QAbstractItemModelRemoveRows(void* obj, int row, int count, void * modelIndex)
-{
-	smokeqyoto_object *o = (smokeqyoto_object*) (*GetSmokeObject)(obj);
-	smokeqyoto_object *i = (smokeqyoto_object*) (*GetSmokeObject)(modelIndex);
-	bool result = ((QAbstractItemModel*) o->ptr)->removeRows(row, count, *(((QModelIndex*) i->ptr)));
-	(*FreeGCHandle)(obj);
-	(*FreeGCHandle)(modelIndex);
-	return result;
-}
-
-bool
-QAbstractItemModelRemoveColumns(void* obj, int column, int count, void * modelIndex)
-{
-	smokeqyoto_object *o = (smokeqyoto_object*) (*GetSmokeObject)(obj);
-	smokeqyoto_object *i = (smokeqyoto_object*) (*GetSmokeObject)(modelIndex);
-	bool result = ((QAbstractItemModel*) o->ptr)->removeColumns(column, count, *(((QModelIndex*) i->ptr)));
-	(*FreeGCHandle)(obj);
-	(*FreeGCHandle)(modelIndex);
-	return result;
-}*/
-
 void*
 QAbstractItemModelIndex(void* obj, int row, int column, void * modelIndex)
 {