From 129bd987d5f3265a66a0cb0d4de8f014a959f87f Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 9 Jan 2014 13:40:12 +0100 Subject: [PATCH] indentation update --- .../plugins/processing/gui/ParametersPanel.py | 2 +- src/app/nodetool/qgsmaptoolnodetool.cpp | 15 ++-- src/app/qgisappstylesheet.cpp | 26 +++---- src/app/qgsprojectproperties.cpp | 7 +- src/core/qgsvectorlayer.cpp | 2 +- src/gui/qgsoptionsdialogbase.cpp | 16 ++-- src/mapserver/qgis_map_serv.cpp | 9 ++- src/mapserver/qgsprojectparser.cpp | 74 +++++++++---------- src/mapserver/qgssldparser.cpp | 4 +- src/mapserver/qgswmsserver.cpp | 4 +- src/providers/wcs/qgswcscapabilities.cpp | 2 +- tests/src/core/testqgscomposerpaper.cpp | 20 ++--- 12 files changed, 93 insertions(+), 88 deletions(-) diff --git a/python/plugins/processing/gui/ParametersPanel.py b/python/plugins/processing/gui/ParametersPanel.py index e9b70fb4823..78c568e06cb 100644 --- a/python/plugins/processing/gui/ParametersPanel.py +++ b/python/plugins/processing/gui/ParametersPanel.py @@ -185,7 +185,7 @@ class ParametersPanel(QtGui.QWidget): return layer.name() def getWidgetFromParameter(self, param): - # TODO Create Parameter widget class that holds the logic + # TODO Create Parameter widget class that holds the logic # for creating a widget that belongs to the parameter. if isinstance(param, ParameterRaster): layers = dataobjects.getRasterLayers() diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp index 0dea76bc9c6..54bb1251d84 100644 --- a/src/app/nodetool/qgsmaptoolnodetool.cpp +++ b/src/app/nodetool/qgsmaptoolnodetool.cpp @@ -723,7 +723,8 @@ void QgsMapToolNodeTool::keyPressEvent( QKeyEvent* e ) if ( mSelectedFeature && ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete ) ) { int firstSelectedIndex = firstSelectedVertex(); - if ( firstSelectedIndex == -1 ) return; + if ( firstSelectedIndex == -1 ) + return; mSelectedFeature->deleteSelectedVertexes(); safeSelectVertex( firstSelectedIndex ); @@ -732,21 +733,21 @@ void QgsMapToolNodeTool::keyPressEvent( QKeyEvent* e ) // Override default shortcut management in MapCanvas e->ignore(); } - else - if ( mSelectedFeature && ( e->key() == Qt::Key_Less || e->key() == Qt::Key_Comma ) ) + else if ( mSelectedFeature && ( e->key() == Qt::Key_Less || e->key() == Qt::Key_Comma ) ) { int firstSelectedIndex = firstSelectedVertex(); - if ( firstSelectedIndex == -1) return; + if ( firstSelectedIndex == -1 ) + return; mSelectedFeature->deselectAllVertexes(); safeSelectVertex( firstSelectedIndex - 1 ); mCanvas->refresh(); } - else - if ( mSelectedFeature && ( e->key() == Qt::Key_Greater || e->key() == Qt::Key_Period ) ) + else if ( mSelectedFeature && ( e->key() == Qt::Key_Greater || e->key() == Qt::Key_Period ) ) { int firstSelectedIndex = firstSelectedVertex(); - if ( firstSelectedIndex == -1) return; + if ( firstSelectedIndex == -1 ) + return; mSelectedFeature->deselectAllVertexes(); safeSelectVertex( firstSelectedIndex + 1 ); diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp index e90e0390563..37fa2e4e407 100644 --- a/src/app/qgisappstylesheet.cpp +++ b/src/app/qgisappstylesheet.cpp @@ -161,19 +161,19 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap& opts ) if ( sidebar ) { - QString style = "QListWidget#mOptionsListWidget {" - "background-color: rgb(69, 69, 69, 220);" - "}" - "QListWidget#mOptionsListWidget::item {" - " color: white;" - " padding: 3px;" - "}" - "QListWidget#mOptionsListWidget::item::selected {" - " color: black;" - " background-color:palette(Window);" - " padding-right: 0px; " - "}"; - ss += style; + QString style = "QListWidget#mOptionsListWidget {" + "background-color: rgb(69, 69, 69, 220);" + "}" + "QListWidget#mOptionsListWidget::item {" + " color: white;" + " padding: 3px;" + "}" + "QListWidget#mOptionsListWidget::item::selected {" + " color: black;" + " background-color:palette(Window);" + " padding-right: 0px; " + "}"; + ss += style; } //fix background issue for gnome desktop diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index 03016f617e2..2471f17db29 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -1058,10 +1058,11 @@ void QgsProjectProperties::on_pbnWMSAddSRS_clicked() { QgsGenericProjectionSelector *mySelector = new QgsGenericProjectionSelector( this ); mySelector->setMessage(); - if ( mWMSList->count() > 0 ) { - mySelector->setSelectedAuthId( mWMSList->item( mWMSList->count()-1 )->text() ); + if ( mWMSList->count() > 0 ) + { + mySelector->setSelectedAuthId( mWMSList->item( mWMSList->count() - 1 )->text() ); } - if ( mySelector->exec() && mySelector->selectedCrsId()!=0 ) + if ( mySelector->exec() && mySelector->selectedCrsId() != 0 ) { QString authid = mySelector->selectedAuthId(); diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 4a8322e15c1..35dc16bc1ec 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -2517,7 +2517,7 @@ bool QgsVectorLayer::changeGeometry( QgsFeatureId fid, QgsGeometry* geom ) bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, QVariant value, bool emitSignal ) { Q_UNUSED( emitSignal ); - return changeAttributeValue ( fid, field, value ); + return changeAttributeValue( fid, field, value ); } bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, QVariant value ) diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp index 58186b33221..d00397c4e92 100644 --- a/src/gui/qgsoptionsdialogbase.cpp +++ b/src/gui/qgsoptionsdialogbase.cpp @@ -55,11 +55,11 @@ void QgsOptionsDialogBase::initOptionsBase( bool restoreUi ) // start with copy of qgsoptionsdialog_template.ui to ensure existence of these objects mOptListWidget = findChild( "mOptionsListWidget" ); - QFrame* optionsFrame = findChild("mOptionsFrame"); + QFrame* optionsFrame = findChild( "mOptionsFrame" ); mOptStackedWidget = findChild( "mOptionsStackedWidget" ); mOptSplitter = findChild( "mOptionsSplitter" ); mOptButtonBox = findChild( "buttonBox" ); - QFrame* buttonBoxFrame = findChild("mButtonBoxFrame"); + QFrame* buttonBoxFrame = findChild( "mButtonBoxFrame" ); if ( !mOptListWidget || !mOptStackedWidget || !mOptSplitter || !optionsFrame ) { @@ -68,20 +68,20 @@ void QgsOptionsDialogBase::initOptionsBase( bool restoreUi ) QSettings settings; int size = settings.value( "/IconSize", 24 ).toInt(); - mOptListWidget->setIconSize( QSize(size, size) ); + mOptListWidget->setIconSize( QSize( size, size ) ); mOptListWidget->setFrameStyle( QFrame::NoFrame ); - optionsFrame->layout()->setContentsMargins(0,3,3,3); - QVBoxLayout* layout = static_cast(optionsFrame->layout()); + optionsFrame->layout()->setContentsMargins( 0, 3, 3, 3 ); + QVBoxLayout* layout = static_cast( optionsFrame->layout() ); if ( buttonBoxFrame ) { - buttonBoxFrame->layout()->setContentsMargins(0,0,0,0); - layout->insertWidget(layout->count() + 1, buttonBoxFrame ); + buttonBoxFrame->layout()->setContentsMargins( 0, 0, 0, 0 ); + layout->insertWidget( layout->count() + 1, buttonBoxFrame ); } else { - layout->insertWidget( layout->count() + 1, mOptButtonBox ); + layout->insertWidget( layout->count() + 1, mOptButtonBox ); } if ( mOptButtonBox ) diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp index 75baa995d6a..fa6952dd091 100644 --- a/src/mapserver/qgis_map_serv.cpp +++ b/src/mapserver/qgis_map_serv.cpp @@ -708,12 +708,15 @@ int main( int argc, char * argv[] ) delete theServer; continue; } - else if ( request.compare( "GetStyles", Qt::CaseInsensitive ) == 0 ) + else if ( request.compare( "GetStyles", Qt::CaseInsensitive ) == 0 ) { // GetStyles is only defined for WMS1.1.1/SLD1.0 - if ( version != "1.1.1") { + if ( version != "1.1.1" ) + { theRequestHandler->sendServiceException( QgsMapServiceException( "OperationNotSupported", "GetStyles method is only available in WMS version 1.1.1" ) ); - } else { + } + else + { try { QDomDocument doc = theServer->getStyles(); diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp index b163fc6003a..b5f343c60ae 100644 --- a/src/mapserver/qgsprojectparser.cpp +++ b/src/mapserver/qgsprojectparser.cpp @@ -1939,52 +1939,52 @@ QDomDocument QgsProjectParser::getStyle( const QString& styleName, const QString QDomDocument QgsProjectParser::getStyles( QStringList& layerList ) const { - QDomDocument myDocument = QDomDocument(); + QDomDocument myDocument = QDomDocument(); - QDomNode header = myDocument.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ); - myDocument.appendChild( header ); + QDomNode header = myDocument.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ); + myDocument.appendChild( header ); - // Create the root element - QDomElement root = myDocument.createElementNS( "http://www.opengis.net/sld", "StyledLayerDescriptor" ); - root.setAttribute( "version", "1.1.0" ); - root.setAttribute( "xsi:schemaLocation", "http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" ); - root.setAttribute( "xmlns:ogc", "http://www.opengis.net/ogc" ); - root.setAttribute( "xmlns:se", "http://www.opengis.net/se" ); - root.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" ); - root.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" ); - myDocument.appendChild( root ); + // Create the root element + QDomElement root = myDocument.createElementNS( "http://www.opengis.net/sld", "StyledLayerDescriptor" ); + root.setAttribute( "version", "1.1.0" ); + root.setAttribute( "xsi:schemaLocation", "http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" ); + root.setAttribute( "xmlns:ogc", "http://www.opengis.net/ogc" ); + root.setAttribute( "xmlns:se", "http://www.opengis.net/se" ); + root.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" ); + root.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" ); + myDocument.appendChild( root ); - for ( int i = 0; i < layerList.size(); i++) + for ( int i = 0; i < layerList.size(); i++ ) + { + QString layerName; + QString typeName; + layerName = layerList.at( i ); + typeName = layerName.replace( " ", "_" ); + QList currentLayerList = mapLayerFromTypeName( typeName ); + if ( currentLayerList.size() < 1 ) { - QString layerName; - QString typeName; - layerName = layerList.at( i ); - typeName = layerName.replace(" ", "_"); - QList currentLayerList = mapLayerFromTypeName( typeName ); - if ( currentLayerList.size() < 1 ) + throw QgsMapServiceException( "Error", QString( "The layer for the TypeName '%1' is not found" ).arg( layerName ) ); + } + for ( int j = 0; j < currentLayerList.size(); j++ ) + { + QgsMapLayer* currentLayer = currentLayerList.at( j ); + QgsVectorLayer* layer = dynamic_cast( currentLayer ); + if ( !layer ) { - throw QgsMapServiceException( "Error", QString( "The layer for the TypeName '%1' is not found" ).arg( layerName ) ); + throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( "Non-vector layers not supported yet" ) ); } - for ( int j = 0; j < currentLayerList.size(); j++) - { - QgsMapLayer* currentLayer = currentLayerList.at( j ); - QgsVectorLayer* layer = dynamic_cast( currentLayer ); - if ( !layer ) - { - throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( "Non-vector layers not supported yet" ) ); - } - // Create the NamedLayer element - QDomElement namedLayerNode = myDocument.createElement( "NamedLayer" ); - root.appendChild( namedLayerNode ); + // Create the NamedLayer element + QDomElement namedLayerNode = myDocument.createElement( "NamedLayer" ); + root.appendChild( namedLayerNode ); - QString errorMsg; - if ( !layer->writeSld( namedLayerNode, myDocument, errorMsg ) ) - { - throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( errorMsg ) ); - } + QString errorMsg; + if ( !layer->writeSld( namedLayerNode, myDocument, errorMsg ) ) + { + throw QgsMapServiceException( "Error", QString( "Could not get style because:\n%1" ).arg( errorMsg ) ); } } - return myDocument; + } + return myDocument; } diff --git a/src/mapserver/qgssldparser.cpp b/src/mapserver/qgssldparser.cpp index e12a6c54fb8..c07dfe7cce5 100644 --- a/src/mapserver/qgssldparser.cpp +++ b/src/mapserver/qgssldparser.cpp @@ -1415,7 +1415,7 @@ QDomDocument QgsSLDParser::getStyle( const QString& styleName, const QString& la QDomDocument QgsSLDParser::getStyles( QStringList& layerList ) const { QDomDocument styleDoc; - for ( int i = 0; i < layerList.size(); i++) + for ( int i = 0; i < layerList.size(); i++ ) { QString layerName; QString typeName; @@ -1426,7 +1426,7 @@ QDomDocument QgsSLDParser::getStyles( QStringList& layerList ) const throw QgsMapServiceException( "LayerNotDefined", "Operation request is for a Layer not offered by the server." ); } QDomNodeList userStyleList = userLayerElement.elementsByTagName( "UserStyle" ); - for ( int j = 0; j < userStyleList.size(); j++) + for ( int j = 0; j < userStyleList.size(); j++ ) { QDomElement userStyleElement = userStyleList.item( i ).toElement(); styleDoc.appendChild( styleDoc.importNode( userStyleElement, true ) ); diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp index 1cf5a5bf944..22f189b0f1b 100644 --- a/src/mapserver/qgswmsserver.cpp +++ b/src/mapserver/qgswmsserver.cpp @@ -603,7 +603,7 @@ QDomDocument QgsWMSServer::getStyle() // GetStyles is only defined for WMS1.1.1/SLD1.0 QDomDocument QgsWMSServer::getStyles() -{ +{ QDomDocument doc; if ( !mParameterMap.contains( "LAYERS" ) ) { @@ -613,7 +613,7 @@ QDomDocument QgsWMSServer::getStyles() QStringList layersList = mParameterMap[ "LAYERS" ].split( ",", QString::SkipEmptyParts ); if ( layersList.size() < 1 ) { - throw QgsMapServiceException( "LayerNotSpecified", "Layers is mandatory for GetStyles operation" ); + throw QgsMapServiceException( "LayerNotSpecified", "Layers is mandatory for GetStyles operation" ); } return mConfigParser->getStyles( layersList ); diff --git a/src/providers/wcs/qgswcscapabilities.cpp b/src/providers/wcs/qgswcscapabilities.cpp index be436acd5d0..b237db131fc 100644 --- a/src/providers/wcs/qgswcscapabilities.cpp +++ b/src/providers/wcs/qgswcscapabilities.cpp @@ -74,7 +74,7 @@ QgsWcsCapabilities::QgsWcsCapabilities( QgsDataSourceURI const &theUri ): retrieveServerCapabilities(); } -QgsWcsCapabilities::QgsWcsCapabilities() +QgsWcsCapabilities::QgsWcsCapabilities() : mCoverageCount( 0 ) { } diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp index b4b50e8872e..006362e1754 100644 --- a/tests/src/core/testqgscomposerpaper.cpp +++ b/tests/src/core/testqgscomposerpaper.cpp @@ -49,8 +49,8 @@ class TestQgsComposerPaper: public QObject QgsMarkerLineSymbolLayerV2* mMarkerLine; QgsFillSymbolV2* mFillSymbol; QgsFillSymbolV2* mMarkerLineSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; - + QgsSingleSymbolRendererV2* mSymbolRenderer; + }; void TestQgsComposerPaper::initTestCase() @@ -61,17 +61,17 @@ void TestQgsComposerPaper::initTestCase() //create empty composition mComposition = new QgsComposition( 0 ); mComposition->setPaperSize( 297, 210 ); //A4 landscape - + //setup simple fill mSimpleFill = new QgsSimpleFillSymbolLayerV2(); mFillSymbol = new QgsFillSymbolV2(); mFillSymbol->changeSymbolLayer( 0, mSimpleFill ); - + //setup marker line fill mMarkerLine = new QgsMarkerLineSymbolLayerV2(); mMarkerLineSymbol = new QgsFillSymbolV2(); - mMarkerLineSymbol->changeSymbolLayer( 0, mMarkerLine ); - + mMarkerLineSymbol->changeSymbolLayer( 0, mMarkerLine ); + mReport = "

