Permalink
Browse files

Fixed more merge conflicts.

  • Loading branch information...
ajpalkovic committed Oct 12, 2010
1 parent 2f025bc commit c48b3a4101f0e34f863f1bb86887eea3e2ab278b
Showing with 6 additions and 6 deletions.
  1. +3 −3 src/EditorCtrl.cpp
  2. +2 −2 src/styler_variablehl.cpp
  3. +1 −1 src/styler_variablehl.h
View
@@ -164,7 +164,7 @@ EditorCtrl::EditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap,
m_lines(mdc, m_doc, *this, m_theme),
m_search_hl_styler(m_doc, m_lines, m_searchRanges, m_cursors, m_theme),
- m_variable_hl_styler(m_doc, m_lines, m_searchRanges, m_theme, eGetSettings(), *this),
+ m_variable_hl_styler(m_doc, m_lines, m_searchRanges, m_cursors, m_theme, eGetSettings(), *this),
m_html_hl_styler(m_doc, m_lines, m_theme, eGetSettings(), *this),
m_syntaxstyler(m_doc, m_lines, &m_syntaxHandler),
m_selectionsStyler(m_doc, m_lines, m_theme, *this),
@@ -223,7 +223,7 @@ EditorCtrl::EditorCtrl(const doc_id di, const wxString& mirrorPath, CatalystWrap
m_lines(mdc, m_doc, *this, m_theme),
m_search_hl_styler(m_doc, m_lines, m_searchRanges, m_cursors, m_theme),
- m_variable_hl_styler(m_doc, m_lines, m_searchRanges, m_theme, eGetSettings(), *this),
+ m_variable_hl_styler(m_doc, m_lines, m_searchRanges, m_cursors, m_theme, eGetSettings(), *this),
m_html_hl_styler(m_doc, m_lines, m_theme, eGetSettings(), *this),
m_syntaxstyler(m_doc, m_lines, &m_syntaxHandler),
m_selectionsStyler(m_doc, m_lines, m_theme, *this),
@@ -297,7 +297,7 @@ EditorCtrl::EditorCtrl(CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent,
m_lines(mdc, m_doc, *this, m_theme),
m_search_hl_styler(m_doc, m_lines, m_searchRanges, m_cursors, m_theme),
- m_variable_hl_styler(m_doc, m_lines, m_searchRanges, m_theme, eGetSettings(), *this),
+ m_variable_hl_styler(m_doc, m_lines, m_searchRanges, m_cursors, m_theme, eGetSettings(), *this),
m_html_hl_styler(m_doc, m_lines, m_theme, eGetSettings(), *this),
m_syntaxstyler(m_doc, m_lines, &m_syntaxHandler),
m_selectionsStyler(m_doc, m_lines, m_theme, *this),
@@ -22,8 +22,8 @@
#include "EditorCtrl.h"
#include "EditorChangeState.h"
-Styler_VariableHL::Styler_VariableHL(const DocumentWrapper& rev, const Lines& lines, const vector<interval>& ranges, const tmTheme& theme, eSettings& settings, EditorCtrl& editorCtrl):
-Styler_SearchHL(rev, lines, ranges, theme), m_settings(settings),
+Styler_VariableHL::Styler_VariableHL(const DocumentWrapper& rev, const Lines& lines, const vector<interval>& ranges, const std::vector<unsigned int>& cursors, const tmTheme& theme, eSettings& settings, EditorCtrl& editorCtrl):
+Styler_SearchHL(rev, lines, ranges, cursors, theme), m_settings(settings),
m_selectionHighlightColor(m_theme.selectionColor),
m_searchHighlightColor(m_theme.searchHighlightColor) ,
m_cursorPosition(0), m_editorCtrl(editorCtrl)
View
@@ -38,7 +38,7 @@ class Lines;
class Styler_VariableHL : public Styler_SearchHL {
public:
- Styler_VariableHL(const DocumentWrapper& rev, const Lines& lines, const std::vector<interval>& ranges, const tmTheme& theme, eSettings& settings, EditorCtrl& editorCtrl);
+ Styler_VariableHL(const DocumentWrapper& rev, const Lines& lines, const std::vector<interval>& ranges, const std::vector<unsigned int>& cursors, const tmTheme& theme, eSettings& settings, EditorCtrl& editorCtrl);
virtual ~Styler_VariableHL() {};
void Clear();

0 comments on commit c48b3a4

Please sign in to comment.