Author: kuemmel
Date: Sat Jan 15 22:40:09 2011
New Revision: 37223
URL: http://www.lyx.org/trac/changeset/37223
Log:
update other build systems, use lyx::Mutex
Modified:
lyx-devel/trunk/development/scons/scons_manifest.py
lyx-devel/trunk/src/support/Makefile.am
lyx-devel/trunk/src/support/unicode.cpp
Modified: lyx-devel/trunk/development/scons/scons_manifest.py
==============================================================================
--- lyx-devel/trunk/development/scons/scons_manifest.py Sat Jan 15 22:06:28
2011 (r37222)
+++ lyx-devel/trunk/development/scons/scons_manifest.py Sat Jan 15 22:40:09
2011 (r37223)
@@ -308,6 +308,7 @@
lyxalgo.h
lyxlib.h
lyxtime.h
+ mutex.h
Messages.h
numpunct_lyx_char_type.h
os.h
@@ -348,6 +349,7 @@
lassert.cpp
lstrings.cpp
lyxtime.cpp
+ mutex.cpp
Messages.cpp
os.cpp
Package.cpp
Modified: lyx-devel/trunk/src/support/Makefile.am
==============================================================================
--- lyx-devel/trunk/src/support/Makefile.am Sat Jan 15 22:06:28 2011
(r37222)
+++ lyx-devel/trunk/src/support/Makefile.am Sat Jan 15 22:40:09 2011
(r37223)
@@ -71,6 +71,8 @@
lyxlib.h \
lyxtime.cpp \
lyxtime.h \
+ mutex.h \
+ mutex.cpp \
Messages.cpp \
Messages.h \
numpunct_lyx_char_type.h \
Modified: lyx-devel/trunk/src/support/unicode.cpp
==============================================================================
--- lyx-devel/trunk/src/support/unicode.cpp Sat Jan 15 22:06:28 2011
(r37222)
+++ lyx-devel/trunk/src/support/unicode.cpp Sat Jan 15 22:40:09 2011
(r37223)
@@ -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 @@
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 @@
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;
