Skip to content

Commit fd84f82

Browse files
elpasoelpaso
committedJul 3, 2018
Fix QLocale bitwise operation and some other minor style issues
·
ltr-3_40final-3_4_0
1 parent a092f56 commit fd84f82

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed
 

‎src/app/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ int main( int argc, char *argv[] )
11931193
QLocale currentLocale;
11941194
if ( myShowGroupSeparatorFlag )
11951195
{
1196-
currentLocale.setNumberOptions( currentLocale.numberOptions() &= !QLocale::NumberOption::OmitGroupSeparator );
1196+
currentLocale.setNumberOptions( currentLocale.numberOptions() &= ~QLocale::NumberOption::OmitGroupSeparator );
11971197
}
11981198
else
11991199
{

‎src/app/qgsoptions.cpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
9696
connect( mCustomVariablesChkBx, &QCheckBox::toggled, this, &QgsOptions::mCustomVariablesChkBx_toggled );
9797
connect( mCurrentVariablesQGISChxBx, &QCheckBox::toggled, this, &QgsOptions::mCurrentVariablesQGISChxBx_toggled );
9898
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsOptions::showHelp );
99-
connect( cboGlobalLocale, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), [ = ]( int ) { updateSampleLocaleText( ); } );
99+
connect( cboGlobalLocale, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), [ = ]( int ) { updateSampleLocaleText( ); } );
100100
connect( cbShowGroupSeparator, &QCheckBox::toggled, this, [ = ]( bool ) { updateSampleLocaleText(); } );
101101

102102
// QgsOptionsDialogBase handles saving/restoring of geometry, splitter and current tab states,
@@ -674,30 +674,30 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
674674
mRasterCumulativeCutUpperDoubleSpinBox->setValue( 100.0 * mSettings->value( QStringLiteral( "/Raster/cumulativeCutUpper" ), QString::number( QgsRasterMinMaxOrigin::CUMULATIVE_CUT_UPPER ) ).toDouble() );
675675

676676
//set the color for selections
677-
int myRed = mSettings->value( QStringLiteral( "/qgis/default_selection_color_red" ), 255 ).toInt();
678-
int myGreen = mSettings->value( QStringLiteral( "/qgis/default_selection_color_green" ), 255 ).toInt();
679-
int myBlue = mSettings->value( QStringLiteral( "/qgis/default_selection_color_blue" ), 0 ).toInt();
680-
int myAlpha = mSettings->value( QStringLiteral( "/qgis/default_selection_color_alpha" ), 255 ).toInt();
681-
pbnSelectionColor->setColor( QColor( myRed, myGreen, myBlue, myAlpha ) );
677+
int red = mSettings->value( QStringLiteral( "/qgis/default_selection_color_red" ), 255 ).toInt();
678+
int green = mSettings->value( QStringLiteral( "/qgis/default_selection_color_green" ), 255 ).toInt();
679+
int blue = mSettings->value( QStringLiteral( "/qgis/default_selection_color_blue" ), 0 ).toInt();
680+
int alpha = mSettings->value( QStringLiteral( "/qgis/default_selection_color_alpha" ), 255 ).toInt();
681+
pbnSelectionColor->setColor( QColor( red, green, blue, alpha ) );
682682
pbnSelectionColor->setColorDialogTitle( tr( "Set Selection Color" ) );
683683
pbnSelectionColor->setAllowOpacity( true );
684684
pbnSelectionColor->setContext( QStringLiteral( "gui" ) );
685685
pbnSelectionColor->setDefaultColor( QColor( 255, 255, 0, 255 ) );
686686

687687
//set the default color for canvas background
688-
myRed = mSettings->value( QStringLiteral( "/qgis/default_canvas_color_red" ), 255 ).toInt();
689-
myGreen = mSettings->value( QStringLiteral( "/qgis/default_canvas_color_green" ), 255 ).toInt();
690-
myBlue = mSettings->value( QStringLiteral( "/qgis/default_canvas_color_blue" ), 255 ).toInt();
691-
pbnCanvasColor->setColor( QColor( myRed, myGreen, myBlue ) );
688+
red = mSettings->value( QStringLiteral( "/qgis/default_canvas_color_red" ), 255 ).toInt();
689+
green = mSettings->value( QStringLiteral( "/qgis/default_canvas_color_green" ), 255 ).toInt();
690+
blue = mSettings->value( QStringLiteral( "/qgis/default_canvas_color_blue" ), 255 ).toInt();
691+
pbnCanvasColor->setColor( QColor( red, green, blue ) );
692692
pbnCanvasColor->setColorDialogTitle( tr( "Set Canvas Color" ) );
693693
pbnCanvasColor->setContext( QStringLiteral( "gui" ) );
694694
pbnCanvasColor->setDefaultColor( Qt::white );
695695

