summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
authorZolnai Tamás <zolnaitamas2000@gmail.com>2012-10-10 15:08:46 +0200
committerZolnai Tamás <zolnaitamas2000@gmail.com>2012-10-10 15:17:20 +0200
commita76c979c1771566e806db67e44f387bb68b862cc (patch)
treea2e010808dd6e13d1b720af3fd053fb9f59ea053 /l10ntools
parent9ebb37f39bb85b1b900916c54ffd4e82f79186a0 (diff)
Delete WhiteSpace member of GenPoEntry
This member allows us to use more kind of whitespace between po entries but we use one end line everywhere so this variable is unneeded. Change-Id: I4e3c9040ca73580fd01484bb91325a9df04cb4e4
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/inc/po.hxx3
-rw-r--r--l10ntools/source/po.cxx15
2 files changed, 3 insertions, 15 deletions
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index d1112e1730d8..fa43b517b437 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -21,7 +21,6 @@ class GenPoEntry
{
private:
- OString m_sWhiteSpace;
OString m_sExtractCom;
OString m_sReference;
OString m_sContext;
@@ -36,7 +35,6 @@ public:
virtual ~GenPoEntry();
//Default copy constructor and copy operator work well
- virtual OString getWhiteSpace() const { return m_sWhiteSpace; }
virtual OString getExtractCom() const { return m_sExtractCom; }
virtual OString getReference() const { return m_sReference; }
virtual OString getContext() const { return m_sContext; }
@@ -45,7 +43,6 @@ public:
virtual bool getFuzzy() const { return m_bFuzzy; }
virtual bool isNull() const { return m_bNull; }
- virtual void setWhiteSpace(const OString& rWhiteSpace);
virtual void setExtractCom(const OString& rExtractCom);
virtual void setReference(const OString& rReference);
virtual void setContext(const OString& rContext);
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 0416ad0aa185..e1c978de6f6f 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -100,8 +100,7 @@ namespace
//Default constructor
GenPoEntry::GenPoEntry()
- : m_sWhiteSpace( OString() )
- , m_sExtractCom( OString() )
+ : m_sExtractCom( OString() )
, m_sReference( OString() )
, m_sContext( OString() )
, m_sUnTransStr( OString() )
@@ -117,11 +116,6 @@ GenPoEntry::~GenPoEntry()
}
//Set class members
-void GenPoEntry::setWhiteSpace(const OString& rWhiteSpace)
-{
- m_sWhiteSpace = rWhiteSpace;
-}
-
void GenPoEntry::setExtractCom(const OString& rExtractCom)
{
m_sExtractCom = rExtractCom;
@@ -155,8 +149,8 @@ void GenPoEntry::setFuzzy(const bool bFuzzy)
//Write to file
void GenPoEntry::writeToFile(std::ofstream& rOFStream) const
{
- if ( !m_sWhiteSpace.isEmpty() )
- rOFStream << m_sWhiteSpace.getStr();
+ if ( rOFStream.tellp() != 0 )
+ rOFStream << std::endl;
if ( !m_sExtractCom.isEmpty() )
rOFStream
<< "#. "
@@ -183,7 +177,6 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
m_bNull = true;
return;
}
- m_sWhiteSpace = "\n";
OString* pLastMsg = 0;
std::string sTemp;
getline(rIFStream,sTemp);
@@ -414,7 +407,6 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
{
throw INVALIDSDFLINE;
}
- m_aGenPo.setWhiteSpace("\n");
m_aGenPo.setReference(vParts[SOURCEFILE].
copy(vParts[SOURCEFILE].lastIndexOf("\\")+1));
@@ -629,7 +621,6 @@ PoHeader::PoHeader( std::ifstream& rOldPo )
assert( rOldPo.is_open() );
m_aGenPo.readFromFile( rOldPo );
- m_aGenPo.setWhiteSpace( OString() );
const OString sExtractCom = m_aGenPo.getExtractCom();
m_aGenPo.setExtractCom(
sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) );