Skip to content

Commit b858056

Browse files
author
wonder
committed
Allow usage of search query builder with no layer, fixed python binding
git-svn-id: http://svn.osgeo.org/qgis/trunk@14869 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent de03684 commit b858056

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

python/gui/qgssearchquerybuilder.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class QgsSearchQueryBuilder : QDialog
55
%End
66

77
public:
8-
QgsSearchQueryBuilder( QgsVectorLayer* layer, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
8+
QgsSearchQueryBuilder( QgsVectorLayer* layer, QWidget *parent /TransferThis/ = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
99
~QgsSearchQueryBuilder();
1010

1111
//! returns newly created search string

src/gui/qgssearchquerybuilder.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ QgsSearchQueryBuilder::QgsSearchQueryBuilder( QgsVectorLayer* layer,
6060
pbn->setToolTip( tr( "Load query from xml file" ) );
6161
connect( pbn, SIGNAL( clicked() ), this, SLOT( loadQuery() ) );
6262

63-
lblDataUri->setText( layer->name() );
63+
if ( layer )
64+
lblDataUri->setText( layer->name() );
6465
populateFields();
6566
}
6667

@@ -71,6 +72,9 @@ QgsSearchQueryBuilder::~QgsSearchQueryBuilder()
7172

7273
void QgsSearchQueryBuilder::populateFields()
7374
{
75+
if ( !mLayer )
76+
return;
77+
7478
QgsDebugMsg( "entering." );
7579
QRegExp reQuote( "[A-Za-z_][A-Za-z0-9_]*" );
7680
const QgsFieldMap& fields = mLayer->pendingFields();
@@ -195,6 +199,9 @@ long QgsSearchQueryBuilder::countRecords( QString searchString )
195199
return -1;
196200
}
197201

202+
if ( !mLayer )
203+
return -1;
204+
198205
QgsSearchTreeNode* searchTree = search.tree();
199206
if ( searchTree == NULL )
200207
{

0 commit comments

Comments
 (0)