Skip to content

Commit

Permalink
Remove use of c style function(void)
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Apr 7, 2016
1 parent 19b9103 commit fde77d3
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 63 deletions.
8 changes: 4 additions & 4 deletions src/app/composer/qgscomposer.cpp
Expand Up @@ -824,7 +824,7 @@ void QgsComposer::connectOtherSlots()
connect( this, SIGNAL( zoomLevelChanged() ), this, SLOT( updateStatusZoom() ) ); connect( this, SIGNAL( zoomLevelChanged() ), this, SLOT( updateStatusZoom() ) );
} }


void QgsComposer::open( void ) void QgsComposer::open()
{ {
if ( mFirstTime ) if ( mFirstTime )
{ {
Expand Down Expand Up @@ -1222,17 +1222,17 @@ void QgsComposer::atlasPageComboEditingFinished()
} }
} }


QgsMapCanvas *QgsComposer::mapCanvas( void ) QgsMapCanvas* QgsComposer::mapCanvas()
{ {
return mQgis->mapCanvas(); return mQgis->mapCanvas();
} }


QgsComposerView *QgsComposer::view( void ) QgsComposerView* QgsComposer::view()
{ {
return mView; return mView;
} }


void QgsComposer::zoomFull( void ) void QgsComposer::zoomFull()
{ {
if ( mView ) if ( mView )
{ {
Expand Down
6 changes: 3 additions & 3 deletions src/app/composer/qgscomposer.h
Expand Up @@ -85,13 +85,13 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
void zoomFull(); void zoomFull();


//! Return pointer to map canvas //! Return pointer to map canvas
QgsMapCanvas *mapCanvas( void ); QgsMapCanvas* mapCanvas();


//! Return pointer to composer view //! Return pointer to composer view
QgsComposerView *view( void ); QgsComposerView* view();


//! Return current composition //! Return current composition
QgsComposition* composition( void ) { return mComposition; } QgsComposition* composition() { return mComposition; }


//! Restore the window and toolbar state //! Restore the window and toolbar state
void restoreWindowState(); void restoreWindowState();
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -9763,7 +9763,7 @@ void QgisApp::selectionChanged( QgsMapLayer *layer )
} }
} }


void QgisApp::legendLayerSelectionChanged( void ) void QgisApp::legendLayerSelectionChanged()
{ {
QList<QgsLayerTreeLayer*> selectedLayers = mLayerTreeView ? mLayerTreeView->selectedLayerNodes() : QList<QgsLayerTreeLayer*>(); QList<QgsLayerTreeLayer*> selectedLayers = mLayerTreeView ? mLayerTreeView->selectedLayerNodes() : QList<QgsLayerTreeLayer*>();


Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.h
Expand Up @@ -643,7 +643,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
void toolButtonActionTriggered( QAction * ); void toolButtonActionTriggered( QAction * );


//! layer selection changed //! layer selection changed
void legendLayerSelectionChanged( void ); void legendLayerSelectionChanged();


//! Watch for QFileOpenEvent. //! Watch for QFileOpenEvent.
virtual bool event( QEvent *event ) override; virtual bool event( QEvent *event ) override;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsidentifyresultsdialog.cpp
Expand Up @@ -74,7 +74,7 @@ QgsIdentifyResultsWebView::QgsIdentifyResultsWebView( QWidget *parent ) : QgsWeb
#endif #endif
} }


