diff options
| -rw-r--r-- | gtk/PlatGTK.cxx | 8 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 4 | ||||
| -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 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
9 files changed, 20 insertions, 21 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index d01c89bbc..30d8d7da2 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -352,6 +352,7 @@ static void GenerateFontSpecStrings(const char *fontName, int characterSet, char tmp[300]; char *d1 = NULL, *d2 = NULL, *d3 = NULL; strncpy(tmp, fontName, sizeof(tmp) - 1); + tmp[sizeof(tmp) - 1] = '\0'; d1 = strchr(tmp, '-'); // we know the first dash exists d2 = strchr(d1 + 1, '-'); @@ -1994,9 +1995,7 @@ class ListBoxX : public ListBox { #if GTK_MAJOR_VERSION >= 2 GtkCellRenderer* pixbuf_renderer; #endif - int lineHeight; XPMSet xset; - bool unicodeMode; int desiredVisibleRows; unsigned int maxItemCharacters; unsigned int aveCharWidth; @@ -2004,8 +2003,9 @@ public: CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), pixhash(NULL), desiredVisibleRows(5), maxItemCharacters(0), - doubleClickAction(NULL), doubleClickActionData(NULL) { + ListBoxX() : list(0), pixhash(NULL), + desiredVisibleRows(5), maxItemCharacters(0), + aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { #if GTK_MAJOR_VERSION < 2 current = 0; #endif diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index aec9e1b7a..6f318205d 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -156,8 +156,8 @@ class ScintillaGTK : public ScintillaBase { GdkRegion *rgnUpdate; // Private so ScintillaGTK objects can not be copied - ScintillaGTK(const ScintillaGTK &) : ScintillaBase() {} - ScintillaGTK &operator=(const ScintillaGTK &) { return * this; } + ScintillaGTK(const ScintillaGTK &); + ScintillaGTK &operator=(const ScintillaGTK &); public: ScintillaGTK(_ScintillaObject *sci_); 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; diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 8ff27011c..71a968541 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -372,8 +372,8 @@ class SurfaceImpl : public Surface { void SetFont(Font &font_); // Private so SurfaceImpl objects can not be copied - SurfaceImpl(const SurfaceImpl &) : Surface() {} - SurfaceImpl &operator=(const SurfaceImpl &) { return *this; } + SurfaceImpl(const SurfaceImpl &); + SurfaceImpl &operator=(const SurfaceImpl &); public: SurfaceImpl(); virtual ~SurfaceImpl(); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 1937458d4..47ff0f41a 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -176,9 +176,9 @@ class ScintillaWin : static HINSTANCE hInstance; ScintillaWin(HWND hwnd); - ScintillaWin(const ScintillaWin &) : ScintillaBase() {} + ScintillaWin(const ScintillaWin &); virtual ~ScintillaWin(); - ScintillaWin &operator=(const ScintillaWin &) { return *this; } + ScintillaWin &operator=(const ScintillaWin &); virtual void Initialise(); virtual void Finalise(); |