* get rid of the matchesCompleted signal for now; no one is actually using it.
* include the match list with the matchesUpdated signal * fix some apidox svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=804701
This commit is contained in:
parent
39a98a8953
commit
0d0fe7770d
@ -191,8 +191,12 @@ public:
|
||||
Private(RunnerManager *parent)
|
||||
: q(parent)
|
||||
{
|
||||
connect(&context, SIGNAL(matchesChanged()), q, SIGNAL(matchesChanged()));
|
||||
connect(Weaver::instance(), SIGNAL(finished()), q, SIGNAL(matchesCompleted()));
|
||||
connect(&context, SIGNAL(matchesChanged()), q, SLOT(matchesChanged()));
|
||||
}
|
||||
|
||||
void matchesChanged()
|
||||
{
|
||||
emit q->matchesChanged(context.matches());
|
||||
}
|
||||
|
||||
void loadConfiguration(KConfigGroup& conf)
|
||||
@ -369,10 +373,6 @@ void RunnerManager::launchQuery (const QString & term, const QString & runnerNam
|
||||
d->searchJobs.append( job );
|
||||
}
|
||||
}
|
||||
|
||||
if (!jobsLaunched) {
|
||||
emit matchesCompleted();
|
||||
}
|
||||
}
|
||||
|
||||
bool RunnerManager::execQuery(const QString & term, const QString & runnerName)
|
||||
@ -402,7 +402,7 @@ bool RunnerManager::execQuery (const QString & term, const QString & runnerName)
|
||||
}
|
||||
|
||||
r->performMatch(d->context);
|
||||
emit matchesCompleted();
|
||||
emit matchesChanged(d->context.matches());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -77,8 +77,8 @@ class PLASMA_EXPORT RunnerManager : public QObject
|
||||
/**
|
||||
* Launch a query, this will create threads and return inmediately.
|
||||
* When the information will be available can be known using the
|
||||
* matchesChanged, matchesUpdated, matchesCompleted signals
|
||||
* The information can be retrieved calling matches
|
||||
* matchesChanged signal.
|
||||
*
|
||||
* @arg term the term we want to find matches for
|
||||
* @arg runner optional, if only one specific runner is to be used
|
||||
*/
|
||||
@ -104,14 +104,10 @@ class PLASMA_EXPORT RunnerManager : public QObject
|
||||
/**
|
||||
* Emited each time a new match is added to the list
|
||||
*/
|
||||
void matchesChanged();
|
||||
|
||||
/**
|
||||
* Emited when all the matches have been found
|
||||
*/
|
||||
void matchesCompleted();
|
||||
void matchesChanged(const QList<Plasma::QueryMatch*> &matches);
|
||||
|
||||
private:
|
||||
Q_PRIVATE_SLOT(d, void matchesChanged());
|
||||
class Private;
|
||||
Private * const d;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user