| -rw-r--r-- | libopie2/opiedb/osqlbackendmanager.cpp | 12 | ||||
| -rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp index fc18e07..bbfbf3d 100644 --- a/libopie2/opiedb/osqlbackendmanager.cpp +++ b/libopie2/opiedb/osqlbackendmanager.cpp @@ -1,7 +1,13 @@ + +#include "osqlbackendmanager.h" + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qdir.h> #include <qmap.h> -#include "osqlbackendmanager.h" /** * \todo FIXME CONFIG!!! @@ -38,7 +44,7 @@ namespace { QString line; for (it = list.begin(); it != list.end(); ++it ) { line = (*it).stripWhiteSpace(); - qWarning("Anonymous::Config:" + line ); + owarn << "Anonymous::Config:" + line << oendl; QStringList test = QStringList::split(' ', line ); m_list.insert( test[0], test[2] ); } @@ -92,7 +98,7 @@ OSQLBackEnd::ValueList OSQLBackEndManager::scanDir( const QString& dirName ) { */ OSQLBackEnd OSQLBackEndManager::file2backend( const QString& file ) { OSQLBackEnd end; - qWarning("fileName: " + file ); + owarn << "fileName: " + file << oendl; Config cfg( file ); if (cfg.load() ) { end.setName( cfg.value( "Name") ); diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 588fc8f..69eddfe 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp @@ -124,7 +124,7 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){ bool OSQLiteDriver::open() { char *error; - qDebug("OSQLiteDriver::open: about to open"); + odebug << "OSQLiteDriver::open: about to open" << oendl; m_sqlite = sqlite_open(m_url.local8Bit(), 0, &error ); @@ -132,7 +132,7 @@ bool OSQLiteDriver::open() { /* failed to open */ if (m_sqlite == 0l ) { // FIXME set the last error - qWarning("OSQLiteDriver::open: %s", error ); + owarn << "OSQLiteDriver::open: " << error << "" << oendl; free( error ); return false; } @@ -174,7 +174,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { char *err; /* SQLITE_OK 0 if return code > 0 == failure */ if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) { - qWarning("OSQLiteDriver::query: Error while executing %s",err); + owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; free(err ); // FixMe Errors } |