Skip to content

Commit edbdba1

Browse files
author
jef
committedAug 31, 2008
automatic indentation update (r9138-r9226)
git-svn-id: http://svn.osgeo.org/qgis/trunk@9227 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 401b8e1 commit edbdba1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1181
-1181
lines changed
 

‎src/app/composer/qgscomposer.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,30 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
7979
// mActionSelectMoveItem
8080

8181
QAction* moveItemContentAction = new QAction( QIcon( QPixmap( myIconPath + "mActionMoveItemContent.png" ) ),
82-
tr( "Move Content" ), 0 );
82+
tr( "Move Content" ), 0 );
8383
moveItemContentAction->setToolTip( tr( "Move item content" ) );
8484
moveItemContentAction->setCheckable( true );
8585
connect( moveItemContentAction, SIGNAL( triggered() ), this, SLOT( moveItemContent() ) );
8686
toolBar->addAction( moveItemContentAction );
8787
//toolBar->addAction(QIcon(QPixmap(myIconPath+"mActionMoveItemContent.png")), tr("Move Item content"), this, SLOT(moveItemContent()));
8888

8989
QAction* groupItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionGroupItems.png" ) ),
90-
tr( "&Group" ), this, SLOT( groupItems() ) );
90+
tr( "&Group" ), this, SLOT( groupItems() ) );
9191
groupItemsAction->setToolTip( tr( "Group items" ) );
9292
QAction* ungroupItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionUngroupItems.png" ) ),
93-
tr( "&Ungroup" ), this, SLOT( ungroupItems() ) );
93+
tr( "&Ungroup" ), this, SLOT( ungroupItems() ) );
9494
ungroupItemsAction->setToolTip( tr( "Ungroup items" ) );
9595
QAction* raiseItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionRaiseItems.png" ) ),
96-
tr( "Raise" ), this, SLOT( raiseSelectedItems() ) );
96+
tr( "Raise" ), this, SLOT( raiseSelectedItems() ) );
9797
raiseItemsAction->setToolTip( tr( "Raise selected items" ) );
9898
QAction* lowerItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionLowerItems.png" ) ),
99-
tr( "Lower" ), this, SLOT( lowerSelectedItems() ) );
99+
tr( "Lower" ), this, SLOT( lowerSelectedItems() ) );
100100
lowerItemsAction->setToolTip( tr( "Lower selected items" ) );
101101
QAction* moveItemsToTopAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToTop.png" ) ),
102-
tr( "Bring to Front" ), this, SLOT( moveSelectedItemsToTop() ) );
102+
tr( "Bring to Front" ), this, SLOT( moveSelectedItemsToTop() ) );
103103
moveItemsToTopAction->setToolTip( tr( "Move selected items to top" ) );
104104
QAction* moveItemsToBottomAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToBottom.png" ) ),
105-
tr( "Send to Back" ), this, SLOT( moveSelectedItemsToBottom() ) );
105+
tr( "Send to Back" ), this, SLOT( moveSelectedItemsToBottom() ) );
106106
moveItemsToBottomAction->setToolTip( tr( "Move selected items to bottom" ) );
107107

108108
QActionGroup* toggleActionGroup = new QActionGroup( this );
@@ -179,7 +179,7 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
179179
layoutMenu->addAction( lowerItemsAction );
180180
layoutMenu->addAction( moveItemsToTopAction );
181181
layoutMenu->addAction( moveItemsToBottomAction );
182-
182+
183183
#ifndef Q_WS_MAC64 /* assertion failure in NSMenuItem setSubmenu (Qt 4.5.0-snapshot-20080830) */
184184
menuBar()->addMenu( QgisApp::instance()->windowMenu() );
185185

@@ -311,15 +311,15 @@ void QgsComposer::changeEvent( QEvent* event )
311311
QMainWindow::changeEvent( event );
312312
switch ( event->type() )
313313
{
314-
case QEvent::ActivationChange:
315-
if ( QApplication::activeWindow() == this )
316-
{
317-
mWindowAction->setChecked( true );
318-
}
319-
break;
314+
case QEvent::ActivationChange:
315+
if ( QApplication::activeWindow() == this )
316+
{
317+
mWindowAction->setChecked( true );
318+
}
319+
break;
320320

321-
default:
322-
break;
321+
default:
322+
break;
323323
}
324324
}
325325

‎src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -362,20 +362,20 @@ void QgsComposerLegendWidget::on_mUpdatePushButton_clicked()
362362
{
363363
return;
364364
}
365-
365+
366366
QModelIndex parentIndex = currentIndex.parent();
367367
if ( !parentIndex.isValid() ) // a layer item
368-
{
369-
QString mapLayerId = currentItem->data().toString();
370-
mLegend->model()->updateLayer(mapLayerId);
371-
mLegend->update();
372-
}
368+
{
369+
QString mapLayerId = currentItem->data().toString();
370+
mLegend->model()->updateLayer( mapLayerId );
371+
mLegend->update();
372+
}
373373
}
374374

375375
void QgsComposerLegendWidget::on_mUpdateAllPushButton_clicked()
376376
{
377-
if(mLegend)
378-
{
379-
mLegend->updateLegend();
380-
}
377+
if ( mLegend )
378+
{
379+
mLegend->updateLegend();
380+
}
381381
}

0 commit comments

Comments
 (0)
Please sign in to comment.