Ensured file paths are constant

Author: gzotti

src/gui/ObsListDialog.cpp

@@ -53,6 +53,8 @@ ObsListDialog::ObsListDialog(QObject *parent) :
 	landscapeMgr(GETSTELMODULE(LandscapeMgr)),
 	labelMgr(GETSTELMODULE(LabelMgr)),
 	itemModel(new QStandardItemModel(0, ColumnCount)),
+	observingListJsonPath(StelFileMgr::findFile("data", static_cast<StelFileMgr::Flags>(StelFileMgr::Directory | StelFileMgr::Writable)) + "/" + QString(JSON_FILE_NAME)),
+	bookmarksJsonPath(    StelFileMgr::findFile("data", static_cast<StelFileMgr::Flags>(StelFileMgr::Directory | StelFileMgr::Writable)) + "/" + QString(JSON_BOOKMARKS_FILE_NAME)),
 	tainted(false),
 	isEditMode(false),
 	isCreationMode(false)
@@ -62,16 +64,6 @@ ObsListDialog::ObsListDialog(QObject *parent) :
 	//Initialize the list of observing lists
 	setObservingListHeaderNames();
 
-	observingListJsonPath =
-			StelFileMgr::findFile("data",
-					      static_cast<StelFileMgr::Flags>(StelFileMgr::Directory | StelFileMgr::Writable)) +
-			"/" +
-			QString(JSON_FILE_NAME);
-	bookmarksJsonPath =
-			StelFileMgr::findFile("data",
-					      static_cast<StelFileMgr::Flags>(StelFileMgr::Directory | StelFileMgr::Writable)) +
-			"/" +
-			QString(JSON_BOOKMARKS_FILE_NAME);
 	QSettings* conf  = StelApp::getInstance().getSettings();
 	flagUseJD        = conf->value("bookmarks/useJD", false).toBool();
 	flagUseLandscape = conf->value("bookmarks/useLandscape", false).toBool();

src/gui/ObsListDialog.hpp

@@ -150,8 +150,8 @@ class ObsListDialog : public StelDialog
 	class LabelMgr *labelMgr;
 
 	QStandardItemModel *itemModel; //!< Data for the table display.
-	QString observingListJsonPath; //!< Path to observingList.json file, set once in constructor. CURRENTLY reset in loading methods which is nonsense!
-	QString bookmarksJsonPath;     //!< Path to bookmarks.json, set once in constructor. INSTEAD: use file name as loading argument!
+	const QString observingListJsonPath; //!< Path to observingList.json file, set once in constructor.
+	const QString bookmarksJsonPath;     //!< Path to bookmarks.json, set once in constructor.
 
 	//! This QVariantMap represents the contents of the observingList.json file. Read ONCE at start. Contains 4 key/value pairs:
 	//! - defaultListOlud: The OLUD of the currently configured default list. If empty or invalid, the first list is used as default.
@@ -165,7 +165,7 @@ class ObsListDialog : public StelDialog
 	QString defaultOlud;  //!< OLUD (UUID) of default list
 	QString selectedOlud; //!< OLUD has to be set before calling loadSelectedObservingList. Could be called currentListOlud
 
-	//! filled when loading a selected observing list. This is needed for the interaction with the table in GUI
+	//! filled when loading a selected observing list. This is needed for the interaction with the table/itemModel in GUI
 	QHash<QString, observingListItem> currentItemCollection;
 
 	QList<int> highlightLabelIDs; //!< int label IDs for addressing labels by the HighlightMgr