Revision: 2386
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2386&view=rev
Author: ulteq
Date: 2012-01-30 03:17:48 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
[bugfixes] -Cleanup
Modified Paths:
--------------
branches/bugfixes/source/main/gui/LobbyGUI.cpp
branches/bugfixes/source/main/gui/LobbyGUI.h
Modified: branches/bugfixes/source/main/gui/LobbyGUI.cpp
===================================================================
--- branches/bugfixes/source/main/gui/LobbyGUI.cpp 2012-01-30 02:46:14 UTC
(rev 2385)
+++ branches/bugfixes/source/main/gui/LobbyGUI.cpp 2012-01-30 03:17:48 UTC
(rev 2386)
@@ -17,25 +17,15 @@
You should have received a copy of the GNU General Public License
along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef USE_MYGUI
+#pragma once
+
+#ifdef USE_MYGUI
+
#include "LobbyGUI.h"
#include "Scripting.h"
#include "InputEngine.h"
-#include "OgreLogManager.h"
-#include "Settings.h"
-#include "RoRFrameListener.h"
-#include "network.h"
-
-#include <MyGUI.h>
-
-#include "libircclient.h"
-
-#include <boost/algorithm/string/replace.hpp> // for replace_all
-
-// class
-
LobbyGUI::LobbyGUI() : current_tab(0), rotatingWait(0)
{
initialiseByAttributes(this);
@@ -95,7 +85,7 @@
Ogre::String realName = name;
- boost::algorithm::replace_all(name, "#", "##");
+ name = Ogre::StringUtil::replaceAll(name, "#", "##");
tabctx_t *t = &tabs[name];
@@ -280,8 +270,8 @@
Ogre::String realchannel = channel;
// escape #
- boost::algorithm::replace_all(channel, "#", "##");
- boost::algorithm::replace_all(txt, "#", "##");
+ channel =Ogre::StringUtil::replaceAll(channel, "#", "##");
+ txt = Ogre::StringUtil::replaceAll(txt, "#", "##");
if(tabs.find(channel) == tabs.end())
@@ -390,7 +380,7 @@
}
// unescape #
- boost::algorithm::replace_all(command, "##", "#");
+ command = Ogre::StringUtil::replaceAll(command, "##", "#");
if(current_tab->name.substr(0, 1) == "#")
{
@@ -453,5 +443,4 @@
}
-
-#endif //USE_MYGUI
+#endif // USE_MYGUI
Modified: branches/bugfixes/source/main/gui/LobbyGUI.h
===================================================================
--- branches/bugfixes/source/main/gui/LobbyGUI.h 2012-01-30 02:46:14 UTC
(rev 2385)
+++ branches/bugfixes/source/main/gui/LobbyGUI.h 2012-01-30 03:17:48 UTC
(rev 2386)
@@ -17,19 +17,15 @@
You should have received a copy of the GNU General Public License
along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef USE_MYGUI
+#ifdef USE_MYGUI
#ifndef LOBBYGUI_H__
#define LOBBYGUI_H__
-#include "RoRPrerequisites.h"
#include "Singleton.h"
#include "IRCWrapper.h"
#include "mygui/BaseLayout.h"
-#include <OgreLog.h>
-#include <OgreUTFString.h>
-
ATTRIBUTE_CLASS_LAYOUT(LobbyGUI, "Lobby.layout");
class LobbyGUI :
public wraps::BaseLayout,
@@ -99,5 +95,5 @@
#endif // LOBBYGUI_H__
-#endif //MYGUI
+#endif // USE_MYGUI
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
