Skip to content

Commit

Permalink
indentation update
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Apr 17, 2012
1 parent 6248295 commit 4d6cc6d
Show file tree
Hide file tree
Showing 36 changed files with 6,606 additions and 6,457 deletions.
40 changes: 20 additions & 20 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -4385,7 +4385,7 @@ void QgisApp::copyStyle( QgsMapLayer * sourceLayer )
QDomImplementation DomImplementation;
QDomDocumentType documentType =
DomImplementation.createDocumentType(
"qgis", "http://mrcc.com/qgis.dtd", "SYSTEM" );
"qgis", "http://mrcc.com/qgis.dtd", "SYSTEM" );
QDomDocument doc( documentType );
QDomElement rootNode = doc.createElement( "qgis" );
rootNode.setAttribute( "version", QString( "%1" ).arg( QGis::QGIS_VERSION ) );
Expand All @@ -4394,10 +4394,10 @@ void QgisApp::copyStyle( QgsMapLayer * sourceLayer )
if ( !selectionLayer->writeSymbology( rootNode, doc, errorMsg ) )
{
QMessageBox::warning( this,
tr( "Error" ),
tr( "Cannot copy style: %1" )
.arg( errorMsg ),
QMessageBox::Ok );
tr( "Error" ),
tr( "Cannot copy style: %1" )
.arg( errorMsg ),
QMessageBox::Ok );
return;
}
// Copies data in text form as well, so the XML can be pasted into a text editor
Expand All @@ -4417,26 +4417,26 @@ void QgisApp::pasteStyle( QgsMapLayer * destinationLayer )
QDomDocument doc( "qgis" );
QString errorMsg;
int errorLine, errorColumn;
if ( !doc.setContent ( clipboard()->data( QGSCLIPBOARD_STYLE_MIME ), false, &errorMsg, &errorLine, &errorColumn ) )
if ( !doc.setContent( clipboard()->data( QGSCLIPBOARD_STYLE_MIME ), false, &errorMsg, &errorLine, &errorColumn ) )
{
QMessageBox::information( this,
tr( "Error" ),
tr( "Cannot parse style: %1:%2:%3" )
.arg( errorMsg )
.arg( errorLine )
.arg( errorColumn ),
QMessageBox::Ok );
return;
QMessageBox::information( this,
tr( "Error" ),
tr( "Cannot parse style: %1:%2:%3" )
.arg( errorMsg )
.arg( errorLine )
.arg( errorColumn ),
QMessageBox::Ok );
return;
}
QDomElement rootNode = doc.firstChildElement( "qgis" );
if ( !selectionLayer->readSymbology( rootNode, errorMsg ) )
{
QMessageBox::information( this,
tr( "Error" ),
tr( "Cannot read style: %1" )
.arg( errorMsg ),
QMessageBox::Ok );
return;
QMessageBox::information( this,
tr( "Error" ),
tr( "Cannot read style: %1" )
.arg( errorMsg ),
QMessageBox::Ok );
return;
}

mMapLegend->refreshLayerSymbology( selectionLayer->id(), false );
Expand Down
26 changes: 13 additions & 13 deletions src/app/qgsclipboard.cpp
View file
Expand Up @@ -167,35 +167,35 @@ QgsCoordinateReferenceSystem QgsClipboard::crs()

void QgsClipboard::setData( const QString& mimeType, const QByteArray& data, const QString* text )
{
QMimeData *mdata = new QMimeData();
mdata->setData( mimeType, data );
if ( text )
{
mdata->setText( *text );
}
// Transfers ownership to the clipboard object
QMimeData *mdata = new QMimeData();
mdata->setData( mimeType, data );
if ( text )
{
mdata->setText( *text );
}
// Transfers ownership to the clipboard object
#ifndef Q_OS_WIN
QApplication::clipboard()->setMimeData( mdata, QClipboard::Selection );
QApplication::clipboard()->setMimeData( mdata, QClipboard::Selection );
#endif
QApplication::clipboard()->setMimeData( mdata, QClipboard::Clipboard );
QApplication::clipboard()->setMimeData( mdata, QClipboard::Clipboard );
}

