summaryrefslogtreecommitdiff
authoreilers <eilers>2004-05-20 16:08:40 (UTC)
committer eilers <eilers>2004-05-20 16:08:40 (UTC)
commitb9a91a24c28a1d12fddd6a5a6d3162c303d3da2f (patch) (side-by-side diff)
tree60193edb7522478dab74045064e4438b606fe715
parent190df1c5ca54fac9d4819ddca661da753139c191 (diff)
downloadopie-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..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/obackendfactory.h2
-rw-r--r--libopie2/opiepim/core/ocontactaccess.cpp2
-rw-r--r--libopie2/opiepim/core/odatebookaccess.cpp2
-rw-r--r--libopie2/opiepim/core/opimaccessfactory.h2
-rw-r--r--libopie2/opiepim/core/otodoaccess.cpp2
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
@@ -177,9 +177,9 @@ class OBackendFactory
* 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 );
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
@@ -64,9 +64,9 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
* 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
@@ -41,9 +41,9 @@ namespace Opie {
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 );
}
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
@@ -103,9 +103,9 @@ class OPimAccessFactory
* 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
@@ -43,9 +43,9 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
// 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() {