diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CallTip.h | 4 | ||||
| -rw-r--r-- | src/DocumentAccessor.h | 4 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 | ||||
| -rw-r--r-- | src/Editor.h | 4 | ||||
| -rw-r--r-- | src/ScintillaBase.h | 7 |
5 files changed, 10 insertions, 11 deletions
diff --git a/src/CallTip.h b/src/CallTip.h index bdf1123c7..a64755fd1 100644 --- a/src/CallTip.h +++ b/src/CallTip.h @@ -27,8 +27,8 @@ class CallTip { bool useStyleCallTip; // if true, STYLE_CALLTIP should be used // Private so CallTip objects can not be copied - CallTip(const CallTip &) {} - CallTip &operator=(const CallTip &) { return *this; } + CallTip(const CallTip &); + CallTip &operator=(const CallTip &); void DrawChunk(Surface *surface, int &x, const char *s, int posStart, int posEnd, int ytext, PRectangle rcClient, bool highlight, bool draw); diff --git a/src/DocumentAccessor.h b/src/DocumentAccessor.h index 92440428e..899865fc1 100644 --- a/src/DocumentAccessor.h +++ b/src/DocumentAccessor.h @@ -17,8 +17,8 @@ class Document; class DocumentAccessor : public Accessor { // Private so DocumentAccessor objects can not be copied - DocumentAccessor(const DocumentAccessor &source) : Accessor(), props(source.props) {} - DocumentAccessor &operator=(const DocumentAccessor &) { return *this; } + DocumentAccessor(const DocumentAccessor &source); + DocumentAccessor &operator=(const DocumentAccessor &); protected: Document *pdoc; diff --git a/src/Editor.cxx b/src/Editor.cxx index e1dcb38bc..8cfbbd6e4 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -336,7 +336,7 @@ const char *ControlCharacterString(unsigned char ch) { class AutoLineLayout { LineLayoutCache &llc; LineLayout *ll; - AutoLineLayout &operator=(const AutoLineLayout &) { return * this; } + AutoLineLayout &operator=(const AutoLineLayout &); public: AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) : llc(llc_), ll(ll_) {} ~AutoLineLayout() { diff --git a/src/Editor.h b/src/Editor.h index e83dbdcb3..a0431df29 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -98,8 +98,8 @@ public: */ class Editor : public DocWatcher { // Private so Editor objects can not be copied - Editor(const Editor &) : DocWatcher() {} - Editor &operator=(const Editor &) { return *this; } + Editor(const Editor &); + Editor &operator=(const Editor &); protected: // ScintillaBase subclass needs access to much of Editor diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index 73fcd72b5..f1fdc5dfd 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -16,8 +16,8 @@ namespace Scintilla { */ class ScintillaBase : public Editor { // Private so ScintillaBase objects can not be copied - ScintillaBase(const ScintillaBase &) : Editor() {} - ScintillaBase &operator=(const ScintillaBase &) { return *this; } + ScintillaBase(const ScintillaBase &); + ScintillaBase &operator=(const ScintillaBase &); protected: /** Enumeration of commands and child windows. */ @@ -43,9 +43,8 @@ protected: int listType; ///< 0 is an autocomplete list int maxListWidth; /// Maximum width of list, in average character widths - bool performingStyle; ///< Prevent reentrance - #ifdef SCI_LEXER + bool performingStyle; ///< Prevent reentrance int lexLanguage; const LexerModule *lexCurrent; PropSetSimple props; |