Skip to content

Commit 3d8440c

Browse files
authored
Merge pull request #5326 from nyalldawson/frick_off_autoconnects
Flip autoconnected slots to explicit connections
2 parents 9aa6142 + e863421 commit 3d8440c

File tree

340 files changed

+4277
-3000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+4277
-3000
lines changed

python/gui/qgserrordialog.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ class QgsErrorDialog: QDialog
3131
\param fl widget flags
3232
%End
3333

34-
public slots:
35-
void on_mDetailPushButton_clicked();
36-
void on_mDetailCheckBox_stateChanged( int state );
37-
3834
};
3935

4036
/************************************************************************

python/gui/qgsnewvectorlayerdialog.sip

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,6 @@ Returns the file format for storage
6060
.. seealso:: crs()
6161
%End
6262

63-
protected slots:
64-
void on_mAddAttributeButton_clicked();
65-
void on_mRemoveAttributeButton_clicked();
66-
void on_mFileFormatComboBox_currentIndexChanged( int index );
67-
void on_mTypeBox_currentIndexChanged( int index );
68-
69-
void showHelp();
70-
%Docstring
71-
Open the associated help
72-
%End
73-
void nameChanged( const QString & );
74-
void selectionChanged();
75-
7663
};
7764

7865
/************************************************************************

python/gui/qgsowssourceselect.sip

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -48,63 +48,15 @@ Constructor
4848
Triggered when the provider's connections need to be refreshed
4949
%End
5050

51-
void on_mNewButton_clicked();
52-
%Docstring
53-
Opens the create connection dialog to build a new connection
54-
%End
55-
void on_mEditButton_clicked();
56-
%Docstring
57-
Opens a dialog to edit an existing connection
58-
%End
59-
void on_mDeleteButton_clicked();
60-
%Docstring
61-
Deletes the selected connection
62-
%End
63-
void on_mSaveButton_clicked();
64-
%Docstring
65-
Saves connections to the file
66-
%End
67-
void on_mLoadButton_clicked();
68-
%Docstring
69-
Loads connections from the file
70-
%End
71-
72-
void on_mConnectButton_clicked();
73-
%Docstring
74-
Connects to the database using the stored connection parameters.
75-
Once connected, available layers are displayed.
76-
%End
77-
78-
void searchFinished();
79-
80-
void on_mChangeCRSButton_clicked();
81-
%Docstring
82-
Opens the Spatial Reference System dialog.
83-
%End
84-
85-
virtual void on_mLayersTreeWidget_itemSelectionChanged();
86-
%Docstring
87-
Signaled when a layer selection is changed.
88-
%End
89-
90-
void showStatusMessage( const QString &message );
91-
%Docstring
92-
Set status message to theMessage
93-
%End
94-
51+
protected slots:
9552
void showError( const QString &title, const QString &format, const QString &error );
9653
%Docstring
9754
show whatever error is exposed.
9855
%End
9956

100-
void on_mConnectionsComboBox_activated( int );
101-
%Docstring
102-
Stores the selected datasource whenerver it is changed
103-
%End
104-
105-
void on_mAddDefaultButton_clicked();
57+
void showStatusMessage( const QString &message );
10658
%Docstring
107-
Add some default wms servers to the list
59+
Set status message to theMessage
10860
%End
10961

11062
protected:
@@ -245,7 +197,6 @@ Returns currently selected cache load control
245197

246198

247199

248-
249200
};
250201

251202
/************************************************************************

python/gui/qgsquerybuilder.sip

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,18 @@ class QgsQueryBuilder : QDialog
3939
virtual void showEvent( QShowEvent *event );
4040

4141

42+
QString sql();
43+
%Docstring
44+
:rtype: str
45+
%End
46+
void setSql( const QString &sqlStatement );
47+
4248
public slots:
4349
virtual void accept();
4450

4551
virtual void reject();
4652

4753
void clear();
48-
void on_btnEqual_clicked();
49-
void on_btnLessThan_clicked();
50-
void on_btnGreaterThan_clicked();
51-
void on_btnPct_clicked();
52-
void on_btnIn_clicked();
53-
void on_btnNotIn_clicked();
54-
void on_btnLike_clicked();
55-
void on_btnILike_clicked();
56-
QString sql();
57-
%Docstring
58-
:rtype: str
59-
%End
60-
void setSql( const QString &sqlStatement );
61-
void on_lstFields_clicked( const QModelIndex &index );
62-
void on_lstFields_doubleClicked( const QModelIndex &index );
63-
void on_lstValues_doubleClicked( const QModelIndex &index );
64-
void on_btnLessEqual_clicked();
65-
void on_btnGreaterEqual_clicked();
66-
void on_btnNotEqual_clicked();
67-
void on_btnAnd_clicked();
68-
void on_btnNot_clicked();
69-
void on_btnOr_clicked();
7054

7155
void test();
7256
%Docstring
@@ -76,19 +60,6 @@ class QgsQueryBuilder : QDialog
7660
statement.
7761
%End
7862

79-
void on_btnGetAllValues_clicked();
80-
%Docstring
81-
Get all distinct values for the field. Values are inserted
82-
into the value list box
83-
%End
84-
85-
void on_btnSampleValues_clicked();
86-
%Docstring
87-
Get sample distinct values for the selected field. The sample size is
88-
limited to an arbitrary value (currently set to 25). The values
89-
are inserted into the values list box.
90-
%End
91-
9263
void setDatasourceDescription( const QString &uri );
9364

9465
};

python/gui/qgsrasterformatsaveoptionswidget.sip

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,17 @@ class QgsRasterFormatSaveOptionsWidget: QWidget
104104
%End
105105

106106
private slots:
107-
void on_mProfileNewButton_clicked() ;
107+
void mProfileNewButton_clicked() ;
108108
private slots:
109-
void on_mProfileDeleteButton_clicked() ;
109+
void mProfileDeleteButton_clicked() ;
110110
private slots:
111-
void on_mProfileResetButton_clicked() ;
111+
void mProfileResetButton_clicked() ;
112112
private slots:
113-
void on_mOptionsAddButton_clicked() ;
113+
void mOptionsAddButton_clicked() ;
114114
private slots:
115-
void on_mOptionsDeleteButton_clicked() ;
115+
void mOptionsDeleteButton_clicked() ;
116116
private slots:
117-
void on_mOptionsLineEdit_editingFinished() ;
117+
void mOptionsLineEdit_editingFinished() ;
118118
private slots:
119119
void optionsTableChanged() ;
120120
private slots:

python/gui/qgsrasterpyramidsoptionswidget.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ class QgsRasterPyramidsOptionsWidget: QWidget
5252
void checkAllLevels( bool checked );
5353

5454
private slots:
55-
void on_cbxPyramidsLevelsCustom_toggled( bool toggled ) ;
55+
void cbxPyramidsLevelsCustom_toggled( bool toggled ) ;
5656
private slots:
57-
void on_cbxPyramidsFormat_currentIndexChanged( int index ) ;
57+
void cbxPyramidsFormat_currentIndexChanged( int index ) ;
5858
private slots:
5959
void setOverviewList() ;
6060
private slots:

python/gui/qgssearchquerybuilder.sip

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -39,44 +39,6 @@ change search string shown in text field
3939
%End
4040

4141
public slots:
42-
void on_btnEqual_clicked();
43-
void on_btnOk_clicked();
44-
void on_btnLessThan_clicked();
45-
void on_btnGreaterThan_clicked();
46-
void on_btnLike_clicked();
47-
void on_btnILike_clicked();
48-
void on_btnPct_clicked();
49-
void on_btnIn_clicked();
50-
void on_btnNotIn_clicked();
51-
52-
void on_lstFields_doubleClicked( const QModelIndex &index );
53-
void on_lstValues_doubleClicked( const QModelIndex &index );
54-
void on_btnLessEqual_clicked();
55-
void on_btnGreaterEqual_clicked();
56-
void on_btnNotEqual_clicked();
57-
void on_btnAnd_clicked();
58-
void on_btnNot_clicked();
59-
void on_btnOr_clicked();
60-
void on_btnClear_clicked();
61-
62-
void on_btnTest_clicked();
63-
%Docstring
64-
Test the constructed search string to see if it's correct.
65-
The number of rows that would be returned is displayed in a message box.
66-
%End
67-
68-
void on_btnGetAllValues_clicked();
69-
%Docstring
70-
Get all distinct values for the field. Values are inserted
71-
into the value list box
72-
%End
73-
74-
void on_btnSampleValues_clicked();
75-
%Docstring
76-
Get sample distinct values for the selected field. The sample size is
77-
limited to an arbitrary value (currently set to 25). The values
78-
are inserted into the values list box.
79-
%End
8042

8143
void saveQuery();
8244
void loadQuery();

python/gui/raster/qgsrasterhistogramwidget.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ Apply a histoActionTriggered() event.
6060
void refreshHistogram();
6161
%Docstring
6262
slot executed when user wishes to refresh raster histogramwidget
63-
%End
64-
void on_mSaveAsImageButton_clicked();
65-
%Docstring
66-
This slot lets you save the histogram as an image to disk
6763
%End
6864

6965
virtual void apply();

python/gui/symbology/qgsgraduatedsymbolrendererwidget.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ Toggle the link between classes boundaries
6060

6161
void rowsMoved();
6262
void modelDataChanged();
63-
void on_mSizeUnitWidget_changed();
64-
void on_methodComboBox_currentIndexChanged( int );
6563
void refreshRanges( bool reset = false );
6664

6765
protected:

python/gui/symbology/qgssmartgroupeditordialog.sip

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@ function to create a new ConditionBox and update UI
103103
slot to remove the condition with id int
104104
%End
105105

106-
void on_buttonBox_accepted();
107-
108106
protected:
107+
109108
};
110109

111110
/************************************************************************

0 commit comments

Comments
 (0)