void QgsIdentifyResultsWebView::print( void ) void QgsIdentifyResultsWebView::print()
{ {
QPrinter printer; QPrinter printer;
QPrintDialog *dialog = new QPrintDialog( &printer ); QPrintDialog *dialog = new QPrintDialog( &printer );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsidentifyresultsdialog.h
Expand Up @@ -56,7 +56,7 @@ class APP_EXPORT QgsIdentifyResultsWebView : public QgsWebView
QgsIdentifyResultsWebView( QWidget *parent = nullptr ); QgsIdentifyResultsWebView( QWidget *parent = nullptr );
QSize sizeHint() const override; QSize sizeHint() const override;
public slots: public slots:
void print( void ); void print();
protected: protected:
void contextMenuEvent( QContextMenuEvent* ) override; void contextMenuEvent( QContextMenuEvent* ) override;
QgsWebView *createWindow( QWebPage::WebWindowType type ) override; QgsWebView *createWindow( QWebPage::WebWindowType type ) override;
Expand Down
6 changes: 3 additions & 3 deletions src/app/qgslabeldialog.cpp
Expand Up @@ -272,7 +272,7 @@ void QgsLabelDialog::init()






void QgsLabelDialog::changeFont( void ) void QgsLabelDialog::changeFont()
{ {
QgsDebugMsg( "entering." ); QgsDebugMsg( "entering." );


Expand All @@ -290,7 +290,7 @@ void QgsLabelDialog::changeFont( void )
lblSample->setFont( mFont ); lblSample->setFont( mFont );
} }


void QgsLabelDialog::changeFontColor( void ) void QgsLabelDialog::changeFontColor()
{ {
QgsDebugMsg( "entering." ); QgsDebugMsg( "entering." );


Expand All @@ -304,7 +304,7 @@ void QgsLabelDialog::changeFontColor( void )
lblSample->setPalette( palette ); lblSample->setPalette( palette );
} }


void QgsLabelDialog::changeBufferColor( void ) void QgsLabelDialog::changeBufferColor()
{ {
QgsDebugMsg( "entering." ); QgsDebugMsg( "entering." );


Expand Down
4 changes: 2 additions & 2 deletions src/app/qgslabeldialog.h
Expand Up @@ -59,7 +59,7 @@ class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase


public slots: public slots:
/** Applies the changes to the label class */ /** Applies the changes to the label class */
void apply( void ); void apply();


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


/** Initialise dialog to vector layer values */ /** Initialise dialog to vector layer values */
void init( void ); void init();


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


Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmeasuredialog.h
Expand Up @@ -36,10 +36,10 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = nullptr ); QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = nullptr );


//! Save position //! Save position
void saveWindowLocation( void ); void saveWindowLocation();


//! Restore last window position/size //! Restore last window position/size
void restorePosition( void ); void restorePosition();


//! Add new point //! Add new point
void addPoint( const QgsPoint &point ); void addPoint( const QgsPoint &point );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -384,7 +384,7 @@ void QgsVectorLayerProperties::setDisplayField( const QString& name )
} }


//! @note in raster props, this method is called sync() //! @note in raster props, this method is called sync()
void QgsVectorLayerProperties::syncToLayer( void ) void QgsVectorLayerProperties::syncToLayer()
{ {
// populate the general information // populate the general information
mLayerOrigNameLineEdit->setText( layer->originalName() ); mLayerOrigNameLineEdit->setText( layer->originalName() );
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposermap.cpp
Expand Up @@ -248,7 +248,7 @@ QgsMapSettings QgsComposerMap::mapSettings( const QgsRectangle& extent, QSizeF s
return jobMapSettings; return jobMapSettings;
} }


void QgsComposerMap::cache( void ) void QgsComposerMap::cache()
{ {
if ( mPreviewMode == Rectangle ) if ( mPreviewMode == Rectangle )
{ {
Expand Down
2 changes: 1 addition & 1 deletion src/core/gps/qextserialport/qextserialport.cpp
Expand Up @@ -166,7 +166,7 @@ QByteArray QextSerialPort::readAll()
Returns the baud rate of the serial port. For a list of possible return values see Returns the baud rate of the serial port. For a list of possible return values see
the definition of the enum BaudRateType. the definition of the enum BaudRateType.
*/ */
BaudRateType QextSerialPort::baudRate(void) const BaudRateType QextSerialPort::baudRate() const
{ {
return Settings.BaudRate; return Settings.BaudRate;
} }
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsfeaturerequest.cpp
Expand Up @@ -382,7 +382,7 @@ QSet<QString> QgsFeatureRequest::OrderBy::usedAttributes() const
return usedAttributes; return usedAttributes;
} }


QString QgsFeatureRequest::OrderBy::dump( void ) const QString QgsFeatureRequest::OrderBy::dump() const
{ {
QStringList results; QStringList results;


Expand Down
4 changes: 2 additions & 2 deletions src/core/qgslabel.cpp
Expand Up @@ -483,7 +483,7 @@ void QgsLabel::setFields( const QgsFields & fields )
mFields = fields; mFields = fields;
} }


QgsFields & QgsLabel::fields( void ) QgsFields & QgsLabel::fields( )
{ {
return mFields; return mFields;
} }
Expand All @@ -507,7 +507,7 @@ QString QgsLabel::labelField( int attr ) const
return mFields.at( fieldIndex ).name(); return mFields.at( fieldIndex ).name();
} }


QgsLabelAttributes *QgsLabel::labelAttributes( void ) QgsLabelAttributes *QgsLabel::labelAttributes()
{ {
return mLabelAttributes; return mLabelAttributes;
} }
Expand Down

0 comments on commit fde77d3

Please sign in to comment.