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/core | |
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/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 |
4 files changed, 4 insertions, 4 deletions
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 @@ -62,13 +62,13 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString , { /* 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); 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 @@ -39,13 +39,13 @@ namespace Opie { * @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() { } 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 @@ -101,13 +101,13 @@ class OPimAccessFactory * @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 ); } }; 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 @@ -41,13 +41,13 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access ) { // 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"); } |