Providers getResult method returns a plain QList now.

tarmack · Jan 1, 2011 · 2d1f7d1 · 2d1f7d1
1 parent bdfe633
commit 2d1f7d1
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 25 deletions.
diff --git a/Applications.cpp b/Applications.cpp
@@ -27,9 +27,9 @@ Applications::Applications()
 Applications::~Applications()
 {}
 
-AppList Applications::getResults(QString query)
+QList<Application> Applications::getResults(QString query)
 {
-    AppList list = AppList();
+    QList<Application> list = QList<Application>();
     int count = 0;
     int seconds = time(NULL);
     foreach(QString name, this->appTable->keys())

diff --git a/Applications.h b/Applications.h
@@ -29,7 +29,7 @@ class Applications : public Provider
     Applications();
     ~Applications();
 public slots:
-    AppList getResults(QString query);
+    QList<Application> getResults(QString query);
     int launch(QVariant selected);
 private:
     void setPopularity(QString entry, popularity pop);

diff --git a/Calculator.cpp b/Calculator.cpp
@@ -23,14 +23,14 @@ Calculator::Calculator()
 Calculator::~Calculator()
 {}
 
-AppList Calculator::getResults(QString query)
+QList<Application> Calculator::getResults(QString query)
 {
     Application result = Application();
     result.icon = "accessories-calculator";
     result.name = QString::number(calculate(query), 'g', 12);
     result.priority = 2147483647;
     result.object = this;
-    AppList list = AppList();
+    QList<Application> list = QList<Application>();
     list.append(result);
     return list;
 }

diff --git a/Calculator.h b/Calculator.h
@@ -12,7 +12,7 @@ class Calculator : public Provider
     Calculator();
     ~Calculator();
 public slots:
-    AppList getResults(QString query);
+    QList<Application> getResults(QString query);
     int launch(QVariant selected);
 private:
     QHash<char, calcFunct> functions;

diff --git a/Mangonel.cpp b/Mangonel.cpp
@@ -130,9 +130,9 @@ void Mangonel::getApp(QString query)
         this->current = -1;
         foreach(Provider* provider, this->providers)
         {
-            AppList list = provider->getResults(query);
+            QList<Application> list = provider->getResults(query);
             foreach(Application app, list)
-            this->apps->insertSorted(app);
+                this->apps->insertSorted(app);
         }
         if (!this->apps->isEmpty())
         {

diff --git a/Mangonel.h b/Mangonel.h
@@ -46,6 +46,14 @@ class IconView : public QGraphicsView
     int current;
 };
 
+class AppList : public QList<Application>
+{
+public:
+    AppList();
+    ~AppList();
+    void insertSorted(Application value);
+};
+
 class Mangonel : public Plasma::Dialog
 {
     Q_OBJECT

diff --git a/Paths.cpp b/Paths.cpp
@@ -10,9 +10,9 @@ Paths::Paths()
 Paths::~Paths()
 {}
 
-AppList Paths::getResults(QString query)
+QList<Application> Paths::getResults(QString query)
 {
-    AppList list = AppList();
+    QList<Application> list = QList<Application>();
     QString original = query;
     QDir dir;
     if (query.startsWith("/"))

diff --git a/Paths.h b/Paths.h
@@ -11,7 +11,7 @@ class Paths : public Provider
     Paths();
     ~Paths();
 public slots:
-    AppList getResults(QString query);
+    QList<Application> getResults(QString query);
     int launch(QVariant selected);
 };
 

diff --git a/Provider.h b/Provider.h
@@ -5,15 +5,15 @@
 #include <QVariant>
 
 
-class AppList;
+class Application;
 
 // Abstract base class of providers.
 class Provider : public QObject
 {
 public:
     virtual ~Provider() {};
 public slots:
-    virtual AppList getResults(QString query) = 0;
+    virtual QList<Application> getResults(QString query) = 0;
     virtual int launch(QVariant selected) = 0;
 };
 
@@ -28,14 +28,5 @@ struct Application
     Provider* object; //Pointer to the search provider that provided this result.
 };
 
-// Search providers return an AppList with their results, they do not need to sort the results.
-class AppList : public QList<Application>
-{
-public:
-    AppList();
-    ~AppList();
-    void insertSorted(Application value);
-};
-
 #endif // Provider_H
 // kate: indent-mode cstyle; space-indent on; indent-width 4; 
diff --git a/Shell.cpp b/Shell.cpp
@@ -19,9 +19,9 @@ Shell::Shell()
 Shell::~Shell()
 {}
 
-AppList Shell::getResults(QString query)
+QList<Application> Shell::getResults(QString query)
 {
-    AppList list = AppList();
+    QList<Application> list = QList<Application>();
     foreach(QString key, this->index.keys())
     {
         if (key.startsWith(query.left(query.indexOf(" ")), Qt::CaseInsensitive))

diff --git a/Shell.h b/Shell.h
@@ -13,7 +13,7 @@ class Shell : public Provider
     Shell();
     ~Shell();
 public slots:
-    AppList getResults(QString query);
+    QList<Application> getResults(QString query);
     int launch(QVariant selected);
 private:
     QHash<QString, QString> index;