summaryrefslogtreecommitdiffstats
path: root/data.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--data.h14
-rw-r--r--data.hpp58
2 files changed, 36 insertions, 36 deletions
diff --git a/data.h b/data.h
index 3137f8fa2..f9639c62f 100644
--- a/data.h
+++ b/data.h
@@ -17,13 +17,13 @@
#ifndef _DATA_HEADER
#define _DATA_HEADER
-int DataManager_ResetDefaults();
-void DataManager_LoadDefaults();
+int DataManager_ResetDefaults(void);
+void DataManager_LoadDefaults(void);
int DataManager_LoadValues(const char* filename);
-int DataManager_Flush();
+int DataManager_Flush(void);
const char* DataManager_GetStrValue(const char* varName);
-const char* DataManager_GetCurrentStoragePath();
-const char* DataManager_GetSettingsStoragePath();
+const char* DataManager_GetCurrentStoragePath(void);
+const char* DataManager_GetSettingsStoragePath(void);
int DataManager_GetIntValue(const char* varName);
int DataManager_SetStrValue(const char* varName, char* value);
@@ -32,8 +32,8 @@ int DataManager_SetFloatValue(const char* varName, float value);
int DataManager_ToggleIntValue(const char* varName);
-void DataManager_DumpValues();
-void DataManager_ReadSettingsFile();
+void DataManager_DumpValues(void);
+void DataManager_ReadSettingsFile(void);
#endif // _DATA_HEADER
diff --git a/data.hpp b/data.hpp
index ff50373bb..ef201d78e 100644
--- a/data.hpp
+++ b/data.hpp
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,32 +26,32 @@ using namespace std;
class DataManager
{
public:
- static int ResetDefaults();
- static int LoadValues(const string filename);
- static int Flush();
+ static int ResetDefaults();
+ static int LoadValues(const string filename);
+ static int Flush();
- // Core get routines
- static int GetValue(const string varName, string& value);
- static int GetValue(const string varName, int& value);
+ // Core get routines
+ static int GetValue(const string varName, string& value);
+ static int GetValue(const string varName, int& value);
static int GetValue(const string varName, float& value);
- static unsigned long long GetValue(const string varName, unsigned long long& value);
+ static unsigned long long GetValue(const string varName, unsigned long long& value);
- // This is a dangerous function. It will create the value if it doesn't exist so it has a valid c_str
- static string& GetValueRef(const string varName);
+ // This is a dangerous function. It will create the value if it doesn't exist so it has a valid c_str
+ static string& GetValueRef(const string varName);
- // Helper functions
- static string GetStrValue(const string varName);
- static int GetIntValue(const string varName);
+ // Helper functions
+ static string GetStrValue(const string varName);
+ static int GetIntValue(const string varName);
- // Core set routines
- static int SetValue(const string varName, string value, int persist = 0);
- static int SetValue(const string varName, int value, int persist = 0);
- static int SetValue(const string varName, float value, int persist = 0);
- static int SetValue(const string varName, unsigned long long value, int persist = 0);
+ // Core set routines
+ static int SetValue(const string varName, string value, int persist = 0);
+ static int SetValue(const string varName, int value, int persist = 0);
+ static int SetValue(const string varName, float value, int persist = 0);
+ static int SetValue(const string varName, unsigned long long value, int persist = 0);
static int SetProgress(float Fraction);
static int ShowProgress(float Portion, float Seconds);
- static void DumpValues();
+ static void DumpValues();
static void update_tz_environment_variables();
static void SetBackupFolder();
static void SetDefaultValues();
@@ -64,20 +64,20 @@ public:
static string& CGetSettingsStoragePath();
protected:
- typedef pair<string, int> TStrIntPair;
- typedef pair<string, unsigned long long> TStrULLPair;
- typedef pair<string, TStrIntPair> TNameValuePair;
- static map<string, TStrIntPair> mValues;
- static map<string, TStrULLPair> mULLValues;
- static string mBackingFile;
- static int mInitialized;
+ typedef pair<string, int> TStrIntPair;
+ typedef pair<string, unsigned long long> TStrULLPair;
+ typedef pair<string, TStrIntPair> TNameValuePair;
+ static map<string, TStrIntPair> mValues;
+ static map<string, TStrULLPair> mULLValues;
+ static string mBackingFile;
+ static int mInitialized;
- static map<string, string> mConstValues;
+ static map<string, string> mConstValues;
protected:
- static int SaveValues();
+ static int SaveValues();
- static int GetMagicValue(string varName, string& value);
+ static int GetMagicValue(string varName, string& value);
private:
static void sanitize_device_id(char* device_id);