update other build systems, use lyx::Mutex

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37223 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index e2d05e10530db1b3616d558d4ed5c7b78c297d06..cd163ad84003c6fe36661f2c6762f3923d0691d6 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -308,6 +308,7 @@ src_support_header_files = Split('''
     lyxalgo.h
     lyxlib.h
     lyxtime.h
+    mutex.h
     Messages.h
     numpunct_lyx_char_type.h
     os.h
@@ -348,6 +349,7 @@ src_support_files = Split('''
     lassert.cpp
     lstrings.cpp
     lyxtime.cpp
+    mutex.cpp
     Messages.cpp
     os.cpp
     Package.cpp

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index a6287330b4020b0c03edc100180a514ea501de3b..9a8fccf61c3ebe62061942462c557678602ee103 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -71,6 +71,8 @@ liblyxsupport_a_SOURCES = \
        lyxlib.h \
        lyxtime.cpp \
        lyxtime.h \
+       mutex.h \
+       mutex.cpp \
        Messages.cpp \
        Messages.h \
        numpunct_lyx_char_type.h \

diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp
index dec1e9c0c668a98c193836000ae456a0929ae5e8..b48f10609f7fe9315e257575aec432b9d8fcb1dc 100644 (file)
--- 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 <iconv.h>
 
@@ -25,7 +26,6 @@
 #include <ostream>
 #include <string>
 
-#include <QMutexLocker>
 
 using namespace std;
 
@@ -67,7 +67,7 @@ struct IconvProcessor::Impl
        string tocode_;
        string fromcode_;
 
-       QMutex mutex_; // iconv() is not thread save, see #7240
+       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;