summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-24 10:13:54 +0200
committerMattes D <github@xoft.cz>2014-10-24 10:13:54 +0200
commit2940ced832e506fb1bb2b5292d49b2c7c31afb5b (patch)
tree9b5c06b80b752eda2cb5dd25d271d50d9eb1dc1f /lib
parentReimplemented cEvent using C++11 primitives. (diff)
parentMerge pull request #1565 from mc-server/MergedIniFile (diff)
downloadcuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.gz
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.bz2
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.lz
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.xz
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.zst
cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.zip
Diffstat (limited to '')
-rw-r--r--lib/inifile/CMakeLists.txt11
-rw-r--r--src/IniFile.cpp (renamed from lib/inifile/iniFile.cpp)20
-rw-r--r--src/IniFile.h (renamed from lib/inifile/iniFile.h)6
3 files changed, 1 insertions, 36 deletions
diff --git a/lib/inifile/CMakeLists.txt b/lib/inifile/CMakeLists.txt
deleted file mode 100644
index 321d501d7..000000000
--- a/lib/inifile/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (iniFile)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
-
-file(GLOB SOURCE
- "*.h"
- "*.cpp"
-)
-
-add_library(iniFile ${SOURCE})
diff --git a/lib/inifile/iniFile.cpp b/src/IniFile.cpp
index 7cfe7661f..a666a4ff8 100644
--- a/lib/inifile/iniFile.cpp
+++ b/src/IniFile.cpp
@@ -24,7 +24,7 @@
#include <ctype.h>
// Local Includes
-#include "iniFile.h"
+#include "IniFile.h"
#if defined(WIN32)
#define iniEOL endl
@@ -32,10 +32,6 @@
#define iniEOL '\r' << endl
#endif
-#ifndef _WIN32
- #define sscanf_s(buffer, stringbuffer, ...) (sscanf(buffer, stringbuffer, __VA_ARGS__))
-#endif
-
using namespace std;
@@ -465,20 +461,6 @@ bool cIniFile::SetValueF(const AString & a_KeyName, const AString & a_ValueName,
-bool cIniFile::SetValueV(const AString & a_KeyName, const AString & a_ValueName, const char * a_Format, ...)
-{
- va_list args;
- va_start(args, a_Format);
- AString Data;
- AppendVPrintf(Data, a_Format, args);
- va_end(args);
- return SetValue(a_KeyName, a_ValueName, Data);
-}
-
-
-
-
-
AString cIniFile::GetValue(const int keyID, const int valueID, const AString & defValue) const
{
if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size()))
diff --git a/lib/inifile/iniFile.h b/src/IniFile.h
index 33229bff0..3f704551f 100644
--- a/lib/inifile/iniFile.h
+++ b/src/IniFile.h
@@ -154,12 +154,6 @@ public:
}
bool SetValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value, const bool a_CreateIfNotExists = true);
- // tolua_end
-
- bool SetValueV( const AString & a_KeyName, const AString & a_ValueName, const char * a_Format, ...);
-
- // tolua_begin
-
// Deletes specified value.
// Returns true if value existed and deleted, false otherwise.
bool DeleteValueByID(const int keyID, const int valueID);