Fix warnings, add sanity check, new default argument to fix warning...

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
@@ -76,5 +76,5 @@ 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
@@ -35,10 +35,10 @@
 
 #include <stdlib.h>
 #include <stdio.h>
 
-namespace Opie { 
-namespace DB { 
+namespace Opie {
+namespace DB {
 namespace Internal {
 
 namespace {
     struct Query {
@@ -103,9 +103,9 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
     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,
@@ -119,17 +119,17 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){
  */
 bool OSQLiteDriver::open() {
     char *error;
 
-    odebug << "OSQLiteDriver::open: about to open" << oendl; 
+    odebug << "OSQLiteDriver::open: about to open" << oendl;
     m_sqlite = sqlite_open(m_url.local8Bit(),
                            0,
                            &error );
 
     /* failed to open */
     if (m_sqlite == 0l ) {
         // FIXME set the last error
-        owarn << "OSQLiteDriver::open: " << error << "" << oendl; 
+        owarn << "OSQLiteDriver::open: " << error << "" << oendl;
         free( error );
         return false;
     }
     if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0)
@@ -182,9 +182,9 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
 }
 
 
 OSQLTable::ValueList OSQLiteDriver::tables() const {
-
+    return OSQLTable::ValueList();
 }
 
 
 OSQLError OSQLiteDriver::lastError() {
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
@@ -70,12 +70,14 @@ QDate OSQLResultItem::dataToDate( int column,  bool *ok ) {
     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;
 }
 
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
@@ -69,9 +69,9 @@ public:
 
     /**
      * @param tableName the Name of the Table
      */
-    OSQLTable(const QString& tableName);
+    OSQLTable(const QString& tableName = QString::null);
 
     /**
      * d'tor
      */