Index: src/libchengine/TSpeedTracker.h =================================================================== diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r1019bc9df4e044491b7102c37c8cac33cf56fb4a --- src/libchengine/TSpeedTracker.h (.../TSpeedTracker.h) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) +++ src/libchengine/TSpeedTracker.h (.../TSpeedTracker.h) (revision 1019bc9df4e044491b7102c37c8cac33cf56fb4a) @@ -1,7 +1,7 @@ #ifndef __TSPEEDTRACKER_H__ #define __TSPEEDTRACKER_H__ -#include "TString.h" +#include "../libstring/TString.h" namespace chengine { @@ -19,8 +19,8 @@ // retrieves speed per second double GetSpeed() const; - TString ToString() const; - void FromString(const TString& strData); + string::TString ToString() const; + void FromString(const string::TString& strData); private: static double NormalizeValueByTime(unsigned long long ullValue, unsigned long long ullTime, unsigned long long ullNormalizeTime = 1000);