author | eilers <eilers> | 2004-05-20 16:08:40 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-05-20 16:08:40 (UTC) |
commit | b9a91a24c28a1d12fddd6a5a6d3162c303d3da2f (patch) (side-by-side diff) | |
tree | 60193edb7522478dab74045064e4438b606fe715 /libopie2/opiepim/backend | |
parent | 190df1c5ca54fac9d4819ddca661da753139c191 (diff) | |
download | opie-b9a91a24c28a1d12fddd6a5a6d3162c303d3da2f.zip opie-b9a91a24c28a1d12fddd6a5a6d3162c303d3da2f.tar.gz opie-b9a91a24c28a1d12fddd6a5a6d3162c303d3da2f.tar.bz2 |
Changing OPimAccessFactory::Default to defaultAccess
Changing OBackendFactory::Default to defaultBackend
I hope this fixes all problems with reserved words.. Sorry for any
inconveniences..
-rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index 993ecb4..4daf861 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h @@ -157,49 +157,49 @@ class OBackendFactory QString db_String = config.readEntry( "usebackend" ); QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle ); dictDbTypes.setAutoDelete( TRUE ); dictDbTypes.insert( "xml", new int (OPimGlobal::XML) ); dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) ); dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) ); int* db_find = dictDbTypes[ db_String ]; if ( !db_find ) return OPimGlobal::UNKNOWN; return (OPimGlobal::DatabaseStyle) *db_find; } /** * Returns the default backend implementation for backendName. Which one is used, is defined * by the configfile "pimaccess.conf". * @param backendName the type of the backend (use "todo", "contact" or "datebook" ) * @param appName The name of your application. It will be passed on to the backend */ - static T* Default( const QString backendName, const QString& appName ){ + static T* defaultBackend( const QString backendName, const QString& appName ){ QAsciiDict<int> dictBackends( OPimGlobal::_END_PimType ); dictBackends.setAutoDelete ( TRUE ); dictBackends.insert( "todo", new int (OPimGlobal::TODOLIST) ); dictBackends.insert( "contact", new int (OPimGlobal::CONTACTLIST) ); dictBackends.insert( "datebook", new int(OPimGlobal::DATEBOOK) ); int* backend_find = dictBackends[ backendName ]; if ( !backend_find ) return NULL; OPimGlobal::DatabaseStyle style = defaultDB( static_cast<OPimGlobal::PimType>( *backend_find ) ); qDebug( "OBackendFactory::Default -> Backend is %s, Database is %d", backendName.latin1(), style ); return create( (OPimGlobal::PimType) *backend_find, style, appName ); } private: OBackendPrivate* d; }; |