diff -r 6e80f038e8df -r c4b96bc41298 src/history.h --- a/src/history.h Fri May 24 04:34:20 2013 +0300 +++ b/src/history.h Fri May 24 15:23:56 2013 +0300 @@ -94,12 +94,12 @@ public: IMPLEMENT_HISTORY_TYPE (Edit) - std::vector ulaIndices; - std::vector paOldObjs, paNewObjs; + vector ulaIndices; + vector paOldObjs, paNewObjs; EditHistory () {} - EditHistory (std::vector ulaIndices, std::vector paOldObjs, - std::vector paNewObjs) : + EditHistory (vector ulaIndices, vector paOldObjs, + vector paNewObjs) : ulaIndices (ulaIndices), paOldObjs (paOldObjs), paNewObjs (paNewObjs) {} void addEntry (LDObject* const oldObj, LDObject* const newObj); @@ -114,10 +114,10 @@ public: IMPLEMENT_HISTORY_TYPE (ListMove) - std::vector ulaIndices; + vector ulaIndices; bool bUp; - std::vector getObjects (short ofs); + vector getObjects (short ofs); ListMoveHistory (vector ulaIndices, const bool bUp) : ulaIndices (ulaIndices), bUp (bUp) {} }; @@ -134,11 +134,11 @@ IMPLEMENT_HISTORY_TYPE (Add) - std::vector ulaIndices; - std::vector paObjs; + vector ulaIndices; + vector paObjs; const Type eType; - AddHistory (std::vector ulaIndices, std::vector paObjs, + AddHistory (vector ulaIndices, vector paObjs, const Type eType = Other) : ulaIndices (ulaIndices), paObjs (paObjs), eType (eType) {} }; @@ -150,10 +150,10 @@ public: IMPLEMENT_HISTORY_TYPE (QuadSplit) - std::vector ulaIndices; - std::vector paQuads; + vector ulaIndices; + vector paQuads; - QuadSplitHistory (std::vector ulaIndices, std::vector paQuads) : + QuadSplitHistory (vector ulaIndices, vector paQuads) : ulaIndices (ulaIndices), paQuads (paQuads) {} }; @@ -164,12 +164,12 @@ public: IMPLEMENT_HISTORY_TYPE (Inline) - const std::vector ulaBitIndices, ulaRefIndices; - const std::vector paRefs; + const vector ulaBitIndices, ulaRefIndices; + const vector paRefs; const bool bDeep; - InlineHistory (const std::vector ulaBitIndices, const std::vector ulaRefIndices, - const std::vector paRefs, const bool bDeep) : + InlineHistory (const vector ulaBitIndices, const vector ulaRefIndices, + const vector paRefs, const bool bDeep) : ulaBitIndices (ulaBitIndices), ulaRefIndices (ulaRefIndices), paRefs (paRefs), bDeep (bDeep) {} }; @@ -180,10 +180,10 @@ public: IMPLEMENT_HISTORY_TYPE (Move) - const std::vector ulaIndices; + const vector ulaIndices; const vertex vVector; - MoveHistory (const std::vector ulaIndices, const vertex vVector) : + MoveHistory (const vector ulaIndices, const vertex vVector) : ulaIndices (ulaIndices), vVector (vVector) {} }; @@ -194,12 +194,12 @@ public: IMPLEMENT_HISTORY_TYPE (Combo) - std::vector paEntries; + vector paEntries; ComboHistory () {} - ComboHistory (std::vector paEntries) : paEntries (paEntries) {} + ComboHistory (vector paEntries) : paEntries (paEntries) {} - void addEntry (HistoryEntry* entry) { if (entry) paEntries.push_back (entry); } + void addEntry (HistoryEntry* entry) { if (entry) paEntries << entry; } ulong numEntries () const { return paEntries.size (); } ComboHistory& operator<< (HistoryEntry* entry) { addEntry (entry); return *this;} }; @@ -214,7 +214,7 @@ void clear (); void updateActions (); long pos (); - std::vector& entries (); + vector& entries (); }; #endif // HISTORY_H \ No newline at end of file