Skip to content
Permalink
Browse files
update indentation and fix a warning
git-svn-id: http://svn.osgeo.org/qgis/trunk@9158 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Aug 24, 2008
1 parent 54ac40c commit b981f3a51d725e7c05f255fcc13510efcff9202c
@@ -76,10 +76,10 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()

toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionGroupItems.png" ) ), tr( "&Group Items" ), this, SLOT( groupItems() ) );
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionUngroupItems.png" ) ), tr( "&Ungroup Items" ), this, SLOT( ungroupItems() ) );
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionRaiseItems.png")), tr("Raise selected items"), this, SLOT(raiseSelectedItems()));
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionLowerItems.png")), tr("Lower selected items"), this, SLOT(lowerSelectedItems()));
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToTop.png")), tr("Move selected items to top"), this, SLOT(moveSelectedItemsToTop()));
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToBottom.png")), tr("Move selected items to bottom"), this, SLOT(moveSelectedItemsToBottom()));
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionRaiseItems.png" ) ), tr( "Raise selected items" ), this, SLOT( raiseSelectedItems() ) );
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionLowerItems.png" ) ), tr( "Lower selected items" ), this, SLOT( lowerSelectedItems() ) );
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToTop.png" ) ), tr( "Move selected items to top" ), this, SLOT( moveSelectedItemsToTop() ) );
toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToBottom.png" ) ), tr( "Move selected items to bottom" ), this, SLOT( moveSelectedItemsToBottom() ) );

QActionGroup* toggleActionGroup = new QActionGroup( this );
toggleActionGroup->addAction( moveItemContentAction );
@@ -1034,34 +1034,34 @@ void QgsComposer::ungroupItems( void )

void QgsComposer::raiseSelectedItems()
{
if(mComposition)
{
mComposition->raiseSelectedItems();
}
if ( mComposition )
{
mComposition->raiseSelectedItems();
}
}

void QgsComposer::lowerSelectedItems()
{
if(mComposition)
{
mComposition->lowerSelectedItems();
}
if ( mComposition )
{
mComposition->lowerSelectedItems();
}
}

void QgsComposer::moveSelectedItemsToTop()
{
if(mComposition)
{
mComposition->moveSelectedItemsToTop();
}
if ( mComposition )
{
mComposition->moveSelectedItemsToTop();
}
}

void QgsComposer::moveSelectedItemsToBottom()
{
if(mComposition)
{
mComposition->moveSelectedItemsToBottom();
}
if ( mComposition )
{
mComposition->moveSelectedItemsToBottom();
}
}

void QgsComposer::moveEvent( QMoveEvent *e ) { saveWindowState(); }
@@ -4658,14 +4658,12 @@ bool QgisApp::saveDirty()

void QgisApp::changeEvent( QEvent* event )
{
switch ( event->type() )
{
case QEvent::WindowTitleChange:
#ifdef Q_WS_MAC
mWindowAction->setText( windowTitle() );
#endif
break;
if ( event->type() == QEvent::WindowTitleChange )
{
mWindowAction->setText( windowTitle() );
}
#endif
QWidget::changeEvent( event );
}

@@ -39,10 +39,10 @@ QgsComposerItem::QgsComposerItem( QgsComposition* composition ): QGraphicsRectIt
setPen( defaultPen );

//let z-Value be managed by composition
if(mComposition)
{
mComposition->addItemToZList(this);
}
if ( mComposition )
{
mComposition->addItemToZList( this );
}
}

QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition ): QGraphicsRectItem( 0, 0, width, height, 0 ), mComposition( composition ), mBoundingResizeRectangle( 0 ), mFrame( true )
@@ -60,19 +60,19 @@ QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, Q
defaultPen.setWidth( 1 );
setPen( defaultPen );

//let z-Value be managed by composition
if(mComposition)
{
mComposition->addItemToZList(this);
}
//let z-Value be managed by composition
if ( mComposition )
{
mComposition->addItemToZList( this );
}
}

QgsComposerItem::~QgsComposerItem()
{
if(mComposition)
{
mComposition->removeItemFromZList(this);
}
if ( mComposition )
{
mComposition->removeItemFromZList( this );
}
}

void QgsComposerItem::setSelected( bool s )

0 comments on commit b981f3a

Please sign in to comment.