summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs/qicucodec_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-03 11:40:35 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-04 00:52:14 +0200
commit4e542d958a8fa81c91e55c1358e15c84e34d15de (patch)
tree0dae9c119fad275a0f3a062b1b3920edf1eda77d /src/corelib/codecs/qicucodec_p.h
parent0715e1e6c2d38776cd9d5661639ce517f685fa6f (diff)
ICU: Mark which functions are threadsafe and which ones aren't
Mark the thread-safe functions with the \threadsafe doc marker. This includes public API, which should be thread-safe anyway. The thread-unsafe functions are marked "\nonreentrant" already. In addition, I renamed the functions that must be called with locked mutexes to Unlocked, following the convention in other libraries like libdbus-1. Change-Id: Ibd93d1266149767f546c8e82959b73c138008469 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/codecs/qicucodec_p.h')
-rw-r--r--src/corelib/codecs/qicucodec_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h
index 0a8ac7d996..2d3f21481d 100644
--- a/src/corelib/codecs/qicucodec_p.h
+++ b/src/corelib/codecs/qicucodec_p.h
@@ -67,10 +67,10 @@ public:
static QList<QByteArray> availableCodecs();
static QList<int> availableMibs();
- static QTextCodec *defaultCodec();
+ static QTextCodec *defaultCodecUnlocked();
- static QTextCodec *codecForName(const char *name);
- static QTextCodec *codecForMib(int mib);
+ static QTextCodec *codecForNameUnlocked(const char *name);
+ static QTextCodec *codecForMibUnlocked(int mib);
QString convertToUnicode(const char *, int, ConverterState *) const;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const;