summaryrefslogtreecommitdiff
path: root/core/pim/osearch/searchgroup.cpp
Side-by-side diff
Diffstat (limited to 'core/pim/osearch/searchgroup.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/searchgroup.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index e307696..0b58176 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -12,4 +12,4 @@
//
-#include "searchgroup.h"
+#include <qobject.h>
#include <qregexp.h>
@@ -19,4 +19,4 @@
#include "olistviewitem.h"
+#include "searchgroup.h"
-//#define NEW_OWAIT
#ifndef NEW_OWAIT
@@ -41,3 +41,3 @@ void SearchGroup::expand()
//expanded = true;
- clearList();
+ if (_lastSearch != _search) clearList();
if (_search.isEmpty()) return;
@@ -71,4 +71,4 @@ int SearchGroup::realSearch()
{
+ if (_lastSearch == _search) return _resultCount;
#ifndef NEW_OWAIT
- qDebug("NOT using NEW_OWAIT");
if (!wait) wait = new OWait( qApp->mainWidget(), "osearch" );
@@ -77,4 +77,4 @@ int SearchGroup::realSearch()
#else
- qDebug("using NEW_OWAIT");
- OWait::start( "osearch" );
+ qDebug("********** NEW_OWAIT *************");
+ OWait( "searching" );
#endif
@@ -83,2 +83,3 @@ int SearchGroup::realSearch()
_resultCount = search();
+ _lastSearch = _search;
setText(0, _name + " - " + _search.pattern() + " (" + QString::number( _resultCount ) + ")");
@@ -87,4 +88,2 @@ int SearchGroup::realSearch()
wait->hide();
-#else
- OWait::stop();
#endif