kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: dont set the namespace in STR_String.h - 'using namespace std', since this is included in many places.

Browse Source
This commit is contained in:
Campbell Barton 2012-02-23 02:36:30 +00:00
parent c8b53d2aaf
commit 190f5d1787
8 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_WindowManager.cpp
View File

@ -79,7 +79,7 @@ GHOST_TSuccess GHOST_WindowManager::removeWindow(const GHOST_IWindow* window)
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 @@ bool GHOST_WindowManager::getWindowFound(const GHOST_IWindow* window) const
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;
}

10
intern/string/STR_String.h
View File

@ -51,8 +51,6 @@
#include <cstring>
#include <cstdlib>
using namespace std;
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
@ -95,8 +93,10 @@ public:
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 @@ public:
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();

14
intern/string/intern/STR_String.cpp
View File

@ -699,23 +699,19 @@ rcSTR_String STR_String::Concat(const char *data, int len)
}
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;
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);
}

2
source/gameengine/Converter/KX_BlenderSceneConverter.h
View File

@ -39,6 +39,8 @@
#include "KX_ISceneConverter.h"
#include "KX_IpoConvert.h"
using namespace std;
class KX_WorldInfo;
class SCA_IActuator;
class SCA_IController;

2
source/gameengine/Expressions/Value.h
View File

@ -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

2
source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
View File

@ -32,6 +32,8 @@
#ifndef NG_LOOPBACKNETWORKDEVICEINTERFACE_H
#define NG_LOOPBACKNETWORKDEVICEINTERFACE_H
using namespace std;
#include <deque>
#include "NG_NetworkDeviceInterface.h"

2
source/gameengine/Network/NG_NetworkScene.h
View File

@ -45,6 +45,8 @@
#undef SendMessage
#endif
using namespace std;
class NG_NetworkDeviceInterface;
class NG_NetworkScene

2
source/gameengine/Rasterizer/RAS_ICanvas.h
View File

@ -36,6 +36,8 @@
#include "MEM_guardedalloc.h"
#endif
using namespace std;
class RAS_Rect;
/**