diff --git a/src/bincimapmime/mime-parseonlyheader.cc b/src/bincimapmime/mime-parseonlyheader.cc index 27885dd4..233cb858 100644 --- a/src/bincimapmime/mime-parseonlyheader.cc +++ b/src/bincimapmime/mime-parseonlyheader.cc @@ -115,7 +115,7 @@ int Binc::MimePart::doParseOnlyHeader(MimeInputSource *ms, if (c == '\n') ++nlines; if (c == ':') break; if (c == '\n') { - for (string::size_type i = name.length() - 1; i >= 0; --i) + for (int i = int(name.length()) - 1; i >= 0; --i) mimeSource->ungetChar(); quit = true; diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp index df9b151f..a2eb993f 100644 --- a/src/common/textsplit.cpp +++ b/src/common/textsplit.cpp @@ -364,11 +364,12 @@ bool TextSplit::words_from_span(size_t bp) * @param spanerase Set if the current span is at its end. Process it. * @param bp The current BYTE position in the stream */ -inline bool TextSplit::doemit(bool spanerase, size_t bp) +inline bool TextSplit::doemit(bool spanerase, size_t _bp) { + int bp = int(_bp); LOGDEB2(("TextSplit::doemit: sper %d bp %d spp %d spanwords %u wS %d wL %d " "inn %d span [%s]\n", - spanerase, int(bp), m_spanpos, m_words_in_span.size(), + spanerase, bp, m_spanpos, m_words_in_span.size(), m_wordStart, m_wordLen, m_inNumber, m_span.c_str())); if (m_wordLen) { diff --git a/src/qtgui/recoll-win.pro b/src/qtgui/recoll-win.pro index 4ca1bca3..ad8419a5 100644 --- a/src/qtgui/recoll-win.pro +++ b/src/qtgui/recoll-win.pro @@ -27,6 +27,7 @@ HEADERS += \ fragbuts.h \ idxsched.h \ widgets/listdialog.h \ + widgets/qxtconfirmationmessage.h \ preview_w.h \ preview_load.h \ preview_plaintorich.h \ diff --git a/src/qtgui/widgets/qxtglobal.h b/src/qtgui/widgets/qxtglobal.h index 7d5abfbe..283b330a 100644 --- a/src/qtgui/widgets/qxtglobal.h +++ b/src/qtgui/widgets/qxtglobal.h @@ -49,6 +49,8 @@ //--------------------------export macros------------------------------ +#define QXT_STATIC + #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE #if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN) diff --git a/src/windows/recoll-setup.iss b/src/windows/recoll-setup.iss index f57b2932..25e232b4 100644 --- a/src/windows/recoll-setup.iss +++ b/src/windows/recoll-setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Recoll" -#define MyAppVersion "1.22.0-20151202" +#define MyAppVersion "1.22.0-20160129" #define MyAppPublisher "Recoll.org" #define MyAppURL "http://www.recoll.org" #define MyAppExeName "recoll.exe"