Changing OPimAccessFactory::Default to defaultAccess

Changing OBackendFactory::Default to defaultBackend

I hope this fixes all problems with reserved words.. Sorry for any
inconveniences..

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
@@ -178,7 +178,7 @@ class OBackendFactory
          * @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
@@ -65,7 +65,7 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
 	 */
         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;
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 )
     : 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
@@ -104,7 +104,7 @@ class OPimAccessFactory
 	 * @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
@@ -44,7 +44,7 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
 
 	// 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 );
 }