Remove using namespace from headers

Author: Ravbug

CMakeLists.txt

@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.17)
 
 project("UnityHubNative")
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIGURATION>)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIGURATION>)
 
@@ -14,6 +12,7 @@ endif()
 
 file(GLOB source "source/*.cpp" "source/*.hpp" "source/*.h")
 add_executable("${PROJECT_NAME}" WIN32 ${source} "source/wxmac.icns" "source/windows.rc")
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
 
 #wxwidgets
 set(wxBUILD_SHARED OFF CACHE INTERNAL "")

source/add_install_dlg_derived.cpp

@@ -150,11 +150,11 @@ void AddNewInstallDlg::InstallSelected(wxCommandEvent&){
 
         thread th([=]{
             // download the file
-            string url = "https://download.unity3d.com/download_unity/" + data.hashcode +
+            string url = "https://download.unity3d.com/download_unity/" + data.hashcode + "/UnityDownloadAssistant" +
             #ifdef __APPLE__
-            "/UnityDownloadAssistant.dmg";
+                ".dmg";
             #elif defined _WIN32
-                
+                ".exe";
             #elif __linux__
 
             #else
@@ -170,7 +170,7 @@ void AddNewInstallDlg::InstallSelected(wxCommandEvent&){
             }
             else{
                 // write the file to temp location
-                auto outpath = fmt::format("{}{}{}{}{}", cachedir,dirsep,"UnityDownloadAssistant",data.hashcode,".dmg");
+                auto outpath = fmt::format("{}{}{}{}.{}", cachedir,dirsep,"UnityDownloadAssistant",data.hashcode,installerExt);
                 ofstream outfile(outpath, std::ios::binary);
                 outfile.write(r.text.c_str(),r.text.size());
 

source/create_dialog_derived.cpp

@@ -12,6 +12,8 @@
 #endif
 #include <wx/msgdlg.h>
 
+using namespace std;
+
 //Declare events here
 wxBEGIN_EVENT_TABLE(CreateProjectDialogD, wxDialog)
 EVT_BUTTON(wxID_CANCEL,CreateProjectDialogD::OnCancel)

source/globals.h

@@ -1,64 +1,66 @@
 //
-//  globals.cpp
 //  Unity Hub Native (Dynamic)
 //
 //  Copyright © 2019 Ravbug. All rights reserved.
 //
 #pragma once
-using namespace std;
 
 #include <sys/stat.h>
 #include <wx/listctrl.h>
 #include <string>
 #include <filesystem>
 
 //data file names
-static const string projectsFile = "projects.txt";
-static const string editorPathsFile = "editorPaths.txt";
-static const string templatePrefix = "com.unity.template";
-static const string AppVersion = "v1.36";
+static const std::string projectsFile = "projects.txt";
+static const std::string editorPathsFile = "editorPaths.txt";
+static const std::string templatePrefix = "com.unity.template";
+static const std::string AppVersion = "v1.4";
 
 //structure for representing an editor and for locating it
 struct editor{
-	string name;
-	string path;
+	std::string name;
+	std::string path;
 };
 
 #if defined __APPLE__
 	#include <pwd.h>
 	//the location to store application data
-	static const string datapath = getpwuid(getuid())->pw_dir + string("/Library/Application Support/UnityHubNative");
+	static const std::string datapath = getpwuid(getuid())->pw_dir + string("/Library/Application Support/UnityHubNative");
 	static const char dirsep = '/';
 
-    static const string cachedir = getpwuid(getuid())->pw_dir + string("/Library/Caches/com.ravbug.UnityHubNative");
+    static const std::string cachedir = getpwuid(getuid())->pw_dir + string("/Library/Caches/com.ravbug.UnityHubNative");
+	static const std::string installerExt = "dmg";
 
 	//where to find various Unity things on macOS
-	static const string executable = "Unity.app/Contents/MacOS/Unity";
-	static const string defaultInstall = "/Applications/Unity/Hub/Editor";
+	static const std::string executable = "Unity.app/Contents/MacOS/Unity";
+	static const std::string defaultInstall = "/Applications/Unity/Hub/Editor";
 	//TODO: make this a preference?
-	static const string hubDefault = "/Applications/Unity Hub.app";
-	static const string templatesDir = "Unity.app/Contents/Resources/PackageManager/ProjectTemplates/";
+	static const std::string hubDefault = "/Applications/Unity Hub.app";
+	static const std::string templatesDir = "Unity.app/Contents/Resources/PackageManager/ProjectTemplates/";
 
 	//for stream redirecting to dev/null
-	static const string null_device = ">/dev/null 2>&1";
+	static const std::string null_device = ">/dev/null 2>&1";
 
 #elif defined _WIN32
 //naming conflicts
 #define popen _popen
 #define pclose _pclose
 #define mkdir _mkdir
-#include <windows.h>
+#include <Windows.h>
 #include <gdiplus.h>	
 #include <wx/wx.h>
-	static const string datapath = getenv("HOMEPATH") + string("\\AppData\\Roaming\\UnityHubNative");
+	static const std::string datapath = getenv("HOMEPATH") + std::string("\\AppData\\Roaming\\UnityHubNative");
 	static const char dirsep = '\\';
 
+	static const std::string cachedir = std::filesystem::temp_directory_path().string();
+	static const std::string installerExt = "exe";
+
 	//where to find various Unity things on windows
-	static const string executable = "Editor\\Unity.exe";
-	static const string defaultInstall = "\\Program Files\\Unity\\Hub\\Editor";
+	static const std::string executable = "Editor\\Unity.exe";
+	static const std::string defaultInstall = "\\Program Files\\Unity\\Hub\\Editor";
 
-	static const string hubDefault = "\\Program Files\\Unity Hub\\Unity Hub.exe";
-	static const string templatesDir = "Editor\\Data\\Resources\\PackageManager\\ProjectTemplates\\";
+	static const std::string hubDefault = "\\Program Files\\Unity Hub\\Unity Hub.exe";
+	static const std::string templatesDir = "Editor\\Data\\Resources\\PackageManager\\ProjectTemplates\\";
 
 	/**
 	@returns the calculated display scale factor using GDI+
@@ -95,7 +97,7 @@ struct editor{
 	@param from the string to be replaced
 	@param to the string to replace `from` with
 	*/
-	inline string ReplaceAll(std::string str, const std::string& from, const std::string& to) {
+	inline std::string ReplaceAll(std::string str, const std::string& from, const std::string& to) {
 		size_t start_pos = 0;
 		while ((start_pos = str.find(from, start_pos)) != std::string::npos) {
 			str.replace(start_pos, from.length(), to);
@@ -109,41 +111,41 @@ struct editor{
 	@param path the windows path to escape
 	@return the escaped path
 	*/
-	inline string WinEscapePath(string& path) {
-		return ReplaceAll(path, string(" "), string("^ "));
+	inline std::string WinEscapePath(std::string& path) {
+		return ReplaceAll(path, std::string(" "), std::string("^ "));
 	}
 
 #elif defined __linux__
 	#include <pwd.h>
-	static const string datapath = getpwuid(getuid())->pw_dir + string("/UnityHubNative");
-	static const string null_device = ">/dev/null 2>&1";
+	static const std::string datapath = getpwuid(getuid())->pw_dir + string("/UnityHubNative");
+	static const std::string null_device = ">/dev/null 2>&1";
 	static const char dirsep = '/';
 
-	static const string executable = "Editor/Unity";
-	static const string defaultInstall =  getpwuid(getuid())->pw_dir +string("/Unity/Hub/Editor");
+	static const std::string executable = "Editor/Unity";
+	static const std::string defaultInstall =  getpwuid(getuid())->pw_dir +string("/Unity/Hub/Editor");
 	//TODO: make this a preference?
-	static const string hubDefault = "/Applications/Unity Hub.app";
-	static const string templatesDir = "Editor/Data/Resources/PackageManager/ProjectTemplates/";
+	static const std::string hubDefault = "/Applications/Unity Hub.app";
+	static const std::string templatesDir = "Editor/Data/Resources/PackageManager/ProjectTemplates/";
 
 #else
 	//disalow compilation for unsupported platforms
-#error You are compiling on an unsupported operating system. Currently only macOS and Windows are supported. If you know how to support your system, submit a pull request.
+#error You are compiling on an unsupported operating system. Currently only macOS, Windows, and Linux are supported. If you know how to support your system, submit a pull request.
 #endif
 
 //structure containing all the info needed to display a project
 struct project{
-	string name;
-	string version;
-	string modifiedDate;
-	string path;
+	std::string name;
+	std::string version;
+	std::string modifiedDate;
+	std::string path;
 };
 
 /**
  Determines if a file exists at a path using stat()
  @param name the path to the file
  @return true if the file exists, false if it does not
  */
-inline bool file_exists(const string& name){
+inline bool file_exists(const std::string& name){
 	struct stat buffer;
 	return (stat (name.c_str(), &buffer) == 0);
 }
@@ -155,7 +157,7 @@ inline bool file_exists(const string& name){
  @param command the shell command to run on the system
  @note The command passed to this function must be correct for the system it is running on. If it is not correct, the function will appear to do nothing.
  */
-inline void launch_process(const string& command) {
+inline void launch_process(const std::string& command) {
 #if defined __APPLE__ || defined __linux__
 	//the '&' runs the command nonblocking, and >/dev/null 2>&1 destroys output
 	FILE* stream = popen(string(command + null_device + " &").c_str(), "r");
@@ -168,7 +170,7 @@ inline void launch_process(const string& command) {
 #endif
 }
 
-inline void reveal_in_explorer(const string& path){
+inline void reveal_in_explorer(const std::string& path){
 #if defined __APPLE__
 	string command = "open \"" + path + "\"";
 
@@ -177,7 +179,7 @@ inline void reveal_in_explorer(const string& path){
 
 #elif defined _WIN32
 	//do not surround the paths in quotes, it will not work
-	string command = "\\Windows\\explorer.exe \"" + path + "\"";
+	std::string command = "\\Windows\\explorer.exe \"" + path + "\"";
 #endif
 	launch_process(command);
 }

source/interface_derived.cpp

@@ -15,6 +15,7 @@
 #else
 #include <dirent.h>
 #endif
+using namespace std;
 
 #define LEARN_TAB 2
 #define WEBVIEW 2000

source/interface_derived.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "interface.h"
 #include "globals.h"
+#include "interface.h"
 #include <functional>
 #include <wx/webview.h>
 #include <wx/timer.h>
@@ -23,32 +23,30 @@
 #define TIMER 2001
 
 
-using namespace std;
-
 class MainFrameDerived : public MainFrame{
 public:
 	//constructor (takes no args)
 	MainFrameDerived();
 
-	static string GetPathFromDialog(const string& message);
+	static std::string GetPathFromDialog(const std::string& message);
 
 private:
 	void AddProject(const project& p);
-	project LoadProject(const string& path);
+	project LoadProject(const std::string& path);
 	void SaveProjects();
 	void OpenProject(const long& index);
 	void OpenProject(const project& p, const editor& e);
 	void SaveEditorVersions();
-	void LoadEditorPath(const string& path);
+	void LoadEditorPath(const std::string& path);
 	void LoadEditorVersions();
 	void ReloadData();
 
 	//will store the list of projects
-	vector<project> projects;
-	vector<string> installPaths;
-	vector<editor> editors;
+	std::vector<project> projects;
+	std::vector<std::string> installPaths;
+	std::vector<editor> editors;
 	wxWebView* learnView = NULL;
-	const string homeurl = "https://learn.unity.com";
+	const std::string homeurl = "https://learn.unity.com";
 	wxString lastURL = wxString(homeurl);
 	wxTimer* timeout;
 
@@ -127,8 +125,8 @@ class MainFrameDerived : public MainFrame{
 	Locates a Unity install path and adds it to the list and UI
 	*/
 	void OnLocateInstall(wxCommandEvent& event){
-		string msg = "Select the folder containing Unity installs";
-		string path = GetPathFromDialog(msg);
+		std::string msg = "Select the folder containing Unity installs";
+		std::string path = GetPathFromDialog(msg);
 		if (path != ""){
 			LoadEditorPath(path);
 		}
@@ -142,7 +140,7 @@ class MainFrameDerived : public MainFrame{
 		int id = installsList->GetSelection();
 		if (id != wxNOT_FOUND){
 			editor& e = editors[id];
-			string path = e.path + dirsep + e.name;
+			std::string path = e.path + dirsep + e.name;
 			reveal_in_explorer(path);
 		}
 	}
@@ -167,18 +165,18 @@ class MainFrameDerived : public MainFrame{
  CreateProjectDialog derived class
  Defines the functionality for the project creation dialog
  */
-typedef std::function<void(const string&,const project&)> DialogCallback;
+typedef std::function<void(const std::string&,const project&)> DialogCallback;
 class CreateProjectDialogD : CreateProjectDialog{
 public:
-	CreateProjectDialogD(wxWindow* parent, const vector<editor>& versions, const DialogCallback& callback);
+	CreateProjectDialogD(wxWindow* parent, const std::vector<editor>& versions, const DialogCallback& callback);
 	void show(){
 		this->ShowModal();
 	}
 private:
-	string validateForm();
+	std::string validateForm();
 	void loadTemplates(const editor& e);
 	DialogCallback callback;
-	vector<editor> editors;
+	std::vector<editor> editors;
 
 	//events
 	void OnCancel(wxCommandEvent& event){
@@ -195,12 +193,12 @@ class CreateProjectDialogD : CreateProjectDialog{
 typedef std::function<void(const project&, const editor&)> OpenWithCallback;
 class OpenWithDlg : OpenWithEditorDlgBase{
 public:
-	OpenWithDlg(wxWindow* parent, const project& project, const vector<editor>& versions,  const OpenWithCallback& callback);
+	OpenWithDlg(wxWindow* parent, const project& project, const std::vector<editor>& versions,  const OpenWithCallback& callback);
 	void show(){
 		this->ShowModal();
 	}
 private:
-	vector<editor> editors;
+	std::vector<editor> editors;
 	project p;
 	OpenWithCallback callback;
 

source/open_with_dlg.cpp

@@ -5,6 +5,7 @@
 //
 
 #include "interface_derived.hpp"
+using namespace std;
 
 wxBEGIN_EVENT_TABLE(OpenWithDlg, wxDialog)
 EVT_BUTTON(wxID_CANCEL,OpenWithDlg::OnCancel)