Use the right Context for FreeSearch

Fixes #4650

src/Core/FreeSearch.cpp

@@ -23,7 +23,7 @@
 #include "IntervalItem.h"
 #include "RideCache.h"
 
-FreeSearch::FreeSearch(QObject *parent, Context *context) : QObject(parent), context(context)
+FreeSearch::FreeSearch()
 {
     // nothing to do, all the data we need is in the ridecache
 }
@@ -76,7 +76,7 @@ static QStringList searchSplit(QString string)
     return returning;
 }
 
-QList<QString> FreeSearch::search(QString query)
+QList<QString> FreeSearch::search(Context* context, QString query)
 {
     filenames.clear();
 

src/Core/FreeSearch.h

@@ -34,7 +34,7 @@ class FreeSearch : public QObject
     Q_OBJECT
 
 public:
-    FreeSearch(QObject *parent, Context *context);
+    FreeSearch();
     ~FreeSearch();
 
 protected:
@@ -42,15 +42,12 @@ protected:
 public slots:
 
     // search metadata texts in ridecache
-    QList<QString> search(QString query);
+    QList<QString> search(Context* context, QString query);
 
 signals:
     void results(QStringList);
 
 private:
-    Context *context;
-    QDir dir;
-
     // Query results
     QStringList filenames;
 };

src/Gui/LTMSidebar.cpp

@@ -890,9 +890,9 @@ LTMSidebar::filterTreeWidgetSelectionChanged()
 
             case NamedSearch::search :
                 {
-                    // use clucence
-                    FreeSearch s(this, context);
-                    results = s.search(ns.text);
+                    // use RideCache
+                    FreeSearch s;
+                    results = s.search(context, ns.text);
                 }
 
             }

src/Gui/SearchBox.cpp

@@ -313,7 +313,7 @@ void SearchBox::searchSubmit()
     // return hit / key pressed
     if (text() != "") {
         filtered = true;
-        mode == Search ? submitQuery(text()) : submitFilter(context, text());
+        mode == Search ? submitQuery(context, text()) : submitFilter(context, text());
     }
 }
 

src/Gui/SearchBox.h

@@ -97,7 +97,7 @@ private slots:
 
 signals:
     // text search mode
-    void submitQuery(QString);
+    void submitQuery(Context*,QString);
     void clearQuery();
 
     // db filter mode

src/Gui/SearchFilterBox.cpp

@@ -38,11 +38,11 @@ SearchFilterBox::SearchFilterBox(QWidget *parent, Context *context, bool nochoos
     searchbox->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
     contents->addWidget(searchbox);
 
-    freeSearch = new FreeSearch(this, context);
+    freeSearch = new FreeSearch();
     datafilter = new DataFilter(this,context);
 
     // text searching
-    connect(searchbox, SIGNAL(submitQuery(QString)), freeSearch, SLOT(search(QString)));
+    connect(searchbox, SIGNAL(submitQuery(Context*,QString)), freeSearch, SLOT(search(Context*,QString)));
     connect(freeSearch, SIGNAL(results(QStringList)), this, SIGNAL(searchResults(QStringList)));
     connect(searchbox, SIGNAL(clearQuery()), this, SIGNAL(searchClear()));
 
@@ -96,8 +96,8 @@ SearchFilterBox::matches(Context *context, QString filter)
 
     if (mode == SearchBox::Search) {
 
-        FreeSearch fs(NULL, context);
-        returning = fs.search(spec);
+        FreeSearch fs;
+        returning = fs.search(context, spec);
     }
 
     return returning;