X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Funicode.cpp;h=b48f10609f7fe9315e257575aec432b9d8fcb1dc;hb=f3ff5e083a6e89861db5fce9eea4532504f8341d;hp=0e773f5327d67d0a1630ec2e66b9a1f62a0d5ec8;hpb=e1f8907816cfc105a23766bf7daa101a2f38a367;p=lyx.git diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp index 0e773f5327..b48f10609f 100644 --- a/src/support/unicode.cpp +++ b/src/support/unicode.cpp @@ -14,6 +14,7 @@ #include "support/unicode.h" #include "support/debug.h" +#include "support/mutex.h" #include @@ -25,7 +26,6 @@ #include #include -#include using namespace std; @@ -67,7 +67,7 @@ struct IconvProcessor::Impl string tocode_; string fromcode_; - QMutex mutex_; // iconv() is not thread save + Mutex mutex_; // iconv() is not thread save, see #7240 }; @@ -124,7 +124,7 @@ bool IconvProcessor::init() int IconvProcessor::convert(char const * buf, size_t buflen, char * outbuf, size_t maxoutsize) { - QMutexLocker lock(&pimpl_->mutex_); + Mutex::Locker lock(&pimpl_->mutex_); if (buflen == 0) return 0;