| -rw-r--r-- | libopie2/opiedb/osqlbackend.cpp | 2 | ||||
| -rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 12 | ||||
| -rw-r--r-- | libopie2/opiedb/osqlresult.cpp | 2 | ||||
| -rw-r--r-- | libopie2/opiedb/osqltable.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/libopie2/opiedb/osqlbackend.cpp b/libopie2/opiedb/osqlbackend.cpp index aede7c1..5c37480 100644 --- a/libopie2/opiedb/osqlbackend.cpp +++ b/libopie2/opiedb/osqlbackend.cpp @@ -79,2 +79,2 @@ void OSQLBackEnd::setPreference( int pref ) { } -}
\ No newline at end of file +} diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 92f89cf..c8b560f 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp @@ -38,4 +38,4 @@ -namespace Opie { -namespace DB { +namespace Opie { +namespace DB { namespace Internal { @@ -106,3 +106,3 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ void rlikeFunc(sqlite_func *context, int arg, const char **argv){ - if( argv[0]==0 || argv[1]==0 ){ + if( arg < 2 || argv[0]==0 || argv[1]==0 ){ printf("One of arguments Null!!\n"); @@ -122,3 +122,3 @@ bool OSQLiteDriver::open() { - odebug << "OSQLiteDriver::open: about to open" << oendl; + odebug << "OSQLiteDriver::open: about to open" << oendl; m_sqlite = sqlite_open(m_url.local8Bit(), @@ -130,3 +130,3 @@ bool OSQLiteDriver::open() { // FIXME set the last error - owarn << "OSQLiteDriver::open: " << error << "" << oendl; + owarn << "OSQLiteDriver::open: " << error << "" << oendl; free( error ); @@ -185,3 +185,3 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { OSQLTable::ValueList OSQLiteDriver::tables() const { - + return OSQLTable::ValueList(); } diff --git a/libopie2/opiedb/osqlresult.cpp b/libopie2/opiedb/osqlresult.cpp index 268ac8e..a34ab2f 100644 --- a/libopie2/opiedb/osqlresult.cpp +++ b/libopie2/opiedb/osqlresult.cpp @@ -73,2 +73,3 @@ QDate OSQLResultItem::dataToDate( int column, bool *ok ) { QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { +// #FIXME xxx QDateTime time = QDateTime::currentDateTime(); @@ -77,2 +78,3 @@ QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) { +// #FIXME xxx QDateTime time = QDateTime::currentDateTime(); diff --git a/libopie2/opiedb/osqltable.h b/libopie2/opiedb/osqltable.h index 86c30dd..8dd786f 100644 --- a/libopie2/opiedb/osqltable.h +++ b/libopie2/opiedb/osqltable.h @@ -72,3 +72,3 @@ public: */ - OSQLTable(const QString& tableName); + OSQLTable(const QString& tableName = QString::null); |