Revision: 1672
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1672&view=rev
Author: rorthomas
Date: 2011-02-13 14:50:33 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
more StringVector fixes
Modified Paths:
--------------
trunk/source/main/gameplay/CacheSystem.cpp
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gameplay/TorqueCurve.cpp
trunk/source/main/gameplay/TorqueCurve.h
trunk/source/main/gameplay/skinmanager.cpp
trunk/source/main/gameplay/skinmanager.h
trunk/source/main/gfx/Skidmark.cpp
trunk/source/main/gfx/Skidmark.h
trunk/source/main/physics/Beam.h
trunk/source/main/physics/BeamSlideNode.cpp
trunk/source/main/physics/CmdKeyInertia.cpp
trunk/source/main/physics/CmdKeyInertia.h
trunk/source/main/physics/input_output/BeamLoadTruck.cpp
Modified: trunk/source/main/gameplay/CacheSystem.cpp
===================================================================
--- trunk/source/main/gameplay/CacheSystem.cpp 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/gameplay/CacheSystem.cpp 2011-02-13 14:50:33 UTC (rev
1672)
@@ -535,7 +535,7 @@
{
String mat = params[1];
Ogre::StringVector ar = StringUtil::split(mat," ");
- for(Ogre::vector < Ogre::String >::type::iterator it =
ar.begin(); it!=ar.end(); it++)
+ for(Ogre::StringVector::iterator it = ar.begin();
it!=ar.end(); it++)
t.materials.insert(*it);
}
}
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-13 14:43:37 UTC
(rev 1671)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-13 14:50:33 UTC
(rev 1672)
@@ -1118,7 +1118,7 @@
{
Ogre::StringVector str = StringUtil::split(cmd, "/");
// process args now
- for(Ogre::vector<String>::type::iterator it = str.begin();
it!=str.end(); it++)
+ for(Ogre::StringVector::iterator it = str.begin();
it!=str.end(); it++)
{
String argstr = *it;
Ogre::StringVector args = StringUtil::split(argstr,
":");
Modified: trunk/source/main/gameplay/TorqueCurve.cpp
===================================================================
--- trunk/source/main/gameplay/TorqueCurve.cpp 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/gameplay/TorqueCurve.cpp 2011-02-13 14:50:33 UTC (rev
1672)
@@ -93,7 +93,7 @@
return processLine(StringUtil::split(line, ","), model);
}
-int TorqueCurve::processLine(Ogre::vector< String >::type args, String model)
+int TorqueCurve::processLine(Ogre::StringVector args, String model)
{
// if its just one arguments, it must be a known model
if (args.size() == 1)
Modified: trunk/source/main/gameplay/TorqueCurve.h
===================================================================
--- trunk/source/main/gameplay/TorqueCurve.h 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/gameplay/TorqueCurve.h 2011-02-13 14:50:33 UTC (rev
1672)
@@ -95,7 +95,7 @@
* @param model Torque model name (i.e. 'turbodiesel')
* @return setTorqueModel() called if one argument given, 1 on error, 0
on success
*/
- int processLine(Ogre::vector< Ogre::String >::type args, Ogre::String
model);
+ int processLine(Ogre::StringVector args, Ogre::String model);
};
Modified: trunk/source/main/gameplay/skinmanager.cpp
===================================================================
--- trunk/source/main/gameplay/skinmanager.cpp 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/gameplay/skinmanager.cpp 2011-02-13 14:50:33 UTC (rev
1672)
@@ -139,11 +139,11 @@
}
//---------------------------------------------------------------------
-String SkinManager::joinString(Ogre::vector<String>::type params, String del,
int skipNo)
+String SkinManager::joinString(Ogre::StringVector params, String del, int
skipNo)
{
String res="";
int i=0;
- for(Ogre::vector<String>::type::iterator it=params.begin();
it!=params.end(); it++, i++)
+ for(Ogre::StringVector::iterator it=params.begin(); it!=params.end();
it++, i++)
{
if(i < skipNo) continue;
res += *it;
Modified: trunk/source/main/gameplay/skinmanager.h
===================================================================
--- trunk/source/main/gameplay/skinmanager.h 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/gameplay/skinmanager.h 2011-02-13 14:50:33 UTC (rev
1672)
@@ -57,7 +57,7 @@
void removeAll(void);
void reloadAll(bool reloadableOnly = true);
void reloadUnreferencedResources(bool reloadableOnly = true);
- Ogre::String joinString(Ogre::vector<Ogre::String>::type params,
Ogre::String del=" ", int skipNo=1);
+ Ogre::String joinString(Ogre::StringVector params, Ogre::String del="
", int skipNo=1);
protected:
Modified: trunk/source/main/gfx/Skidmark.cpp
===================================================================
--- trunk/source/main/gfx/Skidmark.cpp 2011-02-13 14:43:37 UTC (rev 1671)
+++ trunk/source/main/gfx/Skidmark.cpp 2011-02-13 14:50:33 UTC (rev 1672)
@@ -87,7 +87,7 @@
return 0;
}
-int SkidmarkManager::processLine(Ogre::vector< Ogre::String >::type args,
Ogre::String modelName)
+int SkidmarkManager::processLine(Ogre::StringVector args, Ogre::String
modelName)
{
// we only accept 4 arguments
if (args.size() != 4)
Modified: trunk/source/main/gfx/Skidmark.h
===================================================================
--- trunk/source/main/gfx/Skidmark.h 2011-02-13 14:43:37 UTC (rev 1671)
+++ trunk/source/main/gfx/Skidmark.h 2011-02-13 14:50:33 UTC (rev 1672)
@@ -58,7 +58,7 @@
protected:
int loadDefaultModels();
std::map <Ogre::String, std::vector<skidmark_config_t> > models;
- int processLine(Ogre::vector< Ogre::String >::type args, Ogre::String
model);
+ int processLine(Ogre::StringVector args, Ogre::String model);
};
class Skidmark
Modified: trunk/source/main/physics/Beam.h
===================================================================
--- trunk/source/main/physics/Beam.h 2011-02-13 14:43:37 UTC (rev 1671)
+++ trunk/source/main/physics/Beam.h 2011-02-13 14:50:33 UTC (rev 1672)
@@ -720,7 +720,7 @@
* @param railStrings list of node id's in string format
* @return same as getRails
*/
- Rail* parseRailString( const Ogre::vector<Ogre::String>::type&
railStrings);
+ Rail* parseRailString( const Ogre::StringVector &railStrings);
/**
* parses an array of nodes id's to generate a Rail
Modified: trunk/source/main/physics/BeamSlideNode.cpp
===================================================================
--- trunk/source/main/physics/BeamSlideNode.cpp 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/physics/BeamSlideNode.cpp 2011-02-13 14:50:33 UTC (rev
1672)
@@ -318,7 +318,7 @@
return NULL;
}
-Rail* Beam::parseRailString( const Ogre::vector<Ogre::String>::type &
railStrings)
+Rail* Beam::parseRailString( const Ogre::StringVector & railStrings)
{
std::vector<int> nodeids;
Modified: trunk/source/main/physics/CmdKeyInertia.cpp
===================================================================
--- trunk/source/main/physics/CmdKeyInertia.cpp 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/physics/CmdKeyInertia.cpp 2011-02-13 14:50:33 UTC (rev
1672)
@@ -170,7 +170,7 @@
return 0;
}
-int CmdKeyInertia::processLine(Ogre::vector< String >::type args, String
model)
+int CmdKeyInertia::processLine(Ogre::StringVector args, String model)
{
// we only accept 2 arguments
if (args.size() != 2)
Modified: trunk/source/main/physics/CmdKeyInertia.h
===================================================================
--- trunk/source/main/physics/CmdKeyInertia.h 2011-02-13 14:43:37 UTC (rev
1671)
+++ trunk/source/main/physics/CmdKeyInertia.h 2011-02-13 14:50:33 UTC (rev
1672)
@@ -48,7 +48,7 @@
};
Ogre::Real calculateCmdOutput(Ogre::Real time,Ogre::SimpleSpline
*spline);
- int processLine(Ogre::vector< Ogre::String >::type args, Ogre::String
model);
+ int processLine(Ogre::StringVector args, Ogre::String model);
cmdKeyInertia_s *cmdKeyInertia;
std::map < Ogre::String, Ogre::SimpleSpline > splines;
Modified: trunk/source/main/physics/input_output/BeamLoadTruck.cpp
===================================================================
--- trunk/source/main/physics/input_output/BeamLoadTruck.cpp 2011-02-13
14:43:37 UTC (rev 1671)
+++ trunk/source/main/physics/input_output/BeamLoadTruck.cpp 2011-02-13
14:50:33 UTC (rev 1672)
@@ -1588,7 +1588,7 @@
std::vector<float> gears;
- for(Ogre::vector< Ogre::String >::type::iterator it =
tmp.begin(); it != tmp.end(); it++)
+ for(Ogre::StringVector::iterator it = tmp.begin(); it
!= tmp.end(); it++)
{
float tmpf =
Ogre::StringConverter::parseReal(*it);
if( tmpf <= 0.0f ) break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
