diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-10-29 11:52:54 +0100 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-10-29 12:50:09 +0100 |
| commit | 8f57a9d2a186a2cd5d71ed8bbed106ab927322d4 (patch) | |
| tree | df95ad4a88f563b347776a6f1c38266f0dcd3c02 /l10ntools/source/propmerge.cxx | |
| parent | 4147b2646a75add70de4c1659f66fad067c017f8 (diff) | |
Correct some naming in propex
Change-Id: Id5b17be8155f13529439dd9a46b42f6ffeed79b1
Diffstat (limited to 'l10ntools/source/propmerge.cxx')
| -rw-r--r-- | l10ntools/source/propmerge.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 0f1b20b6f1fe..61400147691f 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -168,7 +168,7 @@ void PropParser::Extract( } //Merge strings to source file -void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile ) +void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFile ) { assert( m_bIsInitialized ); std::ofstream aDestination( @@ -180,14 +180,14 @@ void PropParser::Merge( const OString &rSDFFile, const OString &rDestinationFile return; } - MergeDataFile aMergeDataFile( rSDFFile, m_sSource, false ); + MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false ); if( aMergeDataFile.GetLanguages()[0] != m_sLang ) { std::cerr << "Propex error: given language conflicts with " << "language of Mergedata file: " - << m_sLang.getStr() << " - " << rSDFFile.getStr() << std::endl; + << m_sLang.getStr() << " - " << rMergeSrc.getStr() << std::endl; return; } |