author | eilers <eilers> | 2004-05-20 16:08:40 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-05-20 16:08:40 (UTC) |
commit | b9a91a24c28a1d12fddd6a5a6d3162c303d3da2f (patch) (unidiff) | |
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 | |||
@@ -65,7 +65,7 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString , | |||
65 | */ | 65 | */ |
66 | if( end == 0 ) { | 66 | if( end == 0 ) { |
67 | qWarning ("Using BackendFactory !"); | 67 | qWarning ("Using BackendFactory !"); |
68 | end = OBackendFactory<OPimContactAccessBackend>::Default( "contact", appname ); | 68 | end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( "contact", appname ); |
69 | } | 69 | } |
70 | // Set backend locally and in template | 70 | // Set backend locally and in template |
71 | m_backEnd = end; | 71 | m_backEnd = 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 | |||
@@ -42,7 +42,7 @@ ODateBookAccess::ODateBookAccess( ODateBookAccessBackend* back, enum Access ac ) | |||
42 | : OPimAccessTemplate<OPimEvent>( back ) | 42 | : OPimAccessTemplate<OPimEvent>( back ) |
43 | { | 43 | { |
44 | if (!back ) | 44 | if (!back ) |
45 | back = OBackendFactory<ODateBookAccessBackend>::Default("datebook", QString::null ); | 45 | back = OBackendFactory<ODateBookAccessBackend>::defaultBackend("datebook", QString::null ); |
46 | 46 | ||
47 | m_backEnd = back; | 47 | m_backEnd = back; |
48 | setBackEnd( m_backEnd ); | 48 | 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 | |||
@@ -104,7 +104,7 @@ class OPimAccessFactory | |||
104 | * @see OPimGlobal | 104 | * @see OPimGlobal |
105 | * | 105 | * |
106 | */ | 106 | */ |
107 | static T* Default( typename OPimGlobal::PimType type, const QString& appName ){ | 107 | static T* defaultAccess( typename OPimGlobal::PimType type, const QString& appName ){ |
108 | 108 | ||
109 | return create( type, OPimGlobal::DEFAULT, appName ); | 109 | return create( type, OPimGlobal::DEFAULT, appName ); |
110 | 110 | ||
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 | |||
@@ -44,7 +44,7 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access ) | |||
44 | 44 | ||
45 | // Zecke: Du musst hier noch fr das XML-Backend einen Appnamen bergeben ! | 45 | // Zecke: Du musst hier noch fr das XML-Backend einen Appnamen bergeben ! |
46 | if (end == 0l ) | 46 | if (end == 0l ) |
47 | m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::Default ("todo", QString::null); | 47 | m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::defaultBackend ("todo", QString::null); |
48 | 48 | ||
49 | setBackEnd( m_todoBackEnd ); | 49 | setBackEnd( m_todoBackEnd ); |
50 | } | 50 | } |