Composer Paper Tests

\n"; } @@ -109,7 +109,7 @@ void TestQgsComposerPaper::transparentPaper() { mSimpleFill->setColor( Qt::transparent ); mSimpleFill->setBorderColor( Qt::transparent ); - mComposition->setPageStyleSymbol( mFillSymbol ); + mComposition->setPageStyleSymbol( mFillSymbol ); QgsCompositionChecker checker( "composerpaper_transparent", mComposition ); QVERIFY( checker.testComposition( mReport ) ); } @@ -118,14 +118,14 @@ void TestQgsComposerPaper::borderedPaper() { mSimpleFill->setColor( Qt::white ); mSimpleFill->setBorderColor( Qt::black ); - mSimpleFill->setBorderWidth( 6 ); + mSimpleFill->setBorderWidth( 6 ); QgsCompositionChecker checker( "composerpaper_bordered", mComposition ); QVERIFY( checker.testComposition( mReport ) ); } void TestQgsComposerPaper::markerLinePaper() -{ - mComposition->setPageStyleSymbol( mMarkerLineSymbol ); +{ + mComposition->setPageStyleSymbol( mMarkerLineSymbol ); QgsCompositionChecker checker( "composerpaper_markerborder", mComposition ); QVERIFY( checker.testComposition( mReport ) ); }