Renamed highlighter and highlightSpin to Highlighter and SpinHighlighter

Author: bweir

src/propelleride/highlighter.cpp renamed to src/propelleride/Highlighter.cpp

@@ -45,7 +45,7 @@
 **
 ****************************************************************************/
 
-#include "highlighter.h"
+#include "Highlighter.h"
 
 #include <QSettings>
 #include <QVariant>

src/propelleride/highlighter.h renamed to src/propelleride/Highlighter.h

@@ -7,7 +7,7 @@
 #include <QString>
 #include <QStringList>
 
-#include "highlightSpin.h"
+#include "SpinHighlighter.h"
 
 SpinHighlighter::SpinHighlighter(QTextDocument *parent, Preferences *prop)
     : Highlighter(parent, prop)

src/propelleride/highlightSpin.cpp renamed to src/propelleride/SpinHighlighter.cpp

@@ -47,7 +47,7 @@
 **
 ****************************************************************************/
 
-#include "highlighter.h"
+#include "Highlighter.h"
 
 #include <QHash>
 #include <QTextCharFormat>

src/propelleride/highlightSpin.h renamed to src/propelleride/SpinHighlighter.h

@@ -9,7 +9,7 @@
 
 /* C and Spin highlighters prove more languages can be added easily.
  */
-#include "highlightSpin.h"
+#include "SpinHighlighter.h"
 
 #include "mainwindow.h"
 #define MAINWINDOW MainWindow
@@ -1421,23 +1421,17 @@ void Editor::updateBackgroundColors()
     setExtraSelections(OurExtraSelections);
 }
 
-//![extraAreaPaintEvent_0]
 
 void Editor::lineNumberAreaPaintEvent(QPaintEvent *event)
 {
     QPainter painter(lineNumberArea);
     painter.fillRect(event->rect(), QColor(Qt::lightGray).lighter(120));
 
-    //![extraAreaPaintEvent_0]
-
-//![extraAreaPaintEvent_1]
     QTextBlock block = firstVisibleBlock();
     int blockNumber = block.blockNumber();
     int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
     int bottom = top + (int) blockBoundingRect(block).height();
-//![extraAreaPaintEvent_1]
 
-//![extraAreaPaintEvent_2]
     while (block.isValid() && top <= event->rect().bottom()) {
         if (block.isVisible() && bottom >= event->rect().top()) {
             QString number = QString::number(blockNumber + 1);
@@ -1452,4 +1446,3 @@ void Editor::lineNumberAreaPaintEvent(QPaintEvent *event)
         ++blockNumber;
     }
 }
-//![extraAreaPaintEvent_2]

src/propelleride/editor.cpp

@@ -11,7 +11,7 @@
 #include <QTextCursor>
 
 
-#include "highlighter.h"
+#include "Highlighter.h"
 #include "SpinParser.h"
 
 class LineNumberArea;

src/propelleride/editor.h

@@ -1729,7 +1729,6 @@ Editor *MainWindow::createEditor()
     editor->setTabStopWidth(width);
     connect(editor,SIGNAL(textChanged()),this,SLOT(fileChanged()));
     connect(editor,SIGNAL(cursorPositionChanged()),editor,SLOT(updateBackgroundColors()));
-    highlighter = new Highlighter(editor->document(), propDialog);
 
     return editor;
 }

src/propelleride/mainwindow.cpp

@@ -11,7 +11,6 @@
 #include <QPlainTextEdit> 
 #include <QTreeView> 
 
-#include "highlighter.h"
 #include "SpinBuilder.h"
 #include "SpinParser.h"
 #include "SpinModel.h"
@@ -186,7 +185,6 @@ public slots:
     QString     spinCompilerPath;
     QString     spinIncludes;
     QString     spinLoader;
-    Highlighter *highlighter;
 
     QToolBar    *fileToolBar;
     QToolBar    *propToolBar;

src/propelleride/mainwindow.h

@@ -24,7 +24,7 @@ SOURCES += main.cpp\
     mainwindow.cpp \
     $$files(mainwindow/*.cpp) \
     StatusDialog.cpp \
-    highlighter.cpp \
+    Highlighter.cpp \
     treemodel.cpp \
     treeitem.cpp \
     Builder.cpp \
@@ -33,15 +33,15 @@ SOURCES += main.cpp\
     Preferences.cpp \
     PortConnectionMonitor.cpp \
     editor.cpp \
-    highlightSpin.cpp \
+    SpinHighlighter.cpp \
     SpinParser.cpp \
     terminal.cpp \
     console.cpp \
     termprefs.cpp
 
 HEADERS  += mainwindow.h \
     StatusDialog.h \
-    highlighter.h \
+    Highlighter.h \
     treemodel.h \
     treeitem.h \
     Builder.h \
@@ -50,7 +50,7 @@ HEADERS  += mainwindow.h \
     Preferences.h \
     PortConnectionMonitor.h \
     editor.h \
-    highlightSpin.h \
+    SpinHighlighter.h \
     SpinParser.h \
     colors.h \
     Sleeper.h \