author | zecke <zecke> | 2004-08-30 13:31:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-30 13:31:01 (UTC) |
commit | dc30b84bb9c3759bcfee5e6d162395cad9873465 (patch) (unidiff) | |
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 | |||
@@ -104,7 +104,7 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ | |||
104 | } | 104 | } |
105 | 105 | ||
106 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | 106 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ |
107 | if( argv[0]==0 || argv[1]==0 ){ | 107 | if( arg < 2 || argv[0]==0 || argv[1]==0 ){ |
108 | printf("One of arguments Null!!\n"); | 108 | printf("One of arguments Null!!\n"); |
109 | return; | 109 | return; |
110 | } | 110 | } |
@@ -183,7 +183,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | |||
183 | 183 | ||
184 | 184 | ||
185 | OSQLTable::ValueList OSQLiteDriver::tables() const { | 185 | OSQLTable::ValueList OSQLiteDriver::tables() const { |
186 | 186 | return OSQLTable::ValueList(); | |
187 | } | 187 | } |
188 | 188 | ||
189 | 189 | ||
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 | |||
@@ -71,10 +71,12 @@ QDate OSQLResultItem::dataToDate( int column, bool *ok ) { | |||
71 | 71 | ||
72 | } | 72 | } |
73 | QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { | 73 | QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { |
74 | // #FIXME xxx | ||
74 | QDateTime time = QDateTime::currentDateTime(); | 75 | QDateTime time = QDateTime::currentDateTime(); |
75 | return time; | 76 | return time; |
76 | } | 77 | } |
77 | QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) { | 78 | QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) { |
79 | // #FIXME xxx | ||
78 | QDateTime time = QDateTime::currentDateTime(); | 80 | QDateTime time = QDateTime::currentDateTime(); |
79 | return time; | 81 | return time; |
80 | } | 82 | } |
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 | |||
@@ -70,7 +70,7 @@ public: | |||
70 | /** | 70 | /** |
71 | * @param tableName the Name of the Table | 71 | * @param tableName the Name of the Table |
72 | */ | 72 | */ |
73 | OSQLTable(const QString& tableName); | 73 | OSQLTable(const QString& tableName = QString::null); |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * d'tor | 76 | * d'tor |