Skip to content

Commit 5d056e9

Browse files
committedOct 4, 2012
indentation update
1 parent 08a48a2 commit 5d056e9

File tree

7 files changed

+55
-50
lines changed

7 files changed

+55
-50
lines changed
 

‎src/app/qgslabeldialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ void QgsLabelDialog::changeFont( void )
284284
// Native Mac dialog works only for Qt Carbon
285285
mFont = QFontDialog::getFont( &resultFlag, mFont, 0, QString(), QFontDialog::DontUseNativeDialog );
286286
#else
287-
mFont = QFontDialog::getFont( &resultFlag, mFont);
287+
mFont = QFontDialog::getFont( &resultFlag, mFont );
288288
#endif
289289
if ( !resultFlag )
290290
return;

‎src/core/symbology-ng/qgsfillsymbollayerv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context
9090
mSelBrush.setStyle( mBrushStyle );
9191

9292
QColor borderColor = mBorderColor;
93-
borderColor.setAlphaF( context.alpha() * mBorderColor.alphaF());
93+
borderColor.setAlphaF( context.alpha() * mBorderColor.alphaF() );
9494
mPen = QPen( borderColor );
9595
mSelPen = QPen( selPenColor );
9696
mPen.setStyle( mBorderStyle );

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ void QgsSimpleLineSymbolLayerV2Widget::colorChanged()
110110
// Native Mac dialog works only for Qt Carbon
111111
// Qt bug: http://bugreports.qt.nokia.com/browse/QTBUG-14889
112112
// FIXME need to also check max QT_VERSION when Qt bug fixed
113-
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::DontUseNativeDialog | QColorDialog::ShowAlphaChannel);
113+
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::DontUseNativeDialog | QColorDialog::ShowAlphaChannel );
114114
#else
115-
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::ShowAlphaChannel);
115+
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::ShowAlphaChannel );
116116
#endif
117117
if ( !color.isValid() )
118118
return;
@@ -357,9 +357,9 @@ void QgsSimpleFillSymbolLayerV2Widget::setColor()
357357
// Native Mac dialog works only for Qt Carbon
358358
// Qt bug: http://bugreports.qt.nokia.com/browse/QTBUG-14889
359359
// FIXME need to also check max QT_VERSION when Qt bug fixed
360-
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::DontUseNativeDialog | QColorDialog::ShowAlphaChannel);
360+
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::DontUseNativeDialog | QColorDialog::ShowAlphaChannel );
361361
#else
362-
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::ShowAlphaChannel);
362+
QColor color = QColorDialog::getColor( mLayer->color(), this, "", QColorDialog::ShowAlphaChannel );
363363
#endif
364364
if ( !color.isValid() )
365365
return;
@@ -374,9 +374,9 @@ void QgsSimpleFillSymbolLayerV2Widget::setBorderColor()
374374
// Native Mac dialog works only for Qt Carbon
375375
// Qt bug: http://bugreports.qt.nokia.com/browse/QTBUG-14889
376376
// FIXME need to also check max QT_VERSION when Qt bug fixed
377-
QColor color = QColorDialog::getColor( mLayer->borderColor(), this, "", QColorDialog::DontUseNativeDialog | QColorDialog::ShowAlphaChannel);
377+
QColor color = QColorDialog::getColor( mLayer->borderColor(), this, "", QColorDialog::DontUseNativeDialog | QColorDialog::ShowAlphaChannel );
378378
#else
379-
QColor color = QColorDialog::getColor( mLayer->borderColor(), this, "", QColorDialog::ShowAlphaChannel);
379+
QColor color = QColorDialog::getColor( mLayer->borderColor(), this, "", QColorDialog::ShowAlphaChannel );
380380
#endif
381381
if ( !color.isValid() )
382382
return;

‎src/plugins/globe/globe_plugin.cpp

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ void GlobePlugin::run()
220220
if ( !getenv( "OSGNOTIFYLEVEL" ) ) osgEarth::setNotifyLevel( osg::DEBUG_INFO );
221221
#endif
222222

223-
if (mOsgViewer == 0) mOsgViewer = new osgViewer::Viewer();
223+
if ( mOsgViewer == 0 ) mOsgViewer = new osgViewer::Viewer();
224224

225225
// install the programmable manipulator.
226226
osgEarth::Util::EarthManipulator* manip = new osgEarth::Util::EarthManipulator();
@@ -229,19 +229,23 @@ void GlobePlugin::run()
229229
mIsGlobeRunning = true;
230230
setupProxy();
231231