void QgsClipboard::setData( const QString& mimeType, const QByteArray& data, const QString& text )
{
setData( mimeType, data, &text );
setData( mimeType, data, &text );
}

void QgsClipboard::setData( const QString& mimeType, const QByteArray& data )
{
setData( mimeType, data, 0 );
setData( mimeType, data, 0 );
}

bool QgsClipboard::hasFormat( const QString& mimeType )
{
return QApplication::clipboard()->mimeData()->hasFormat( mimeType );
return QApplication::clipboard()->mimeData()->hasFormat( mimeType );
}

QByteArray QgsClipboard::data( const QString& mimeType )
{
return QApplication::clipboard()->mimeData()->data( mimeType );
return QApplication::clipboard()->mimeData()->data( mimeType );
}
4 changes: 2 additions & 2 deletions src/app/qgsmaptooloffsetcurve.cpp
View file
Expand Up @@ -375,8 +375,8 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide
}
}
#else //GEOS_VERSION>=3.3
Q_UNUSED(offset);
Q_UNUSED(leftSide);
Q_UNUSED( offset );
Q_UNUSED( leftSide );
#endif //GEOS_VERSION>=3.3
}

Expand Down
12 changes: 6 additions & 6 deletions src/core/composer/qgscomposerscalebar.cpp
View file
Expand Up @@ -29,12 +29,12 @@
#include <cmath>

QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition )
: QgsComposerItem( composition )
, mComposerMap( 0 )
, mNumUnitsPerSegment( 0 )
, mStyle( 0 )
, mSegmentMillimeters( 0.0 )
, mAlignment( Left )
: QgsComposerItem( composition )
, mComposerMap( 0 )
, mNumUnitsPerSegment( 0 )
, mStyle( 0 )
, mSegmentMillimeters( 0.0 )
, mAlignment( Left )
{
applyDefaultSettings();
applyDefaultSize();
Expand Down
12 changes: 6 additions & 6 deletions src/core/qgscoordinatereferencesystem.cpp
View file
Expand Up @@ -212,7 +212,7 @@ bool QgsCoordinateReferenceSystem::createFromEpsg( long id )
bool QgsCoordinateReferenceSystem::createFromSrsId( long id )
{
return loadFromDb( id < USER_CRS_START_ID ? QgsApplication::srsDbFilePath() :
QgsApplication::qgisUserDbFilePath(),
QgsApplication::qgisUserDbFilePath(),
"srs_id", QString::number( id ) );
}

Expand Down Expand Up @@ -254,8 +254,8 @@ bool QgsCoordinateReferenceSystem::loadFromDb( QString db, QString expression, Q
*/

QString mySql = "select srs_id,description,projection_acronym,"
"ellipsoid_acronym,parameters,srid,auth_name||':'||auth_id,is_geo "
"from tbl_srs where " + expression + "=" + quotedValue( value );
"ellipsoid_acronym,parameters,srid,auth_name||':'||auth_id,is_geo "
"from tbl_srs where " + expression + "=" + quotedValue( value );
myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(),
mySql.toUtf8().length(),
&myPreparedStatement, &myTail );
Expand All @@ -265,7 +265,7 @@ bool QgsCoordinateReferenceSystem::loadFromDb( QString db, QString expression, Q
mSrsId = QString::fromUtf8(( char * )sqlite3_column_text(
myPreparedStatement, 0 ) ).toLong();
mDescription = QString::fromUtf8(( char * )sqlite3_column_text(
myPreparedStatement, 1 ) );
myPreparedStatement, 1 ) );
mProjectionAcronym = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 2 ) );
mEllipsoidAcronym = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 3 ) );
QString toProj4 = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) );
Expand Down Expand Up @@ -813,8 +813,8 @@ void QgsCoordinateReferenceSystem::setProj4String( QString theProj4String )
OSRDestroySpatialReference( mCRS );
mCRS = OSRNewSpatialReference( NULL );
mIsValidFlag =
OSRImportFromProj4( mCRS, theProj4String.toLatin1().constData() )
== OGRERR_NONE;
OSRImportFromProj4( mCRS, theProj4String.toLatin1().constData() )
== OGRERR_NONE;
mWkt.clear();
setMapUnits();

