Skip to content

Commit bb63c62

Browse files
author
telwertowski
committed
Don't specify organization name on QSettings constructors. It overrides the organization domain set in QApplicaton. This results in Mac settings being written to different files depending upon whether the argument is or isn't present on constructors.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6290 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ff229db commit bb63c62

15 files changed

+50
-45
lines changed

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui(QgisIface * _qI, QWidget *
3939
setupUi(this);
4040
// at startup, fetch the last used delimiter and directory from
4141
// settings
42-
QSettings settings("QuantumGIS", "qgis");
42+
QSettings settings;
4343
QString key = "/Plugin-DelimitedText";
4444
txtDelimiter->setText(settings.readEntry(key + "/delimiter"));
4545

@@ -75,7 +75,7 @@ void QgsDelimitedTextPluginGui::on_pbnOK_clicked()
7575
emit drawVectorLayer(uri,txtLayerName->text(),"delimitedtext");
7676
// store the settings
7777

78-
QSettings settings("QuantumGIS", "qgis");
78+
QSettings settings;
7979
QString key = "/Plugin-DelimitedText";
8080
settings.writeEntry(key + "/delimiter", txtDelimiter->text());
8181
QFileInfo fi(txtFilePath->text());
@@ -185,7 +185,7 @@ void QgsDelimitedTextPluginGui::getOpenFileName()
185185
{
186186
// Get a file to process, starting at the current directory
187187
// Set inital dir to last used
188-
QSettings settings("QuantumGIS", "qgis");
188+
QSettings settings;
189189

190190
QString s = QFileDialog::getOpenFileName(
191191
this,

‎src/plugins/georeferencer/plugingui.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void QgsGeorefPluginGui::on_pbnClose_clicked()
5050

5151

5252
void QgsGeorefPluginGui::on_pbnSelectRaster_clicked() {
53-
QSettings settings("QuantumGIS", "qgis");
53+
QSettings settings;
5454
QString dir = settings.readEntry("/Plugin-GeoReferencer/rasterdirectory");
5555
if (dir.isEmpty())
5656
dir = ".";
@@ -82,7 +82,7 @@ void QgsGeorefPluginGui::on_pbnEnterWorldCoords_clicked() {
8282

8383
// remember the directory
8484
{
85-
QSettings settings("QuantumGIS", "qgis");
85+
QSettings settings;
8686
QFileInfo fileInfo(leSelectRaster->text());
8787
settings.writeEntry("/Plugin-GeoReferencer/rasterdirectory",
8888
fileInfo.dirPath());
@@ -117,7 +117,7 @@ void QgsGeorefPluginGui::on_pbnEnterWorldCoords_clicked() {
117117

118118
// XXX This is horrible, but it works and I'm tired / ll
119119
{
120-
QSettings settings("QuantumGIS", "qgis");
120+
QSettings settings;
121121
QgsProject* prj = QgsProject::instance();
122122
mProjBehaviour = settings.readEntry("/Projections/defaultBehaviour");
123123
mProjectSRS = prj->readEntry("SpatialRefSys", "/ProjectSRSProj4String");

‎src/plugins/gps_importer/qgsgpsdevicedialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void QgsGPSDeviceDialog::slotSelectionChanged() {
149149

150150
void QgsGPSDeviceDialog::writeDeviceSettings() {
151151
QStringList deviceNames;
152-
QSettings settings("QuantumGIS", "qgis");
152+
QSettings settings;
153153
QString devPath = "/Plugin-GPS/devices/%1";
154154
settings.remove("/Plugin-GPS/devices");
155155

‎src/plugins/gps_importer/qgsgpsplugingui.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void QgsGPSPluginGui::on_pbnGPXSelectFile_clicked()
206206
QgsLogger::debug(" Gps File Importer::pbnGPXSelectFile_clicked() ");
207207
QString myFileTypeQString;
208208
QString myFilterString=tr("GPS eXchange format (*.gpx)");
209-
QSettings settings("QuantumGIS", "qgis");
209+
QSettings settings;
210210
QString dir = settings.readEntry("/Plugin-GPS/gpxdirectory");
211211
if (dir.isEmpty())
212212
dir = ".";
@@ -337,7 +337,7 @@ void QgsGPSPluginGui::populatePortComboBoxes() {
337337
// OSX, OpenBSD, NetBSD etc? Anyone?
338338

339339
// remember the last ports used
340-
QSettings settings("QuantumGIS", "qgis");
340+
QSettings settings;
341341
QString lastDLPort = settings.readEntry("/Plugin-GPS/lastdlport", "");
342342
QString lastULPort = settings.readEntry("/Plugin-GPS/lastulport", "");
343343
for (int i = 0; i < cmbDLPort->count(); ++i) {
@@ -365,7 +365,7 @@ void QgsGPSPluginGui::populateIMPBabelFormats() {
365365
mBabelFilter = "";
366366
cmbULDevice->clear();
367367
cmbDLDevice->clear();
368-
QSettings settings("QuantumGIS", "qgis");
368+
QSettings settings;
369369
QString lastDLDevice = settings.readEntry("/Plugin-GPS/lastdldevice", "");
370370
QString lastULDevice = settings.readEntry("/Plugin-GPS/lastuldevice", "");
371371
BabelMap::const_iterator iter;

‎src/plugins/grass/qgsgrassattributes.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void QgsGrassAttributes::restorePosition()
125125
#ifdef QGISDEBUG
126126
std::cerr << "QgsGrassAttributes::restorePosition()" << std::endl;
127127
#endif
128-
QSettings settings("QuantumGIS", "qgis");
128+
QSettings settings;
129129
int ww = settings.readNumEntry("/GRASS/windows/attributes/w", 250);
130130
int wh = settings.readNumEntry("/GRASS/windows/attributes/h", 350);
131131
int wx = settings.readNumEntry("/GRASS/windows/attributes/x", 100);
@@ -142,7 +142,7 @@ void QgsGrassAttributes::saveWindowLocation()
142142
#ifdef QGISDEBUG
143143
std::cerr << "QgsGrassAttributes::saveWindowLocation()" << std::endl;
144144
#endif
145-
QSettings settings("QuantumGIS", "qgis");
145+
QSettings settings;
146146
QPoint p = this->pos();
147147
QSize s = this->size();
148148
settings.writeEntry("/GRASS/windows/attributes/x", p.x());
@@ -181,7 +181,7 @@ int QgsGrassAttributes::addTab ( const QString & label )
181181

182182
resetButtons();
183183

184-
QSettings settings("QuantumGIS", "qgis");
184+
QSettings settings;
185185
QString path = "/GRASS/windows/attributes/columnWidth/";
186186
for ( int i = 0; i < 2; i++ )
187187
{
@@ -401,7 +401,7 @@ void QgsGrassAttributes::resetButtons ( )
401401

402402
void QgsGrassAttributes::columnSizeChanged ( int section, int oldSize, int newSize )
403403
{
404-
QSettings settings("QuantumGIS", "qgis");
404+
QSettings settings;
405405
QString path = "/GRASS/windows/attributes/columnWidth/"
406406
+ QString::number(section);
407407
std::cerr << "path = " << path.ascii() << " newSize = " << newSize << std::endl;

‎src/plugins/grass/qgsgrassedit.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ void QgsGrassEdit::init()
402402

403403
// Restore symbology
404404
QString spath = "/GRASS/edit/symb/";
405-
QSettings settings("QuantumGIS", "qgis");
405+
QSettings settings;
406406

407407
mLineWidth = settings.readNumEntry (
408408
spath + "lineWidth", 1 );
@@ -731,7 +731,7 @@ void QgsGrassEdit::changeSymbology(Q3ListViewItem * item, const QPoint & pnt, in
731731
std::cerr << "QgsGrassEdit::changeSymbology() col = " << col << std::endl;
732732
#endif
733733

734-
QSettings settings("QuantumGIS", "qgis");
734+
QSettings settings;
735735

736736
if ( !item ) return;
737737

@@ -768,7 +768,7 @@ void QgsGrassEdit::lineWidthChanged()
768768
#ifdef QGISDEBUG
769769
std::cerr << "QgsGrassEdit::lineWidthChanged()" << std::endl;
770770
#endif
771-
QSettings settings("QuantumGIS", "qgis");
771+
QSettings settings;
772772
mLineWidth = mLineWidthSpinBox->value();
773773

774774
for ( int i = 0; i < SYMB_COUNT; i++ ) {
@@ -784,15 +784,15 @@ void QgsGrassEdit::markerSizeChanged()
784784
#ifdef QGISDEBUG
785785
std::cerr << "QgsGrassEdit::markerSizeChanged()" << std::endl;
786786
#endif
787-
QSettings settings("QuantumGIS", "qgis");
787+
QSettings settings;
788788
mSize = mMarkerSizeSpinBox->value();
789789
QString spath = "/GRASS/edit/symb/";
790790
settings.writeEntry ( spath + "markerSize", mSize );
791791
}
792792

793793
void QgsGrassEdit::restorePosition()
794794
{
795-
QSettings settings("QuantumGIS", "qgis");
795+
QSettings settings;
796796
int ww = settings.readNumEntry("/GRASS/windows/edit/w", 420);
797797
int wh = settings.readNumEntry("/GRASS/windows/edit/h", 150);
798798
int wx = settings.readNumEntry("/GRASS/windows/edit/x", 100);
@@ -803,7 +803,7 @@ void QgsGrassEdit::restorePosition()
803803

804804
void QgsGrassEdit::saveWindowLocation()
805805
{
806-
QSettings settings("QuantumGIS", "qgis");
806+
QSettings settings;
807807
QPoint p = this->pos();
808808
QSize s = this->size();
809809
settings.writeEntry("/GRASS/windows/edit/x", p.x());

‎src/plugins/grass/qgsgrassnewmapset.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ QgsGrassNewMapset::QgsGrassNewMapset ( QgisApp *qgisApp, QgisIface *iface,
120120
mMapsetText->setPaletteBackgroundColor ( paletteBackgroundColor() );
121121

122122
// DATABASE
123-
QSettings settings("QuantumGIS", "qgis");
123+
QSettings settings;
124124
QString db = settings.readEntry("/GRASS/lastGisdbase");
125125
if ( !db.isNull() )
126126
{
@@ -201,7 +201,7 @@ void QgsGrassNewMapset::databaseChanged()
201201
#endif
202202
// TODO: reset next tabs
203203
//
204-
QSettings settings("QuantumGIS", "qgis");
204+
QSettings settings;
205205
settings.writeEntry("/GRASS/lastGisdbase", mDatabaseLineEdit->text() );
206206

207207
setNextEnabled ( page(DATABASE), false );
@@ -271,7 +271,7 @@ void QgsGrassNewMapset::setLocations ( )
271271

272272
mLocationComboBox->clear();
273273

274-
QSettings settings("QuantumGIS", "qgis");
274+
QSettings settings;
275275
QString lastLocation = settings.readEntry("/GRASS/lastLocation");
276276

277277
// Get available locations with write permissions

‎src/plugins/grass/qgsgrassplugin.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void QgsGrassPlugin::initGui()
138138
mNewMapset = 0;
139139
mRegion = 0;
140140

141-
QSettings settings("QuantumGIS", "qgis");
141+
QSettings settings;
142142

143143
QgsGrass::init();
144144

@@ -257,7 +257,7 @@ void QgsGrassPlugin::mapsetChanged ()
257257
mCloseMapsetAction->setEnabled(true);
258258
mNewVectorAction->setEnabled(true);
259259

260-
QSettings settings("QuantumGIS", "qgis");
260+
QSettings settings;
261261
bool on = settings.readBoolEntry ("/GRASS/region/on", true );
262262
mRegionAction->setOn(on);
263263
switchRegion(on);
@@ -605,7 +605,7 @@ void QgsGrassPlugin::switchRegion(bool on)
605605
std::cout << "QgsGrassPlugin::switchRegion()" << std::endl;
606606
#endif
607607

608-
QSettings settings("QuantumGIS", "qgis");
608+
QSettings settings;
609609
settings.writeEntry ("/GRASS/region/on", on );
610610

611611
if ( on ) {
@@ -663,7 +663,7 @@ void QgsGrassPlugin::setRegionPen(QPen & pen)
663663
mRegionBand->setColor ( mRegionPen.color() );
664664
mRegionBand->setWidth ( mRegionPen.width() );
665665

666-
QSettings settings("QuantumGIS", "qgis");
666+
QSettings settings;
667667
settings.writeEntry ("/GRASS/region/color", mRegionPen.color().name() );
668668
settings.writeEntry ("/GRASS/region/width", (int) mRegionPen.width() );
669669
}

‎src/plugins/grass/qgsgrassregion.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ void QgsGrassRegion::postRender(QPainter *painter)
449449
void QgsGrassRegion::accept()
450450
{
451451
// TODO: better repaint region
452-
QSettings settings("QuantumGIS", "qgis");
452+
QSettings settings;
453453

454454
bool on = settings.readBoolEntry ("/GRASS/region/on", true );
455455

@@ -483,7 +483,7 @@ void QgsGrassRegion::reject()
483483

484484
void QgsGrassRegion::restorePosition()
485485
{
486-
QSettings settings("QuantumGIS", "qgis");
486+
QSettings settings;
487487
int ww = settings.readNumEntry("/GRASS/windows/region/w", 250);
488488
int wh = settings.readNumEntry("/GRASS/windows/region/h", 350);
489489
int wx = settings.readNumEntry("/GRASS/windows/region/x", 100);
@@ -494,7 +494,7 @@ void QgsGrassRegion::restorePosition()
494494

495495
void QgsGrassRegion::saveWindowLocation()
496496
{
497-
QSettings settings("QuantumGIS", "qgis");
497+
QSettings settings;
498498
QPoint p = this->pos();
499499
QSize s = this->size();
500500
settings.writeEntry("/GRASS/windows/region/x", p.x());

‎src/plugins/grass/qgsgrassselect.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ QgsGrassSelect::QgsGrassSelect(int type):QgsGrassSelectBase()
4949
lastLocation = QgsGrass::getDefaultLocation();
5050
lastMapset = QgsGrass::getDefaultMapset();
5151
} else {
52-
QSettings settings("QuantumGIS", "qgis");
52+
QSettings settings;
5353
lastGisdbase = settings.readEntry("/GRASS/lastGisdbase");
5454
//check we got something from qsettings otherwise default to users home dir
5555
if (lastGisdbase.isEmpty())
@@ -108,7 +108,7 @@ void QgsGrassSelect::restorePosition()
108108
optionsFrame->adjustSize ();
109109
adjustSize ();
110110

111-
QSettings settings("QuantumGIS", "qgis");
111+
QSettings settings;
112112
int ww = settings.readNumEntry("/GRASS/windows/select/w", 500);
113113
int wh = settings.readNumEntry("/GRASS/windows/select/h", 100);
114114
int wx = settings.readNumEntry("/GRASS/windows/select/x", 100);
@@ -119,7 +119,7 @@ void QgsGrassSelect::restorePosition()
119119

120120
void QgsGrassSelect::saveWindowLocation()
121121
{
122-
QSettings settings("QuantumGIS", "qgis");
122+
QSettings settings;
123123
QPoint p = this->pos();
124124
QSize s = this->size();
125125
settings.writeEntry("/GRASS/windows/select/x", p.x());
@@ -484,7 +484,7 @@ void QgsGrassSelect::on_ok_clicked()
484484
}
485485

486486
//write to qgsettings as gisdbase seems to be valid
487-
QSettings settings("QuantumGIS", "qgis");
487+
QSettings settings;
488488
settings.writeEntry("/GRASS/lastGisdbase",lastGisdbase );
489489

490490
location = elocation->currentText();

‎src/plugins/grass/qgsgrasstools.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void QgsGrassTools::closeEvent(QCloseEvent *e)
420420

421421
void QgsGrassTools::restorePosition()
422422
{
423-
QSettings settings("QuantumGIS", "qgis");
423+
QSettings settings;
424424
int ww = settings.readNumEntry("/GRASS/windows/tools/w", 250);
425425
int wh = settings.readNumEntry("/GRASS/windows/tools/h", 300);
426426
int wx = settings.readNumEntry("/GRASS/windows/tools/x", 100);
@@ -432,7 +432,7 @@ void QgsGrassTools::restorePosition()
432432

433433
void QgsGrassTools::saveWindowLocation()
434434
{
435-
QSettings settings("QuantumGIS", "qgis");
435+
QSettings settings;
436436
QPoint p = this->pos();
437437
QSize s = this->size();
438438
settings.writeEntry("/GRASS/windows/tools/x", p.x());

‎src/plugins/spit/main.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
int main( int argc, char ** argv )
55
{
66
QApplication a( argc, argv );
7+
// Set up the QSettings environment must be done after qapp is created
8+
QCoreApplication::setOrganizationName("QuantumGIS");
9+
QCoreApplication::setOrganizationDomain("qgis.org");
10+
QCoreApplication::setApplicationName("qgis");
11+
712
QgsSpit w(0, Qt::Window);
813
w.show();
914

‎src/plugins/spit/qgsconnectiondialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ QgsConnectionDialog::QgsConnectionDialog(QWidget *parent, const QString& connNam
3535
{
3636
setupUi(this);
3737
if (!connName.isEmpty()) {
38-
QSettings settings("QuantumGIS", "qgis");
38+
QSettings settings;
3939
QString key = "/PostgreSQL/connections/" + connName;
4040
txtHost->setText(settings.readEntry(key + "/host"));
4141
txtDatabase->setText(settings.readEntry(key + "/database"));
@@ -90,7 +90,7 @@ void QgsConnectionDialog::testConnection()
9090

9191
void QgsConnectionDialog::saveConnection()
9292
{
93-
QSettings settings("QuantumGIS", "qgis");
93+
QSettings settings;
9494
QString baseKey = "/PostgreSQL/connections/";
9595
baseKey += txtName->text();
9696
settings.writeEntry(baseKey + "/host", txtHost->text());

0 commit comments

Comments
 (0)