fix QgsExternalResourceWidget valueChanged signal

3nids · 3nids · commit 4ae8065d2c88 · 2017-05-10T08:43:11.000+02:00
also add some missing ConvertToClassCode
diff --git a/python/gui/qgsexternalresourcewidget.sip b/python/gui/qgsexternalresourcewidget.sip
@@ -1,8 +1,22 @@
 
+%ModuleHeaderCode
+// fix to allow compilation with sip 4.7 that for some reason
+// doesn't add this include to the file where the code from
+// ConvertToSubClassCode goes.
+#include "qgsexternalresourcewidget.h"
+%End
+
 class QgsExternalResourceWidget : QWidget
 {
 %TypeHeaderCode
-#include <qgsexternalresourcewidget.h>
+#include "qgsexternalresourcewidget.h"
+%End
+
+%ConvertToSubClassCode
+  if (dynamic_cast<QgsExternalResourceWidget*>(sipCpp) != NULL)
+    sipType = sipType_QgsExternalResourceWidget;
+  else
+    sipType = NULL;
 %End
 
   public:
diff --git a/python/gui/qgsfilewidget.sip b/python/gui/qgsfilewidget.sip
@@ -1,10 +1,24 @@
 
+%ModuleHeaderCode
+// fix to allow compilation with sip 4.7 that for some reason
+// doesn't add this include to the file where the code from
+// ConvertToSubClassCode goes.
+#include "qgsfilewidget.h"
+%End
+
 class QgsFileWidget : QWidget
 {
 %TypeHeaderCode
 #include <qgsfilewidget.h>
 %End
 
+%ConvertToSubClassCode
+  if (dynamic_cast<QgsFileWidget*>(sipCpp) != NULL)
+    sipType = sipType_QgsFileWidget;
+  else
+    sipType = NULL;
+%End
+
   public:
     /**
      * @brief The StorageMode enum determines if the file picker should pick files or directories
diff --git a/python/gui/qgsfilterlineedit.sip b/python/gui/qgsfilterlineedit.sip
@@ -1,17 +1,23 @@
-/** \class QgsFilterLineEdit
- * \ingroup gui
- * QLineEdit subclass with built in support for clearing the widget's value and
- * handling custom null value representations.
- *
- * When using QgsFilterLineEdit the value(), setValue() and clearValue() methods should be used
- * instead of QLineEdit's text(), setText() and clear() methods, and the valueChanged()
- * signal should be used instead of textChanged().
- **/
+%ModuleHeaderCode
+// fix to allow compilation with sip 4.7 that for some reason
+// doesn't add this include to the file where the code from
+// ConvertToSubClassCode goes.
+#include "qgsfilterlineedit.h"
+%End
+
 class QgsFilterLineEdit : QLineEdit
 {
 %TypeHeaderCode
 #include <qgsfilterlineedit.h>
 %End
+
+%ConvertToSubClassCode
+  if (dynamic_cast<QgsFilterLineEdit*>(sipCpp) != NULL)
+    sipType = sipType_QgsFilterLineEdit;
+  else
+    sipType = NULL;
+%End
+
   public:
 
     //! Behaviour when clearing value of widget
diff --git a/src/gui/qgsexternalresourcewidget.cpp b/src/gui/qgsexternalresourcewidget.cpp
@@ -59,6 +59,7 @@ QgsExternalResourceWidget::QgsExternalResourceWidget( QWidget *parent )
   setLayout( layout );
 
   connect( mFileWidget, SIGNAL( fileChanged( QString ) ), this, SLOT( loadDocument( QString ) ) );
+  connect( mFileWidget, SIGNAL( fileChanged( QString ) ), this, SIGNAL( valueChanged( QString ) ) );
 }
 
 QVariant QgsExternalResourceWidget::documentPath( QVariant::Type type ) const

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ QgsExternalResourceWidget::QgsExternalResourceWidget( QWidget *parent )`
`59`	`59`	`setLayout( layout );`
`60`	`60`
`61`	`61`	`connect( mFileWidget, SIGNAL( fileChanged( QString ) ), this, SLOT( loadDocument( QString ) ) );`
	`62`	`+ connect( mFileWidget, SIGNAL( fileChanged( QString ) ), this, SIGNAL( valueChanged( QString ) ) );`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`QVariant QgsExternalResourceWidget::documentPath( QVariant::Type type ) const`