232-
if ( getenv( "MAPXML" ) ) {
233-
char* mapxml = getenv( "MAPXML" );
234-
QgsDebugMsg( mapxml );
235-
osg::Node* node = osgDB::readNodeFile(mapxml);
236-
if ( !node ) {
237-
QgsDebugMsg( "Failed to load earth file " );
238-
return;
239-
}
240-
mMapNode = MapNode::findMapNode(node);
241-
mRootNode = new osg::Group();
242-
mRootNode->addChild( node );
243-
} else {
244-
setupMap();
232+
if ( getenv( "MAPXML" ) )
233+
{
234+
char* mapxml = getenv( "MAPXML" );
235+
QgsDebugMsg( mapxml );
236+
osg::Node* node = osgDB::readNodeFile( mapxml );
237+
if ( !node )
238+
{
239+
QgsDebugMsg( "Failed to load earth file " );
240+
return;
241+
}
242+
mMapNode = MapNode::findMapNode( node );
243+
mRootNode = new osg::Group();
244+
mRootNode->addChild( node );
245+
}
246+
else
247+
{
248+
setupMap();
245249
}
246250

247251
// create a surface to house the controls
@@ -250,27 +254,27 @@ void GlobePlugin::run()
250254

251255
mOsgViewer->setSceneData( mRootNode );
252256

253-
mOsgViewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
257+
mOsgViewer->setThreadingModel( osgViewer::Viewer::SingleThreaded );
254258

255-
mOsgViewer->addEventHandler(new osgViewer::StatsHandler());
256-
mOsgViewer->addEventHandler(new osgViewer::WindowSizeHandler());
257-
mOsgViewer->addEventHandler(new osgViewer::ThreadingHandler());
258-
mOsgViewer->addEventHandler(new osgViewer::LODScaleHandler());
259-
mOsgViewer->addEventHandler(new osgGA::StateSetManipulator(mOsgViewer->getCamera()->getOrCreateStateSet()));
259+
mOsgViewer->addEventHandler( new osgViewer::StatsHandler() );
260+
mOsgViewer->addEventHandler( new osgViewer::WindowSizeHandler() );
261+
mOsgViewer->addEventHandler( new osgViewer::ThreadingHandler() );
262+
mOsgViewer->addEventHandler( new osgViewer::LODScaleHandler() );
263+
mOsgViewer->addEventHandler( new osgGA::StateSetManipulator( mOsgViewer->getCamera()->getOrCreateStateSet() ) );
260264
// add a handler that will automatically calculate good clipping planes
261265
//mOsgViewer->addEventHandler( new osgEarth::Util::AutoClipPlaneHandler() );
262266
// osgEarth benefits from pre-compilation of GL objects in the pager. In newer versions of
263267
// OSG, this activates OSG's IncrementalCompileOpeartion in order to avoid frame breaks.
264268
mOsgViewer->getDatabasePager()->setDoPreCompile( true );
265269

266-
mSettingsDialog->setViewer(mOsgViewer);
270+
mSettingsDialog->setViewer( mOsgViewer );
267271

268272
#ifdef GLOBE_OSG_STANDALONE_VIEWER
269273
mOsgViewer->run();
270274
#endif
271275

272276
QWidget* viewerWidget = new osgEarth::QtGui::ViewerWidget( mOsgViewer );
273-
viewerWidget->setGeometry(100, 100, 1024, 800);
277+
viewerWidget->setGeometry( 100, 100, 1024, 800 );
274278
viewerWidget->show();
275279

276280
// Set a home viewpoint
@@ -285,8 +289,8 @@ void GlobePlugin::run()
285289
mOsgViewer->addEventHandler( new KeyboardControlHandler( manip, mQGisIface ) );
286290

287291
mOsgViewer->addEventHandler( new QueryCoordinatesHandler( this, mElevationManager,
288-
mMapNode->getMap()->getProfile()->getSRS() )
289-
);
292+
mMapNode->getMap()->getProfile()->getSRS() )
293+
);
290294
}
291295

292296
void GlobePlugin::settings()
@@ -319,7 +323,7 @@ void GlobePlugin::setupMap()
319323
*/
320324
TMSOptions imagery;
321325
imagery.url() = "http://readymap.org/readymap/tiles/1.0.0/7/";
322-
map->addImageLayer( new ImageLayer("Imagery", imagery) );
326+
map->addImageLayer( new ImageLayer( "Imagery", imagery ) );
323327

