Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2414] trunk/OpenMPT/soundlib
|
From: <man...@us...> - 2013-06-27 13:41:14
|
Revision: 2414
http://sourceforge.net/p/modplug/code/2414
Author: manxorist
Date: 2013-06-27 13:41:04 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
[Ref] Do not import standard library types into global namespace, qualify them with std:: instead.
Modified Paths:
--------------
trunk/OpenMPT/soundlib/tuning.cpp
trunk/OpenMPT/soundlib/tuning.h
trunk/OpenMPT/soundlib/tuningCollection.cpp
trunk/OpenMPT/soundlib/tuningbase.cpp
trunk/OpenMPT/soundlib/tuningbase.h
trunk/OpenMPT/soundlib/tuningcollection.h
Modified: trunk/OpenMPT/soundlib/tuning.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuning.cpp 2013-06-27 13:03:26 UTC (rev 2413)
+++ trunk/OpenMPT/soundlib/tuning.cpp 2013-06-27 13:41:04 UTC (rev 2414)
@@ -21,15 +21,15 @@
typedef CTuningRTI::NOTEINDEXTYPE NOTEINDEXTYPE;
typedef CTuningRTI::UNOTEINDEXTYPE UNOTEINDEXTYPE;
typedef CTuningRTI::STEPINDEXTYPE STEPINDEXTYPE;
-typedef CTuningRTI::USTEPINDEXTYPE USTEPINDEXTYPE;
+typedef CTuningRTI::USTEPINDEXTYPE USTEPINDEXTYPE;
-const string CTuningRTI::s_DerivedclassID = "RTI";
+const std::string CTuningRTI::s_DerivedclassID = "RTI";
namespace CTuningS11n
{
void ReadStr(std::istream& iStrm, std::string& str, const size_t);
void ReadNoteMap(std::istream& iStrm, CTuningBase::NOTENAMEMAP& m, const size_t);
- void ReadRatioTable(std::istream& iStrm, vector<CTuningRTI::RATIOTYPE>& v, const size_t);
+ void ReadRatioTable(std::istream& iStrm, std::vector<CTuningRTI::RATIOTYPE>& v, const size_t);
void WriteNoteMap(std::ostream& oStrm, const CTUNINGBASE::NOTENAMEMAP& m);
void WriteStr(std::ostream& oStrm, const std::string& str);
@@ -90,7 +90,7 @@
}
-bool CTuningRTI::CreateRatioTableGG(const vector<RATIOTYPE>& v, const RATIOTYPE r, const VRPAIR& vr, const NOTEINDEXTYPE ratiostartpos)
+bool CTuningRTI::CreateRatioTableGG(const std::vector<RATIOTYPE>& v, const RATIOTYPE r, const VRPAIR& vr, const NOTEINDEXTYPE ratiostartpos)
//-------------------------------------------------------------------------------------------------
{
if(v.size() == 0 || r <= 0) return true;
@@ -116,7 +116,7 @@
}
-bool CTuningRTI::ProCreateGroupGeometric(const vector<RATIOTYPE>& v, const RATIOTYPE& r, const VRPAIR& vr, const NOTEINDEXTYPE ratiostartpos)
+bool CTuningRTI::ProCreateGroupGeometric(const std::vector<RATIOTYPE>& v, const RATIOTYPE& r, const VRPAIR& vr, const NOTEINDEXTYPE ratiostartpos)
//---------------------------------------------------------------------
{
//Note: Setting finestep is handled by base class when CreateGroupGeometric is called.
@@ -156,7 +156,7 @@
{
const NOTEINDEXTYPE pos = ((x % m_GroupSize) + m_GroupSize) % m_GroupSize;
const NOTEINDEXTYPE middlePeriodNumber = 5;
- string rValue;
+ std::string rValue;
NNM_CITER nmi = m_NoteNameMap.find(pos);
if(nmi != m_NoteNameMap.end())
{
@@ -371,7 +371,7 @@
}
-CTuningBase* CTuningRTI::Deserialize(istream& iStrm)
+CTuningBase* CTuningRTI::Deserialize(std::istream& iStrm)
//--------------------------------------------------
{
if(iStrm.fail())
@@ -467,7 +467,7 @@
}
-CTUNINGBASE::SERIALIZATION_RETURN_TYPE CTuningRTI::Serialize(ostream& outStrm) const
+CTUNINGBASE::SERIALIZATION_RETURN_TYPE CTuningRTI::Serialize(std::ostream& outStrm) const
//----------------------------------------------------------------------------------
{
srlztn::Ssb ssb(outStrm);
@@ -536,7 +536,7 @@
}
-void ReadRatioTable(std::istream& iStrm, vector<CTuningRTI::RATIOTYPE>& v, const size_t)
+void ReadRatioTable(std::istream& iStrm, std::vector<CTuningRTI::RATIOTYPE>& v, const size_t)
//------------------------------------------------------------------------------------------
{
uint64 val;
Modified: trunk/OpenMPT/soundlib/tuning.h
===================================================================
--- trunk/OpenMPT/soundlib/tuning.h 2013-06-27 13:03:26 UTC (rev 2413)
+++ trunk/OpenMPT/soundlib/tuning.h 2013-06-27 13:41:04 UTC (rev 2414)
@@ -63,21 +63,21 @@
virtual STEPINDEXTYPE GetStepDistance(const NOTEINDEXTYPE& noteFrom, const STEPINDEXTYPE& stepDistFrom, const NOTEINDEXTYPE& noteTo, const STEPINDEXTYPE& stepDistTo) const
{return GetStepDistance(noteFrom, noteTo) + stepDistTo - stepDistFrom;}
- static CTuningBase* Deserialize(istream& inStrm);
+ static CTuningBase* Deserialize(std::istream& inStrm);
static uint32 GetVersion() {return s_SerializationVersion;}
//Try to read old version (v.3) and return pointer to new instance if succesfull, else nullptr.
- static CTuningRTI* DeserializeOLD(istream&) {return 0;}
+ static CTuningRTI* DeserializeOLD(std::istream&) {return 0;}
- SERIALIZATION_RETURN_TYPE Serialize(ostream& out) const;
+ SERIALIZATION_RETURN_TYPE Serialize(std::ostream& out) const;
public:
//PUBLIC CONSTRUCTORS/DESTRUCTORS:
- CTuningRTI(const vector<RATIOTYPE>& ratios,
+ CTuningRTI(const std::vector<RATIOTYPE>& ratios,
const NOTEINDEXTYPE& stepMin = s_StepMinDefault,
- const string& name = "")
+ const std::string& name = "")
: CTuning(name)
{
SetDummyValues();
@@ -90,9 +90,9 @@
CTuningRTI() {SetDummyValues();}
- CTuningRTI(const string& name) : CTuning(name) {SetDummyValues();}
+ CTuningRTI(const std::string& name) : CTuning(name) {SetDummyValues();}
- CTuningRTI(const NOTEINDEXTYPE& stepMin, const string& name) : CTuning(name)
+ CTuningRTI(const NOTEINDEXTYPE& stepMin, const std::string& name) : CTuning(name)
{
SetDummyValues();
m_StepMin = stepMin;
@@ -103,7 +103,7 @@
//BEGIN PROTECTED VIRTUALS:
protected:
bool ProSetRatio(const NOTEINDEXTYPE&, const RATIOTYPE&);
- bool ProCreateGroupGeometric(const vector<RATIOTYPE>&, const RATIOTYPE&, const VRPAIR&, const NOTEINDEXTYPE ratiostartpos);
+ bool ProCreateGroupGeometric(const std::vector<RATIOTYPE>&, const RATIOTYPE&, const VRPAIR&, const NOTEINDEXTYPE ratiostartpos);
bool ProCreateGeometric(const UNOTEINDEXTYPE&, const RATIOTYPE&, const VRPAIR&);
void ProSetFineStepCount(const USTEPINDEXTYPE&);
@@ -126,7 +126,7 @@
protected:
//BEGIN PROTECTED CLASS SPECIFIC METHODS:
//GroupGeometric.
- bool CreateRatioTableGG(const vector<RATIOTYPE>&, const RATIOTYPE, const VRPAIR& vr, const NOTEINDEXTYPE ratiostartpos);
+ bool CreateRatioTableGG(const std::vector<RATIOTYPE>&, const RATIOTYPE, const VRPAIR& vr, const NOTEINDEXTYPE ratiostartpos);
//Note: Stepdiff should be in range [1, finestepcount]
virtual RATIOTYPE GetRatioFine(const NOTEINDEXTYPE& note, USTEPINDEXTYPE stepDiff) const;
@@ -136,7 +136,7 @@
//For example GetRefNote(-1) is to return note :'groupsize-1'.
NOTEINDEXTYPE GetRefNote(NOTEINDEXTYPE note) const;
- virtual const string& GetDerivedClassID() const {return s_DerivedclassID;}
+ virtual const std::string& GetDerivedClassID() const {return s_DerivedclassID;}
private:
//PRIVATE METHODS:
@@ -157,10 +157,10 @@
//NOTE: Update SetDummyValues when adding members.
//Noteratios
- vector<RATIOTYPE> m_RatioTable;
+ std::vector<RATIOTYPE> m_RatioTable;
//'Fineratios'
- vector<RATIOTYPE> m_RatioTableFine;
+ std::vector<RATIOTYPE> m_RatioTableFine;
//The lowest index of note in the table
NOTEINDEXTYPE m_StepMin;
@@ -179,7 +179,7 @@
mutable UNOTEINDEXTYPE m_SerHelperRatiotableSize;
- static const string s_DerivedclassID;
+ static const std::string s_DerivedclassID;
}; //End: CTuningRTI declaration.
Modified: trunk/OpenMPT/soundlib/tuningCollection.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningCollection.cpp 2013-06-27 13:03:26 UTC (rev 2413)
+++ trunk/OpenMPT/soundlib/tuningCollection.cpp 2013-06-27 13:41:04 UTC (rev 2414)
@@ -37,7 +37,7 @@
void ReadStr(std::istream& iStrm, std::string& str, const size_t);
void ReadNoteMap(std::istream& iStrm, CTuningBase::NOTENAMEMAP& m, const size_t);
- void ReadRatioTable(std::istream& iStrm, vector<CTuningRTI::RATIOTYPE>& v, const size_t);
+ void ReadRatioTable(std::istream& iStrm, std::vector<CTuningRTI::RATIOTYPE>& v, const size_t);
void WriteStr(std::ostream& oStrm, const std::string& str);
void ReadTuning(istream& iStrm, CTuningCollection& Tc, const size_t) {Tc.AddTuning(iStrm, true);}
@@ -47,7 +47,7 @@
using namespace CTuningS11n;
-CTuningCollection::CTuningCollection(const string& name) : m_Name(name), m_EditMask(EM_ALLOWALL)
+CTuningCollection::CTuningCollection(const std::string& name) : m_Name(name), m_EditMask(EM_ALLOWALL)
//------------------------------------
{
if(m_Name.size() > GetNameLengthMax()) m_Name.resize(GetNameLengthMax());
@@ -70,7 +70,7 @@
m_DeletedTunings.clear();
}
-CTuning* CTuningCollection::FindTuning(const string& name) const
+CTuning* CTuningCollection::FindTuning(const std::string& name) const
//------------------------------------------------------
{
for(size_t i = 0; i<m_Tunings.size(); i++)
@@ -88,13 +88,13 @@
}
-CTuning* CTuningCollection::GetTuning(const string& name)
+CTuning* CTuningCollection::GetTuning(const std::string& name)
//----------------------------------------------
{
return FindTuning(name);
}
-const CTuning* CTuningCollection::GetTuning(const string& name) const
+const CTuning* CTuningCollection::GetTuning(const std::string& name) const
//-------------------------------------------------------------------
{
return FindTuning(name);
@@ -353,7 +353,7 @@
}
-string CTuningCollection::GetEditMaskString() const
+std::string CTuningCollection::GetEditMaskString() const
//-------------------------------------------------
{
std::bitset<16> mask(m_EditMask);
Modified: trunk/OpenMPT/soundlib/tuningbase.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.cpp 2013-06-27 13:03:26 UTC (rev 2413)
+++ trunk/OpenMPT/soundlib/tuningbase.cpp 2013-06-27 13:41:04 UTC (rev 2414)
@@ -94,7 +94,7 @@
if(allowExactnamecopy)
to.m_TuningName = from.m_TuningName;
else
- to.m_TuningName = string("Copy of ") + from.m_TuningName;
+ to.m_TuningName = std::string("Copy of ") + from.m_TuningName;
to.m_NoteNameMap = from.m_NoteNameMap;
to.m_EditMask = from.m_EditMask;
@@ -165,7 +165,7 @@
}
TEMPLATEDEC
-string CTUNINGBASE::GetTuningTypeStr(const TUNINGTYPE& tt)
+std::string CTUNINGBASE::GetTuningTypeStr(const TUNINGTYPE& tt)
//----------------------------------------------------------------
{
if(tt == TT_GENERAL)
@@ -220,7 +220,7 @@
}
TEMPLATEDEC
-bool CTUNINGBASE::SetNoteName(const NOTEINDEXTYPE& n, const string& str)
+bool CTUNINGBASE::SetNoteName(const NOTEINDEXTYPE& n, const std::string& str)
//-----------------------------------------------------------------------
{
if(MayEdit(EM_NOTENAME))
@@ -283,7 +283,7 @@
if(s < 1 || r <= 0 || startindex < GetValidityRange().first)
return true;
- vector<RATIOTYPE> v;
+ std::vector<RATIOTYPE> v;
v.reserve(s);
for(NOTEINDEXTYPE i = startindex; i<startindex+s; i++)
v.push_back(GetRatio(i));
@@ -291,7 +291,7 @@
}
TEMPLATEDEC
-bool CTUNINGBASE::CreateGroupGeometric(const vector<RATIOTYPE>& v, const RATIOTYPE& r, const VRPAIR vr, const NOTEINDEXTYPE ratiostartpos)
+bool CTUNINGBASE::CreateGroupGeometric(const std::vector<RATIOTYPE>& v, const RATIOTYPE& r, const VRPAIR vr, const NOTEINDEXTYPE ratiostartpos)
//------------------------------------------------------------------------------------------
{
if(MayEdit(EM_RATIOS) &&
@@ -425,7 +425,7 @@
TEMPLATEDEC
-bool CTUNINGBASE::DeserializeOLD(istream& inStrm)
+bool CTUNINGBASE::DeserializeOLD(std::istream& inStrm)
//------------------------------------------------
{
char begin[8];
@@ -457,7 +457,7 @@
for(size_t i = 0; i<size; i++)
{
NOTEINDEXTYPE n;
- string str;
+ std::string str;
inStrm.read(reinterpret_cast<char*>(&n), sizeof(n));
if(srlztn::StringFromBinaryStream<uint8>(inStrm, str))
return SERIALIZATION_FAILURE;
Modified: trunk/OpenMPT/soundlib/tuningbase.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.h 2013-06-27 13:03:26 UTC (rev 2413)
+++ trunk/OpenMPT/soundlib/tuningbase.h 2013-06-27 13:41:04 UTC (rev 2414)
@@ -29,11 +29,6 @@
#include <limits>
#include "../common/misc_util.h"
#include "../common/typedefs.h"
-using std::string;
-using std::vector;
-using std::istream;
-using std::ostream;
-using std::map;
namespace srlztn {class Ssb;}
@@ -158,7 +153,7 @@
virtual bool Multiply(const RATIOTYPE&);
//Create GroupGeometric tuning of *this using virtual ProCreateGroupGeometric.
- bool CreateGroupGeometric(const vector<RATIOTYPE>&, const RATIOTYPE&, const VRPAIR vr, const NOTEINDEXTYPE ratiostartpos);
+ bool CreateGroupGeometric(const std::vector<RATIOTYPE>&, const RATIOTYPE&, const VRPAIR vr, const NOTEINDEXTYPE ratiostartpos);
//Create GroupGeometric of *this using ratios from 'itself' and ratios starting from
//position given as third argument.
@@ -168,15 +163,15 @@
bool CreateGeometric(const UNOTEINDEXTYPE& p, const RATIOTYPE& r) {return CreateGeometric(p,r,GetValidityRange());}
bool CreateGeometric(const UNOTEINDEXTYPE&, const RATIOTYPE&, const VRPAIR vr);
- virtual SERIALIZATION_RETURN_TYPE Serialize(ostream& /*out*/) const {return false;}
+ virtual SERIALIZATION_RETURN_TYPE Serialize(std::ostream& /*out*/) const {return false;}
NOTESTR GetNoteName(const NOTEINDEXTYPE& x) const;
- void SetName(const string& s);
+ void SetName(const std::string& s);
- string GetName() const {return m_TuningName;}
+ std::string GetName() const {return m_TuningName;}
- bool SetNoteName(const NOTEINDEXTYPE&, const string&);
+ bool SetNoteName(const NOTEINDEXTYPE&, const std::string&);
bool ClearNoteName(const NOTEINDEXTYPE& n, const bool clearAll = false);
@@ -184,7 +179,7 @@
TUNINGTYPE GetTuningType() const {return m_TuningType;}
- static string GetTuningTypeStr(const TUNINGTYPE& tt);
+ static std::string GetTuningTypeStr(const TUNINGTYPE& tt);
static TUNINGTYPE GetTuningType(const char* str);
bool IsOfType(const TUNINGTYPE& type) const;
@@ -225,7 +220,7 @@
EDITMASK GetEditMask() const {return m_EditMask;}
- bool DeserializeOLD(istream&);
+ bool DeserializeOLD(std::istream&);
virtual ~CTuningBase() {};
@@ -240,7 +235,7 @@
virtual NOTESTR ProGetNoteName(const NOTEINDEXTYPE&) const;
//The two methods below return false if action was done, true otherwise.
- virtual bool ProCreateGroupGeometric(const vector<RATIOTYPE>&, const RATIOTYPE&, const VRPAIR&, const NOTEINDEXTYPE /*ratiostartpos*/) {return true;}
+ virtual bool ProCreateGroupGeometric(const std::vector<RATIOTYPE>&, const RATIOTYPE&, const VRPAIR&, const NOTEINDEXTYPE /*ratiostartpos*/) {return true;}
virtual bool ProCreateGeometric(const UNOTEINDEXTYPE&, const RATIOTYPE&, const VRPAIR&) {return true;}
virtual VRPAIR ProSetValidityRange(const VRPAIR&) {return GetValidityRange();}
@@ -263,7 +258,7 @@
TUNINGTYPE GetType() const {return m_TuningType;}
//This is appended to baseclassID in serialization with which objects are identified when loading.
- virtual const string& GetDerivedClassID() const = 0;
+ virtual const std::string& GetDerivedClassID() const = 0;
//Return true if data loading failed, false otherwise.
virtual bool ProProcessUnserializationdata() = 0;
@@ -280,7 +275,7 @@
//BEGIN: DATA MEMBERS
protected:
- string m_TuningName;
+ std::string m_TuningName;
EDITMASK m_EditMask; //Behavior: true <~> allow modification
TUNINGTYPE m_TuningType;
NOTENAMEMAP m_NoteNameMap;
@@ -290,7 +285,7 @@
//END DATA MEMBERS
protected:
- CTuningBase(const string name = "Unnamed") :
+ CTuningBase(const std::string name = "Unnamed") :
m_TuningName(name),
m_EditMask(uint16_max), //All bits to true - allow all by default.
m_TuningType(TT_GENERAL), //Unspecific tuning by default.
@@ -299,8 +294,8 @@
private:
CTuningBase(CTuningBase&) {}
CTuningBase& operator=(const CTuningBase&) {return *this;}
- static void ReadNotenamemapPair(istream& iStrm, TYPENAME NOTENAMEMAP::value_type& val, const size_t);
- static void WriteNotenamemappair(ostream& oStrm, const TYPENAME NOTENAMEMAP::value_type& val, const size_t);
+ static void ReadNotenamemapPair(std::istream& iStrm, TYPENAME NOTENAMEMAP::value_type& val, const size_t);
+ static void WriteNotenamemappair(std::ostream& oStrm, const TYPENAME NOTENAMEMAP::value_type& val, const size_t);
public:
static const char* s_TuningDescriptionGeneral;
@@ -330,7 +325,7 @@
}
TEMPLATEDEC
-inline void CTUNINGBASE::SetName(const string& s)
+inline void CTUNINGBASE::SetName(const std::string& s)
//-----------------------------------------------
{
if(MayEdit(EM_NAME)) m_TuningName = s;
Modified: trunk/OpenMPT/soundlib/tuningcollection.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningcollection.h 2013-06-27 13:03:26 UTC (rev 2413)
+++ trunk/OpenMPT/soundlib/tuningcollection.h 2013-06-27 13:41:04 UTC (rev 2414)
@@ -18,7 +18,7 @@
namespace CTuningS11n
{
- void ReadTuning(istream& iStrm, CTuningCollection& Tc, const size_t);
+ void ReadTuning(std::istream& iStrm, CTuningCollection& Tc, const size_t);
}
@@ -34,7 +34,7 @@
//If changing this, see whether serialization should be
//modified as well.
- typedef vector<CTuning*> TUNINGVECTOR;
+ typedef std::vector<CTuning*> TUNINGVECTOR;
typedef TUNINGVECTOR::iterator TITER; //Tuning ITERator.
typedef TUNINGVECTOR::const_iterator CTITER;
@@ -66,13 +66,13 @@
//BEGIN INTERFACE:
public:
- CTuningCollection(const string& name = "");
+ CTuningCollection(const std::string& name = "");
~CTuningCollection();
//Note: Given pointer is deleted by CTuningCollection
//at some point.
bool AddTuning(CTuning* const pT);
- bool AddTuning(istream& inStrm) {return AddTuning(inStrm, false);}
+ bool AddTuning(std::istream& inStrm) {return AddTuning(inStrm, false);}
bool Remove(const size_t i);
bool Remove(const CTuning*);
@@ -83,28 +83,28 @@
const EDITMASK& GetEditMask() const {return m_EditMask;}
- string GetEditMaskString() const;
+ std::string GetEditMaskString() const;
CTuning& GetTuning(size_t i) {return *m_Tunings.at(i);}
const CTuning& GetTuning(size_t i) const {return *m_Tunings.at(i);}
- CTuning* GetTuning(const string& name);
- const CTuning* GetTuning(const string& name) const;
+ CTuning* GetTuning(const std::string& name);
+ const CTuning* GetTuning(const std::string& name) const;
size_t GetNumTunings() const {return m_Tunings.size();}
- const string& GetName() const {return m_Name;}
+ const std::string& GetName() const {return m_Name;}
void SetSavefilePath(const std::string &psz) {m_SavefilePath = psz;}
- const string& GetSaveFilePath() const {return m_SavefilePath;}
+ const std::string& GetSaveFilePath() const {return m_SavefilePath;}
- string GetVersionString() const {return Stringify(static_cast<int>(s_SerializationVersion));}
+ std::string GetVersionString() const {return Stringify(static_cast<int>(s_SerializationVersion));}
size_t GetNameLengthMax() const {return 256;}
//Serialization/unserialisation
- bool Serialize(ostream&) const;
+ bool Serialize(std::ostream&) const;
bool Serialize() const;
- bool Deserialize(istream&);
+ bool Deserialize(std::istream&);
bool Deserialize();
//Transfer tuning pT from pTCsrc to pTCdest
@@ -118,25 +118,25 @@
private:
//BEGIN: SERIALIZABLE DATA MEMBERS
TUNINGVECTOR m_Tunings; //The actual tuningobjects are stored as deletable pointers here.
- string m_Name;
+ std::string m_Name;
EDITMASK m_EditMask;
//END: SERIALIZABLE DATA MEMBERS
//BEGIN: NONSERIALIZABLE DATA MEMBERS
TUNINGVECTOR m_DeletedTunings; //See Remove()-method for explanation of this.
- string m_SavefilePath;
+ std::string m_SavefilePath;
//END: NONSERIALIZABLE DATA MEMBERS
//END: DATA MEMBERS
- friend void CTuningS11n::ReadTuning(istream& iStrm, CTuningCollection& Tc, const size_t);
+ friend void CTuningS11n::ReadTuning(std::istream& iStrm, CTuningCollection& Tc, const size_t);
//BEGIN PRIVATE METHODS
private:
- CTuning* FindTuning(const string& name) const;
+ CTuning* FindTuning(const std::string& name) const;
size_t FindTuning(const CTuning* const) const;
- bool AddTuning(istream& inStrm, const bool ignoreEditmask);
+ bool AddTuning(std::istream& inStrm, const bool ignoreEditmask);
bool Remove(TITER removable, bool moveToTrashBin = true);
@@ -144,7 +144,7 @@
CTuningCollection& operator=(const CTuningCollection&) {return *this;}
CTuningCollection(const CTuningCollection&) {}
- bool DeserializeOLD(istream&, bool& loadingSuccessful);
+ bool DeserializeOLD(std::istream&, bool& loadingSuccessful);
//END PRIVATE METHODS.
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
