Renaming "Filters" to "Highlighters" nickbnf#71

doc/documentation.markdown

@@ -44,14 +44,14 @@ In addition to the filtered window, the match overview on the right hand side
 of the screen offers a view of the position of matches in the log file. Matches
 are showed as small red lines.
 
-## Using filters
+## Using highlighters
 
-_Filters_ can colorize some lines of the log being displayed, for example to
+_Highlighters_ can colorize some lines of the log being displayed, for example to
 draw attention to lines indicating an error, or to associate a color with each
-sort of event. Any number of filter can be defined in the 'Filters'
+sort of event. Any number of highlighter can be defined in the 'highlighters'
 configuration dialog, each using a regexp against which lines will be matched.
-For each line, all filters are tried in order and the fore and back colors of
-the first successful filter are applied.
+For each line, all highlighters are tried in order and the fore and back colors of
+the first successful highlighter are applied.
 
 ## Marking lines in the log file
 

glogg.pro

@@ -35,8 +35,6 @@ SOURCES += \
     src/optionsdialog.cpp \
     src/persistentinfo.cpp \
     src/configuration.cpp \
-    src/filtersdialog.cpp \
-    src/filterset.cpp \
     src/savedsearches.cpp \
     src/infoline.cpp \
     src/menuactiontooltipbehavior.cpp \
@@ -55,6 +53,8 @@ SOURCES += \
     src/viewtools.cpp \
     src/encodingspeculator.cpp \
     src/gloggapp.cpp \
+    src/highlightersdialog.cpp \
+    src/highlighterset.cpp
 
 INCLUDEPATH += src/
 
@@ -78,8 +78,6 @@ HEADERS += \
     src/optionsdialog.h \
     src/persistentinfo.h \
     src/configuration.h \
-    src/filtersdialog.h \
-    src/filterset.h \
     src/savedsearches.h \
     src/infoline.h \
     src/filewatcher.h \
@@ -103,6 +101,8 @@ HEADERS += \
     src/viewtools.h \
     src/encodingspeculator.h \
     src/gloggapp.h \
+    src/highlighterset.h \
+    src/highlightersdialog.h
 
 isEmpty(BOOST_PATH) {
     message(Building using system dynamic Boost libraries)
@@ -118,14 +118,15 @@ isEmpty(BOOST_PATH) {
 else {
     message(Building using static Boost libraries at $$BOOST_PATH)
 
-    SOURCES += $$BOOST_PATH/libs/program_options/src/*.cpp \
-        $$BOOST_PATH/libs/smart_ptr/src/*.cpp
+    SOURCES += $$BOOST_PATH/libs/program_options/src/*.cpp #\
+        #$$BOOST_PATH/libs/smart_ptr/src/*.cpp
 
     INCLUDEPATH += $$BOOST_PATH
 }
 
-FORMS += src/optionsdialog.ui
-FORMS += src/filtersdialog.ui
+FORMS += src/optionsdialog.ui \
+    src/highlightersdialog.ui
+FORMS +=
 
 macx {
     # Icon for Mac

src/abstractlogview.cpp

@@ -43,7 +43,7 @@
 #include "log.h"
 
 #include "persistentinfo.h"
-#include "filterset.h"
+#include "highlighterset.h"
 #include "logmainview.h"
 #include "quickfind.h"
 #include "quickfindpattern.h"
@@ -1435,8 +1435,8 @@ void AbstractLogView::drawTextArea( QPaintDevice* paint_device, int32_t )
     const int paintDeviceHeight = paint_device->height() / viewport()->devicePixelRatio();
     const int paintDeviceWidth = paint_device->width() / viewport()->devicePixelRatio();
     const QPalette& palette = viewport()->palette();
-    std::shared_ptr<const FilterSet> filterSet =
-        Persistent<FilterSet>( "filterSet" );
+    std::shared_ptr<const HighlighterSet> highlighterSet =
+        Persistent<HighlighterSet>( "highlighterSet" );
     QColor foreColor, backColor;
 
     static const QBrush normalBulletBrush = QBrush( Qt::white );
@@ -1536,7 +1536,7 @@ void AbstractLogView::drawTextArea( QPaintDevice* paint_device, int32_t )
             backColor = palette.color( QPalette::Highlight );
             painter.setPen(palette.color(QPalette::Text));
         }
-        else if ( filterSet->matchLine( logData->getLineString( line_index ),
+        else if ( highlighterSet->matchLine( logData->getLineString( line_index ),
                     &foreColor, &backColor ) ) {
             // Apply a filter to the line
         }