From 4358e152dd09bf20f855403a2b2dbc022aef5b2b Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Sat, 23 Mar 2013 21:06:10 +0000
Subject: [PATCH] Fixup search highlighting

.. on Linux/Windows since its slightly different.
.. also fixes a SEGV
---
 src/GcCalendar.cpp | 4 ++--
 src/GcCalendar.h   | 8 ++++----
 src/MainWindow.cpp | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/GcCalendar.cpp b/src/GcCalendar.cpp
index 5747ecd7f..714c79de8 100644
--- a/src/GcCalendar.cpp
+++ b/src/GcCalendar.cpp
@@ -716,7 +716,7 @@ GcMiniCalendar::clearRide()
 }
 
 void
-GcMiniCalendar::setFilter(QList<QString>filter)
+GcMiniCalendar::setFilter(QStringList filter)
 {
     filters = filter;
 }
@@ -822,7 +822,7 @@ GcMultiCalendar::GcMultiCalendar(MainWindow *main) : QScrollArea(main), main(mai
 }
 
 void
-GcMultiCalendar::setFilter(QList<QString>filter)
+GcMultiCalendar::setFilter(QStringList filter)
 {
     for (int i=0; i<calendars.count();i++) {
         calendars.at(i)->setFilter(filter);
diff --git a/src/GcCalendar.h b/src/GcCalendar.h
index a8a893d5f..9e34ca9a9 100644
--- a/src/GcCalendar.h
+++ b/src/GcCalendar.h
@@ -77,7 +77,7 @@ class GcMiniCalendar : public QWidget
         void getDate(int &_month, int &_year) { _month = month; _year = year; }
         void clearRide();
 
-        void setFilter(QList<QString> filter);
+        void setFilter(QStringList filter);
         void clearFilter();
 
     public slots:
@@ -114,7 +114,7 @@ class GcMiniCalendar : public QWidget
         GcCalendarModel *calendarModel;
         bool master;
 
-        QList<QString> filters;
+        QStringList filters;
 };
 
 class GcMultiCalendar : public QScrollArea
@@ -130,7 +130,7 @@ class GcMultiCalendar : public QScrollArea
         void dateChanged(int month, int year);
         void setRide(RideItem *ride);
         void resizeEvent(QResizeEvent*);
-        void setFilter(QList<QString> filter);
+        void setFilter(QStringList filter);
         void clearFilter();
 
 
@@ -156,7 +156,7 @@ class GcCalendar : public QWidget // not a GcWindow - belongs on sidebar
         void refresh(); 
         void setSummary(); // set the summary at the bottom
 
-        void setFilter(QList<QString> filters) { multiCalendar->setFilter(filters);}
+        void setFilter(QStringList filters) { multiCalendar->setFilter(filters);}
         void clearFilter() { multiCalendar->clearFilter();}
 
     signals:
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index d6229d4aa..b62e5b587 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -562,6 +562,10 @@ MainWindow::MainWindow(const QDir &home) :
     listView = new RideNavigator(this, true);
     listView->setProperty("nomenu", true);
 
+    // sidebar items
+    gcCalendar = new GcCalendar(this);
+    gcMultiCalendar = new GcMultiCalendar(this);
+
     // we need to connect the search box on Linux/Windows
 #if !defined (Q_OS_MAC) && defined (GC_HAVE_LUCENE)
     connect(searchBox, SIGNAL(searchResults(QStringList)), listView, SLOT(searchStrings(QStringList)));
@@ -620,7 +624,6 @@ MainWindow::MainWindow(const QDir &home) :
     intervalSplitter->setCollapsible(1, false);
 
     GcSplitterItem *calendarItem = new GcSplitterItem(tr("Calendar"), iconFromPNG(":images/sidebar/calendar.png"), this);
-    gcMultiCalendar = new GcMultiCalendar(this);
     calendarItem->addWidget(gcMultiCalendar);
 
     analItem = new GcSplitterItem(tr("Activities"), iconFromPNG(":images/sidebar/folder.png"), this);
@@ -730,7 +733,6 @@ MainWindow::MainWindow(const QDir &home) :
     // POPULATE TOOLBOX
 
     // do controllers after home windows -- they need their first signals caught
-    gcCalendar = new GcCalendar(this);
     connect(gcCalendar, SIGNAL(dateRangeChanged(DateRange)), this, SLOT(dateRangeChangedDiary(DateRange)));
 
     ltmSidebar = new LTMSidebar(this, home);