Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move QgsSearchQuery builder from app to gui
git-svn-id: http://svn.osgeo.org/qgis/trunk@14867 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 8, 2010
1 parent fc6ab72 commit de03684
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 3 deletions.
1 change: 1 addition & 0 deletions python/gui/gui.sip
Expand Up @@ -32,5 +32,6 @@
%Include qgsrubberband.sip
%Include qgstextannotationitem.sip
%Include qgsvertexmarker.sip
%Include qgssearchquerybuilder.sip

%Include symbology-ng-gui.sip
16 changes: 16 additions & 0 deletions 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 );
};
2 changes: 0 additions & 2 deletions src/app/CMakeLists.txt
Expand Up @@ -78,7 +78,6 @@ SET(QGIS_APP_SRCS
qgsprojectproperties.cpp
qgsrastercalcdialog.cpp
qgsrasterlayerproperties.cpp
qgssearchquerybuilder.cpp
qgstextannotationdialog.cpp
qgswmssourceselect.cpp
qgsshortcutsmanager.cpp
Expand Down Expand Up @@ -214,7 +213,6 @@ SET (QGIS_APP_MOC_HDRS
qgsprojectproperties.h
qgsrastercalcdialog.h
qgsrasterlayerproperties.h
qgssearchquerybuilder.h
qgstextannotationdialog.h
qgswmssourceselect.h
qgssinglesymboldialog.h
Expand Down
4 changes: 4 additions & 0 deletions src/gui/CMakeLists.txt
Expand Up @@ -55,6 +55,7 @@ qgsrubberband.cpp
qgstextannotationitem.cpp
qgsvertexmarker.cpp
qgsludialog.cpp
qgssearchquerybuilder.cpp
)

SET(QGIS_GUI_MOC_HDRS
Expand Down Expand Up @@ -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})
Expand Down Expand Up @@ -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
)


Expand Down
File renamed without changes.
Expand Up @@ -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

Expand Down

0 comments on commit de03684

Please sign in to comment.