Some minor interface updates

3 files changed, 21 insertions, 18 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
index 97ef40f..50ea329 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
@@ -18,4 +18,7 @@
  * History:
  * $Log$
+ * Revision 1.3  2002/10/14 16:21:54  eilers
+ * Some minor interface updates
+ *
  * Revision 1.2  2002/10/07 17:34:24  eilers
  * added OBackendFactory for advanced backend access
@@ -200,8 +203,8 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 				/* Just compare fields which are not empty in the query object */
 				if ( !query.field(i).isEmpty() ){
-					switch ( settings & ~OContactAccess::query_IgnoreCase ){
-					case OContactAccess::query_RegExp:{
+					switch ( settings & ~OContactAccess::IgnoreCase ){
+					case OContactAccess::RegExp:{
 						QRegExp expr ( query.field(i),
-							       !(settings & OContactAccess::query_IgnoreCase),
+							       !(settings & OContactAccess::IgnoreCase),
 							       false );
 						if ( expr.find ( (*it).field(i), 0 ) == -1 )
@@ -209,7 +212,7 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 					}
 						break;
-					case OContactAccess::query_WildCards:{
+					case OContactAccess::WildCards:{
 						QRegExp expr ( query.field(i),
-							       !(settings & OContactAccess::query_IgnoreCase),
+							       !(settings & OContactAccess::IgnoreCase),
 							       true );
 						if ( expr.find ( (*it).field(i), 0 ) == -1 )
@@ -217,6 +220,6 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 					}
 						break;
-					case OContactAccess::query_ExactMatch:{
-						if (settings & OContactAccess::query_IgnoreCase){
+					case OContactAccess::ExactMatch:{
+						if (settings & OContactAccess::IgnoreCase){
 							if ( query.field(i).upper() !=
 							     (*it).field(i).upper() )
@@ -244,22 +247,22 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 	const uint querySettings()
 		{
-			return ( OContactAccess::query_WildCards
-				 & OContactAccess::query_IgnoreCase
-				 & OContactAccess::query_RegExp
-				 & OContactAccess::query_ExactMatch );
+			return ( OContactAccess::WildCards
+				 & OContactAccess::IgnoreCase
+				 & OContactAccess::RegExp
+				 & OContactAccess::ExactMatch );
 		}
 	
 	bool hasQuerySettings (uint querySettings) const
 		{
-			/* OContactAccess::query_IgnoreCase may be added with one
+			/* OContactAccess::IgnoreCase may be added with one
 			 * of the other settings, but never used alone.
 			 * The other settings are just valid alone...
 			 */
-			switch ( querySettings & ~OContactAccess::query_IgnoreCase ){
-			case OContactAccess::query_RegExp:
+			switch ( querySettings & ~OContactAccess::IgnoreCase ){
+			case OContactAccess::RegExp:
 				return ( true );
-			case OContactAccess::query_WildCards:
+			case OContactAccess::WildCards:
 				return ( true );
-			case OContactAccess::query_ExactMatch:
+			case OContactAccess::ExactMatch:
 				return ( true );
 			default:
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index f3b0783..3b4cab2 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -188,5 +188,5 @@ QArray<int> OTodoAccessXML::allRecords()const {
     return ids;
 }
-QArray<int> OTodoAccessXML::queryByExample( const OTodo&, int sort ) {
+QArray<int> OTodoAccessXML::queryByExample( const OTodo&, int ) {
     QArray<int> ids(0);
     return ids;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.h b/libopie2/opiepim/backend/otodoaccessxml.h
index 1e7e371..dc41c32 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.h
+++ b/libopie2/opiepim/backend/otodoaccessxml.h
@@ -25,5 +25,5 @@ public:
 
     QArray<int> allRecords()const;
-    QArray<int> queryByExample( const OTodo&, int sort );
+    QArray<int> queryByExample( const OTodo&, int querysettings );
     OTodo find( int uid )const;
     void clear();