Swiftdiff options
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/History/SConscript | 18 | ||||
| -rw-r--r-- | Swiften/History/SQLiteHistoryManager.cpp | 11 |
2 files changed, 12 insertions, 17 deletions
diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript index 9c2a9d6..975f839 100644 --- a/Swiften/History/SConscript +++ b/Swiften/History/SConscript @@ -1,11 +1,11 @@ Import("swiften_env") -#myenv = swiften_env.Clone() -#if myenv["target"] == "native": -# myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {})) -# -#objects = myenv.SwiftenObject([ -# "HistoryManager.cpp", -# "SQLiteHistoryManager.cpp", -# ]) -#swiften_env.Append(SWIFTEN_OBJECTS = [objects]) +myenv = swiften_env.Clone() +if myenv["target"] == "native": + myenv.MergeFlags(swiften_env.get("SQLITE_FLAGS", {})) + +objects = myenv.SwiftenObject([ + "HistoryManager.cpp", + "SQLiteHistoryManager.cpp", + ]) +swiften_env.Append(SWIFTEN_OBJECTS = [objects]) diff --git a/Swiften/History/SQLiteHistoryManager.cpp b/Swiften/History/SQLiteHistoryManager.cpp index 3b65f62..a24dec2 100644 --- a/Swiften/History/SQLiteHistoryManager.cpp +++ b/Swiften/History/SQLiteHistoryManager.cpp @@ -10,17 +10,12 @@ #include <sqlite3.h> #include <Swiften/History/SQLiteHistoryManager.h> -namespace { - -inline Swift::std::string getEscapedString(const Swift::std::string& s) { - Swift::std::string result(s); - result.replaceAll('\'', Swift::std::string("\\'")); +inline std::string getEscapedString(const std::string& s) { + std::string result(s); + // result.replaceAll('\'', std::string("\\'")); return result; } -} - - namespace Swift { SQLiteHistoryManager::SQLiteHistoryManager(const std::string& file) : db_(0) { |