camelCase: Converted remaining code that was missed

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

diff --git a/source/common/preferences.cpp b/source/common/preferences.cpp
index f43b48b..b108baf 100644 (file)
--- a/source/common/preferences.cpp
+++ b/source/common/preferences.cpp
@@ -79,10 +79,10 @@ XCALPreferences::XCALPreferences(wxString preferencesFilename){
 
                bool posXValid, posYValid, posHValid, posWValid = FALSE;
 
-               posXValid = settingfile->Read(wxT("WindowPositionX"), &posX);
-               posYValid = settingfile->Read(wxT("WindowPositionY"), &posY);
-               posHValid = settingfile->Read(wxT("WindowPositionHeight"), &posH);
-               posWValid = settingfile->Read(wxT("WindowPositionWidth"), &posW);
+               posXValid = settingFile->Read(wxT("WindowPositionX"), &posX);
+               posYValid = settingFile->Read(wxT("WindowPositionY"), &posY);
+               posHValid = settingFile->Read(wxT("WindowPositionHeight"), &posH);
+               posWValid = settingFile->Read(wxT("WindowPositionWidth"), &posW);
 
                if (posXValid == TRUE && posYValid == TRUE && posHValid == TRUE && posWValid == TRUE){
 
@@ -129,7 +129,7 @@ XCALPreferences::XCALPreferences(wxString preferencesFilename){
        long itemIndex = 0;
        bool continueAcc = TRUE;
     
-       continueAcc = cfgFile->GetFirstGroup(accountname, itemIndex);
+       continueAcc = cfgFile->GetFirstGroup(accountName, itemIndex);
     
        while (continueAcc){
 
@@ -164,8 +164,8 @@ XCALPreferences::XCALPreferences(wxString preferencesFilename){
 
                        cfgFile->Read(wxT("accountdir"), &accDir);
                        accountAddressValid = cfgFile->Read(wxT("address"), &accAdr);
-                       accountPortValid = cfgFile->Read(wxT("port"), &AccPort);
-                       accountSSLValid = cfgFile->Read(wxT("ssl"), &AccSSLInc);
+                       accountPortValid = cfgFile->Read(wxT("port"), &accPort);
+                       accountSSLValid = cfgFile->Read(wxT("ssl"), &accSSLInc);
                        if (accSSLInc == wxT("true")){
                                accSSL = TRUE;
                        }
@@ -191,7 +191,7 @@ XCALPreferences::XCALPreferences(wxString preferencesFilename){
                                accountPortValid = TRUE;
                        }
             
-                       accounts.AddAccount(accountname, wxT("CalDAV"), accAdr, accPort,
+                       accounts.AddAccount(accountName, wxT("CalDAV"), accAdr, accPort,
                                accSSL, accUsr, accPass, 
                                accPrefix, accDir, accRef);
             
@@ -255,7 +255,7 @@ XCALPreferences::XCALPreferences(wxString preferencesFilename){
                preAccountStage = TRUE;
     
                cfgFile->SetPath(wxT("/"));
-               ContinueAcc = cfgfile->GetNextGroup(accountName, itemIndex);
+               continueAcc = cfgFile->GetNextGroup(accountName, itemIndex);
     
        }
   
@@ -288,7 +288,7 @@ void XCALPreferences::SetMainWindowData(wxRect windowData){
 
        // Set the main window data from a wxRect object.
 
-       mainWindowData = WindowData;
+       mainWindowData = windowData;
 
 }
 
@@ -298,7 +298,7 @@ XCALPrefAccounts::XCALPrefAccounts(){
 
        // Setup the default values for XCALPrefAccounts.
 
-       AccountsCount = 0;
+       accountsCount = 0;
        
 }