Remove use of c style function(void)

qgis · Apr 7, 2016 · fde77d3 · fde77d3
1 parent 19b9103
commit fde77d3
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 63 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -824,7 +824,7 @@ void QgsComposer::connectOtherSlots()
   connect( this, SIGNAL( zoomLevelChanged() ), this, SLOT( updateStatusZoom() ) );
 }
 
-void QgsComposer::open( void )
+void QgsComposer::open()
 {
   if ( mFirstTime )
   {
@@ -1222,17 +1222,17 @@ void QgsComposer::atlasPageComboEditingFinished()
   }
 }
 
-QgsMapCanvas *QgsComposer::mapCanvas( void )
+QgsMapCanvas* QgsComposer::mapCanvas()
 {
   return mQgis->mapCanvas();
 }
 
-QgsComposerView *QgsComposer::view( void )
+QgsComposerView* QgsComposer::view()
 {
   return mView;
 }
 
-void QgsComposer::zoomFull( void )
+void QgsComposer::zoomFull()
 {
   if ( mView )
   {

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -85,13 +85,13 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     void zoomFull();
 
     //! Return pointer to map canvas
-    QgsMapCanvas *mapCanvas( void );
+    QgsMapCanvas* mapCanvas();
 
     //! Return pointer to composer view
-    QgsComposerView *view( void );
+    QgsComposerView* view();
 
     //! Return current composition
-    QgsComposition* composition( void ) { return mComposition; }
+    QgsComposition* composition() { return mComposition; }
 
     //! Restore the window and toolbar state
     void restoreWindowState();

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9763,7 +9763,7 @@ void QgisApp::selectionChanged( QgsMapLayer *layer )
   }
 }
 
-void QgisApp::legendLayerSelectionChanged( void )
+void QgisApp::legendLayerSelectionChanged()
 {
   QList<QgsLayerTreeLayer*> selectedLayers = mLayerTreeView ? mLayerTreeView->selectedLayerNodes() : QList<QgsLayerTreeLayer*>();
 

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -643,7 +643,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     void toolButtonActionTriggered( QAction * );
 
     //! layer selection changed
-    void legendLayerSelectionChanged( void );
+    void legendLayerSelectionChanged();
 
     //! Watch for QFileOpenEvent.
     virtual bool event( QEvent *event ) override;

diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -74,7 +74,7 @@ QgsIdentifyResultsWebView::QgsIdentifyResultsWebView( QWidget *parent ) : QgsWeb
 #endif
 }
 
-void QgsIdentifyResultsWebView::print( void )
+void QgsIdentifyResultsWebView::print()
 {
   QPrinter printer;
   QPrintDialog *dialog = new QPrintDialog( &printer );

diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -56,7 +56,7 @@ class APP_EXPORT QgsIdentifyResultsWebView : public QgsWebView
     QgsIdentifyResultsWebView( QWidget *parent = nullptr );
     QSize sizeHint() const override;
   public slots:
-    void print( void );
+    void print();
   protected:
     void contextMenuEvent( QContextMenuEvent* ) override;
     QgsWebView *createWindow( QWebPage::WebWindowType type ) override;

diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp
@@ -272,7 +272,7 @@ void QgsLabelDialog::init()
 
 
 
-void QgsLabelDialog::changeFont( void )
+void QgsLabelDialog::changeFont()
 {
   QgsDebugMsg( "entering." );
 
@@ -290,7 +290,7 @@ void QgsLabelDialog::changeFont( void )
   lblSample->setFont( mFont );
 }
 
-void QgsLabelDialog::changeFontColor( void )
+void QgsLabelDialog::changeFontColor()
 {
   QgsDebugMsg( "entering." );
 
@@ -304,7 +304,7 @@ void QgsLabelDialog::changeFontColor( void )
   lblSample->setPalette( palette );
 }
 
-void QgsLabelDialog::changeBufferColor( void )
+void QgsLabelDialog::changeBufferColor()
 {
   QgsDebugMsg( "entering." );
 

diff --git a/src/app/qgslabeldialog.h b/src/app/qgslabeldialog.h
@@ -59,7 +59,7 @@ class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
 
   public slots:
     /** Applies the changes to the label class */
-    void apply( void );
+    void apply();
 
     /** Change font - reimplements method from base class*/
     void changeFont();
@@ -69,7 +69,7 @@ class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
     void changeFontColor();
 
     /** Initialise dialog to vector layer values */
-    void init( void );
+    void init();
 
     void on_cboLabelField_activated( int ) {emit labelSourceSet(); }
 

diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
@@ -36,10 +36,10 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
     QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = nullptr );
 
     //! Save position
-    void saveWindowLocation( void );
+    void saveWindowLocation();
 
     //! Restore last window position/size
-    void restorePosition( void );
+    void restorePosition();
 
     //! Add new point
     void addPoint( const QgsPoint &point );

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -384,7 +384,7 @@ void QgsVectorLayerProperties::setDisplayField( const QString& name )
 }
 
 //! @note in raster props, this method is called sync()
-void QgsVectorLayerProperties::syncToLayer( void )
+void QgsVectorLayerProperties::syncToLayer()
 {
   // populate the general information
   mLayerOrigNameLineEdit->setText( layer->originalName() );

diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -248,7 +248,7 @@ QgsMapSettings QgsComposerMap::mapSettings( const QgsRectangle& extent, QSizeF s
   return jobMapSettings;
 }
 
-void QgsComposerMap::cache( void )
+void QgsComposerMap::cache()
 {
   if ( mPreviewMode == Rectangle )
   {

diff --git a/src/core/gps/qextserialport/qextserialport.cpp b/src/core/gps/qextserialport/qextserialport.cpp
@@ -166,7 +166,7 @@ QByteArray QextSerialPort::readAll()
 Returns the baud rate of the serial port.  For a list of possible return values see
 the definition of the enum BaudRateType.
 */
-BaudRateType QextSerialPort::baudRate(void) const
+BaudRateType QextSerialPort::baudRate() const
 {
     return Settings.BaudRate;
 }

diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -382,7 +382,7 @@ QSet<QString> QgsFeatureRequest::OrderBy::usedAttributes() const
   return usedAttributes;
 }
 
-QString QgsFeatureRequest::OrderBy::dump( void ) const
+QString QgsFeatureRequest::OrderBy::dump() const
 {
   QStringList results;
 

diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp
@@ -483,7 +483,7 @@ void QgsLabel::setFields( const QgsFields & fields )
   mFields = fields;
 }
 
-QgsFields & QgsLabel::fields( void )
+QgsFields & QgsLabel::fields( )
 {
   return mFields;
 }
@@ -507,7 +507,7 @@ QString QgsLabel::labelField( int attr ) const
   return mFields.at( fieldIndex ).name();
 }
 
-QgsLabelAttributes *QgsLabel::labelAttributes( void )
+QgsLabelAttributes *QgsLabel::labelAttributes()
 {
   return mLabelAttributes;
 }