summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-30 13:31:01 (UTC)
committer zecke <zecke>2004-08-30 13:31:01 (UTC)
commitdc30b84bb9c3759bcfee5e6d162395cad9873465 (patch) (side-by-side diff)
treeca70ec6c942d078367c81d47a04ad7cda52cd9a1
parentba35591e04701ec0a4a9111ab754b98674ee3d29 (diff)
downloadopie-dc30b84bb9c3759bcfee5e6d162395cad9873465.zip
opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.tar.gz
opie-dc30b84bb9c3759bcfee5e6d162395cad9873465.tar.bz2
Fix warnings, add sanity check, new default argument to fix warning...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlbackend.cpp2
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp12
-rw-r--r--libopie2/opiedb/osqlresult.cpp2
-rw-r--r--libopie2/opiedb/osqltable.h2
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
@@ -77,4 +77,4 @@ 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
@@ -36,8 +36,8 @@
#include <stdlib.h>
#include <stdio.h>
-namespace Opie {
-namespace DB {
+namespace Opie {
+namespace DB {
namespace Internal {
namespace {
@@ -104,7 +104,7 @@ 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");
return;
}
@@ -120,7 +120,7 @@ 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 );
@@ -128,7 +128,7 @@ bool OSQLiteDriver::open() {
/* 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;
}
@@ -183,7 +183,7 @@ 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
@@ -71,10 +71,12 @@ QDate OSQLResultItem::dataToDate( int column, bool *ok ) {
}
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
@@ -70,7 +70,7 @@ public:
/**
* @param tableName the Name of the Table
*/
- OSQLTable(const QString& tableName);
+ OSQLTable(const QString& tableName = QString::null);
/**
* d'tor