| -rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 2 | ||||
| -rw-r--r-- | libopie2/opiepim/core/ocontactaccess.cpp | 2 | ||||
| -rw-r--r-- | libopie2/opiepim/core/odatebookaccess.cpp | 2 | ||||
| -rw-r--r-- | libopie2/opiepim/core/opimaccessfactory.h | 2 | ||||
| -rw-r--r-- | libopie2/opiepim/core/otodoaccess.cpp | 2 |
5 files changed, 5 insertions, 5 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 @@ -169,25 +169,25 @@ class OBackendFactory 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 ) ); diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp index 67f267f..417a954 100644 --- a/libopie2/opiepim/core/ocontactaccess.cpp +++ b/libopie2/opiepim/core/ocontactaccess.cpp @@ -56,25 +56,25 @@ namespace Opie { OPimContactAccess::OPimContactAccess ( const QString appname, const QString , OPimContactAccessBackend* end, bool autosync ): OPimAccessTemplate<OPimContact>( end ) { /* take care of the backend. If there is no one defined, we * will use the XML-Backend as default (until we have a cute SQL-Backend..). */ if( end == 0 ) { qWarning ("Using BackendFactory !"); - end = OBackendFactory<OPimContactAccessBackend>::Default( "contact", appname ); + end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( "contact", appname ); } // Set backend locally and in template m_backEnd = end; OPimAccessTemplate<OPimContact>::setBackEnd (end); /* Connect signal of external db change to function */ QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(copMessage(const QCString&,const QByteArray&)) ); if ( autosync ){ QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this ); diff --git a/libopie2/opiepim/core/odatebookaccess.cpp b/libopie2/opiepim/core/odatebookaccess.cpp index 29298ea..5f471cf 100644 --- a/libopie2/opiepim/core/odatebookaccess.cpp +++ b/libopie2/opiepim/core/odatebookaccess.cpp @@ -33,25 +33,25 @@ namespace Opie { /** * Simple constructor * It takes a ODateBookAccessBackend as parent. If it is 0 the default implementation * will be used! * @param back The backend to be used or 0 for the default backend * @param ac What kind of access is intended */ ODateBookAccess::ODateBookAccess( ODateBookAccessBackend* back, enum Access ac ) : OPimAccessTemplate<OPimEvent>( back ) { if (!back ) - back = OBackendFactory<ODateBookAccessBackend>::Default("datebook", QString::null ); + back = OBackendFactory<ODateBookAccessBackend>::defaultBackend("datebook", QString::null ); m_backEnd = back; setBackEnd( m_backEnd ); } ODateBookAccess::~ODateBookAccess() { } /** * @return all events available */ ODateBookAccess::List ODateBookAccess::rawEvents()const { QArray<int> ints = m_backEnd->rawEvents(); diff --git a/libopie2/opiepim/core/opimaccessfactory.h b/libopie2/opiepim/core/opimaccessfactory.h index 7d32958..6aaa5e4 100644 --- a/libopie2/opiepim/core/opimaccessfactory.h +++ b/libopie2/opiepim/core/opimaccessfactory.h @@ -95,23 +95,23 @@ class OPimAccessFactory /** * Returns the selected PIM access-object, using the default database style * Which style is selected is defined in the configfile "pimaccess.conf" in * the directory "Settings" * @param type Type of the selected database (addressbook, todolist or datebook) * @param appName "Name" of your application. This should be any constant string which is used * by some backends for creating special files (i.e.journal files). Please keep the * string unique for your application ! * @see OPimGlobal * */ - static T* Default( typename OPimGlobal::PimType type, const QString& appName ){ + static T* defaultAccess( typename OPimGlobal::PimType type, const QString& appName ){ return create( type, OPimGlobal::DEFAULT, appName ); } }; } #endif diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp index 6fa0089..87a211f 100644 --- a/libopie2/opiepim/core/otodoaccess.cpp +++ b/libopie2/opiepim/core/otodoaccess.cpp @@ -35,25 +35,25 @@ #include <opie2/obackendfactory.h> #include <opie2/opimresolver.h> namespace Opie { OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access ) : QObject(), OPimAccessTemplate<OPimTodo>( end ), m_todoBackEnd( end ) { // if (end == 0l ) // m_todoBackEnd = new OPimTodoAccessBackendSQL( QString::null); // Zecke: Du musst hier noch fr das XML-Backend einen Appnamen bergeben ! if (end == 0l ) - m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::Default ("todo", QString::null); + m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::defaultBackend ("todo", QString::null); setBackEnd( m_todoBackEnd ); } OPimTodoAccess::~OPimTodoAccess() { // qWarning("~OPimTodoAccess"); } void OPimTodoAccess::mergeWith( const QValueList<OPimTodo>& list ) { QValueList<OPimTodo>::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { replace( (*it) ); } } |