From 8a6ef2beb841be1bb169d18fab79fc718e9b37ca Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Tue, 11 May 2010 03:37:09 +0000
Subject: Made method const.

---
 src/XPM.cxx            |  2 +-
 src/XPM.h              |  2 +-
 win32/ScintillaWin.cxx | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/XPM.cxx b/src/XPM.cxx
index 2a0399837..d1389efa0 100644
--- a/src/XPM.cxx
+++ b/src/XPM.cxx
@@ -38,7 +38,7 @@ static size_t MeasureLength(const char *s) {
 	return i;
 }
 
-ColourAllocated XPM::ColourFromCode(int ch) {
+ColourAllocated XPM::ColourFromCode(int ch) const {
 	return colourCodeTable[ch]->allocated;
 #ifdef SLOW
 	for (int i=0; i<nColours; i++) {
diff --git a/src/XPM.h b/src/XPM.h
index 71970a6b5..cb05aae3e 100644
--- a/src/XPM.h
+++ b/src/XPM.h
@@ -24,7 +24,7 @@ class XPM {
 	char codeTransparent;
 	char *codes;
 	ColourPair *colours;
-	ColourAllocated ColourFromCode(int ch);
+	ColourAllocated ColourFromCode(int ch) const;
 	void FillRun(Surface *surface, int code, int startX, int y, int x);
 	char **lines;
 	ColourPair *colourCodeTable[256];
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 30fe7b2bd..59df887f5 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1379,7 +1379,7 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
 	if (lengthUTF16 == 0)	// Failed to convert
 		return s;
 
-	DWORD mapFlags = LCMAP_LINGUISTIC_CASING | 
+	DWORD mapFlags = LCMAP_LINGUISTIC_CASING |
 		((caseMapping == cmUpper) ? LCMAP_UPPERCASE : LCMAP_LOWERCASE);
 
 	// Many conversions performed by search function are short so optimize this case.
@@ -1396,16 +1396,16 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
 		int charsConverted = ::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags,
 			&vwcText[0], lengthUTF16, NULL, 0);
 		std::vector<wchar_t> vwcConverted(charsConverted);
-		::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags, 
+		::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags,
 			&vwcText[0], lengthUTF16, &vwcConverted[0], charsConverted);
 
 		// Change back to document encoding
 		unsigned int lengthConverted = ::WideCharToMultiByte(cpDoc, 0,
-			&vwcConverted[0], vwcConverted.size(), 
+			&vwcConverted[0], vwcConverted.size(),
 			NULL, 0, NULL, 0);
 		std::vector<char> vcConverted(lengthConverted);
-		::WideCharToMultiByte(cpDoc, 0, 
-			&vwcConverted[0], vwcConverted.size(), 
+		::WideCharToMultiByte(cpDoc, 0,
+			&vwcConverted[0], vwcConverted.size(),
 			&vcConverted[0], vcConverted.size(), NULL, 0);
 
 		return std::string(&vcConverted[0], vcConverted.size());
@@ -1428,12 +1428,12 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
 
 		// Change back to document encoding
 		unsigned int lengthConverted = ::WideCharToMultiByte(cpDoc, 0,
-			vwcConverted, charsConverted, 
+			vwcConverted, charsConverted,
 			NULL, 0, NULL, 0);
 		// Each UTF-16 code unit may need up to 3 bytes in UTF-8
 		char vcConverted[shortSize * 3 * 3];
-		::WideCharToMultiByte(cpDoc, 0, 
-			vwcConverted, charsConverted, 
+		::WideCharToMultiByte(cpDoc, 0,
+			vwcConverted, charsConverted,
 			vcConverted, lengthConverted, NULL, 0);
 
 		return std::string(vcConverted, lengthConverted);
@@ -1496,7 +1496,7 @@ public:
 	void SetClip(UINT uFormat) {
 		::SetClipboardData(uFormat, Unlock());
 	}
-	operator bool() {
+	operator bool() const {
 		return ptr != 0;
 	}
 	SIZE_T Size() {
-- 
cgit v1.2.3