Skip to content

Commit fde77d3

Browse files
committed
Remove use of c style function(void)
1 parent 19b9103 commit fde77d3

16 files changed

+63
-63
lines changed

src/app/composer/qgscomposer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ void QgsComposer::connectOtherSlots()
824824
connect( this, SIGNAL( zoomLevelChanged() ), this, SLOT( updateStatusZoom() ) );
825825
}
826826

827-
void QgsComposer::open( void )
827+
void QgsComposer::open()
828828
{
829829
if ( mFirstTime )
830830
{
@@ -1222,17 +1222,17 @@ void QgsComposer::atlasPageComboEditingFinished()
12221222
}
12231223
}
12241224

1225-
QgsMapCanvas *QgsComposer::mapCanvas( void )
1225+
QgsMapCanvas* QgsComposer::mapCanvas()
12261226
{
12271227
return mQgis->mapCanvas();
12281228
}
12291229

1230-
QgsComposerView *QgsComposer::view( void )
1230+
QgsComposerView* QgsComposer::view()
12311231
{
12321232
return mView;
12331233
}
12341234

1235-
void QgsComposer::zoomFull( void )
1235+
void QgsComposer::zoomFull()
12361236
{
12371237
if ( mView )
12381238
{

src/app/composer/qgscomposer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
8585
void zoomFull();
8686

8787
//! Return pointer to map canvas
88-
QgsMapCanvas *mapCanvas( void );
88+
QgsMapCanvas* mapCanvas();
8989

9090
//! Return pointer to composer view
91-
QgsComposerView *view( void );
91+
QgsComposerView* view();
9292

9393
//! Return current composition
94-
QgsComposition* composition( void ) { return mComposition; }
94+
QgsComposition* composition() { return mComposition; }
9595

9696
//! Restore the window and toolbar state
9797
void restoreWindowState();

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9763,7 +9763,7 @@ void QgisApp::selectionChanged( QgsMapLayer *layer )
97639763
}
97649764
}
97659765

9766-
void QgisApp::legendLayerSelectionChanged( void )
9766+
void QgisApp::legendLayerSelectionChanged()
97679767
{
97689768
QList<QgsLayerTreeLayer*> selectedLayers = mLayerTreeView ? mLayerTreeView->selectedLayerNodes() : QList<QgsLayerTreeLayer*>();
97699769

src/app/qgisapp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
643643
void toolButtonActionTriggered( QAction * );
644644

645645
//! layer selection changed
646-
void legendLayerSelectionChanged( void );
646+
void legendLayerSelectionChanged();
647647

648648
//! Watch for QFileOpenEvent.
649649
virtual bool event( QEvent *event ) override;

src/app/qgsidentifyresultsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ QgsIdentifyResultsWebView::QgsIdentifyResultsWebView( QWidget *parent ) : QgsWeb
7474
#endif
7575
}
7676

77-
void QgsIdentifyResultsWebView::print( void )
77+
void QgsIdentifyResultsWebView::print()
7878
{
7979
QPrinter printer;
8080
QPrintDialog *dialog = new QPrintDialog( &printer );

src/app/qgsidentifyresultsdialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class APP_EXPORT QgsIdentifyResultsWebView : public QgsWebView
5656
QgsIdentifyResultsWebView( QWidget *parent = nullptr );
5757
QSize sizeHint() const override;
5858
public slots:
59-
void print( void );
59+
void print();
6060
protected:
6161
void contextMenuEvent( QContextMenuEvent* ) override;
6262
QgsWebView *createWindow( QWebPage::WebWindowType type ) override;

src/app/qgslabeldialog.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void QgsLabelDialog::init()
272272

273273

274274

275-
void QgsLabelDialog::changeFont( void )
275+
void QgsLabelDialog::changeFont()
276276
{
277277
QgsDebugMsg( "entering." );
278278

@@ -290,7 +290,7 @@ void QgsLabelDialog::changeFont( void )
290290
lblSample->setFont( mFont );
291291
}
292292

293-
void QgsLabelDialog::changeFontColor( void )
293+
void QgsLabelDialog::changeFontColor()
294294
{
295295
QgsDebugMsg( "entering." );
296296

@@ -304,7 +304,7 @@ void QgsLabelDialog::changeFontColor( void )
304304
lblSample->setPalette( palette );
305305
}
306306

307-
void QgsLabelDialog::changeBufferColor( void )
307+
void QgsLabelDialog::changeBufferColor()
308308
{
309309
QgsDebugMsg( "entering." );
310310

src/app/qgslabeldialog.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
5959

6060
public slots:
6161
/** Applies the changes to the label class */
62-
void apply( void );
62+
void apply();
6363

6464
/** Change font - reimplements method from base class*/
6565
void changeFont();
@@ -69,7 +69,7 @@ class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
6969
void changeFontColor();
7070

7171
/** Initialise dialog to vector layer values */
72-
void init( void );
72+
void init();
7373

7474
void on_cboLabelField_activated( int ) {emit labelSourceSet(); }
7575

src/app/qgsmeasuredialog.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
3636
QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = nullptr );
3737

3838
//! Save position
39-
void saveWindowLocation( void );
39+
void saveWindowLocation();
4040

4141
//! Restore last window position/size
42-
void restorePosition( void );
42+
void restorePosition();
4343

4444
//! Add new point
4545
void addPoint( const QgsPoint &point );

src/app/qgsvectorlayerproperties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ void QgsVectorLayerProperties::setDisplayField( const QString& name )
384384
}
385385

386386
//! @note in raster props, this method is called sync()
387-
void QgsVectorLayerProperties::syncToLayer( void )
387+
void QgsVectorLayerProperties::syncToLayer()
388388
{
389389
// populate the general information
390390
mLayerOrigNameLineEdit->setText( layer->originalName() );

src/core/composer/qgscomposermap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ QgsMapSettings QgsComposerMap::mapSettings( const QgsRectangle& extent, QSizeF s
248248
return jobMapSettings;
249249
}
250250

251-
void QgsComposerMap::cache( void )
251+
void QgsComposerMap::cache()
252252
{
253253
if ( mPreviewMode == Rectangle )
254254
{

src/core/gps/qextserialport/qextserialport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ QByteArray QextSerialPort::readAll()
166166
Returns the baud rate of the serial port. For a list of possible return values see
167167
the definition of the enum BaudRateType.
168168
*/
169-
BaudRateType QextSerialPort::baudRate(void) const
169+
BaudRateType QextSerialPort::baudRate() const
170170
{
171171
return Settings.BaudRate;
172172
}

src/core/qgsfeaturerequest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ QSet<QString> QgsFeatureRequest::OrderBy::usedAttributes() const
382382
return usedAttributes;
383383
}
384384

385-
QString QgsFeatureRequest::OrderBy::dump( void ) const
385+
QString QgsFeatureRequest::OrderBy::dump() const
386386
{
387387
QStringList results;
388388

src/core/qgslabel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ void QgsLabel::setFields( const QgsFields & fields )
483483
mFields = fields;
484484
}
485485

486-
QgsFields & QgsLabel::fields( void )
486+
QgsFields & QgsLabel::fields( )
487487
{
488488
return mFields;
489489
}
@@ -507,7 +507,7 @@ QString QgsLabel::labelField( int attr ) const
507507
return mFields.at( fieldIndex ).name();
508508
}
509509

510-
QgsLabelAttributes *QgsLabel::labelAttributes( void )
510+
QgsLabelAttributes *QgsLabel::labelAttributes()
511511
{
512512
return mLabelAttributes;
513513
}

0 commit comments

Comments
 (0)