Skip to content

Refactoring: add class ZSeparator #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavel-pimenov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactoring: add class ZSeparator #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457c78b
Refactoring: add class ZSeparator
pavel-pimenov Nov 3, 2016
49b08b0
Fix tab->space (Araxis Merge)
pavel-pimenov Nov 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Source/ZenLib/InfoMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace ZenLib
/// @brief Helper for InfoMap
//***************************************************************************

class InfoMap : public std::multimap<Ztring, ZtringList>
class InfoMap : public std::multimap<Ztring, ZtringList>, protected ZSeparator
{
public :
//Constructors/Destructor
Expand All @@ -47,10 +47,6 @@ public :
/// During Read() or Write() method, if there is more elements, merge them with the last element
void Max_Set (size_type Level, size_type Max);

protected :
Ztring Separator[2];
Ztring Quote;
size_type Max[2];
};

} //namespace
Expand Down
6 changes: 1 addition & 5 deletions Source/ZenLib/Translation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace ZenLib
/// @brief Helper for translation
//***************************************************************************

class Translation : public std::map<Ztring, Ztring>
class Translation : public std::map<Ztring, Ztring>, protected ZSeparator
{
public :
//Constructors/Destructor
Expand Down Expand Up @@ -49,10 +49,6 @@ public :
/// During Read() or Write() method, if there is more elements, merge them with the last element
void Max_Set (size_type Level, size_type Max);

protected :
Ztring Separator[2];
Ztring Quote;
size_type Max[2];
};

} //namespace
Expand Down
13 changes: 13 additions & 0 deletions Source/ZenLib/Ztring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,19 @@ public :
bool Compare (const Ztring &ToCompare, const Ztring &Comparator=__T("=="), ztring_t Options=Ztring_Nothing) const;
};

class ZSeparator
{
public:
ZSeparator()
{
Max[0] = Max[1] = Error;
}
protected:
Ztring Separator[2];
Ztring Quote;
size_t Max[2];
};

} //NameSpace

#endif
2 changes: 2 additions & 0 deletions Source/ZenLib/ZtringList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ ZtringList::ZtringList ()
ZtringList::ZtringList(const ZtringList &Source)
: std::vector<ZenLib::Ztring, std::allocator<ZenLib::Ztring> > ()
{
Max[0] = Error;
Separator[0]=Source.Separator[0];
Quote=Source.Quote;

Expand Down Expand Up @@ -76,6 +77,7 @@ ZtringList::ZtringList (const Char *Source)
#ifdef _UNICODE
ZtringList::ZtringList (const char* S)
{
Max[0] = Error;
Write(Ztring(S));
}
#endif
Expand Down
6 changes: 1 addition & 5 deletions Source/ZenLib/ZtringListList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace ZenLib
/// @brief Vector of vectors of strings manipulation (based on std::vector<std::vector<std::(w)string>>)
//***************************************************************************

class ZtringListList : public std::vector<ZtringList>
class ZtringListList : public std::vector<ZtringList>, protected ZSeparator
{
public :
//Constructors/Destructor
Expand Down Expand Up @@ -122,10 +122,6 @@ public :
/// During Read() or Write() method, if there is more elements, merge them with the last element
void Max_Set (size_type Level, size_type Max);

protected :
Ztring Separator[2];
Ztring Quote;
size_type Max[2];
};

} //namespace
Expand Down
4 changes: 2 additions & 2 deletions Source/ZenLib/ZtringListListF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ bool ZtringListListF::CSV_Charger ()
//Separators
if (Separator[0]==__T("(Default)"))
Separator[0]=EOL;
Ztring SeparatorT=Separator[1];
const Ztring SeparatorT=Separator[1];
Separator[1]=__T(";");

//Writing
Expand Down Expand Up @@ -183,7 +183,7 @@ bool ZtringListListF::CFG_Charger ()
Z1.From_UTF8((char*)Buffer, 0, BytesCount);
List.Write(Z1);

Ztring SeparatorT=Separator[1];
const Ztring SeparatorT=Separator[1];
Separator[1]=__T(";");

Ztring Propriete, Valeur, Commentaire;
Expand Down