editorPath -> mapEditorPath

launcher/main.cpp

@@ -63,14 +63,14 @@ void startGame(const QStringList & args)
 	startExecutable(pathToQString(VCMIDirs::get().clientPath()), args);
 #endif
 }
-
-void startEditor(const QStringList & args)
-{
-#ifdef ENABLE_EDITOR
-	startExecutable(pathToQString(VCMIDirs::get().mapEditorPath()), args);
-#endif
-}
-
+
+void startEditor(const QStringList & args)
+{
+#ifdef ENABLE_EDITOR
+	startExecutable(pathToQString(VCMIDirs::get().mapEditorPath()), args);
+#endif
+}
+
 #ifndef Q_OS_IOS
 void startExecutable(QString name, const QStringList & args)
 {

lib/VCMIDirs.cpp

@@ -158,7 +158,7 @@ class VCMIDirsWIN32 final : public IVCMIDirs
 		std::vector<bfs::path> dataPaths() const override;
 
 		bfs::path clientPath() const override;
-		bfs::path editorPath() const override;
+		bfs::path mapEditorPath() const override;
 		bfs::path serverPath() const override;
 
 		bfs::path libraryPath() const override;
@@ -349,7 +349,7 @@ std::vector<bfs::path> VCMIDirsWIN32::dataPaths() const
 }
 
 bfs::path VCMIDirsWIN32::clientPath() const { return binaryPath() / "VCMI_client.exe"; }
-bfs::path VCMIDirsWIN32::editorPath() const { return binaryPath() / "VCMI_editor.exe"; }
+bfs::path VCMIDirsWIN32::mapEditorPath() const { return binaryPath() / "VCMI_editor.exe"; }
 bfs::path VCMIDirsWIN32::serverPath() const { return binaryPath() / "VCMI_server.exe"; }
 
 bfs::path VCMIDirsWIN32::libraryPath() const { return "."; }
@@ -361,7 +361,7 @@ class IVCMIDirsUNIX : public IVCMIDirs
 {
 	public:
 		bfs::path clientPath() const override;
-		bfs::path editorPath() const override;
+		bfs::path mapEditorPath() const override;
 		bfs::path serverPath() const override;
 
 		virtual bool developmentMode() const;
@@ -374,7 +374,7 @@ bool IVCMIDirsUNIX::developmentMode() const
 }
 
 bfs::path IVCMIDirsUNIX::clientPath() const { return binaryPath() / "vcmiclient"; }
-bfs::path IVCMIDirsUNIX::editorPath() const { return binaryPath() / "vcmieditor"; }
+bfs::path IVCMIDirsUNIX::mapEditorPath() const { return binaryPath() / "vcmieditor"; }
 bfs::path IVCMIDirsUNIX::serverPath() const { return binaryPath() / "vcmiserver"; }
 
 #ifdef VCMI_APPLE

lib/VCMIDirs.h

@@ -39,7 +39,7 @@ public:
 	virtual boost::filesystem::path clientPath() const = 0;
 
 	// Full path to editor executable, including name (e.g. /usr/bin/vcmieditor)
-	virtual boost::filesystem::path editorPath() const = 0;
+	virtual boost::filesystem::path mapEditorPath() const = 0;
 
 	// Full path to server executable, including name (e.g. /usr/bin/vcmiserver)
 	virtual boost::filesystem::path serverPath() const = 0;