Skip to content
Permalink
Browse files
Fix some compiler warnings
  • Loading branch information
dakcarto committed Feb 19, 2013
1 parent bb57cf4 commit 77afb1656739271d42134a546db98a6b43643c64
@@ -47,21 +47,21 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
void on_mItemIdLineEdit_textChanged( const QString& text );

//adjust coordinates in line edits
void on_mXLineEdit_editingFinished(){ changeItemPosition(); }
void on_mYLineEdit_editingFinished(){ changeItemPosition(); }
void on_mWidthLineEdit_editingFinished(){ changeItemPosition(); }
void on_mHeightLineEdit_editingFinished(){ changeItemPosition(); }
void on_mXLineEdit_editingFinished() { changeItemPosition(); }
void on_mYLineEdit_editingFinished() { changeItemPosition(); }
void on_mWidthLineEdit_editingFinished() { changeItemPosition(); }
void on_mHeightLineEdit_editingFinished() { changeItemPosition(); }

void on_mUpperLeftCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mUpperMiddleCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mUpperRightCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mMiddleLeftCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mMiddleCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mMiddleRightCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mLowerLeftCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mLowerMiddleCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
void on_mLowerRightCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }

void on_mUpperLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mUpperMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mUpperRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mMiddleLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mMiddleRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mLowerLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mLowerMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
void on_mLowerRightCheckBox_stateChanged( int state ){ changeItemPosition(); }

void setValuesForGuiElements();
void setValuesForGuiPositionElements();

@@ -237,7 +237,7 @@ void QgsComposerMapWidget::updateGuiElements()
blockAllSignals( true );

//width, height, scale
QRectF composerMapRect = mComposerMap->rect();
// QRectF composerMapRect = mComposerMap->rect();
mScaleLineEdit->setText( QString::number( mComposerMap->scale(), 'f', 0 ) );

//preview mode
@@ -856,6 +856,7 @@ void QgsComposerMapWidget::showEvent( QShowEvent * event )

void QgsComposerMapWidget::addPageToToolbox( QWidget* widget, const QString& name )
{
Q_UNUSED( name );
//TODO : wrap the widget in a collapsibleGroupBox to be more consistent with previous implementation
mainLayout->addWidget( widget );
}
@@ -314,7 +314,7 @@ void QgsComposerPictureWidget::setGuiElementValues()
mRotationFromComposerMapCheckBox->blockSignals( true );

mPictureLineEdit->setText( mPicture->pictureFile() );
QRectF pictureRect = mPicture->rect();
// QRectF pictureRect = mPicture->rect();
mRotationSpinBox->setValue( mPicture->rotation() );

refreshMapComboBox();
@@ -25,9 +25,10 @@
#include <QWebPage>

QgsComposerLabel::QgsComposerLabel( QgsComposition *composition ):
QgsComposerItem( composition ), mMargin( 1.0 ), mHtmlState( 0 ), mFontColor( QColor( 0, 0, 0 ) ),
QgsComposerItem( composition ), mHtmlState( 0 ), mHtmlUnitsToMM( 1.0 ),
mMargin( 1.0 ), mFontColor( QColor( 0, 0, 0 ) ),
mHAlignment( Qt::AlignLeft ), mVAlignment( Qt::AlignTop ),
mExpressionFeature( 0 ), mExpressionLayer( 0 ), mHtmlUnitsToMM( 1.0 )
mExpressionFeature( 0 ), mExpressionLayer( 0 )
{
mHtmlUnitsToMM = htmlUnitsToMM();
//default font size is 10 point

0 comments on commit 77afb16

Please sign in to comment.