macOS: Implemented macOS specific paths and variable name fixes

[xestiacalendar/.git] / source / common / dirs.cpp

diff --git a/source/common/dirs.cpp b/source/common/dirs.cpp
index ad4f695..2559834 100644 (file)
--- a/source/common/dirs.cpp
+++ b/source/common/dirs.cpp
@@ -23,31 +23,31 @@ wxString GetUserDir()
     
        // Get the user directory.
     
-       wxString UserDir;
+       wxString userDir;
     
 #if defined(__HAIKU__)
         
 #elif defined(__WIN32__)
     
-       UserDir.Clear();
-       UserDir.Append(wxString::FromUTF8(getenv("APPDATA")));
-       UserDir.Append(wxT("\\Xestia\\Calendar\\"));
+       userDir.Clear();
+       userDir.Append(wxString::FromUTF8(getenv("APPDATA")));
+       userDir.Append(wxT("\\Xestia\\Calendar\\"));
     
 #elif defined(__APPLE__)
     
-       UserDir.Clear();
-       UserDir.Append(wxString::FromUTF8(getenv("HOME")));
-       UserDir.Append(wxT("/Library/Preferences/Xestia/Calendar/"));
+       userDir.Clear();
+       userDir.Append(wxString::FromUTF8(getenv("HOME")));
+       userDir.Append(wxT("/Library/Preferences/Xestia/Calendar/"));
     
 #else
     
-       UserDir.Clear();
-       UserDir.Append(wxString::FromUTF8(getenv("HOME")));
-       UserDir.Append(wxT("/.xestiacal/"));
+       userDir.Clear();
+       userDir.Append(wxString::FromUTF8(getenv("HOME")));
+       userDir.Append(wxT("/.xestiacal/"));
     
 #endif
     
-       return UserDir;
+       return userDir;
     
 }
 
@@ -56,133 +56,133 @@ wxString GetUserPrefDir()
     
        // Get the user preferences directory.
     
-       wxString UserPrefDir;
+       wxString userPrefDir;
     
 #if defined(__HAIKU__)
         
 #elif defined(__WIN32__)
     
-       UserPrefDir.Clear();
-       UserPrefDir.Append(wxString::FromUTF8(getenv("APPDATA")));
-       UserPrefDir.Append(wxT("\\Xestia\\Calendar\\preferences\\"));
+       userPrefDir.Clear();
+       userPrefDir.Append(wxString::FromUTF8(getenv("APPDATA")));
+       userPrefDir.Append(wxT("\\Xestia\\Calendar\\preferences\\"));
     
 #elif defined(__APPLE__)
     
-       UserPrefDir.Clear();
-       UserPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
-       UserPrefDir.Append(wxT("/Library/Preferences/Xestia/Calendar/preferences/"));
+       userPrefDir.Clear();
+       userPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
+       userPrefDir.Append(wxT("/Library/Preferences/Xestia/Calendar/preferences/"));
     
 #else
     
-       UserPrefDir.Clear();
-       UserPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
-       UserPrefDir.Append(wxT("/.xestiacal/preferences/"));
+       userPrefDir.Clear();
+       userPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
+       userPrefDir.Append(wxT("/.xestiacal/preferences/"));
     
 #endif
     
-       return UserPrefDir;
+       return userPrefDir;
     
 }
 