324328
// add a TMS elevation layer:
325329
/*

‎src/plugins/globe/globe_plugin_dialog.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -514,20 +514,21 @@ void QgsGlobePluginDialog::setStereoMode()
514514

515515
void QgsGlobePluginDialog::setStereoConfig()
516516
{
517-
if (mViewer) {
518-
mViewer->getDatabasePager()->clear();
519-
//SETTING THE VALUES IN THE OEGearth instance
520-
setStereoMode();
521-
osg::DisplaySettings::instance()->setScreenDistance( screenDistance->value() );
522-
osg::DisplaySettings::instance()->setScreenWidth( screenWidth->value() );
523-
osg::DisplaySettings::instance()->setScreenHeight( screenHeight->value() );
524-
osg::DisplaySettings::instance()->setEyeSeparation( eyeSeparation->value() );
525-
osg::DisplaySettings::instance()->setSplitStereoHorizontalSeparation( splitStereoHorizontalSeparation->value() );
526-
osg::DisplaySettings::instance()->setSplitStereoVerticalSeparation( splitStereoVerticalSeparation->value() );
527-
osg::DisplaySettings::instance()->setSplitStereoHorizontalEyeMapping(
528-
( osg::DisplaySettings::SplitStereoHorizontalEyeMapping ) splitStereoHorizontalEyeMapping->currentIndex() );
529-
osg::DisplaySettings::instance()->setSplitStereoVerticalEyeMapping(
530-
( osg::DisplaySettings::SplitStereoVerticalEyeMapping ) splitStereoVerticalEyeMapping->currentIndex() );
517+
if ( mViewer )
518+
{
519+
mViewer->getDatabasePager()->clear();
520+
//SETTING THE VALUES IN THE OEGearth instance
521+
setStereoMode();
522+
osg::DisplaySettings::instance()->setScreenDistance( screenDistance->value() );
523+
osg::DisplaySettings::instance()->setScreenWidth( screenWidth->value() );
524+
osg::DisplaySettings::instance()->setScreenHeight( screenHeight->value() );
525+
osg::DisplaySettings::instance()->setEyeSeparation( eyeSeparation->value() );
526+
osg::DisplaySettings::instance()->setSplitStereoHorizontalSeparation( splitStereoHorizontalSeparation->value() );
527+
osg::DisplaySettings::instance()->setSplitStereoVerticalSeparation( splitStereoVerticalSeparation->value() );
528+
osg::DisplaySettings::instance()->setSplitStereoHorizontalEyeMapping(
529+
( osg::DisplaySettings::SplitStereoHorizontalEyeMapping ) splitStereoHorizontalEyeMapping->currentIndex() );
530+
osg::DisplaySettings::instance()->setSplitStereoVerticalEyeMapping(
531+
( osg::DisplaySettings::SplitStereoVerticalEyeMapping ) splitStereoVerticalEyeMapping->currentIndex() );
531532
}
532533
}
533534

‎src/providers/postgres/qgspostgresconn.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert
10231023

10241024
if ( !layerProperty.schemaName.isEmpty() )
10251025
{
1026-
table = QString("%1.%2").arg( quotedIdentifier( layerProperty.schemaName ) ).arg( layerProperty.tableName );
1026+
table = QString( "%1.%2" ).arg( quotedIdentifier( layerProperty.schemaName ) ).arg( layerProperty.tableName );
10271027
}
10281028
else
10291029
{
@@ -1041,7 +1041,7 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert
10411041
.arg( layerProperty.sql.isEmpty() ? "" : QString( " AND (%1)" ).arg( layerProperty.sql ) )
10421042
.arg( sGeomTypeSelectLimit );
10431043
}
1044-
else if( !layerProperty.sql.isEmpty() )
1044+
else if ( !layerProperty.sql.isEmpty() )
10451045
{
10461046
table += QString( " WHERE %1" ).arg( layerProperty.sql );
10471047
}

‎src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2778,7 +2778,7 @@ bool QgsPostgresProvider::getGeometryDetails()
27782778
if ( QgsPostgresConn::wkbTypeFromPostgis( detectedType ) == QGis::WKBUnknown )
27792779
{
27802780
QgsPostgresLayerProperty layerProperty;
2781-
if( !mIsQuery )
2781+
if ( !mIsQuery )
27822782
{
27832783
layerProperty.schemaName = schemaName;
27842784
layerProperty.tableName = tableName;

0 commit comments

Comments
 (0)
Please sign in to comment.