diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-26 22:46:37 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-03 17:41:55 +0100 |
| commit | 098a5e2fa7c6eca8e3435c9cdeb33c652df20bee (patch) | |
| tree | 81442c8766bf6868e738dde1d1aceefcecd80b69 | |
| parent | 8bc7b6058489ae5bb36d497fb5ed17b92375c796 (diff) | |
| download | tdesvn-098a5e2fa7c6eca8e3435c9cdeb33c652df20bee.tar.gz tdesvn-098a5e2fa7c6eca8e3435c9cdeb33c652df20bee.zip | |
Update svn/sqlite cmake detection
(part of the original commit)
(cherry picked from commit 4ce4baa8d68bdbc6f7e49f17338e61b9f2598332)
| -rw-r--r-- | src/svnqt/cache/LogCache.cpp | 6 | ||||
| -rw-r--r-- | src/svnqt/cache/LogCache.hpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index 942b2ae..2b3e322 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -187,7 +187,7 @@ public: TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key); db->setDatabaseName(m_BasePath+"/maindb.db"); if (!db->open()) { - qWarning("Failed to open main database: " + db->lastError().text()); + qWarning(TQString("Failed to open main database: " + db->lastError().text()).ascii()); } else { m_mainDB.setLocalData(new ThreadDBStore); m_mainDB.localData()->key = _key; @@ -269,12 +269,12 @@ void LogCache::setupMainDb() #endif TQDataBase mainDB = m_CacheData->getMainDB(); if (!mainDB || !mainDB->open()) { - qWarning("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")); + qWarning(TQString("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii()); } else { TQSqlQuery q(TQString(), mainDB); mainDB->transaction(); if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) { - qWarning("Failed create main database: " + mainDB->lastError().text()); + qWarning(TQString("Failed create main database: " + mainDB->lastError().text()).ascii()); } mainDB->commit(); } diff --git a/src/svnqt/cache/LogCache.hpp b/src/svnqt/cache/LogCache.hpp index e0a7f02..eaaf37a 100644 --- a/src/svnqt/cache/LogCache.hpp +++ b/src/svnqt/cache/LogCache.hpp @@ -3,6 +3,7 @@ #include <tqstring.h> #include <tqdir.h> +#include <tqmutex.h> #include "svnqt/svnqt_defines.hpp" #include "svnqt/shared_pointer.hpp" |