author | zecke <zecke> | 2004-08-30 13:31:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-30 13:31:01 (UTC) |
commit | dc30b84bb9c3759bcfee5e6d162395cad9873465 (patch) (side-by-side diff) | |
tree | ca70ec6c942d078367c81d47a04ad7cda52cd9a1 | |
parent | ba35591e04701ec0a4a9111ab754b98674ee3d29 (diff) | |
download | opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.zip opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.tar.gz opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.tar.bz2 |
Fix warnings, add sanity check, new default argument to fix warning...
-rw-r--r-- | libopie2/opiedb/osqlbackend.cpp | 0 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiedb/osqlresult.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiedb/osqltable.h | 2 |
4 files changed, 5 insertions, 3 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 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 @@ -99,17 +99,17 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ return 0; } } res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); return res; } 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"); return; } sqlite_set_result_int(context, sqliteRlikeCompare((const char*)argv[0], (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); } @@ -178,17 +178,17 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { OSQLResult result(OSQLResult::Success, query.items, query.errors ); return result; } OSQLTable::ValueList OSQLiteDriver::tables() const { - + return OSQLTable::ValueList(); } OSQLError OSQLiteDriver::lastError() { OSQLError error; return error; }; 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 @@ -66,20 +66,22 @@ QDate OSQLResultItem::dataToDate( int column, bool *ok ) { QString str = data( column, ok ); if (!str.isEmpty() ) { ;// convert } return date; } QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { +// #FIXME xxx QDateTime time = QDateTime::currentDateTime(); return time; } QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) { +// #FIXME xxx QDateTime time = QDateTime::currentDateTime(); return time; } OSQLResult::OSQLResult( enum State state, const OSQLResultItem::ValueList& list, const OSQLError::ValueList& error ) : m_state( state ), m_list( list ), m_error( error ) 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 @@ -65,17 +65,17 @@ private: */ class OSQLTable { public: typedef QValueList<OSQLTable> ValueList; /** * @param tableName the Name of the Table */ - OSQLTable(const QString& tableName); + OSQLTable(const QString& tableName = QString::null); /** * d'tor */ ~OSQLTable(); /** * setColumns sets the Columns of the Table |