← Back to branch summary

~georg-zotti/stellarium/gz_AtmosphereTweaks

« back to all changes in this revision

Viewing changes to src/main.cpp

  • Committer: Georg Zotti
  • Date: 2017-05-23 13:18:09 UTC
  • mfrom: (8115.1.1321 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20170523131809-a6pus0ogpmjwtmd8
merge-in trunk r9436

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.cpp
248
248
                        qFatal("Could not create configuration file %s.", qPrintable(configName));
249
249
        }
250
250
 
251
 
        QSettings* confSettings = NULL;
 
251
        QSettings* confSettings = Q_NULLPTR;
252
252
        if (StelFileMgr::exists(configFileFullPath))
253
253
        {
254
254
                // Implement "restore default settings" feature.
259
259
                }
260
260
                else
261
261
                {
262
 
                        confSettings = new QSettings(configFileFullPath, StelIniFormat, NULL);
 
262
                        confSettings = new QSettings(configFileFullPath, StelIniFormat, Q_NULLPTR);
263
263
                        restoreDefaultConfigFile = confSettings->value("main/restore_defaults", false).toBool();
264
264
                }
265
265
                if (!restoreDefaultConfigFile)