From a5690fa2a4cce2698225f1f558183f6fe306d860 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Fri, 24 Feb 2012 21:16:12 +0100
Subject: 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
---
 src/gui/serverdialog.cpp | 4 ++--
 src/gui/serverdialog.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui')

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;
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index eedf5134..cf9e62e7 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -113,7 +113,7 @@ class ServerDialog : public Window,
 
     protected:
         friend class ServersListModel;
-        MutexLocker lock() { return MutexLocker(&mMutex); }
+        Mutex *getMutex() { return &mMutex; }
 
         friend class CustomServerDialog;
         /**
-- 
cgit v1.2.3-70-g09d2