Skip to content

Commit e977f1f

Browse files
committed
remove unused provider mManagerMode member
1 parent d0ebcd9 commit e977f1f

File tree

8 files changed

+6
-25
lines changed

8 files changed

+6
-25
lines changed

src/gui/qgsowssourceselect.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ class GUI_EXPORT QgsOWSSourceSelect : public QDialog, public Ui::QgsOWSSourceSel
169169
//! Service name
170170
QString mService;
171171

172-
//! Connections manager mode
173-
bool mManagerMode;
174-
175172
//! Embedded mode, without 'Close'
176173
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::None;
177174

src/providers/db2/qgsdb2sourceselect.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ class QgsDb2SourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase
155155
typedef QPair<QString, QString> geomPair;
156156
typedef QList<geomPair> geomCol;
157157

158-
//! Connections manager mode
159-
bool mManagerMode;
160-
161158
//! Embedded mode, without 'Close'
162159
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::None;
163160

src/providers/mssql/qgsmssqlsourceselect.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ class QgsMssqlSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase
153153
typedef QPair<QString, QString> geomPair;
154154
typedef QList<geomPair> geomCol;
155155

156-
//! Connections manager mode
157-
bool mManagerMode;
158-
159156
//! Embedded mode, without 'Close'
160157
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::None;
161158

src/providers/oracle/qgsoracledataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ QList<QAction *> QgsOracleRootItem::actions()
471471

472472
QWidget *QgsOracleRootItem::paramWidget()
473473
{
474-
QgsOracleSourceSelect *select = new QgsOracleSourceSelect( 0, 0, true, true );
474+
QgsOracleSourceSelect *select = new QgsOracleSourceSelect();
475475
connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
476476
return select;
477477
}

src/providers/oracle/qgsoracleprovider.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "qgscoordinatereferencesystem.h"
2525
#include "qgsvectorlayerexporter.h"
2626
#include "qgslogger.h"
27-
#include "qgsproviderregistry.h"
2827

2928
#include "qgsoracleprovider.h"
3029
#include "qgsoracletablemodel.h"

src/providers/oracle/qgsoraclesourceselect.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ void QgsOracleSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItem
168168

169169
QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
170170
: QDialog( parent, fl )
171-
, mManagerMode( managerMode )
172171
, mWidgetMode( widgetMode )
173172
, mColumnTypeThread( 0 )
174173
, mIsConnected( false )
@@ -191,14 +190,11 @@ QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags f
191190
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
192191
mBuildQueryButton->setDisabled( true );
193192

194-
if ( !mManagerMode )
195-
{
196-
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
197-
connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
193+
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
194+
connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
198195

199-
buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
200-
connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
201-
}
196+
buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
197+
connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
202198

203199
mSearchModeComboBox->addItem( tr( "Wildcard" ) );
204200
mSearchModeComboBox->addItem( tr( "RegExp" ) );

src/providers/oracle/qgsoraclesourceselect.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "qgsoracletablemodel.h"
2424
#include "qgshelp.h"
2525
#include "qgsoracleconnpool.h"
26+
#include "qgsproviderregistry.h"
2627

2728
#include <QMap>
2829
#include <QPair>
@@ -142,9 +143,6 @@ class QgsOracleSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase
142143
typedef QPair<QString, QString> geomPair;
143144
typedef QList<geomPair> geomCol;
144145

145-
//! Connections manager mode
146-
bool mManagerMode;
147-
148146
//! Embedded mode, without 'Close'
149147
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::None;
150148

src/providers/wms/qgswmssourceselect.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
108108
//! Add a few example servers to the list.
109109
void addDefaultServers();
110110

111-
//! Connections manager mode
112-
bool mManagerMode;
113-
114111
//! Embedded mode, without 'Close'
115112
QgsProviderRegistry::WidgetMode mWidgetMode = QgsProviderRegistry::WidgetMode::None;
116113

0 commit comments

Comments
 (0)