Expand Down
25 changes: 13 additions & 12 deletions src/core/qgsmaplayerregistry.cpp
View file
Expand Up @@ -59,21 +59,21 @@ QgsMapLayer * QgsMapLayerRegistry::mapLayer( QString theLayerId )

//introduced in 1.8
QList<QgsMapLayer *> QgsMapLayerRegistry::addMapLayers(
QList<QgsMapLayer *> theMapLayers,
bool theEmitSignal )
QList<QgsMapLayer *> theMapLayers,
bool theEmitSignal )
{
QList<QgsMapLayer *> myResultList;
for (int i = 0; i < theMapLayers.size(); ++i)
for ( int i = 0; i < theMapLayers.size(); ++i )
{
QgsMapLayer * myLayer = theMapLayers.at(i);
QgsMapLayer * myLayer = theMapLayers.at( i );
if ( !myLayer || !myLayer->isValid() )
{
QgsDebugMsg( "cannot add invalid layers" );
continue;
}
//check the layer is not already registered!
QMap<QString, QgsMapLayer*>::iterator myIterator =
mMapLayers.find( myLayer->id() );
mMapLayers.find( myLayer->id() );
//if myIterator returns mMapLayers.end() then it
//does not exist in registry and its safe to add it
if ( myIterator == mMapLayers.end() )
Expand All @@ -97,30 +97,31 @@ QgsMapLayerRegistry::addMapLayer( QgsMapLayer * theMapLayer,
bool theEmitSignal )
{
QList<QgsMapLayer *> myList;
myList.append(theMapLayer);
addMapLayers(myList, theEmitSignal);
myList.append( theMapLayer );
addMapLayers( myList, theEmitSignal );
return theMapLayer;
} // QgsMapLayerRegistry::addMapLayer

//introduced in 1.8
void QgsMapLayerRegistry::removeMapLayers( QStringList theLayerIds,
bool theEmitSignal )
bool theEmitSignal )
{
if ( theEmitSignal )
emit layersWillBeRemoved( theLayerIds );

foreach (const QString &myId, theLayerIds) {
foreach( const QString &myId, theLayerIds )
{
if ( theEmitSignal )
emit layerWillBeRemoved( myId );
delete mMapLayers[myId];
mMapLayers.remove( myId );
}
emit layersWillBeRemoved(theLayerIds);
emit layersWillBeRemoved( theLayerIds );
}

//deprecated 1.8 use removeMapLayers rather
void QgsMapLayerRegistry::removeMapLayer( QString theLayerId,
bool theEmitSignal )
bool theEmitSignal )
{
QStringList myList;
myList << theLayerId;
Expand All @@ -141,7 +142,7 @@ void QgsMapLayerRegistry::removeAllMapLayers()
QString id = it.key();
myList << id;
}
removeMapLayers(myList, false);
removeMapLayers( myList, false );
mMapLayers.clear();
} // QgsMapLayerRegistry::removeAllMapLayers()

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayer.cpp
View file
Expand Up @@ -125,7 +125,7 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
#else
bool use_symbology_ng_default = true;
#endif
if ( settings.value( "/qgis/use_symbology_ng", use_symbology_ng_default ).toBool() && hasGeometryType() )
if ( settings.value( "/qgis/use_symbology_ng", use_symbology_ng_default ).toBool() && hasGeometryType() )
{
// using symbology-ng!
setUsingRendererV2( true );
Expand Down

0 comments on commit 4d6cc6d

Please sign in to comment.