696696
// set the default color for the measure tool
697-
myRed = mSettings->value( QStringLiteral( "/qgis/default_measure_color_red" ), 222 ).toInt();
698-
myGreen = mSettings->value( QStringLiteral( "/qgis/default_measure_color_green" ), 155 ).toInt();
699-
myBlue = mSettings->value( QStringLiteral( "/qgis/default_measure_color_blue" ), 67 ).toInt();
700-
pbnMeasureColor->setColor( QColor( myRed, myGreen, myBlue ) );
697+
red = mSettings->value( QStringLiteral( "/qgis/default_measure_color_red" ), 222 ).toInt();
698+
green = mSettings->value( QStringLiteral( "/qgis/default_measure_color_green" ), 155 ).toInt();
699+
blue = mSettings->value( QStringLiteral( "/qgis/default_measure_color_blue" ), 67 ).toInt();
700+
pbnMeasureColor->setColor( QColor( red, green, blue ) );
701701
pbnMeasureColor->setColorDialogTitle( tr( "Set Measuring Tool Color" ) );
702702
pbnMeasureColor->setContext( QStringLiteral( "gui" ) );
703703
pbnMeasureColor->setDefaultColor( QColor( 222, 155, 67 ) );
@@ -905,13 +905,13 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
905905
//
906906
// Translation and locale settings
907907
//
908-
QString mySystemLocale = QLocale().name();
909-
lblSystemLocale->setText( tr( "Detected active locale on your system: %1" ).arg( mySystemLocale ) );
910-
QString myUserLocale = mSettings->value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
908+
QString systemLocale = QLocale().name();
909+
lblSystemLocale->setText( tr( "Detected active locale on your system: %1" ).arg( systemLocale ) );
910+
QString userLocale = mSettings->value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
911911
bool showGroupSeparator = mSettings->value( QStringLiteral( "locale/showGroupSeparator" ), false ).toBool();
912-
QString myGlobalLocale = mSettings->value( QStringLiteral( "locale/globalLocale" ), QString() ).toString();
913-
QStringList myI18nList = i18nList();
914-
Q_FOREACH ( const QString &l, myI18nList )
912+
QString globalLocale = mSettings->value( QStringLiteral( "locale/globalLocale" ), QLocale().name() ).toString();
913+
const QStringList curentI18nList( i18nList() );
914+
for ( const auto &l : curentI18nList )
915915
{
916916
// QTBUG-57802: eo locale is improperly handled
917917
QString displayName = l.startsWith( QLatin1String( "eo" ) ) ? QLocale::languageToString( QLocale::Esperanto ) : QLocale( l ).nativeLanguageName();
@@ -934,29 +934,29 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
934934
}
935935
}
936936

937-
cboTranslation->setCurrentIndex( cboTranslation->findData( myUserLocale ) );
938-
cboGlobalLocale->setCurrentIndex( cboGlobalLocale->findData( myGlobalLocale ) );
939-
bool myLocaleOverrideFlag = mSettings->value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();
940-
grpLocale->setChecked( myLocaleOverrideFlag );
937+
cboTranslation->setCurrentIndex( cboTranslation->findData( userLocale ) );
938+
cboGlobalLocale->setCurrentIndex( cboGlobalLocale->findData( globalLocale ) );
939+
bool localeOverrideFlag = mSettings->value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();
940+
grpLocale->setChecked( localeOverrideFlag );
941941
cbShowGroupSeparator->setChecked( showGroupSeparator );
942942

943943

944944
//set elements in digitizing tab
945945
mLineWidthSpinBox->setValue( mSettings->value( QStringLiteral( "/qgis/digitizing/line_width" ), 1 ).toInt() );
946-
myRed = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_red" ), 255 ).toInt();
947-
myGreen = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_green" ), 0 ).toInt();
948-
myBlue = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_blue" ), 0 ).toInt();
949-
myAlpha = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_alpha" ), 200 ).toInt();
950-
mLineColorToolButton->setColor( QColor( myRed, myGreen, myBlue, myAlpha ) );
946+
red = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_red" ), 255 ).toInt();
947+
green = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_green" ), 0 ).toInt();
948+
blue = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_blue" ), 0 ).toInt();
949+
alpha = mSettings->value( QStringLiteral( "/qgis/digitizing/line_color_alpha" ), 200 ).toInt();
950+
mLineColorToolButton->setColor( QColor( red, green, blue, alpha ) );
951951
mLineColorToolButton->setAllowOpacity( true );
952952
mLineColorToolButton->setContext( QStringLiteral( "gui" ) );
953953
mLineColorToolButton->setDefaultColor( QColor( 255, 0, 0, 200 ) );
954954

955-
myRed = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_red" ), 255 ).toInt();
956-
myGreen = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_green" ), 0 ).toInt();
957-
myBlue = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_blue" ), 0 ).toInt();
958-
myAlpha = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_alpha" ), 30 ).toInt();
959-
mFillColorToolButton->setColor( QColor( myRed, myGreen, myBlue, myAlpha ) );
955+
red = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_red" ), 255 ).toInt();
956+
green = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_green" ), 0 ).toInt();
957+
blue = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_blue" ), 0 ).toInt();
958+
alpha = mSettings->value( QStringLiteral( "/qgis/digitizing/fill_color_alpha" ), 30 ).toInt();
959+
mFillColorToolButton->setColor( QColor( red, green, blue, alpha ) );
960960
mFillColorToolButton->setAllowOpacity( true );
961961
mFillColorToolButton->setContext( QStringLiteral( "gui" ) );
962962
mFillColorToolButton->setDefaultColor( QColor( 255, 0, 0, 30 ) );
@@ -2388,7 +2388,7 @@ void QgsOptions::updateSampleLocaleText()
23882388
QLocale locale( cboGlobalLocale->currentData( ).toString() );
23892389
if ( cbShowGroupSeparator->isChecked( ) )
23902390
{
2391-
locale.setNumberOptions( locale.numberOptions() &= ! QLocale::NumberOption::OmitGroupSeparator );
2391+
locale.setNumberOptions( locale.numberOptions() &= ~QLocale::NumberOption::OmitGroupSeparator );
23922392
}
23932393
else
23942394
{

0 commit comments

Comments
 (0)
Please sign in to comment.