move QgsSearchQuery builder from app to gui

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14867 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 8, 2010 · 67aefb3 · 67aefb3
1 parent e554840
commit 67aefb3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -32,5 +32,6 @@
 %Include qgsrubberband.sip
 %Include qgstextannotationitem.sip
 %Include qgsvertexmarker.sip
+%Include qgssearchquerybuilder.sip
 
 %Include symbology-ng-gui.sip
diff --git a/python/gui/qgssearchquerybuilder.sip b/python/gui/qgssearchquerybuilder.sip
@@ -0,0 +1,16 @@
+class QgsSearchQueryBuilder : QDialog
+{
+%TypeHeaderCode
+#include <qgssearchquerybuilder.h>
+%End
+
+  public:
+    QgsSearchQueryBuilder( QgsVectorLayer* layer, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    ~QgsSearchQueryBuilder();
+
+    //! returns newly created search string
+    QString searchString();
+
+    //! change search string shown in text field
+    void setSearchString( QString searchString );
+};
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -78,7 +78,6 @@ SET(QGIS_APP_SRCS
   qgsprojectproperties.cpp
   qgsrastercalcdialog.cpp
   qgsrasterlayerproperties.cpp
-  qgssearchquerybuilder.cpp
   qgstextannotationdialog.cpp
   qgswmssourceselect.cpp
   qgsshortcutsmanager.cpp
@@ -214,7 +213,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsprojectproperties.h
   qgsrastercalcdialog.h
   qgsrasterlayerproperties.h
-  qgssearchquerybuilder.h
   qgstextannotationdialog.h
   qgswmssourceselect.h
   qgssinglesymboldialog.h

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -55,6 +55,7 @@ qgsrubberband.cpp
 qgstextannotationitem.cpp
 qgsvertexmarker.cpp
 qgsludialog.cpp
+qgssearchquerybuilder.cpp
 )
 
 SET(QGIS_GUI_MOC_HDRS
@@ -98,6 +99,7 @@ qgsquickprint.h
 qgsludialog.h
 qgsprojectbadlayerguihandler.h
 qgslonglongvalidator.h
+qgssearchquerybuilder.h
 )
 
 QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
@@ -187,12 +189,14 @@ qgsprojectionselector.h
 qgsrubberband.h
 qgsvertexmarker.h
 qgsmaptip.h
+qgssearchquerybuilder.h
 
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsdetaileditemwidgetbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsgenericprojectionselectorbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsmessageviewer.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgscredentialdialog.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsprojectionselectorbase.h
+${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsquerybuilderbase.h
 )
 
 

diff --git a/src/app/qgssearchquerybuilder.cpp → src/gui/qgssearchquerybuilder.cpp b/src/app/qgssearchquerybuilder.cpp → src/gui/qgssearchquerybuilder.cpp
diff --git a/src/app/qgssearchquerybuilder.h → src/gui/qgssearchquerybuilder.h b/src/app/qgssearchquerybuilder.h → src/gui/qgssearchquerybuilder.h
@@ -33,7 +33,7 @@ class QgsVectorLayer;
  * \brief Query Builder for search strings
  *
  */
-class QgsSearchQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBase
+class GUI_EXPORT QgsSearchQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBase
 {
     Q_OBJECT