resolve merge conflict

1 files changed, 2 insertions, 2 deletions

diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index de74efb..23aa82a 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -1,49 +1,49 @@
 //
 //
 // C++ Interface: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef SEARCHGROUP_H
 #define SEARCHGROUP_H
 
 #include "olistviewitem.h"
 
 class QRegExp;
 class QPopupMenu;
 
 /**
 @author Patrick S. Vogt
 */
 class SearchGroup : public OListViewItem
 {
 public:
     SearchGroup(QListView* parent, QString name);
 
     ~SearchGroup();
 
     virtual void expand();
     virtual void doSearch();
     virtual void setSearch(QRegExp);
     virtual int rtti() { return Searchgroup;}
 
 protected:
 	virtual void load() = 0;
 	virtual int search() = 0;
 	virtual void insertItem( void* ) = 0;
 	QRegExp _search;
 	QRegExp _lastSearch;
 	QString _name;
-	bool loaded : 1;
-	int _resultCount;
 private:
 	int realSearch();
+	bool loaded :1;
+	int _resultCount;
 };
 
 #endif