summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 15:15:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-19 16:39:56 +0300
commit10badd2c0e099c7611f6d23b3973e54f210bc172 (patch)
tree3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/net
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadmv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/charhandler.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net/charhandler.cpp b/src/net/charhandler.cpp
index 016b72cbf..add4fa459 100644
--- a/src/net/charhandler.cpp
+++ b/src/net/charhandler.cpp
@@ -25,7 +25,8 @@
#include "debug.h"
-using namespace Net;
+namespace Net
+{
void CharHandler::updateCharSelectDialog()
{
@@ -38,3 +39,5 @@ void CharHandler::unlockCharSelectDialog()
if (mCharSelectDialog)
mCharSelectDialog->unlock();
}
+
+}