summaryrefslogtreecommitdiff
path: root/src/gui/serverdialog.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-24 21:16:12 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-24 22:28:23 +0100
commita5690fa2a4cce2698225f1f558183f6fe306d860 (patch)
tree822d4e237412afd38008de04d9be11fd0718f101 /src/gui/serverdialog.cpp
parent054246ebffcdd20da72a8e464b40eaf64d484743 (diff)
downloadmana-a5690fa2a4cce2698225f1f558183f6fe306d860.tar.gz
mana-a5690fa2a4cce2698225f1f558183f6fe306d860.tar.bz2
mana-a5690fa2a4cce2698225f1f558183f6fe306d860.tar.xz
mana-a5690fa2a4cce2698225f1f558183f6fe306d860.zip
Introduced compile-time option to disable use of C++0x
This is in order to still support older compilers, in particular GCC 4.2.1, so that Mana may be compiled for Maemo 5. Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/gui/serverdialog.cpp')
-rw-r--r--src/gui/serverdialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index f9fcb597..49de7f38 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -90,13 +90,13 @@ ServersListModel::ServersListModel(ServerInfos *servers, ServerDialog *parent):
int ServersListModel::getNumberOfElements()
{
- MutexLocker lock = mParent->lock();
+ MutexLocker lock(mParent->getMutex());
return mServers->size();
}
std::string ServersListModel::getElementAt(int elementIndex)
{
- MutexLocker lock = mParent->lock();
+ MutexLocker lock(mParent->getMutex());
const ServerInfo &server = mServers->at(elementIndex);
std::string myServer;
myServer += server.hostname;