const -> inline

GUI/Model/Project/ProjectDocument.cpp

@@ -80,7 +80,7 @@ void ProjectDocument::setProjectDir(const QString& text)
 QString ProjectDocument::projectFileName() const
 {
     if (!projectName().isEmpty())
-        return projectDir() + "/" + projectName() + projectFileExtension();
+        return projectDir() + "/" + projectName() + GUI::Project::Utils::projectFileExtension;
     return "";
 }
 
@@ -90,11 +90,6 @@ void ProjectDocument::setProjectFileName(const QString& projectFileName)
     setProjectDir(GUI::Project::Utils::projectDir(projectFileName));
 }
 
-QString ProjectDocument::projectFileExtension()
-{
-    return ".pro";
-}
-
 InstrumentModel* ProjectDocument::instrumentModel() const
 {
     return m_applicationModels.instrumentModel();

GUI/Model/Project/ProjectDocument.h

@@ -67,8 +67,6 @@ public:
     QString projectFileName() const;
     void setProjectFileName(const QString& text);
 
-    static QString projectFileExtension();
-
     InstrumentModel* instrumentModel() const;
     SampleModel* sampleModel() const;
     MaterialModel* materialModel() const;

GUI/Model/Project/ProjectUtils.cpp

@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Project/ProjectUtils.h"
-#include "GUI/Model/Project/ProjectDocument.h"
 #include <QFileInfo>
 
 QString GUI::Project::Utils::projectName(const QString& projectFileName)
@@ -39,7 +38,7 @@ QString GUI::Project::Utils::autosaveDir(const QString& projectFileName)
 QString GUI::Project::Utils::autosaveName(const QString& projectFileName)
 {
     return autosaveDir(projectFileName) + "/" + projectName(projectFileName)
-           + ProjectDocument::projectFileExtension();
+           + projectFileExtension;
 }
 
 bool GUI::Project::Utils::hasAutosavedData(const QString& projectFileName)

GUI/Model/Project/ProjectUtils.h

@@ -21,6 +21,8 @@
 
 namespace GUI::Project::Utils {
 
+inline constexpr const char* projectFileExtension{".pro"};
+
 //! Returns project name deduced from project file name.
 QString projectName(const QString& projectFileName);
 

GUI/View/Main/NewProjectDialog.cpp

@@ -15,6 +15,7 @@
 #include "GUI/View/Main/NewProjectDialog.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Model/Project/ProjectUtils.h"
 #include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
@@ -102,7 +103,7 @@ void NewProjectDialog::setWorkingDirectory(const QString& text)
 QString NewProjectDialog::getProjectFileName() const
 {
     QString projectDir = getWorkingDirectory() + QString("/") + getProjectName();
-    QString projectFile = getProjectName() + ProjectDocument::projectFileExtension();
+    QString projectFile = getProjectName() + GUI::Project::Utils::projectFileExtension;
     return projectDir + QString("/") + projectFile;
 }