Skip to content

Commit 77afb16

Browse files
committed
Fix some compiler warnings
1 parent bb57cf4 commit 77afb16

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

src/app/composer/qgscomposeritemwidget.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
4747
void on_mItemIdLineEdit_textChanged( const QString& text );
4848

4949
//adjust coordinates in line edits
50-
void on_mXLineEdit_editingFinished(){ changeItemPosition(); }
51-
void on_mYLineEdit_editingFinished(){ changeItemPosition(); }
52-
void on_mWidthLineEdit_editingFinished(){ changeItemPosition(); }
53-
void on_mHeightLineEdit_editingFinished(){ changeItemPosition(); }
50+
void on_mXLineEdit_editingFinished() { changeItemPosition(); }
51+
void on_mYLineEdit_editingFinished() { changeItemPosition(); }
52+
void on_mWidthLineEdit_editingFinished() { changeItemPosition(); }
53+
void on_mHeightLineEdit_editingFinished() { changeItemPosition(); }
54+
55+
void on_mUpperLeftCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
56+
void on_mUpperMiddleCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
57+
void on_mUpperRightCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
58+
void on_mMiddleLeftCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
59+
void on_mMiddleCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
60+
void on_mMiddleRightCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
61+
void on_mLowerLeftCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
62+
void on_mLowerMiddleCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
63+
void on_mLowerRightCheckBox_stateChanged( int state ) { Q_UNUSED( state ); changeItemPosition(); }
5464

55-
void on_mUpperLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
56-
void on_mUpperMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
57-
void on_mUpperRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
58-
void on_mMiddleLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
59-
void on_mMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
60-
void on_mMiddleRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
61-
void on_mLowerLeftCheckBox_stateChanged( int state ){ changeItemPosition(); }
62-
void on_mLowerMiddleCheckBox_stateChanged( int state ){ changeItemPosition(); }
63-
void on_mLowerRightCheckBox_stateChanged( int state ){ changeItemPosition(); }
64-
6565
void setValuesForGuiElements();
6666
void setValuesForGuiPositionElements();
6767

src/app/composer/qgscomposermapwidget.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void QgsComposerMapWidget::updateGuiElements()
237237
blockAllSignals( true );
238238

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

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

857857
void QgsComposerMapWidget::addPageToToolbox( QWidget* widget, const QString& name )
858858
{
859+
Q_UNUSED( name );
859860
//TODO : wrap the widget in a collapsibleGroupBox to be more consistent with previous implementation
860861
mainLayout->addWidget( widget );
861862
}

src/app/composer/qgscomposerpicturewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void QgsComposerPictureWidget::setGuiElementValues()
314314
mRotationFromComposerMapCheckBox->blockSignals( true );
315315

316316
mPictureLineEdit->setText( mPicture->pictureFile() );
317-
QRectF pictureRect = mPicture->rect();
317+
// QRectF pictureRect = mPicture->rect();
318318
mRotationSpinBox->setValue( mPicture->rotation() );
319319

320320
refreshMapComboBox();

src/core/composer/qgscomposerlabel.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
#include <QWebPage>
2626

2727
QgsComposerLabel::QgsComposerLabel( QgsComposition *composition ):
28-
QgsComposerItem( composition ), mMargin( 1.0 ), mHtmlState( 0 ), mFontColor( QColor( 0, 0, 0 ) ),
28+
QgsComposerItem( composition ), mHtmlState( 0 ), mHtmlUnitsToMM( 1.0 ),
29+
mMargin( 1.0 ), mFontColor( QColor( 0, 0, 0 ) ),
2930
mHAlignment( Qt::AlignLeft ), mVAlignment( Qt::AlignTop ),
30-
mExpressionFeature( 0 ), mExpressionLayer( 0 ), mHtmlUnitsToMM( 1.0 )
31+
mExpressionFeature( 0 ), mExpressionLayer( 0 )
3132
{
3233
mHtmlUnitsToMM = htmlUnitsToMM();
3334
//default font size is 10 point

0 commit comments

Comments
 (0)