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 /libopie2/opiedb | |
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 | 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 | |||
@@ -72,9 +72,9 @@ void OSQLBackEnd::setDefault( bool def) { | |||
72 | m_default = def; | 72 | m_default = def; |
73 | } | 73 | } |
74 | void OSQLBackEnd::setPreference( int pref ) { | 74 | void OSQLBackEnd::setPreference( int pref ) { |
75 | m_pref = pref; | 75 | m_pref = pref; |
76 | } | 76 | } |
77 | 77 | ||
78 | 78 | ||
79 | } | 79 | } |
80 | } \ No newline at end of file | 80 | } |
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 | |||
@@ -31,18 +31,18 @@ | |||
31 | #include "osqlquery.h" | 31 | #include "osqlquery.h" |
32 | #include "osqlitedriver.h" | 32 | #include "osqlitedriver.h" |
33 | 33 | ||
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | #include <stdio.h> | 37 | #include <stdio.h> |
38 | 38 | ||
39 | namespace Opie { | 39 | namespace Opie { |
40 | namespace DB { | 40 | namespace DB { |
41 | namespace Internal { | 41 | namespace Internal { |
42 | 42 | ||
43 | namespace { | 43 | namespace { |
44 | struct Query { | 44 | struct Query { |
45 | OSQLError::ValueList errors; | 45 | OSQLError::ValueList errors; |
46 | OSQLResultItem::ValueList items; | 46 | OSQLResultItem::ValueList items; |
47 | OSQLiteDriver *driver; | 47 | OSQLiteDriver *driver; |
48 | }; | 48 | }; |
@@ -99,41 +99,41 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ | |||
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | } | 101 | } |
102 | res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); | 102 | res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); |
103 | return res; | 103 | return res; |
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 | } |
111 | sqlite_set_result_int(context, | 111 | sqlite_set_result_int(context, |
112 | sqliteRlikeCompare((const char*)argv[0], | 112 | sqliteRlikeCompare((const char*)argv[0], |
113 | (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); | 113 | (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); |
114 | } | 114 | } |
115 | 115 | ||
116 | /* | 116 | /* |
117 | * try to open a db specified via setUrl | 117 | * try to open a db specified via setUrl |
118 | * and options | 118 | * and options |
119 | */ | 119 | */ |
120 | bool OSQLiteDriver::open() { | 120 | bool OSQLiteDriver::open() { |
121 | char *error; | 121 | char *error; |
122 | 122 | ||
123 | odebug << "OSQLiteDriver::open: about to open" << oendl; | 123 | odebug << "OSQLiteDriver::open: about to open" << oendl; |
124 | m_sqlite = sqlite_open(m_url.local8Bit(), | 124 | m_sqlite = sqlite_open(m_url.local8Bit(), |
125 | 0, | 125 | 0, |
126 | &error ); | 126 | &error ); |
127 | 127 | ||
128 | /* failed to open */ | 128 | /* failed to open */ |
129 | if (m_sqlite == 0l ) { | 129 | if (m_sqlite == 0l ) { |
130 | // FIXME set the last error | 130 | // FIXME set the last error |
131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; | 131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; |
132 | free( error ); | 132 | free( error ); |
133 | return false; | 133 | return false; |
134 | } | 134 | } |
135 | if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) | 135 | if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) |
136 | odebug << "Unable to create user defined function!" << oendl; | 136 | odebug << "Unable to create user defined function!" << oendl; |
137 | if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0) | 137 | if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0) |
138 | odebug << "Unable to set rlike function result type!" << oendl; | 138 | odebug << "Unable to set rlike function result type!" << oendl; |
139 | sqreg.regex_raw = NULL; | 139 | sqreg.regex_raw = NULL; |
@@ -178,17 +178,17 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | |||
178 | OSQLResult result(OSQLResult::Success, | 178 | OSQLResult result(OSQLResult::Success, |
179 | query.items, | 179 | query.items, |
180 | query.errors ); | 180 | query.errors ); |
181 | return result; | 181 | return result; |
182 | } | 182 | } |
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 | ||
190 | OSQLError OSQLiteDriver::lastError() { | 190 | OSQLError OSQLiteDriver::lastError() { |
191 | OSQLError error; | 191 | OSQLError error; |
192 | return error; | 192 | return error; |
193 | }; | 193 | }; |
194 | 194 | ||
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 ) { | |||
66 | QString str = data( column, ok ); | 66 | QString str = data( column, ok ); |
67 | if (!str.isEmpty() ) { | 67 | if (!str.isEmpty() ) { |
68 | ;// convert | 68 | ;// convert |
69 | } | 69 | } |
70 | return date; | 70 | return date; |
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 | } |
81 | 83 | ||
82 | OSQLResult::OSQLResult( enum State state, | 84 | OSQLResult::OSQLResult( enum State state, |
83 | const OSQLResultItem::ValueList& list, | 85 | const OSQLResultItem::ValueList& list, |
84 | const OSQLError::ValueList& error ) | 86 | const OSQLError::ValueList& error ) |
85 | : m_state( state ), m_list( list ), m_error( error ) | 87 | : 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: | |||
65 | */ | 65 | */ |
66 | class OSQLTable { | 66 | class OSQLTable { |
67 | public: | 67 | public: |
68 | typedef QValueList<OSQLTable> ValueList; | 68 | typedef QValueList<OSQLTable> ValueList; |
69 | 69 | ||
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 |
77 | */ | 77 | */ |
78 | ~OSQLTable(); | 78 | ~OSQLTable(); |
79 | 79 | ||
80 | /** | 80 | /** |
81 | * setColumns sets the Columns of the Table | 81 | * setColumns sets the Columns of the Table |