author | zecke <zecke> | 2004-05-20 19:05:32 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-05-20 19:05:32 (UTC) |
commit | bd50c1a78affd8a6ce6b9e6d811831c0e3325303 (patch) (unidiff) | |
tree | 3348c2715d8db822003f887fef31683c96f59f12 | |
parent | f2ced3e20749f7f2f523ead85f45a38391e6fca0 (diff) | |
download | opie-bd50c1a78affd8a6ce6b9e6d811831c0e3325303.zip opie-bd50c1a78affd8a6ce6b9e6d811831c0e3325303.tar.gz opie-bd50c1a78affd8a6ce6b9e6d811831c0e3325303.tar.bz2 |
add a 'default' backend for readEntry or you could/will crash
because QString::null is not in the dictionary of available backends.
I'm conversative so it is 'xml'
Eilers/BradC change it on your will
-rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index 4daf861..4bedbef 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h | |||
@@ -80,21 +80,21 @@ class OBackendFactory | |||
80 | /** | 80 | /** |
81 | * Returns a selected backend implementation | 81 | * Returns a selected backend implementation |
82 | * @param type the type of the backend | 82 | * @param type the type of the backend |
83 | * @param database the type of the used database | 83 | * @param database the type of the used database |
84 | * @param appName The name of your application. It will be passed on to the backend. | 84 | * @param appName The name of your application. It will be passed on to the backend. |
85 | */ | 85 | */ |
86 | static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database, | 86 | static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database, |
87 | const QString& appName ){ | 87 | const QString& appName ){ |
88 | qWarning("Selected backend for %d is: %d", type, database ); | 88 | qWarning("Selected backend for %d is: %d", type, database ); |
89 | // If we should use the dafult database style, we have to request it | 89 | // If we should use the dafult database style, we have to request it |
90 | OPimGlobal::DatabaseStyle used_database = database; | 90 | OPimGlobal::DatabaseStyle used_database = database; |
91 | if ( database == OPimGlobal::DEFAULT ){ | 91 | if ( database == OPimGlobal::DEFAULT ){ |
92 | used_database = defaultDB( type ); | 92 | used_database = defaultDB( type ); |
93 | } | 93 | } |
94 | 94 | ||
95 | 95 | ||
96 | switch ( type ){ | 96 | switch ( type ){ |
97 | case OPimGlobal::TODOLIST: | 97 | case OPimGlobal::TODOLIST: |
98 | #ifdef __USE_SQL | 98 | #ifdef __USE_SQL |
99 | if ( used_database == OPimGlobal::SQL ) | 99 | if ( used_database == OPimGlobal::SQL ) |
100 | return (T*) new OPimTodoAccessBackendSQL(""); | 100 | return (T*) new OPimTodoAccessBackendSQL(""); |
@@ -151,14 +151,14 @@ class OBackendFactory | |||
151 | default: | 151 | default: |
152 | group_name = "unknown"; | 152 | group_name = "unknown"; |
153 | } | 153 | } |
154 | 154 | ||
155 | Config config( "pimaccess" ); | 155 | Config config( "pimaccess" ); |
156 | config.setGroup ( group_name ); | 156 | config.setGroup ( group_name ); |
157 | QString db_String = config.readEntry( "usebackend" ); | 157 | QString db_String = config.readEntry( "usebackend", "xml" ); |
158 | 158 | ||
159 | QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle ); | 159 | QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle ); |
160 | dictDbTypes.setAutoDelete( TRUE ); | 160 | dictDbTypes.setAutoDelete( TRUE ); |
161 | 161 | ||
162 | dictDbTypes.insert( "xml", new int (OPimGlobal::XML) ); | 162 | dictDbTypes.insert( "xml", new int (OPimGlobal::XML) ); |
163 | dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) ); | 163 | dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) ); |
164 | dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) ); | 164 | dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) ); |
@@ -189,20 +189,20 @@ class OBackendFactory | |||
189 | 189 | ||
190 | int* backend_find = dictBackends[ backendName ]; | 190 | int* backend_find = dictBackends[ backendName ]; |
191 | if ( !backend_find ) return NULL; | 191 | if ( !backend_find ) return NULL; |
192 | 192 | ||
193 | OPimGlobal::DatabaseStyle style = defaultDB( static_cast<OPimGlobal::PimType>( *backend_find ) ); | 193 | OPimGlobal::DatabaseStyle style = defaultDB( static_cast<OPimGlobal::PimType>( *backend_find ) ); |
194 | 194 | ||
195 | qDebug( "OBackendFactory::Default -> Backend is %s, Database is %d", backendName.latin1(), | 195 | qDebug( "OBackendFactory::Default -> Backend is %s, Database is %d", backendName.latin1(), |
196 | style ); | 196 | style ); |
197 | 197 | ||
198 | return create( (OPimGlobal::PimType) *backend_find, style, appName ); | 198 | return create( (OPimGlobal::PimType) *backend_find, style, appName ); |
199 | 199 | ||
200 | } | 200 | } |
201 | private: | 201 | private: |
202 | OBackendPrivate* d; | 202 | OBackendPrivate* d; |
203 | 203 | ||
204 | }; | 204 | }; |
205 | 205 | ||
206 | } | 206 | } |
207 | 207 | ||
208 | #endif | 208 | #endif |