aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2013-12-15 12:49:06 +1100
committerNeil <nyamatongwe@gmail.com>2013-12-15 12:49:06 +1100
commit3d0a66fc8c15a74ae33a5d92b68c0b9adcd02920 (patch)
tree0eac4ed28358e0496be6a35f77891b308849b477 /src
parent7c020de8903c45bcc32795e28cc13a32285513f3 (diff)
downloadscintilla-mirror-3d0a66fc8c15a74ae33a5d92b68c0b9adcd02920.tar.gz
Make single argument constructors explicit to avoid unexpected conversions.
Diffstat (limited to 'src')
-rw-r--r--src/Decoration.h2
-rw-r--r--src/Document.cxx2
-rw-r--r--src/Document.h4
-rw-r--r--src/Editor.cxx6
-rw-r--r--src/ExternalLexer.h2
-rw-r--r--src/Partitioning.h4
-rw-r--r--src/PositionCache.cxx2
-rw-r--r--src/PositionCache.h4
-rw-r--r--src/RESearch.h2
-rw-r--r--src/ScintillaBase.cxx2
-rw-r--r--src/Selection.cxx2
-rw-r--r--src/Selection.h4
-rw-r--r--src/XPM.h6
13 files changed, 21 insertions, 21 deletions
diff --git a/src/Decoration.h b/src/Decoration.h
index 23d70c7ca..a0c434af8 100644
--- a/src/Decoration.h
+++ b/src/Decoration.h
@@ -17,7 +17,7 @@ public:
RunStyles rs;
int indicator;
- Decoration(int indicator_);
+ explicit Decoration(int indicator_);
~Decoration();
bool Empty() const;
diff --git a/src/Document.cxx b/src/Document.cxx
index acf4d9755..1788cf74e 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -2103,7 +2103,7 @@ int Document::BraceMatch(int position, int /*maxReStyle*/) {
*/
class BuiltinRegex : public RegexSearchBase {
public:
- BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {}
+ explicit BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {}
virtual ~BuiltinRegex() {
}
diff --git a/src/Document.h b/src/Document.h
index 1e43076ca..effdd5fe5 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -32,7 +32,7 @@ public:
Position start;
Position end;
- Range(Position pos=0) :
+ explicit Range(Position pos=0) :
start(pos), end(pos) {
}
Range(Position start_, Position end_) :
@@ -165,7 +165,7 @@ protected:
ILexer *instance;
bool performingStyle; ///< Prevent reentrance
public:
- LexInterface(Document *pdoc_) : pdoc(pdoc_), instance(0), performingStyle(false) {
+ explicit LexInterface(Document *pdoc_) : pdoc(pdoc_), instance(0), performingStyle(false) {
}
virtual ~LexInterface() {
}
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 764e00dce..7e1da9e20 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4206,7 +4206,7 @@ void Editor::ClearSelection(bool retainMultipleSelections) {
sel.Range(r).End().Position())) {
pdoc->DeleteChars(sel.Range(r).Start().Position(),
sel.Range(r).Length());
- sel.Range(r) = sel.Range(r).Start();
+ sel.Range(r) = SelectionRange(sel.Range(r).Start());
}
}
}
@@ -4324,9 +4324,9 @@ void Editor::Clear() {
if (!RangeContainsProtected(sel.Range(r).caret.Position(), sel.Range(r).caret.Position() + 1)) {
if (sel.Range(r).Start().VirtualSpace()) {
if (sel.Range(r).anchor < sel.Range(r).caret)
- sel.Range(r) = SelectionPosition(InsertSpace(sel.Range(r).anchor.Position(), sel.Range(r).anchor.VirtualSpace()));
+ sel.Range(r) = SelectionRange(InsertSpace(sel.Range(r).anchor.Position(), sel.Range(r).anchor.VirtualSpace()));
else
- sel.Range(r) = SelectionPosition(InsertSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace()));
+ sel.Range(r) = SelectionRange(InsertSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace()));
}
if ((sel.Count() == 1) || !pdoc->IsPositionInLineEnd(sel.Range(r).caret.Position())) {
pdoc->DelChar(sel.Range(r).caret.Position());
diff --git a/src/ExternalLexer.h b/src/ExternalLexer.h
index bf175a631..a2ec93946 100644
--- a/src/ExternalLexer.h
+++ b/src/ExternalLexer.h
@@ -54,7 +54,7 @@ class LexerLibrary {
LexerMinder *last;
public:
- LexerLibrary(const char *ModuleName);
+ explicit LexerLibrary(const char *ModuleName);
~LexerLibrary();
void Release();
diff --git a/src/Partitioning.h b/src/Partitioning.h
index 18bcbc004..688b38d7d 100644
--- a/src/Partitioning.h
+++ b/src/Partitioning.h
@@ -18,7 +18,7 @@ namespace Scintilla {
class SplitVectorWithRangeAdd : public SplitVector<int> {
public:
- SplitVectorWithRangeAdd(int growSize_) {
+ explicit SplitVectorWithRangeAdd(int growSize_) {
SetGrowSize(growSize_);
ReAllocate(growSize_);
}
@@ -88,7 +88,7 @@ private:
}
public:
- Partitioning(int growSize) {
+ explicit Partitioning(int growSize) {
Allocate(growSize);
}
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index 413796f85..db64b1160 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -359,7 +359,7 @@ void SpecialRepresentations::SetRepresentation(const char *charBytes, const char
// New entry so increment for first byte
startByteHasReprs[static_cast<unsigned char>(charBytes[0])]++;
}
- mapReprs[KeyFromString(charBytes, UTF8MaxBytes)] = value;
+ mapReprs[KeyFromString(charBytes, UTF8MaxBytes)] = Representation(value);
}
void SpecialRepresentations::ClearRepresentation(const char *charBytes) {
diff --git a/src/PositionCache.h b/src/PositionCache.h
index 6d14cf0a3..2b4223769 100644
--- a/src/PositionCache.h
+++ b/src/PositionCache.h
@@ -53,7 +53,7 @@ public:
int lines;
XYPOSITION wrapIndent; // In pixels
- LineLayout(int maxLineLength_);
+ explicit LineLayout(int maxLineLength_);
virtual ~LineLayout();
void Resize(int maxLineLength_);
void Free();
@@ -116,7 +116,7 @@ public:
class Representation {
public:
std::string stringRep;
- Representation(const char *value="") : stringRep(value) {
+ explicit Representation(const char *value="") : stringRep(value) {
}
};
diff --git a/src/RESearch.h b/src/RESearch.h
index 702259d52..48533a41c 100644
--- a/src/RESearch.h
+++ b/src/RESearch.h
@@ -31,7 +31,7 @@ public:
class RESearch {
public:
- RESearch(CharClassify *charClassTable);
+ explicit RESearch(CharClassify *charClassTable);
~RESearch();
void GrabMatches(CharacterIndexer &ci);
const char *Compile(const char *pattern, int length, bool caseSensitive, bool posix);
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 1fb4d6f27..f8b989bd4 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -486,7 +486,7 @@ class LexState : public LexInterface {
public:
int lexLanguage;
- LexState(Document *pdoc_);
+ explicit LexState(Document *pdoc_);
virtual ~LexState();
void SetLexer(uptr_t wParam);
void SetLexerLanguage(const char *languageName);
diff --git a/src/Selection.cxx b/src/Selection.cxx
index 385e2360e..0c02c198b 100644
--- a/src/Selection.cxx
+++ b/src/Selection.cxx
@@ -166,7 +166,7 @@ void SelectionRange::MinimizeVirtualSpace() {
}
Selection::Selection() : mainRange(0), moveExtends(false), tentativeMain(false), selType(selStream) {
- AddSelection(SelectionPosition(0));
+ AddSelection(SelectionRange(SelectionPosition(0)));
}
Selection::~Selection() {
diff --git a/src/Selection.h b/src/Selection.h
index d7c7d79ad..956a0f99d 100644
--- a/src/Selection.h
+++ b/src/Selection.h
@@ -88,9 +88,9 @@ struct SelectionRange {
SelectionRange() : caret(), anchor() {
}
- SelectionRange(SelectionPosition single) : caret(single), anchor(single) {
+ explicit SelectionRange(SelectionPosition single) : caret(single), anchor(single) {
}
- SelectionRange(int single) : caret(single), anchor(single) {
+ explicit SelectionRange(int single) : caret(single), anchor(single) {
}
SelectionRange(SelectionPosition caret_, SelectionPosition anchor_) : caret(caret_), anchor(anchor_) {
}
diff --git a/src/XPM.h b/src/XPM.h
index 2648fecd9..47f5c52f1 100644
--- a/src/XPM.h
+++ b/src/XPM.h
@@ -25,8 +25,8 @@ class XPM {
ColourDesired ColourFromCode(int ch) const;
void FillRun(Surface *surface, int code, int startX, int y, int x);
public:
- XPM(const char *textForm);
- XPM(const char *const *linesForm);
+ explicit XPM(const char *textForm);
+ explicit XPM(const char *const *linesForm);
~XPM();
void Init(const char *textForm);
void Init(const char *const *linesForm);
@@ -53,7 +53,7 @@ class RGBAImage {
std::vector<unsigned char> pixelBytes;
public:
RGBAImage(int width_, int height_, float scale_, const unsigned char *pixels_);
- RGBAImage(const XPM &xpm);
+ explicit RGBAImage(const XPM &xpm);
virtual ~RGBAImage();
int GetHeight() const { return height; }
int GetWidth() const { return width; }