[QGIS Commit] r15575 - in trunk/qgis: python/gui src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-22 17:58:54 -0700 (Tue, 22 Mar 2011)
New Revision: 15575

Modified:
   trunk/qgis/python/gui/qgsattributeeditor.sip
   trunk/qgis/python/gui/qgsfieldvalidator.sip
   trunk/qgis/python/gui/qgslegendinterface.sip
   trunk/qgis/src/gui/qgsattributeeditor.cpp
   trunk/qgis/src/gui/qgsattributeeditor.h
Log:
fix build error

Modified: trunk/qgis/python/gui/qgsattributeeditor.sip
===================================================================
--- trunk/qgis/python/gui/qgsattributeeditor.sip	2011-03-23 00:51:38 UTC (rev 15574)
+++ trunk/qgis/python/gui/qgsattributeeditor.sip	2011-03-23 00:58:54 UTC (rev 15575)
@@ -1,5 +1,6 @@
-/* \brief create attribute widget for editing */
-class QgsAttributeEditor : public QObject
+
+// \brief create attribute widget for editing
+class QgsAttributeEditor : QObject
 {
 %TypeHeaderCode
 #include <qgsattributeeditor.h>
@@ -11,6 +12,6 @@
     static bool setValue( QWidget *widget, QgsVectorLayer *vl, int idx, const QVariant &value );
 
   public slots:
-    void selectFileName( void );
-    void selectDate( void );
+    void selectFileName();
+    void selectDate();
 };

Modified: trunk/qgis/python/gui/qgsfieldvalidator.sip
===================================================================
--- trunk/qgis/python/gui/qgsfieldvalidator.sip	2011-03-23 00:51:38 UTC (rev 15574)
+++ trunk/qgis/python/gui/qgsfieldvalidator.sip	2011-03-23 00:58:54 UTC (rev 15575)
@@ -1,4 +1,5 @@
-class QgsFieldValidator : public QValidator
+
+class QgsFieldValidator : QValidator
 {
 %TypeHeaderCode
 #include <qgsfieldvalidator.h>

Modified: trunk/qgis/python/gui/qgslegendinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgslegendinterface.sip	2011-03-23 00:51:38 UTC (rev 15574)
+++ trunk/qgis/python/gui/qgslegendinterface.sip	2011-03-23 00:58:54 UTC (rev 15575)
@@ -51,7 +51,7 @@
 
     //! Add a new group
     //! @note added parent parameter in 1.7
-    virtual int addGroup( QString name, bool expand = true, QTreeWidgetItem* parent =0 ) =0;
+    virtual int addGroup( QString name, bool expand = true, QTreeWidgetItem* parent =0 ) = 0;
 
     //! Remove group on index
     virtual void removeGroup( int groupIndex ) =0;

Modified: trunk/qgis/src/gui/qgsattributeeditor.cpp
===================================================================
--- trunk/qgis/src/gui/qgsattributeeditor.cpp	2011-03-23 00:51:38 UTC (rev 15574)
+++ trunk/qgis/src/gui/qgsattributeeditor.cpp	2011-03-23 00:58:54 UTC (rev 15575)
@@ -40,7 +40,7 @@
 #include <QDialogButtonBox>
 #include <QSettings>
 
-void QgsAttributeEditor::selectFileName( void )
+void QgsAttributeEditor::selectFileName()
 {
   QPushButton *pb = qobject_cast<QPushButton *>( sender() );
   if ( !pb )
@@ -61,7 +61,7 @@
   le->setText( fileName );
 }
 
-void QgsAttributeEditor::selectDate( void )
+void QgsAttributeEditor::selectDate()
 {
   QPushButton *pb = qobject_cast<QPushButton *>( sender() );
   if ( !pb )

Modified: trunk/qgis/src/gui/qgsattributeeditor.h
===================================================================
--- trunk/qgis/src/gui/qgsattributeeditor.h	2011-03-23 00:51:38 UTC (rev 15574)
+++ trunk/qgis/src/gui/qgsattributeeditor.h	2011-03-23 00:58:54 UTC (rev 15575)
@@ -40,8 +40,8 @@
     static QComboBox *comboBox( QWidget *editor, QWidget *parent );
 
   public slots:
-    void selectFileName( void );
-    void selectDate( void );
+    void selectFileName();
+    void selectDate();
 };