colabse applnkitem in case of new search, since it's far to slow...

... I wonder how slow osearch will be on the pda!

3 files changed, 9 insertions, 2 deletions

diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index d5b2930..acf650a 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -8,48 +8,56 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "applnksearch.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 
 #include "applnkitem.h"
 
 AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
 {
 	_apps = 0;
 }
 
 
 AppLnkSearch::~AppLnkSearch()
 {
 	delete _apps;
 }
 
 
 void AppLnkSearch::load()
 {
 	_apps = new AppLnkSet(QPEApplication::qpeDir());
 }
 
 int AppLnkSearch::search()
 {
 	int count = 0;
 	QList<AppLnk> appList = _apps->children();
 	for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
 		if ( (_search.match( app->name() ) != -1)
 		    || (_search.match(app->comment()) != -1)
 		    || (_search.match(app->exec()) != -1) ) {
 		    	count++;
 			insertItem( app );
 		}
 	}
 	return count;
 }
 
 void AppLnkSearch::insertItem( void *rec )
 {
 	new AppLnkItem( this, (AppLnk*)rec );
 }
+
+void AppLnkSearch::setSearch(QRegExp re)
+{
+	expanded = false;
+	setOpen( false );
+	SearchGroup::setSearch( re );
+}
+
diff --git a/core/pim/osearch/applnksearch.h b/core/pim/osearch/applnksearch.h
index d88a8ce..6bb7486 100644
--- a/core/pim/osearch/applnksearch.h
+++ b/core/pim/osearch/applnksearch.h
@@ -1,38 +1,38 @@
 //
 //
 // C++ Interface: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef APPLNKSEARCH_H
 #define APPLNKSEARCH_H
 
 #include "searchgroup.h"
 
 class AppLnkSet;
 
 /**
 @author Patrick S. Vogt
 */
 class AppLnkSearch : public SearchGroup
 {
 public:
     AppLnkSearch(QListView* parent, QString name);
 
     ~AppLnkSearch();
 
-protected:
+	virtual void setSearch(QRegExp);
 	virtual void load();
 	virtual int search();
 	virtual void insertItem( void* );
 
 	AppLnkSet *_apps;
 };
 
 #endif
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index ebe1193..35949f0 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -1,49 +1,48 @@
 //
 //
 // 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;
 
 /**
 @author Patrick S. Vogt
 */
 class SearchGroup : public OListViewItem
 {
 public:
     SearchGroup(QListView* parent, QString name);
 
     ~SearchGroup();
 
     virtual void expand();
     virtual void setSearch(QString);
     virtual void setSearch(QRegExp);
     virtual int rtti() { return Searchgroup;}
 
 
 
 protected:
 	QRegExp _search;
 	virtual void load() = 0;
 	virtual int search() = 0;
 	virtual void insertItem( void* ) = 0;
-private:
 	void clearList();
 	QString _name;
 	bool expanded;
 	bool loaded;
 };
 
 #endif