aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaQt.cpp
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-04-07 17:28:01 +1000
committerNeil <nyamatongwe@gmail.com>2017-04-07 17:28:01 +1000
commitb9b6ef0c4617d99774df4b46c853469ef62cd7c1 (patch)
treec904443e3d9c224d9dd9d1fbf3ad847d06f73ee0 /qt/ScintillaEditBase/ScintillaQt.cpp
parent32ae171da032fbdcfc94405877a49e1d3e3b0abb (diff)
downloadscintilla-mirror-b9b6ef0c4617d99774df4b46c853469ef62cd7c1.tar.gz
Use same parameter names in declarations and definitions.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp')
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index fc1d40c74..c5490a1d6 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -648,10 +648,10 @@ void ScintillaQt::AddToPopUp(const char *label,
this, SLOT(execCommand(QAction *)));
}
-sptr_t ScintillaQt::WndProc(unsigned int message, uptr_t wParam, sptr_t lParam)
+sptr_t ScintillaQt::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
{
try {
- switch (message) {
+ switch (iMessage) {
case SCI_SETIMEINTERACTION:
// Only inline IME supported on Qt
@@ -674,7 +674,7 @@ sptr_t ScintillaQt::WndProc(unsigned int message, uptr_t wParam, sptr_t lParam)
#endif
default:
- return ScintillaBase::WndProc(message, wParam, lParam);
+ return ScintillaBase::WndProc(iMessage, wParam, lParam);
}
} catch (std::bad_alloc &) {
errorStatus = SC_STATUS_BADALLOC;