diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Document.h | 6 | ||||
| -rw-r--r-- | src/DocumentAccessor.h | 2 | ||||
| -rw-r--r-- | src/ExternalLexer.h | 2 | ||||
| -rw-r--r-- | src/LexCaml.cxx | 10 | ||||
| -rw-r--r-- | src/LexSML.cxx | 10 | ||||
| -rw-r--r-- | src/Style.h | 2 | 
6 files changed, 14 insertions, 18 deletions
| diff --git a/src/Document.h b/src/Document.h index 55df77fcb..8bd047b23 100644 --- a/src/Document.h +++ b/src/Document.h @@ -32,10 +32,10 @@ public:  	Range(Position pos=0) :  		start(pos), end(pos) { -	}; +	}  	Range(Position start_, Position end_) :  		start(start_), end(end_) { -	}; +	}  	bool Valid() const {  		return (start != invalidPosition) && (end != invalidPosition); @@ -118,7 +118,7 @@ struct StyledText {  class CaseFolder {  public:  	virtual ~CaseFolder() { -	}; +	}  	virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) = 0;  }; diff --git a/src/DocumentAccessor.h b/src/DocumentAccessor.h index 39a0f2521..eb877d6d1 100644 --- a/src/DocumentAccessor.h +++ b/src/DocumentAccessor.h @@ -63,7 +63,7 @@ public:  	WindowID GetWindow() { return id; }  	void StartAt(unsigned int start, char chMask=31); -	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; +	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }  	unsigned int GetStartSegment() { return startSeg; }  	void StartSegment(unsigned int pos);  	void ColourTo(unsigned int pos, int chAttr); diff --git a/src/ExternalLexer.h b/src/ExternalLexer.h index 913098ddc..eb2bad5d1 100644 --- a/src/ExternalLexer.h +++ b/src/ExternalLexer.h @@ -42,7 +42,7 @@ public:  		strncpy(name, languageName_, sizeof(name));  		name[sizeof(name)-1] = '\0';  		languageName = name; -	}; +	}  	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,  					WordList *keywordlists[], Accessor &styler) const;  	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle, diff --git a/src/LexCaml.cxx b/src/LexCaml.cxx index 0d1162259..ca1b65f38 100644 --- a/src/LexCaml.cxx +++ b/src/LexCaml.cxx @@ -430,13 +430,11 @@ void ColouriseCamlDoc(  static  #endif	/* BUILD_AS_EXTERNAL_LEXER */  void FoldCamlDoc( -	unsigned int startPos, int length, -	int initStyle, -	WordList *keywordlists[], -	Accessor &styler) +	unsigned int, int, +	int, +	WordList *[], +	Accessor &)  { -	// below useless evaluation(s) to supress "not used" warnings -	startPos || length || initStyle || keywordlists[0] || styler.Length();  }  static const char * const camlWordListDesc[] = { diff --git a/src/LexSML.cxx b/src/LexSML.cxx index a61753077..a41b4c10d 100644 --- a/src/LexSML.cxx +++ b/src/LexSML.cxx @@ -203,13 +203,11 @@ void ColouriseSMLDoc(  }  void FoldSMLDoc( -	unsigned int startPos, int length, -	int initStyle, -	WordList *keywordlists[], -	Accessor &styler) +	unsigned int, int, +	int, +	WordList *[], +	Accessor &)  { -	//supress "not used" warnings -	startPos || length || initStyle || keywordlists[0] || styler.Length();  }  static const char * const SMLWordListDesc[] = { diff --git a/src/Style.h b/src/Style.h index 0be3d4f07..c1f87e1b3 100644 --- a/src/Style.h +++ b/src/Style.h @@ -54,7 +54,7 @@ public:  	void ClearTo(const Style &source);  	bool EquivalentFontTo(const Style *other) const;  	void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, int extraFontFlag = 0); -	bool IsProtected() const { return !(changeable && visible);}; +	bool IsProtected() const { return !(changeable && visible);}  };  #ifdef SCI_NAMESPACE | 
