aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/PlatQt.cpp
diff options
context:
space:
mode:
authorNeil <unknown>2014-02-10 15:04:34 +1100
committerNeil <unknown>2014-02-10 15:04:34 +1100
commit1bb6f0022eeb025bd6e74c80d3e0c4d761523225 (patch)
treed7191da967e9d18c5394d6a57284158598a9d581 /qt/ScintillaEditBase/PlatQt.cpp
parentcbef67a19434cd5d4d71e217a2b6dcbf8df70786 (diff)
downloadscintilla-mirror-1bb6f0022eeb025bd6e74c80d3e0c4d761523225.tar.gz
Fix 'possible loss of data' warnings on 64-bit Windows.
Diffstat (limited to 'qt/ScintillaEditBase/PlatQt.cpp')
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 71c4c08fc..243c9476c 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -471,7 +471,7 @@ void SurfaceImpl::MeasureWidths(Font &font,
int i=0;
while (ui<fit) {
size_t lenChar = utf8LengthFromLead(us[i]);
- size_t codeUnits = (lenChar < 4) ? 1 : 2;
+ int codeUnits = (lenChar < 4) ? 1 : 2;
qreal xPosition = tl.cursorToX(ui+codeUnits);
for (unsigned int bytePos=0; (bytePos<lenChar) && (i<len); bytePos++) {
positions[i++] = qRound(xPosition);
@@ -977,7 +977,7 @@ void ListBoxImpl::SetList(const char *list, char separator, char typesep)
// This method is *not* platform dependent.
// It is borrowed from the GTK implementation.
Clear();
- int count = strlen(list) + 1;
+ size_t count = strlen(list) + 1;
std::vector<char> words(list, list+count);
char *startword = &words[0];
char *numword = NULL;