From a640cd5555cef0092393a0feacb3c9222e177fe4 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Thu, 10 Mar 2016 08:34:00 +0000 Subject: [PATCH] Idented code properly in common/defaults.cpp --- source/common/defaults.cpp | 186 +++++++++++++++++++------------------ 1 file changed, 95 insertions(+), 91 deletions(-) diff --git a/source/common/defaults.cpp b/source/common/defaults.cpp index 9fc5e4d..30455a7 100644 --- a/source/common/defaults.cpp +++ b/source/common/defaults.cpp @@ -21,203 +21,207 @@ void SetupDefaultAddressBook(){ - // Check if the 'Default.local' directory exists. + // Setup the default address book if there are none. - wxString DefaultLocalDir; + // Check if the 'Default.local' directory exists. + + wxString DefaultLocalDir; #if defined(__HAIKU__) - //preffilename = wxT("noo"); + //preffilename = wxT("noo"); #elif defined(__WIN32__) - DefaultLocalDir.Clear(); - DefaultLocalDir.Append(wxString::FromUTF8(getenv("APPDATA"))); - DefaultLocalDir.Append(wxT("\\Xestia\\Address Book\\accounts\\")); - DefaultLocalDir.Append(wxT("Default.local")); + DefaultLocalDir.Clear(); + DefaultLocalDir.Append(wxString::FromUTF8(getenv("APPDATA"))); + DefaultLocalDir.Append(wxT("\\Xestia\\Address Book\\accounts\\")); + DefaultLocalDir.Append(wxT("Default.local")); #elif defined(__APPLE__) - DefaultLocalDir.Clear(); - DefaultLocalDir.Append(wxString::FromUTF8(getenv("HOME"))); - DefaultLocalDir.Append(wxT("/Library/Preferences/Xestia/Address Book/accounts/")); - DefaultLocalDir.Append(wxT("Default.local")); + DefaultLocalDir.Clear(); + DefaultLocalDir.Append(wxString::FromUTF8(getenv("HOME"))); + DefaultLocalDir.Append(wxT("/Library/Preferences/Xestia/Address Book/accounts/")); + DefaultLocalDir.Append(wxT("Default.local")); #else - DefaultLocalDir.Clear(); - DefaultLocalDir.Append(wxString::FromUTF8(getenv("HOME"))); - DefaultLocalDir.Append(wxT("/.xestiaab/accounts/")); - DefaultLocalDir.Append(wxT("Default.local")); + DefaultLocalDir.Clear(); + DefaultLocalDir.Append(wxString::FromUTF8(getenv("HOME"))); + DefaultLocalDir.Append(wxT("/.xestiaab/accounts/")); + DefaultLocalDir.Append(wxT("Default.local")); #endif - if (wxDirExists(DefaultLocalDir) == FALSE){ + if (wxDirExists(DefaultLocalDir) == FALSE){ - if (wxMkdir(DefaultLocalDir, 0740) == TRUE){ + if (wxMkdir(DefaultLocalDir, 0740) == TRUE){ - } + } - } + } } void SetupDefaultSettings(){ - // Setup default (non account) settings if they don't exist. + // Setup the default settings if they don't exist. + + // Setup default (non account) settings if they don't exist. - wxString DefaultPrefDir; + wxString DefaultPrefDir; #if defined(__HAIKU__) - //preffilename = wxT("noo"); + //preffilename = wxT("noo"); #elif defined(__WIN32__) - DefaultPrefDir.Clear(); - DefaultPrefDir.Append(wxString::FromUTF8(getenv("APPDATA"))); - DefaultPrefDir.Append(wxT("\\Xestia\\Address Book\\preferences\\")); + DefaultPrefDir.Clear(); + DefaultPrefDir.Append(wxString::FromUTF8(getenv("APPDATA"))); + DefaultPrefDir.Append(wxT("\\Xestia\\Address Book\\preferences\\")); #elif defined(__APPLE__) - DefaultPrefDir.Clear(); - DefaultPrefDir.Append(wxString::FromUTF8(getenv("HOME"))); - DefaultPrefDir.Append(wxT("/Library/Preferences/Xestia/Address Book/preferences")); + DefaultPrefDir.Clear(); + DefaultPrefDir.Append(wxString::FromUTF8(getenv("HOME"))); + DefaultPrefDir.Append(wxT("/Library/Preferences/Xestia/Address Book/preferences")); #else - DefaultPrefDir.Clear(); - DefaultPrefDir.Append(wxString::FromUTF8(getenv("HOME"))); - DefaultPrefDir.Append(wxT("/.xestiaab/preferences/")); + DefaultPrefDir.Clear(); + DefaultPrefDir.Append(wxString::FromUTF8(getenv("HOME"))); + DefaultPrefDir.Append(wxT("/.xestiaab/preferences/")); #endif - // Create the accounts file if it doesn't exist. + // Create the accounts file if it doesn't exist. - if (wxFileExists(DefaultPrefDir + wxT("accounts")) == FALSE){ + if (wxFileExists(DefaultPrefDir + wxT("accounts")) == FALSE){ - wxString AccountsFilename; - wxFFile AccountsFile; + wxString AccountsFilename; + wxFFile AccountsFile; - AccountsFilename = DefaultPrefDir; - AccountsFilename.Append(wxT("accounts")); + AccountsFilename = DefaultPrefDir; + AccountsFilename.Append(wxT("accounts")); #if wxABI_VERSION < 20900 - AccountsFile.Open(AccountsFilename.c_str(), wxT("w")); + AccountsFile.Open(AccountsFilename.c_str(), wxT("w")); #else - AccountsFile.Open(AccountsFilename, wxT("w")); + AccountsFile.Open(AccountsFilename, wxT("w")); #endif - AccountsFile.Write(wxT("")); + AccountsFile.Write(wxT("")); - } + } - // Create the preferences file if it doesn't exist. + // Create the preferences file if it doesn't exist. - if (wxFileExists(DefaultPrefDir + wxT("settings")) == FALSE){ + if (wxFileExists(DefaultPrefDir + wxT("settings")) == FALSE){ - wxString PrefsFilename; - wxFFile PrefsFile; + wxString PrefsFilename; + wxFFile PrefsFile; - PrefsFilename = DefaultPrefDir; - PrefsFilename.Append(wxT("settings")); + PrefsFilename = DefaultPrefDir; + PrefsFilename.Append(wxT("settings")); #if wxABI_VERSION < 20900 - PrefsFile.Open(PrefsFilename.c_str(), wxT("w")); + PrefsFile.Open(PrefsFilename.c_str(), wxT("w")); #else - PrefsFile.Open(PrefsFilename, wxT("w")); + PrefsFile.Open(PrefsFilename, wxT("w")); #endif - PrefsFile.Write(wxT("HideLocalAddressBooks=false\nSaveWindowPosition=true\n")); + PrefsFile.Write(wxT("HideLocalAddressBooks=false\nSaveWindowPosition=true\n")); - } + } } void SetupDirectories(){ - // Create the directories if they don't exist. + // Create the directories if they don't exist. - wxString DefaultSettingsDir; + wxString DefaultSettingsDir; #if defined(__HAIKU__) - //preffilename = wxT("noo"); + //preffilename = wxT("noo"); #elif defined(__WIN32__) - DefaultSettingsDir.Clear(); - DefaultSettingsDir.Append(wxString::FromUTF8(getenv("APPDATA"))); - DefaultSettingsDir.Append(wxT("\\Xestia\\")); + DefaultSettingsDir.Clear(); + DefaultSettingsDir.Append(wxString::FromUTF8(getenv("APPDATA"))); + DefaultSettingsDir.Append(wxT("\\Xestia\\")); - if (wxDirExists(DefaultSettingsDir) == FALSE){ + if (wxDirExists(DefaultSettingsDir) == FALSE){ - // Create the directory. + // Create the directory. - if (wxMkdir(DefaultSettingsDir, 0740) == TRUE){ + if (wxMkdir(DefaultSettingsDir, 0740) == TRUE){ - } + } - } + } - // TODO: APPEND 'Address Book' to the directory. + // 'Address Book' to the directory. - DefaultSettingsDir.Append(wxT("\\Address Book\\")); + DefaultSettingsDir.Append(wxT("\\Address Book\\")); #elif defined(__APPLE__) - DefaultSettingsDir.Clear(); - DefaultSettingsDir.Append(wxString::FromUTF8(getenv("HOME"))); - DefaultSettingsDir.Append(wxT("/Library/Preferences/Xestia/")); + DefaultSettingsDir.Clear(); + DefaultSettingsDir.Append(wxString::FromUTF8(getenv("HOME"))); + DefaultSettingsDir.Append(wxT("/Library/Preferences/Xestia/")); - if (wxDirExists(DefaultSettingsDir) == FALSE){ + if (wxDirExists(DefaultSettingsDir) == FALSE){ - // Create the directory. + // Create the directory. - if (wxMkdir(DefaultSettingsDir, 0740) == TRUE){ + if (wxMkdir(DefaultSettingsDir, 0740) == TRUE){ - } + } - } + } - // TODO: APPEND 'Address Book' to the directory. + // Append 'Address Book' to the directory. - DefaultSettingsDir.Append(wxT("/Address Book/")); + DefaultSettingsDir.Append(wxT("/Address Book/")); #else - DefaultSettingsDir.Clear(); - DefaultSettingsDir.Append(wxString::FromUTF8(getenv("HOME"))); - DefaultSettingsDir.Append(wxT("/.xestiaab/")); + DefaultSettingsDir.Clear(); + DefaultSettingsDir.Append(wxString::FromUTF8(getenv("HOME"))); + DefaultSettingsDir.Append(wxT("/.xestiaab/")); #endif - // Check if the directory exists. + // Check if the directory exists. - if (wxDirExists(DefaultSettingsDir) == FALSE){ + if (wxDirExists(DefaultSettingsDir) == FALSE){ - // Create the directory. + // Create the directory. - if (wxMkdir(DefaultSettingsDir, 0740) == TRUE){ + if (wxMkdir(DefaultSettingsDir, 0740) == TRUE){ - } + } - } + } - if (wxDirExists(DefaultSettingsDir + wxT("accounts")) == FALSE){ + if (wxDirExists(DefaultSettingsDir + wxT("accounts")) == FALSE){ - if (wxMkdir(DefaultSettingsDir + wxT("accounts"), 0740) == TRUE){ + if (wxMkdir(DefaultSettingsDir + wxT("accounts"), 0740) == TRUE){ - } + } - } + } - if (wxDirExists(DefaultSettingsDir + wxT("preferences")) == FALSE){ + if (wxDirExists(DefaultSettingsDir + wxT("preferences")) == FALSE){ - if (wxMkdir(DefaultSettingsDir + wxT("preferences"), 0740) == TRUE){ + if (wxMkdir(DefaultSettingsDir + wxT("preferences"), 0740) == TRUE){ - } + } - } + } } \ No newline at end of file -- 2.39.2