improved applnk and doclnk searching

clean up:
- mainwindow: handling of searchgroups
- searchgroups: introduced load, search and insertItem functions
- flexible actions handling
- doclnksearch inherits applnksearch

1 files changed, 17 insertions, 8 deletions

diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 7872ae3..d5b2930 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -4,3 +4,3 @@
 //
-// Description: 
+// Description:
 //
@@ -31,16 +31,25 @@ AppLnkSearch::~AppLnkSearch()
 
-void AppLnkSearch::expand()
+void AppLnkSearch::load()
 {
-	SearchGroup::expand();
-	if (_search.isEmpty()) return;
-	if (!_apps) _apps = new AppLnkSet(QPEApplication::qpeDir());
+	_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 (app->name().contains(_search) || app->comment().contains(_search))
 		if ( (_search.match( app->name() ) != -1)
 		    || (_search.match(app->comment()) != -1)
-		    || (_search.match(app->exec()) != -1) )
-			new AppLnkItem( this, app );
+		    || (_search.match(app->exec()) != -1) ) {
+		    	count++;
+			insertItem( app );
+		}
 	}
+	return count;
 }
 
+void AppLnkSearch::insertItem( void *rec )
+{
+	new AppLnkItem( this, (AppLnk*)rec );
+}