-wxString GetAccountDir(wxString AccName, bool ServerCert)
+wxString GetAccountDir(wxString accName, bool serverCert)
 {
     
        // Get the account directory.
     
-       wxString AccountDir;
+       wxString accountDir;
     
 #if defined(__HAIKU__)
     
 #elif defined(__WIN32__)
     
-       AccountDir.Clear();
-       AccountDir.Append(wxString::FromUTF8(getenv("APPDATA")));
-       AccountDir.Append(wxT("\\Xestia\\Calendar\\accounts\\"));
-       AccountDir.Append(AccName);
-       AccountDir.Append(wxT("\\"));
+       accountDir.Clear();
+       accountDir.Append(wxString::FromUTF8(getenv("APPDATA")));
+       accountDir.Append(wxT("\\Xestia\\Calendar\\accounts\\"));
+       accountDir.Append(accName);
+       accountDir.Append(wxT("\\"));
     
-       if (ServerCert == TRUE){
-               AccountDir.Append(wxT("server.crt"));
+       if (serverCert == TRUE){
+               accountDir.Append(wxT("server.crt"));
        }
     
 #elif defined(__APPLE__)
     
-       AccountDir.Clear();
-       AccountDir.Append(wxString::FromUTF8(getenv("HOME")));
-       AccountDir.Append(wxT("/Library/Preferences/Xestia/Calendar/accounts/"));
-       AccountDir.Append(AccName);
-       AccountDir.Append(wxT("/"));
+       accountDir.Clear();
+       accountDir.Append(wxString::FromUTF8(getenv("HOME")));
+       accountDir.Append(wxT("/Library/Preferences/Xestia/Calendar/accounts/"));
+       accountDir.Append(accName);
+       accountDir.Append(wxT("/"));
     
-       if (ServerCert == TRUE){
-               AccountDir.Append(wxT("server.crt"));
+       if (serverCert == TRUE){
+               accountDir.Append(wxT("server.crt"));
        }
     
 #else
     
-       AccountDir.Clear();
-       AccountDir.Append(wxString::FromUTF8(getenv("HOME")));
-       AccountDir.Append(wxT("/.xestiacal/accounts/"));
-       AccountDir.Append(AccName);
-       AccountDir.Append(wxT("/"));
+       accountDir.Clear();
+       accountDir.Append(wxString::FromUTF8(getenv("HOME")));
+       accountDir.Append(wxT("/.xestiacal/accounts/"));
+       accountDir.Append(accName);
+       accountDir.Append(wxT("/"));
     
-       if (ServerCert == TRUE){
-               AccountDir.Append(wxT("server.crt"));
+       if (serverCert == TRUE){
+               accountDir.Append(wxT("server.crt"));
        }
     
 #endif
     
-       return AccountDir;
+       return accountDir;
     
 }
 
-std::string GetAccountDir(std::string AccName, bool ServerCert)
+std::string GetAccountDir(std::string accName, bool serverCert)
 {
     
        // Get the account directory.
     
-       std::string AccountDir;
+       std::string accountDir;
     
 #if defined(__HAIKU__)
     
 #elif defined(__WIN32__)
     
-       AccountDir.clear();
-       AccountDir.append(getenv("APPDATA"));
-       AccountDir.append("\\Xestia\\Calendar\\accounts\\");
-       AccountDir.append(AccName);
-       AccountDir.append("\\");
+       accountDir.clear();
+       accountDir.append(getenv("APPDATA"));
+       accountDir.append("\\Xestia\\Calendar\\accounts\\");
+       accountDir.append(accName);
+       accountDir.append("\\");
     
-       if (ServerCert == true){
-               AccountDir.append("server.crt");
+       if (serverCert == true){
+               accountDir.append("server.crt");
        }
     
 #elif defined(__APPLE__)
     
-       AccountDir.clear();
-       AccountDir.append(getenv("HOME"));
-       AccountDir.append("/Library/Preferences/Xestia/Calendar/accounts/");
-       AccountDir.append(AccName);
-       AccountDir.append("/");
+       accountDir.clear();
+       accountDir.append(getenv("HOME"));
+       accountDir.append("/Library/Preferences/Xestia/Calendar/accounts/");
+       accountDir.append(accName);
+       accountDir.append("/");
     
-       if (ServerCert == true){
-               AccountDir.append("server.crt");
+       if (serverCert == true){
+               accountDir.append("server.crt");
        }
     
 #else
     
-       AccountDir.clear();
-       AccountDir.append(getenv("HOME"));
-       AccountDir.append("/.xestiacal/accounts/");
-       AccountDir.append(AccName);
-       AccountDir.append("/");
+       accountDir.clear();
+       accountDir.append(getenv("HOME"));
+       accountDir.append("/.xestiacal/accounts/");
+       accountDir.append(accName);
+       accountDir.append("/");
     
-       if (ServerCert == true){
-               AccountDir.append("server.crt");
+       if (serverCert == true){
+               accountDir.append("server.crt");
        }
 
 #endif
     
-       return AccountDir;
+       return accountDir;
     
 }
 
@@ -191,31 +191,31 @@ wxString GetAccountsFile()
     
        // Get the accounts preferences file.
     
-       wxString AccountsFile;
+       wxString accountsFile;
     
 #if defined(__HAIKU__)
     
 #elif defined(__WIN32__)
     
-       AccountsFile.Clear();
-       AccountsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
-       AccountsFile.Append(wxT("\\Xestia\\Calendar\\preferences\\accounts"));
+       accountsFile.Clear();
+       accountsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
+       accountsFile.Append(wxT("\\Xestia\\Calendar\\preferences\\accounts"));
     
 #elif defined(__APPLE__)
     
-       AccountsFile.Clear();
-       AccountsFile.Append(wxString::FromUTF8(getenv("HOME")));
-       AccountsFile.Append(wxT("/Library/Preferences/Xestia/Calendar/preferences/accounts"));
+       accountsFile.Clear();
+       accountsFile.Append(wxString::FromUTF8(getenv("HOME")));
+       accountsFile.Append(wxT("/Library/Preferences/Xestia/Calendar/preferences/accounts"));
     
 #else
     
-       AccountsFile.Clear();
-       AccountsFile.Append(wxString::FromUTF8(getenv("HOME")));
-       AccountsFile.Append(wxT("/.xestiacal/preferences/accounts"));
+       accountsFile.Clear();
+       accountsFile.Append(wxString::FromUTF8(getenv("HOME")));
+       accountsFile.Append(wxT("/.xestiacal/preferences/accounts"));
     
 #endif
     
-       return AccountsFile;
+       return accountsFile;
     
 }
 
@@ -224,30 +224,30 @@ wxString GetSettingsFile()
     
        // Get the preferences general settings file.
     
-       wxString SettingsFile;
+       wxString settingsFile;
     
 #if defined(__HAIKU__)
     
 #elif defined(__WIN32__)
     
-       SettingsFile.Clear();
-       SettingsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
-       SettingsFile.Append(wxT("\\Xestia\\Calendar\\preferences\\settings"));
+       settingsFile.Clear();
+       settingsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
+       settingsFile.Append(wxT("\\Xestia\\Calendar\\preferences\\settings"));
     
 #elif defined(__APPLE__)
     
-       SettingsFile.Clear();
-       SettingsFile.Append(wxString::FromUTF8(getenv("HOME")));
-       SettingsFile.Append(wxT("/Library/Preferences/Xestia/Calendar/preferences/settings"));
+       settingsFile.Clear();
+       settingsFile.Append(wxString::FromUTF8(getenv("HOME")));
+       settingsFile.Append(wxT("/Library/Preferences/Xestia/Calendar/preferences/settings"));
     
 #else
     
-       SettingsFile.Clear();
-       SettingsFile.Append(wxString::FromUTF8(getenv("HOME")));
-       SettingsFile.Append(wxT("/.xestiacal/preferences/settings"));
+       settingsFile.Clear();
+       settingsFile.Append(wxString::FromUTF8(getenv("HOME")));
+       settingsFile.Append(wxT("/.xestiacal/preferences/settings"));
     
 #endif
     
-       return SettingsFile;
+       return settingsFile;
     
 }
\ No newline at end of file