Browse Source

Added a couple of missing override keywords.

tags/2021-05-28
jules 10 years ago
parent
commit
7b42c1846a
2 changed files with 12 additions and 12 deletions
  1. +6
    -6
      modules/juce_gui_basics/widgets/juce_TextEditor.cpp
  2. +6
    -6
      modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp

+ 6
- 6
modules/juce_gui_basics/widgets/juce_TextEditor.cpp View File

@@ -723,19 +723,19 @@ public:
{ {
} }
bool perform()
bool perform() override
{ {
owner.insert (text, insertIndex, font, colour, 0, newCaretPos); owner.insert (text, insertIndex, font, colour, 0, newCaretPos);
return true; return true;
} }
bool undo()
bool undo() override
{ {
owner.remove (Range<int> (insertIndex, insertIndex + text.length()), 0, oldCaretPos); owner.remove (Range<int> (insertIndex, insertIndex + text.length()), 0, oldCaretPos);
return true; return true;
} }
int getSizeInUnits()
int getSizeInUnits() override
{ {
return text.length() + 16; return text.length() + 16;
} }
@@ -767,20 +767,20 @@ public:
removedSections.addArray (oldSections); removedSections.addArray (oldSections);
} }
bool perform()
bool perform() override
{ {
owner.remove (range, 0, newCaretPos); owner.remove (range, 0, newCaretPos);
return true; return true;
} }
bool undo()
bool undo() override
{ {
owner.reinsert (range.getStart(), removedSections); owner.reinsert (range.getStart(), removedSections);
owner.moveCaretTo (oldCaretPos, false); owner.moveCaretTo (oldCaretPos, false);
return true; return true;
} }
int getSizeInUnits()
int getSizeInUnits() override
{ {
int n = 16; int n = 16;
for (int i = removedSections.size(); --i >= 0;) for (int i = removedSections.size(); --i >= 0;)


+ 6
- 6
modules/juce_gui_extra/code_editor/juce_CodeDocument.cpp View File

@@ -807,21 +807,21 @@ public:
{ {
} }
bool perform()
bool perform() override
{ {
owner.currentActionIndex++; owner.currentActionIndex++;
owner.insert (text, insertPos, false); owner.insert (text, insertPos, false);
return true; return true;
} }
bool undo()
bool undo() override
{ {
owner.currentActionIndex--; owner.currentActionIndex--;
owner.remove (insertPos, insertPos + text.length(), false); owner.remove (insertPos, insertPos + text.length(), false);
return true; return true;
} }
int getSizeInUnits() { return text.length() + 32; }
int getSizeInUnits() override { return text.length() + 32; }
private: private:
CodeDocument& owner; CodeDocument& owner;
@@ -902,21 +902,21 @@ public:
{ {
} }
bool perform()
bool perform() override
{ {
owner.currentActionIndex++; owner.currentActionIndex++;
owner.remove (startPos, endPos, false); owner.remove (startPos, endPos, false);
return true; return true;
} }
bool undo()
bool undo() override
{ {
owner.currentActionIndex--; owner.currentActionIndex--;
owner.insert (removedText, startPos, false); owner.insert (removedText, startPos, false);
return true; return true;
} }
int getSizeInUnits() { return (endPos - startPos) + 32; }
int getSizeInUnits() override { return (endPos - startPos) + 32; }
private: private:
CodeDocument& owner; CodeDocument& owner;


Loading…
Cancel
Save