Changeset 7221 in orxonox.OLD for trunk/src/util/track

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/util/track

Files:

• track_manager.cc (modified) (8 diffs)
• track_manager.h (modified) (3 diffs)

trunk/src/util/track/track_manager.cc

@@ -123 +123 @@
  * @returns The TrackElement if Found, NULL otherwise.
 */
-TrackElement* TrackElement::findByName(const char* trackName)
+TrackElement* TrackElement::findByName(const std::string& trackName)
 {
   // return if Found.
@@ -532 +532 @@
  * @param trackName the Name of the Track to work on
 */
-void TrackManager::workOnS(const char* trackName)
+void TrackManager::workOnS(const std::string& trackName)
 {
   TrackElement* tmpElem = this->firstTrackElem->findByName(trackName);
@@ -657 +657 @@
    @todo this must be better
 */
-void TrackManager::setSavePointS(const char* nextElementName)
+void TrackManager::setSavePointS(const std::string& nextElementName)
 {
   this->setSavePoint(NULL);
@@ -725 +725 @@
   for(int i = 0; i < count; i++)
     {
-      this->firstTrackElem->findByID(trackIDs[i])->setName(va_arg(name, const char*));
+      this->firstTrackElem->findByID(trackIDs[i])->setName(va_arg(name, const std::string&));
     }
   va_end(name);
@@ -734 +734 @@
    \see TrackManager::fork(unsigned int count, ...)
 */
-void TrackManager::forkS(const char* forkString)
+void TrackManager::forkS(const std::string& forkString)
 {
   SubString strings(forkString, ',');
@@ -860 +860 @@
   for(int i = 0; i < count; i++)
     {
-      const char* name = va_arg (NAME, char*);
+      const std::string& name = va_arg (NAME, char*);
       TrackElement* tmpElem = this->firstTrackElem->findByName(name);
       if (tmpElem)
@@ -875 +875 @@
    \see void TrackManager::join(unsigned int count, ...)
 */
-void TrackManager::joinS(const char* joinString)
+void TrackManager::joinS(const std::string& joinString)
 {
   SubString strings(joinString, ',');
@@ -884 +884 @@
   for(unsigned int i = 0; i < strings.getCount(); i++)
     {
-      TrackElement* tmpElem = this->firstTrackElem->findByName(strings.getString(i));
+      TrackElement* tmpElem = this->firstTrackElem->findByName(strings.getString(i).c_str());
       if (tmpElem != NULL)
         trackIDs[i] = tmpElem->ID;
       else
       {
-        PRINTF(1)("Trying to join a Track, of which the name does not exist: %s\n", strings.getString(i));
+        PRINTF(1)("Trying to join a Track, of which the name does not exist: %s\n", strings.getString(i).c_str());
         trackIDs[i] = -1;
       }

trunk/src/util/track/track_manager.h

@@ -46 +46 @@
 
   TrackElement* findByID(unsigned int trackID);
-  TrackElement* findByName(const char* trackName);
+  TrackElement* findByName(const std::string& trackName);
   bool backLoopCheck() const;
 
@@ -142 +142 @@
   // Methods to change the Path (initialisation)
   void workOn(unsigned int trackID);
-  void workOnS(const char* trackName);
+  void workOnS(const std::string& trackName);
 
   /** \see setCurveType(CurveType curveType, TrackElement* trackElem); @param curveType the type of the Curve */
@@ -153 +153 @@
   void addHotPoint(float x, float y, float z);
   int addHotPointV(Vector newPoint, TrackElement* trackElem = NULL);
-  void setSavePointS(const char* nextElementName);
+  void setSavePointS(const std::string& nextElementName);
   void setSavePoint(TrackElement* trackElem = NULL);
   void fork(unsigned int count, ...);
   void forkS(unsigned int count, ...);
-  void forkS(const char* forkString);
+  void forkS(const std::string& forkString);
   void forkV(unsigned int count, int* trackIDs, char** trackNames, TrackElement* trackElem = NULL);
   void condition(unsigned int trackID, CONDITION cond, void* subject);
   void condition(CONDITION cond, void* subject, TrackElement* trackElem = NULL);
   void join(unsigned int count, ...);
-  void joinS(const char* joinString);
+  void joinS(const std::string& joinString);
   void joinS(unsigned int cound, ...);
   void joinV(unsigned int count, int* trackIDs);