diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index 7a701acfd71..987dff82bec 100644 --- a/src/app/composer/qgscomposer.cpp +++ b/src/app/composer/qgscomposer.cpp @@ -80,7 +80,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(), QSettings settings; int size = settings.value( "/IconSize", 24 ).toInt(); - setIconSize(QSize(size,size)); + setIconSize( QSize( size, size ) ); QToolButton* orderingToolButton = new QToolButton( this ); orderingToolButton->setPopupMode( QToolButton::InstantPopup ); @@ -302,15 +302,15 @@ void QgsComposer::setupTheme() void QgsComposer::setIconSizes( int size ) { - //Set the icon size of for all the toolbars created in the future. - setIconSize(QSize(size,size)); + //Set the icon size of for all the toolbars created in the future. + setIconSize( QSize( size, size ) ); - //Change all current icon sizes. - QList toolbars = findChildren(); - foreach(QToolBar * toolbar, toolbars) - { - toolbar->setIconSize(QSize(size,size)); - } + //Change all current icon sizes. + QList toolbars = findChildren(); + foreach( QToolBar * toolbar, toolbars ) + { + toolbar->setIconSize( QSize( size, size ) ); + } } void QgsComposer::connectSlots() diff --git a/src/app/composer/qgscomposerlegendlayersdialog.cpp b/src/app/composer/qgscomposerlegendlayersdialog.cpp index 67ce251013c..bba4a0fcd4f 100644 --- a/src/app/composer/qgscomposerlegendlayersdialog.cpp +++ b/src/app/composer/qgscomposerlegendlayersdialog.cpp @@ -21,11 +21,11 @@ QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog( QList::iterator layerIt = layers.begin(); - for (; layerIt != layers.end(); ++layerIt ) + for ( ; layerIt != layers.end(); ++layerIt ) { QListWidgetItem* item = new QListWidgetItem(( *layerIt )->name(), listMapLayers ); mItemLayerMap.insert( item, *layerIt ); - } + } } QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog(): QDialog( 0 ) diff --git a/src/app/gps/qgsgpsmarker.cpp b/src/app/gps/qgsgpsmarker.cpp index e5520f7dd8d..aced4c32c57 100644 --- a/src/app/gps/qgsgpsmarker.cpp +++ b/src/app/gps/qgsgpsmarker.cpp @@ -24,7 +24,7 @@ QgsGpsMarker::QgsGpsMarker( QgsMapCanvas* mapCanvas ) - : QgsMapCanvasItem( mapCanvas ) + : QgsMapCanvasItem( mapCanvas ) { mSize = 16; mWgs84CRS.createFromEpsg( 4326 ); @@ -38,14 +38,14 @@ void QgsGpsMarker::setSize( int theSize ) void QgsGpsMarker::setCenter( const QgsPoint& point ) { //transform to map crs - if( mMapCanvas && mMapCanvas->mapRenderer() ) + if ( mMapCanvas && mMapCanvas->mapRenderer() ) { QgsCoordinateTransform t( mWgs84CRS, mMapCanvas->mapRenderer()->destinationSrs() ); try { mCenter = t.transform( point ); } - catch( QgsCsException e ) //silently ignore transformation exceptions + catch ( QgsCsException e ) //silently ignore transformation exceptions { return; } @@ -62,7 +62,7 @@ void QgsGpsMarker::setCenter( const QgsPoint& point ) void QgsGpsMarker::paint( QPainter* p ) { QSvgRenderer mySVG; - if( !mySVG.load( QString( ":/images/north_arrows/gpsarrow2.svg" ) ) ) + if ( !mySVG.load( QString( ":/images/north_arrows/gpsarrow2.svg" ) ) ) { qDebug( "GPS marker not found!" ); return; diff --git a/src/app/gps/qwtpolar/qwt_polar_itemdict.cpp b/src/app/gps/qwtpolar/qwt_polar_itemdict.cpp index 9aa96a74193..2148394c257 100644 --- a/src/app/gps/qwtpolar/qwt_polar_itemdict.cpp +++ b/src/app/gps/qwtpolar/qwt_polar_itemdict.cpp @@ -28,7 +28,7 @@ class QwtPolarItemDict::PrivateData // for lists in Qt4. The implementation below // is slow, but there shouldn't be many plot items. - // TODO add binary search + // TODO add binary search #if QT_VERSION < 0x040000 QValueListIterator it; diff --git a/src/app/legend/qgslegendgroup.cpp b/src/app/legend/qgslegendgroup.cpp index 14a90d7a6d4..4f7d3477d72 100644 --- a/src/app/legend/qgslegendgroup.cpp +++ b/src/app/legend/qgslegendgroup.cpp @@ -25,7 +25,7 @@ #include QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName ) - : QgsLegendItem( theItem, theName ) + : QgsLegendItem( theItem, theName ) { mType = LEGEND_GROUP; setFlags( Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable ); @@ -34,7 +34,7 @@ QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName ) setIcon( 0, myIcon ); } QgsLegendGroup::QgsLegendGroup( QTreeWidget* theListView, QString theString ) - : QgsLegendItem( theListView, theString ) + : QgsLegendItem( theListView, theString ) { mType = LEGEND_GROUP; setFlags( Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable ); diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 930fd51988f..6c6d6bdeb85 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -550,7 +550,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent, } else { - QgsDebugMsg( "Tips are disabled"); + QgsDebugMsg( "Tips are disabled" ); } //finally show all the application settings as initialised above @@ -1893,7 +1893,7 @@ void QgisApp::createToolBars() mHelpToolBar->addAction( mActionHelpContents ); mHelpToolBar->addAction( QWhatsThis::createAction() ); mToolbarMenu->addAction( mHelpToolBar->toggleViewAction() ); - + // // Raster Toolbar mRasterToolBar = addToolBar( tr( "Raster" ) ); @@ -2050,18 +2050,18 @@ void QgisApp::setIconSizes( int size ) //Set the icon size of for all the toolbars created in the future. setIconSize( QSize( size, size ) ); - //Change all current icon sizes. - QList toolbars = findChildren(); - foreach( QToolBar * toolbar, toolbars ) - { - toolbar->setIconSize( QSize( size, size ) ); - } - - QSet::iterator composerIt = mPrintComposers.begin(); - for ( ; composerIt != mPrintComposers.end(); ++composerIt ) - { - ( *composerIt )->setIconSizes(size); - } + //Change all current icon sizes. + QList toolbars = findChildren(); + foreach( QToolBar * toolbar, toolbars ) + { + toolbar->setIconSize( QSize( size, size ) ); + } + + QSet::iterator composerIt = mPrintComposers.begin(); + for ( ; composerIt != mPrintComposers.end(); ++composerIt ) + { + ( *composerIt )->setIconSizes( size ); + } } void QgisApp::setTheme( QString theThemeName ) @@ -5525,11 +5525,11 @@ void QgisApp::localHistogramStretch() } if ( rlayer->drawingStyle() == QgsRasterLayer::SingleBandGray || rlayer->drawingStyle() == QgsRasterLayer::MultiBandSingleBandGray - ) + ) { rlayer->setContrastEnhancementAlgorithm( "StretchToMinimumMaximum" ); rlayer->setMinimumMaximumUsingLastExtent(); - rlayer->setCacheImage(NULL); + rlayer->setCacheImage( NULL ); //refreshLayerSymbology( rlayer->getLayerID() ); mMapCanvas->refresh(); return; @@ -5537,10 +5537,10 @@ void QgisApp::localHistogramStretch() else { QMessageBox::information( this, - tr( "No Valid Raster Layer Selected" ), - tr( "To perform a local histogram stretch, you need to have a grayscale " - "(multiband single layer, or singleband grayscale) raster layer " - "selected." ) ); + tr( "No Valid Raster Layer Selected" ), + tr( "To perform a local histogram stretch, you need to have a grayscale " + "(multiband single layer, or singleband grayscale) raster layer " + "selected." ) ); return; } } diff --git a/src/app/qgsdisplayangle.cpp b/src/app/qgsdisplayangle.cpp index e5208bbe379..90c9adac8de 100644 --- a/src/app/qgsdisplayangle.cpp +++ b/src/app/qgsdisplayangle.cpp @@ -27,10 +27,10 @@ QgsDisplayAngle::QgsDisplayAngle( QWidget * parent, Qt::WindowFlags f ): QDialog else mcbProjectionEnabled->setCheckState( Qt::Unchecked ); - connect( mcbProjectionEnabled, SIGNAL( stateChanged(int) ), - this, SLOT( changeState() ) ); - connect( mcbProjectionEnabled, SIGNAL( stateChanged(int) ), - this, SIGNAL( changeProjectionEnabledState() ) ); + connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ), + this, SLOT( changeState() ) ); + connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ), + this, SIGNAL( changeProjectionEnabledState() ) ); } QgsDisplayAngle::~QgsDisplayAngle() @@ -65,7 +65,7 @@ void QgsDisplayAngle::changeState() { QSettings settings; if ( mcbProjectionEnabled->isChecked() ) - settings.setValue( "/qgis/measure/projectionEnabled", 2); + settings.setValue( "/qgis/measure/projectionEnabled", 2 ); else - settings.setValue( "/qgis/measure/projectionEnabled", 0); + settings.setValue( "/qgis/measure/projectionEnabled", 0 ); } diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h index 234d720d464..7ac807fed99 100644 --- a/src/app/qgsdisplayangle.h +++ b/src/app/qgsdisplayangle.h @@ -34,7 +34,7 @@ class QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase signals: void changeProjectionEnabledState(); - + private slots: void changeState(); diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h index 3a36965c81f..3a17221e930 100644 --- a/src/app/qgslabelpropertydialog.h +++ b/src/app/qgslabelpropertydialog.h @@ -28,7 +28,7 @@ class QgsMapRenderer; /**A dialog to enter data defined label attributes*/ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialogBase { - Q_OBJECT + Q_OBJECT public: QgsLabelPropertyDialog( const QString& layerId, int featureId, QgsMapRenderer* renderer, QWidget * parent = 0, Qt::WindowFlags f = 0 ); ~QgsLabelPropertyDialog(); @@ -48,7 +48,7 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog void on_mBufferColorButton_clicked(); void on_mHaliComboBox_currentIndexChanged( const QString& text ); void on_mValiComboBox_currentIndexChanged( const QString& text ); - void on_mLabelTextLineEdit_textChanged ( const QString& text ); + void on_mLabelTextLineEdit_textChanged( const QString& text ); private: /**Sets activation / values to the gui elements depending on the label settings and feature values*/ diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp index 3334db56e07..7d95848ccc1 100644 --- a/src/app/qgsmaptoolselect.cpp +++ b/src/app/qgsmaptoolselect.cpp @@ -29,7 +29,7 @@ QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas ) - : QgsMapTool( canvas ) + : QgsMapTool( canvas ) { mCursor = Qt::ArrowCursor; } @@ -37,7 +37,7 @@ QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas ) void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e ) { QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( mCanvas ); - if( vlayer == NULL ) + if ( vlayer == NULL ) { return; } diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp index cbba325c937..4a04d88a4e9 100644 --- a/src/core/qgscoordinatereferencesystem.cpp +++ b/src/core/qgscoordinatereferencesystem.cpp @@ -99,30 +99,30 @@ bool QgsCoordinateReferenceSystem::createFromId( const long theId, CrsType theTy bool QgsCoordinateReferenceSystem::createFromString( const QString theDefinition ) { bool result = false; - QRegExp reCrsId("^(epsg|postgis|internal)\\:(\\d+)$",Qt::CaseInsensitive); - if( reCrsId.indexIn(theDefinition) == 0) + QRegExp reCrsId( "^(epsg|postgis|internal)\\:(\\d+)$", Qt::CaseInsensitive ); + if ( reCrsId.indexIn( theDefinition ) == 0 ) { - QString authName = reCrsId.cap(1).toLower(); - CrsType type = InternalCrsId; - if( authName == "epsg" ) type = EpsgCrsId; - if( authName == "postgis" ) type = PostgisCrsId; - long id = reCrsId.cap(2).toLong(); - result = createFromId(id,type); + QString authName = reCrsId.cap( 1 ).toLower(); + CrsType type = InternalCrsId; + if ( authName == "epsg" ) type = EpsgCrsId; + if ( authName == "postgis" ) type = PostgisCrsId; + long id = reCrsId.cap( 2 ).toLong(); + result = createFromId( id, type ); } else { - QRegExp reCrsStr("^(?:(wkt|proj4)\\:)?(.+)$",Qt::CaseInsensitive); - if( reCrsStr.indexIn(theDefinition) == 0 ) + QRegExp reCrsStr( "^(?:(wkt|proj4)\\:)?(.+)$", Qt::CaseInsensitive ); + if ( reCrsStr.indexIn( theDefinition ) == 0 ) + { + if ( reCrsStr.cap( 1 ).toLower() == "proj4" ) { - if( reCrsStr.cap(1).toLower() == "proj4" ) - { - result = createFromProj4(reCrsStr.cap(2)); - } - else - { - result = createFromWkt(reCrsStr.cap(2)); - } + result = createFromProj4( reCrsStr.cap( 2 ) ); } + else + { + result = createFromWkt( reCrsStr.cap( 2 ) ); + } + } } return result; } diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h index bc9aff94e49..67eda08613b 100644 --- a/src/core/qgscoordinatereferencesystem.h +++ b/src/core/qgscoordinatereferencesystem.h @@ -57,7 +57,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem ~QgsCoordinateReferenceSystem(); /*! - * Constructs a CRS object from a string definition as defined in the createFromString + * Constructs a CRS object from a string definition as defined in the createFromString * member function (by default a WKT definition). * @param theDefinition A String containing a coordinate reference system definition. */ @@ -162,7 +162,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem * @return bool TRUE if sucess else false */ bool createFromProj4( const QString theProjString ); - + /*! Set up this srs from a string definition, by default a WKT definition. Otherwise * the string defines a authority, followed by a colon, followed by the definition. * The authority can be one of "epsg", "postgis", "internal" for integer definitions, diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp index 94246c80452..1c75015109d 100644 --- a/src/core/qgsmaprenderer.cpp +++ b/src/core/qgsmaprenderer.cpp @@ -235,13 +235,13 @@ void QgsMapRenderer::render( QPainter* painter ) } // wait - if( mDrawing ) + if ( mDrawing ) { QgsDebugMsg( "already rendering" ); QCoreApplication::processEvents(); } - if( mDrawing ) + if ( mDrawing ) { QgsDebugMsg( "still rendering - skipping" ); return; @@ -381,7 +381,7 @@ void QgsMapRenderer::render( QPainter* painter ) split = splitLayersExtent( ml, r1, r2 ); ct = new QgsCoordinateTransform( ml->srs(), *mDestCRS ); mRenderContext.setExtent( r1 ); - if( !r1.isFinite() || !r2.isFinite() ) //there was a problem transforming the extent. Skip the layer + if ( !r1.isFinite() || !r2.isFinite() ) //there was a problem transforming the extent. Skip the layer { continue; } diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index a28deb7efc6..1c0a3434a88 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -578,7 +578,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext if ( distance != 0 ) { - if( distInMapUnits ) //convert distance from mm/map units to pixels + if ( distInMapUnits ) //convert distance from mm/map units to pixels { distance /= context.mapToPixel().mapUnitsPerPixel(); } diff --git a/src/core/spatialindex/include/Tools.h b/src/core/spatialindex/include/Tools.h index fa7871c9b39..9574aa616f1 100644 --- a/src/core/spatialindex/include/Tools.h +++ b/src/core/spatialindex/include/Tools.h @@ -316,7 +316,7 @@ namespace Tools // since all base classes are interfaces (there is no state involved) all // inheritance can be virtual for efficiency. - interface IShape : public virtual ISerializable + interface IShape : public virtual ISerializable { public: virtual bool intersectsShape( const IShape& in ) const = 0; @@ -332,7 +332,7 @@ namespace Tools // since all base classes are interfaces (there is no state involved) all // inheritance can be virtual for efficiency. - interface ITimeShape : public virtual IShape, public virtual IInterval + interface ITimeShape : public virtual IShape, public virtual IInterval { public: virtual bool intersectsShapeInTime( const ITimeShape& in ) const = 0; @@ -350,7 +350,7 @@ namespace Tools // since all base classes are interfaces (there is no state involved) all // inheritance can be virtual for efficiency. - interface IEvolvingShape : public virtual IShape + interface IEvolvingShape : public virtual IShape { public: virtual void getVMBR( Region& out ) const = 0; diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp index e975a0ae3ee..8c1ec919637 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -423,7 +423,7 @@ void QgsMapCanvas::saveAsImage( QString theFileName, QPixmap * theQPixmap, QStri else //use the map view { QPixmap *pixmap = dynamic_cast( &mMap->paintDevice() ); - if( !pixmap ) + if ( !pixmap ) return; pixmap->save( theFileName, theFormat.toLocal8Bit().data() ); @@ -1237,7 +1237,7 @@ bool QgsMapCanvas::isFrozen() QPixmap& QgsMapCanvas::canvasPixmap() { QPixmap *pixmap = dynamic_cast( &canvasPaintDevice() ); - if( pixmap ) + if ( pixmap ) { return *pixmap; } @@ -1247,7 +1247,7 @@ QPixmap& QgsMapCanvas::canvasPixmap() static QPixmap staticPixmap; QImage *image = dynamic_cast( &mMap->paintDevice() ); - if( image ) + if ( image ) { staticPixmap = QPixmap::fromImage( *image ); } diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp index b01840ac85d..c77952192cb 100644 --- a/src/gui/qgsmapoverviewcanvas.cpp +++ b/src/gui/qgsmapoverviewcanvas.cpp @@ -90,7 +90,7 @@ void QgsMapOverviewCanvas::resizeEvent( QResizeEvent* e ) void QgsMapOverviewCanvas::paintEvent( QPaintEvent* pe ) { - if( mNewSize.isValid() ) + if ( mNewSize.isValid() ) { mPixmap = QPixmap( mNewSize ); mMapRenderer->setOutputSize( mNewSize, mPixmap.logicalDpiX() ); diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp index 2d2914a93d8..8ac7efe1ec4 100644 --- a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp +++ b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp @@ -12,36 +12,36 @@ // delegate used from Qt Spin Box example class SpinBoxDelegate : public QItemDelegate { -public: - SpinBoxDelegate(QObject *parent = 0) : QItemDelegate(parent) {} + public: + SpinBoxDelegate( QObject *parent = 0 ) : QItemDelegate( parent ) {} - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem & /*option*/, const QModelIndex &/*index*/) const + QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem & /*option*/, const QModelIndex &/*index*/ ) const { - QSpinBox *editor = new QSpinBox(parent); - editor->setMinimum(0); - editor->setMaximum(999); - return editor; + QSpinBox *editor = new QSpinBox( parent ); + editor->setMinimum( 0 ); + editor->setMaximum( 999 ); + return editor; } - void setEditorData(QWidget *editor, const QModelIndex &index) const + void setEditorData( QWidget *editor, const QModelIndex &index ) const { - int value = index.model()->data(index, Qt::EditRole).toInt(); - QSpinBox *spinBox = static_cast(editor); - spinBox->setValue(value); + int value = index.model()->data( index, Qt::EditRole ).toInt(); + QSpinBox *spinBox = static_cast( editor ); + spinBox->setValue( value ); } - void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const + void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const { - QSpinBox *spinBox = static_cast(editor); - spinBox->interpretText(); - int value = spinBox->value(); + QSpinBox *spinBox = static_cast( editor ); + spinBox->interpretText(); + int value = spinBox->value(); - model->setData(index, value, Qt::EditRole); + model->setData( index, value, Qt::EditRole ); } - void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const + void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex & /*index*/ ) const { - editor->setGeometry(option.rect); + editor->setGeometry( option.rect ); } }; @@ -53,7 +53,7 @@ QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog( QgsSymbolV2List symbols, bool { setupUi( this ); - tableLevels->setItemDelegate( new SpinBoxDelegate(this) ); + tableLevels->setItemDelegate( new SpinBoxDelegate( this ) ); chkEnable->setChecked( usingSymbolLevels ); diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp index 2f704035ef3..8481f4eab33 100644 --- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp +++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp @@ -41,7 +41,7 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsSt QStandardItemModel* model = new QStandardItemModel( viewSymbols ); viewSymbols->setModel( model ); connect( viewSymbols, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( setSymbolFromStyle( const QModelIndex & ) ) ); - lblSymbolName->setText(""); + lblSymbolName->setText( "" ); populateSymbolView(); updateSymbolPreview(); updateSymbolInfo(); @@ -98,7 +98,7 @@ void QgsSymbolV2SelectorDialog::populateSymbolView() } QStandardItem* item = new QStandardItem( names[i] ); item->setData( names[i], Qt::UserRole ); //so we can show a label when it is clicked - item->setText(""); //set the text to nothing and show in label when clicked rather + item->setText( "" ); //set the text to nothing and show in label when clicked rather item->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable ); // create preview icon QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( s, previewSize ); diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp index 3ebb4cc94ab..91612b9239f 100644 --- a/src/plugins/grass/qgsgrassmodule.cpp +++ b/src/plugins/grass/qgsgrassmodule.cpp @@ -1183,7 +1183,7 @@ QPixmap QgsGrassModule::pixmap( QString path, int height ) painter.end(); } } - int buffer = height/3; // buffer around a sign + int buffer = height / 3; // buffer around a sign if ( pixmaps.size() > 1 ) width += arrowWidth + 2 * buffer; // -> if ( pixmaps.size() > 2 ) width += plusWidth + 2 * buffer; // + diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp index 0a72333f888..26925c89fc7 100644 --- a/src/plugins/grass/qgsgrassregion.cpp +++ b/src/plugins/grass/qgsgrassregion.cpp @@ -94,7 +94,7 @@ void QgsGrassRegionEdit::setRegion( const QgsPoint& ul, const QgsPoint& lr ) mRubberBand->addPoint( ul, false ); mRubberBand->addPoint( QgsPoint( ul.x(), lr.y() ), false ); mRubberBand->addPoint( lr, false ); - mRubberBand->addPoint( QgsPoint( lr.x(), ul.y() ), true ); // true to update canvas + mRubberBand->addPoint( QgsPoint( lr.x(), ul.y() ), true ); // true to update canvas mRubberBand->show(); } @@ -231,7 +231,7 @@ void QgsGrassRegion::refreshGui() mUpdatingGui = true; - QgsDebugMsg( "entered." ); + QgsDebugMsg( "entered." ); mNorth->setText( QString( "%1" ).arg( mWindow.north, 0, 'g', 15 ) ); mSouth->setText( QString( "%1" ).arg( mWindow.south, 0, 'g', 15 ) ); @@ -304,7 +304,7 @@ void QgsGrassRegion::NSResChanged() if ( mUpdatingGui ) return; mWindow.ns_res = mNSRes->text().toDouble(); - if ( mWindow.ns_res <= 0) + if ( mWindow.ns_res <= 0 ) mWindow.ns_res = 1; adjust(); @@ -316,7 +316,7 @@ void QgsGrassRegion::EWResChanged() if ( mUpdatingGui ) return; mWindow.ew_res = mEWRes->text().toDouble(); - if ( mWindow.ew_res <= 0) + if ( mWindow.ew_res <= 0 ) mWindow.ew_res = 1; adjust(); @@ -328,7 +328,7 @@ void QgsGrassRegion::rowsChanged() if ( mUpdatingGui ) return; mWindow.rows = mRows->text().toInt(); - if ( mWindow.rows < 1) + if ( mWindow.rows < 1 ) mWindow.rows = 1; adjust(); @@ -340,7 +340,7 @@ void QgsGrassRegion::colsChanged() if ( mUpdatingGui ) return; mWindow.cols = mCols->text().toInt(); - if ( mWindow.cols < 1) + if ( mWindow.cols < 1 ) mWindow.cols = 1; adjust(); diff --git a/src/plugins/grass/qgsgrassregion.h b/src/plugins/grass/qgsgrassregion.h index 2044edd6509..298b04f005e 100644 --- a/src/plugins/grass/qgsgrassregion.h +++ b/src/plugins/grass/qgsgrassregion.h @@ -46,7 +46,7 @@ class QgsGrassRegion: public QDialog, private Ui::QgsGrassRegionBase public: //! Constructor QgsGrassRegion( QgsGrassPlugin *plugin, QgisInterface *iface, - QWidget * parent = 0, Qt::WFlags f = 0 ); + QWidget * parent = 0, Qt::WFlags f = 0 ); //! Destructor ~QgsGrassRegion(); diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp index 36ab2ac6bcf..6c6e2a82b81 100644 --- a/src/plugins/grass/qgsgrassselect.cpp +++ b/src/plugins/grass/qgsgrassselect.cpp @@ -170,7 +170,7 @@ void QgsGrassSelect::setLocations() { elocation->setCurrentIndex( sel ); } - buttonBox->button(QDialogButtonBox::Ok)->setDefault( true ); + buttonBox->button( QDialogButtonBox::Ok )->setDefault( true ); GisdbaseBrowse->setDefault( elocation->count() == 0 ); setMapsets(); @@ -213,7 +213,7 @@ void QgsGrassSelect::setMapsets() } if ( emap->isHidden() ) { - buttonBox->button(QDialogButtonBox::Ok)->setDefault( emapset->count() > 0 ); + buttonBox->button( QDialogButtonBox::Ok )->setDefault( emapset->count() > 0 ); } setMaps(); @@ -308,7 +308,7 @@ void QgsGrassSelect::setMaps() */ if ( !emap->isHidden() ) { - buttonBox->button(QDialogButtonBox::Ok)->setDefault( emap->count() > 0 ); + buttonBox->button( QDialogButtonBox::Ok )->setDefault( emap->count() > 0 ); } setLayers(); diff --git a/src/plugins/offline_editing/offline_editing_plugin_gui.cpp b/src/plugins/offline_editing/offline_editing_plugin_gui.cpp index f77c1c8bdfa..10674384b02 100644 --- a/src/plugins/offline_editing/offline_editing_plugin_gui.cpp +++ b/src/plugins/offline_editing/offline_editing_plugin_gui.cpp @@ -77,17 +77,17 @@ void QgsOfflineEditingPluginGui::updateLayerList( bool filterEditableLayers ) bool showLayer = true; if ( filterEditableLayers ) { - int cap = layer->dataProvider()->capabilities(); - showLayer = ( cap & QgsVectorDataProvider::AddFeatures ) && - ( cap & QgsVectorDataProvider::DeleteFeatures ) && - ( cap & QgsVectorDataProvider::ChangeAttributeValues ) && - ( cap & QgsVectorDataProvider::AddAttributes ) && - ( cap & QgsVectorDataProvider::ChangeGeometries ); + int cap = layer->dataProvider()->capabilities(); + showLayer = ( cap & QgsVectorDataProvider::AddFeatures ) && + ( cap & QgsVectorDataProvider::DeleteFeatures ) && + ( cap & QgsVectorDataProvider::ChangeAttributeValues ) && + ( cap & QgsVectorDataProvider::AddAttributes ) && + ( cap & QgsVectorDataProvider::ChangeGeometries ); } if ( showLayer ) { - QListWidgetItem* item = new QListWidgetItem( layer->name(), ui_layerList ); - item->setData( Qt::UserRole, QVariant( layer_it.key() ) ); + QListWidgetItem* item = new QListWidgetItem( layer->name(), ui_layerList ); + item->setData( Qt::UserRole, QVariant( layer_it.key() ) ); } } } @@ -111,7 +111,7 @@ void QgsOfflineEditingPluginGui::on_butBrowse_clicked() void QgsOfflineEditingPluginGui::on_checkboxShowEditableLayers_stateChanged( int state ) { - updateLayerList( checkboxShowEditableLayers->checkState() == Qt::Checked ); + updateLayerList( checkboxShowEditableLayers->checkState() == Qt::Checked ); } void QgsOfflineEditingPluginGui::on_buttonBox_accepted() diff --git a/tests/src/core/regression992.cpp b/tests/src/core/regression992.cpp index fbf2e028e94..030b88465de 100644 --- a/tests/src/core/regression992.cpp +++ b/tests/src/core/regression992.cpp @@ -28,11 +28,11 @@ //qgis includes... -#include -#include -#include +#include +#include +#include #include -#include +#include //qgis unit test includes #include @@ -43,16 +43,16 @@ */ class Regression992: public QObject { - Q_OBJECT; + Q_OBJECT; private slots: void initTestCase();// will be called before the first testfunction is executed. void cleanupTestCase();// will be called after the last testfunction was executed. - void init(){};// will be called before each testfunction is executed. - void cleanup(){};// will be called after every testfunction. + void init() {};// will be called before each testfunction is executed. + void cleanup() {};// will be called after every testfunction. void regression992(); private: - bool render(QString theFileName); + bool render( QString theFileName ); QString mTestDataDir; QgsRasterLayer * mpRasterLayer; QgsMapRenderer * mpMapRenderer; @@ -63,55 +63,55 @@ class Regression992: public QObject void Regression992::initTestCase() { // init QGIS's paths - true means that all path will be inited from prefix - QString qgisPath = QCoreApplication::applicationDirPath (); - QgsApplication::setPrefixPath(INSTALL_PREFIX, true); + QString qgisPath = QCoreApplication::applicationDirPath(); + QgsApplication::setPrefixPath( INSTALL_PREFIX, true ); QgsApplication::showSettings(); //create some objects that will be used in all tests... //create a raster layer that will be used in all tests... - mTestDataDir = QString(TEST_DATA_DIR) + QDir::separator(); //defined in CMakeLists.txt + mTestDataDir = QString( TEST_DATA_DIR ) + QDir::separator(); //defined in CMakeLists.txt QString myFileName = mTestDataDir + "rgbwcmyk01_YeGeo.jp2"; - QFileInfo myRasterFileInfo ( myFileName ); - mpRasterLayer = new QgsRasterLayer ( myRasterFileInfo.filePath(), - myRasterFileInfo.completeBaseName() ); + QFileInfo myRasterFileInfo( myFileName ); + mpRasterLayer = new QgsRasterLayer( myRasterFileInfo.filePath(), + myRasterFileInfo.completeBaseName() ); // Register the layer with the registry - QgsMapLayerRegistry::instance()->addMapLayer(mpRasterLayer); + QgsMapLayerRegistry::instance()->addMapLayer( mpRasterLayer ); // add the test layer to the maprender mpMapRenderer = new QgsMapRenderer(); QStringList myLayers; myLayers << mpRasterLayer->id(); - mpMapRenderer->setLayerSet(myLayers); + mpMapRenderer->setLayerSet( myLayers ); mReport += "

Regression 992 Test

\n"; mReport += "

See " - "trac ticket 992 for more details.

"; + "trac ticket 992 for more details.

"; } //runs after all tests void Regression992::cleanupTestCase() { QString myReportFile = QDir::tempPath() + QDir::separator() + "regression992.html"; - QFile myFile ( myReportFile); - if ( myFile.open ( QIODevice::WriteOnly ) ) + QFile myFile( myReportFile ); + if ( myFile.open( QIODevice::WriteOnly ) ) { - QTextStream myQTextStream ( &myFile ); + QTextStream myQTextStream( &myFile ); myQTextStream << mReport; myFile.close(); - QDesktopServices::openUrl("file://"+myReportFile); + QDesktopServices::openUrl( "file://" + myReportFile ); } } void Regression992::regression992() { - QVERIFY ( mpRasterLayer->isValid() ); - mpMapRenderer->setExtent(mpRasterLayer->extent()); - QString myDataDir (TEST_DATA_DIR); //defined in CmakeLists.txt + QVERIFY( mpRasterLayer->isValid() ); + mpMapRenderer->setExtent( mpRasterLayer->extent() ); + QString myDataDir( TEST_DATA_DIR ); //defined in CmakeLists.txt QString myTestDataDir = myDataDir + QDir::separator(); QgsRenderChecker myChecker; - myChecker.setExpectedImage ( myTestDataDir + "expected_rgbwcmyk01_YeGeo.jp2.png" ); - myChecker.setMapRenderer ( mpMapRenderer ); - bool myResultFlag = myChecker.runTest("regression992"); + myChecker.setExpectedImage( myTestDataDir + "expected_rgbwcmyk01_YeGeo.jp2.png" ); + myChecker.setMapRenderer( mpMapRenderer ); + bool myResultFlag = myChecker.runTest( "regression992" ); mReport += "\n\n\n" + myChecker.report(); - QVERIFY(myResultFlag); + QVERIFY( myResultFlag ); } -QTEST_MAIN(Regression992) +QTEST_MAIN( Regression992 ) #include "moc_regression992.cxx"