Revision: 44350
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44350
Author: campbellbarton
Date: 2012-02-23 02:36:30 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
code cleanup: dont set the namespace in STR_String.h - 'using namespace std',
since this is included in many places.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp
trunk/blender/intern/string/STR_String.h
trunk/blender/intern/string/intern/STR_String.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
trunk/blender/source/gameengine/Network/NG_NetworkScene.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp 2012-02-23
02:23:42 UTC (rev 44349)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp 2012-02-23
02:36:30 UTC (rev 44350)
@@ -79,7 +79,7 @@
endFullScreen();
}
else {
- vector<GHOST_IWindow*>::iterator result =
find(m_windows.begin(), m_windows.end(), window);
+ std::vector<GHOST_IWindow*>::iterator result =
find(m_windows.begin(), m_windows.end(), window);
if (result != m_windows.end()) {
setWindowInactive(window);
m_windows.erase(result);
@@ -99,7 +99,7 @@
found = true;
}
else {
- vector<GHOST_IWindow*>::const_iterator result =
find(m_windows.begin(), m_windows.end(), window);
+ std::vector<GHOST_IWindow*>::const_iterator result =
find(m_windows.begin(), m_windows.end(), window);
if (result != m_windows.end()) {
found = true;
}
Modified: trunk/blender/intern/string/STR_String.h
===================================================================
--- trunk/blender/intern/string/STR_String.h 2012-02-23 02:23:42 UTC (rev
44349)
+++ trunk/blender/intern/string/STR_String.h 2012-02-23 02:36:30 UTC (rev
44350)
@@ -51,8 +51,6 @@
#include <cstring>
#include <cstdlib>
-using namespace std;
-
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
@@ -95,8 +93,10 @@
inline void Clear()
{ Len = pData[0] = 0; }
inline const STR_String & Reverse()
{
- for (int i1=0, i2=Len-1; i1<i2; i1++, i2--)
- swap(pData[i1], pData[i2]); return *this;
+ for (int i1 = 0, i2 = Len - 1; i1 < i2; i1++, i2--) {
+ std::swap(pData[i1], pData[i2]);
+ return *this;
+ }
}
// Properties
@@ -133,7 +133,7 @@
int FindOneOf(const char *set, int pos = 0)
const;
int RFindOneOf(const char *set, int pos =
0) const;
- vector<STR_String> Explode(char c) const;
+ std::vector<STR_String> Explode(char c) const;
// Formatting
STR_String& Upper();
Modified: trunk/blender/intern/string/intern/STR_String.cpp
===================================================================
--- trunk/blender/intern/string/intern/STR_String.cpp 2012-02-23 02:23:42 UTC
(rev 44349)
+++ trunk/blender/intern/string/intern/STR_String.cpp 2012-02-23 02:36:30 UTC
(rev 44350)
@@ -699,23 +699,19 @@
}
-
-
-
-vector<STR_String> STR_String::Explode(char c) const
+std::vector<STR_String> STR_String::Explode(char c) const
{
- STR_String lcv = *this;
- vector<STR_String> uc;
+ STR_String lcv = *this;
+ std::vector<STR_String> uc;
while (lcv.Length())
{
int pos = lcv.Find(c);
- if (pos < 0)
- {
+ if (pos < 0) {
uc.push_back(lcv);
lcv.Clear();
- } else
- {
+ }
+ else {
uc.push_back(lcv.Left(pos));
lcv = lcv.Mid(pos+1);
}
Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2012-02-23 02:23:42 UTC (rev 44349)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2012-02-23 02:36:30 UTC (rev 44350)
@@ -39,6 +39,8 @@
#include "KX_ISceneConverter.h"
#include "KX_IpoConvert.h"
+using namespace std;
+
class KX_WorldInfo;
class SCA_IActuator;
class SCA_IController;
Modified: trunk/blender/source/gameengine/Expressions/Value.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.h 2012-02-23 02:23:42 UTC
(rev 44349)
+++ trunk/blender/source/gameengine/Expressions/Value.h 2012-02-23 02:36:30 UTC
(rev 44350)
@@ -26,6 +26,8 @@
#include <map> // array functionality for the propertylist
#include "STR_String.h" // STR_String class
+using namespace std;
+
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
Modified:
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
===================================================================
---
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
2012-02-23 02:23:42 UTC (rev 44349)
+++
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
2012-02-23 02:36:30 UTC (rev 44350)
@@ -32,6 +32,8 @@
#ifndef NG_LOOPBACKNETWORKDEVICEINTERFACE_H
#define NG_LOOPBACKNETWORKDEVICEINTERFACE_H
+using namespace std;
+
#include <deque>
#include "NG_NetworkDeviceInterface.h"
Modified: trunk/blender/source/gameengine/Network/NG_NetworkScene.h
===================================================================
--- trunk/blender/source/gameengine/Network/NG_NetworkScene.h 2012-02-23
02:23:42 UTC (rev 44349)
+++ trunk/blender/source/gameengine/Network/NG_NetworkScene.h 2012-02-23
02:36:30 UTC (rev 44350)
@@ -45,6 +45,8 @@
#undef SendMessage
#endif
+using namespace std;
+
class NG_NetworkDeviceInterface;
class NG_NetworkScene
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h 2012-02-23
02:23:42 UTC (rev 44349)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h 2012-02-23
02:36:30 UTC (rev 44350)
@@ -36,6 +36,8 @@
#include "MEM_guardedalloc.h"
#endif
+using namespace std;
+
class RAS_Rect;
/**
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
