author | eilers <eilers> | 2004-05-16 16:21:51 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-05-16 16:21:51 (UTC) |
commit | 0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914 (patch) (unidiff) | |
tree | bca776a6ab6d751bdbd9861f95c4dc5bc57752a0 /libopie2/opiepim/backend/obackendfactory.h | |
parent | 52691aca593d6b321597d26467b9e9af9ec0b6fe (diff) | |
download | opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.zip opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.tar.gz opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.tar.bz2 |
Improved accessing of default database style by using OPimGlobal::DEFAULT
Diffstat (limited to 'libopie2/opiepim/backend/obackendfactory.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index d8caa80..993ecb4 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h | |||
@@ -86,13 +86,19 @@ class OBackendFactory | |||
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 | ||
90 | OPimGlobal::DatabaseStyle used_database = database; | ||
91 | if ( database == OPimGlobal::DEFAULT ){ | ||
92 | used_database = defaultDB( type ); | ||
93 | } | ||
94 | |||
89 | 95 | ||
90 | switch ( type ){ | 96 | switch ( type ){ |
91 | case OPimGlobal::TODOLIST: | 97 | case OPimGlobal::TODOLIST: |
92 | #ifdef __USE_SQL | 98 | #ifdef __USE_SQL |
93 | if ( database == OPimGlobal::SQL ) | 99 | if ( used_database == OPimGlobal::SQL ) |
94 | return (T*) new OPimTodoAccessBackendSQL(""); | 100 | return (T*) new OPimTodoAccessBackendSQL(""); |
95 | #else | 101 | #else |
96 | if ( database == OPimGlobal::SQL ) | 102 | if ( used_database == OPimGlobal::SQL ) |
97 | qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!"); | 103 | qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!"); |
98 | #endif | 104 | #endif |
@@ -101,8 +107,8 @@ class OBackendFactory | |||
101 | case OPimGlobal::CONTACTLIST: | 107 | case OPimGlobal::CONTACTLIST: |
102 | #ifdef __USE_SQL | 108 | #ifdef __USE_SQL |
103 | if ( database == OPimGlobal::SQL ) | 109 | if ( used_database == OPimGlobal::SQL ) |
104 | return (T*) new OPimContactAccessBackend_SQL(""); | 110 | return (T*) new OPimContactAccessBackend_SQL(""); |
105 | #else | 111 | #else |
106 | if ( database == OPimGlobal::SQL ) | 112 | if ( used_database == OPimGlobal::SQL ) |
107 | qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!"); | 113 | qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!"); |
108 | #endif | 114 | #endif |
@@ -111,8 +117,8 @@ class OBackendFactory | |||
111 | case OPimGlobal::DATEBOOK: | 117 | case OPimGlobal::DATEBOOK: |
112 | #ifdef __USE_SQL | 118 | #ifdef __USE_SQL |
113 | if ( database == OPimGlobal::SQL ) | 119 | if ( used_database == OPimGlobal::SQL ) |
114 | return (T*) new ODateBookAccessBackend_SQL(""); | 120 | return (T*) new ODateBookAccessBackend_SQL(""); |
115 | #else | 121 | #else |
116 | if ( database == OPimGlobal::SQL ) | 122 | if ( used_database == OPimGlobal::SQL ) |
117 | qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!"); | 123 | qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!"); |
118 | #endif | 124 | #endif |
@@ -126,8 +132,12 @@ class OBackendFactory | |||
126 | } | 132 | } |
127 | 133 | ||
128 | 134 | /** | |
129 | static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType backend ){ | 135 | * Returns the style of the default database which is used to contact PIM data. |
136 | * @param type the type of the backend | ||
137 | * @see OPimGlobal | ||
138 | */ | ||
139 | static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){ | ||
130 | QString group_name; | 140 | QString group_name; |
131 | switch ( backend ){ | 141 | switch ( type ){ |
132 | case OPimGlobal::TODOLIST: | 142 | case OPimGlobal::TODOLIST: |
133 | group_name = "todo"; | 143 | group_name = "todo"; |