diff options
author | Neil Hodgson <nyamatongwe@gmail.com> | 2018-04-14 09:18:35 +1000 |
---|---|---|
committer | Neil Hodgson <nyamatongwe@gmail.com> | 2018-04-14 09:18:35 +1000 |
commit | cc0af579fe23e74cce1fdc41ab53895cb18e396a (patch) | |
tree | 14fa25832551eb73002b67475a8b2da7532fc2a9 /src | |
parent | 0f6f1b05894d29f03bc2b57e75fe4c8a37f9ac21 (diff) | |
download | scintilla-mirror-cc0af579fe23e74cce1fdc41ab53895cb18e396a.tar.gz |
Make some changes recommended by clang-tidy.
Diffstat (limited to 'src')
-rw-r--r-- | src/CaseConvert.cxx | 2 | ||||
-rw-r--r-- | src/CaseFolder.h | 2 | ||||
-rw-r--r-- | src/CellBuffer.cxx | 2 | ||||
-rw-r--r-- | src/ContractionState.cxx | 2 | ||||
-rw-r--r-- | src/Decoration.cxx | 4 | ||||
-rw-r--r-- | src/Document.h | 2 | ||||
-rw-r--r-- | src/Editor.h | 4 | ||||
-rw-r--r-- | src/PerLine.h | 10 | ||||
-rw-r--r-- | src/ScintillaBase.h | 2 | ||||
-rw-r--r-- | src/Selection.cxx | 2 | ||||
-rw-r--r-- | src/SparseVector.h | 4 | ||||
-rw-r--r-- | src/Style.h | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx index 49205cb3e..ce191f574 100644 --- a/src/CaseConvert.cxx +++ b/src/CaseConvert.cxx @@ -593,7 +593,7 @@ public: return characters.size() > 0; } void Add(int character, const char *conversion) { - characterToConversion.push_back(CharacterConversion(character, conversion)); + characterToConversion.emplace_back(character, conversion); } const char *Find(int character) { const std::vector<int>::iterator it = std::lower_bound(characters.begin(), characters.end(), character); diff --git a/src/CaseFolder.h b/src/CaseFolder.h index 790da0b29..5fa65870e 100644 --- a/src/CaseFolder.h +++ b/src/CaseFolder.h @@ -21,7 +21,7 @@ protected: char mapping[256]; public: CaseFolderTable(); - virtual ~CaseFolderTable(); + ~CaseFolderTable() override; size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override; void SetTranslation(char ch, char chTranslation); void StandardASCII(); diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx index 837fb0c23..0ee66ce7c 100644 --- a/src/CellBuffer.cxx +++ b/src/CellBuffer.cxx @@ -52,7 +52,7 @@ public: LineVector() : starts(256), perLine(0) { Init(); } - ~LineVector() { + ~LineVector() override { starts.DeleteAll(); } void Init() override { diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index a349fc23d..83a7ee2ea 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -55,7 +55,7 @@ public: void operator=(const ContractionState &) = delete; ContractionState(ContractionState &&) = delete; void operator=(ContractionState &&) = delete; - ~ContractionState(); + ~ContractionState() override; void Clear() noexcept override; diff --git a/src/Decoration.cxx b/src/Decoration.cxx index 2fe2eb318..c650b11dc 100644 --- a/src/Decoration.cxx +++ b/src/Decoration.cxx @@ -35,7 +35,7 @@ public: explicit Decoration(int indicator_) : indicator(indicator_) { } - ~Decoration() { + ~Decoration() override { } bool Empty() const override { @@ -85,7 +85,7 @@ class DecorationList : public IDecorationList { public: DecorationList(); - ~DecorationList(); + ~DecorationList() override; const std::vector<const IDecoration*> &View() const override { return decorationView; diff --git a/src/Document.h b/src/Document.h index a3f234051..7614373e2 100644 --- a/src/Document.h +++ b/src/Document.h @@ -267,7 +267,7 @@ public: // Deleted so Document objects can not be copied. Document(const Document &) = delete; void operator=(const Document &) = delete; - virtual ~Document(); + ~Document() override; int AddRef(); int SCI_METHOD Release() override; diff --git a/src/Editor.h b/src/Editor.h index 2e8ac1503..db070916d 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -271,14 +271,14 @@ protected: // ScintillaBase subclass needs access to much of Editor // The top left visible point in main window coordinates. Will be 0,0 except for // scroll views where it will be equivalent to the current scroll position. - virtual Point GetVisibleOriginInMain() const override; + Point GetVisibleOriginInMain() const override; PointDocument DocumentPointFromView(Point ptView) const; // Convert a point from view space to document Sci::Line TopLineOfMain() const override; // Return the line at Main's y coordinate 0 virtual PRectangle GetClientRectangle() const; virtual PRectangle GetClientDrawingRectangle(); PRectangle GetTextRectangle() const; - virtual Sci::Line LinesOnScreen() const override; + Sci::Line LinesOnScreen() const override; Sci::Line LinesToScroll() const; Sci::Line MaxScrollPos() const; SelectionPosition ClampPositionIntoDocument(SelectionPosition sp) const; diff --git a/src/PerLine.h b/src/PerLine.h index f1df0c31d..66990799a 100644 --- a/src/PerLine.h +++ b/src/PerLine.h @@ -51,7 +51,7 @@ public: // Deleted so Worker objects can not be copied. LineMarkers(const LineMarkers &) = delete; void operator=(const LineMarkers &) = delete; - virtual ~LineMarkers(); + ~LineMarkers() override; void Init() override; void InsertLine(Sci::Line line) override; void RemoveLine(Sci::Line line) override; @@ -73,7 +73,7 @@ public: // Deleted so Worker objects can not be copied. LineLevels(const LineLevels &) = delete; void operator=(const LineLevels &) = delete; - virtual ~LineLevels(); + ~LineLevels() override; void Init() override; void InsertLine(Sci::Line line) override; void RemoveLine(Sci::Line line) override; @@ -92,7 +92,7 @@ public: // Deleted so Worker objects can not be copied. LineState(const LineState &) = delete; void operator=(const LineState &) = delete; - virtual ~LineState(); + ~LineState() override; void Init() override; void InsertLine(Sci::Line line) override; void RemoveLine(Sci::Line line) override; @@ -110,7 +110,7 @@ public: // Deleted so Worker objects can not be copied. LineAnnotation(const LineAnnotation &) = delete; void operator=(const LineAnnotation &) = delete; - virtual ~LineAnnotation(); + ~LineAnnotation() override; void Init() override; void InsertLine(Sci::Line line) override; void RemoveLine(Sci::Line line) override; @@ -137,7 +137,7 @@ public: // Deleted so Worker objects can not be copied. LineTabstops(const LineTabstops &) = delete; void operator=(const LineTabstops &) = delete; - virtual ~LineTabstops(); + ~LineTabstops() override; void Init() override; void InsertLine(Sci::Line line) override; void RemoveLine(Sci::Line line) override; diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index f2633ba90..202098129 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -55,7 +55,7 @@ protected: // Deleted so ScintillaBase objects can not be copied. explicit ScintillaBase(const ScintillaBase &) = delete; ScintillaBase &operator=(const ScintillaBase &) = delete; - virtual ~ScintillaBase(); + ~ScintillaBase() override; void Initialise() override {} void Finalise() override; diff --git a/src/Selection.cxx b/src/Selection.cxx index f6e4bdad0..dc4d179d9 100644 --- a/src/Selection.cxx +++ b/src/Selection.cxx @@ -403,7 +403,7 @@ Sci::Position Selection::VirtualSpaceFor(Sci::Position pos) const { void Selection::Clear() { ranges.clear(); - ranges.push_back(SelectionRange()); + ranges.emplace_back(); mainRange = ranges.size() - 1; selType = selStream; moveExtends = false; diff --git a/src/SparseVector.h b/src/SparseVector.h index 867409895..11a126a1a 100644 --- a/src/SparseVector.h +++ b/src/SparseVector.h @@ -26,8 +26,8 @@ private: } public: SparseVector() : empty() { - starts.reset(new Partitioning<Sci::Position>(8)); - values.reset(new SplitVector<T>()); + starts = std::make_unique<Partitioning<Sci::Position>>(8); + values = std::make_unique<SplitVector<T>>(); values->InsertEmpty(0, 2); } ~SparseVector() { diff --git a/src/Style.h b/src/Style.h index f2d70039f..e119bc65e 100644 --- a/src/Style.h +++ b/src/Style.h @@ -36,7 +36,7 @@ public: // FontAlias objects can not be assigned except for initialization FontAlias &operator=(const FontAlias &) = delete; FontAlias(const FontAlias &); - virtual ~FontAlias(); + ~FontAlias() override; void MakeAlias(Font &fontOrigin); void ClearFont(); }; |