summaryrefslogtreecommitdiff
path: root/development/translation/shared/opie.cpp
authorzecke <zecke>2004-07-07 15:18:14 (UTC)
committer zecke <zecke>2004-07-07 15:18:14 (UTC)
commitab010081c21f097e436c54ef8786f9abdf764790 (patch) (unidiff)
tree36934a2aecd6e898c09d3414764efce0e2777915 /development/translation/shared/opie.cpp
parentd6ed7f967feb423a91a5c6ea94d54001b33bcd77 (diff)
downloadopie-ab010081c21f097e436c54ef8786f9abdf764790.zip
opie-ab010081c21f097e436c54ef8786f9abdf764790.tar.gz
opie-ab010081c21f097e436c54ef8786f9abdf764790.tar.bz2
INCLUDEPATH = FOO $$INCLUDEPATH triggered an infinte loop
backport the fix from Qt3.3 for that issue Add alternative mode to only generate one language...
Diffstat (limited to 'development/translation/shared/opie.cpp') (more/less context) (show whitespace changes)
-rw-r--r--development/translation/shared/opie.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/development/translation/shared/opie.cpp b/development/translation/shared/opie.cpp
index c5c72d1..c8cea42 100644
--- a/development/translation/shared/opie.cpp
+++ b/development/translation/shared/opie.cpp
@@ -13,14 +13,16 @@ OPIE::~OPIE() {
13} 13}
14OPIE* OPIE::self() { 14OPIE* OPIE::self() {
15 if (!m_self ) m_self = new OPIE; 15 if (!m_self ) m_self = new OPIE;
16 return m_self; 16 return m_self;
17} 17}
18QStringList OPIE::languageList( const QString& _opieDir )const { 18QStringList OPIE::languageList( const QString& _opieDir )const {
19#if 0
20 return QStringList::split(':',QString(::getenv("OPIE_CREATE_LANGS")));
21#else
19 QString opieDi = opieDir( _opieDir ); 22 QString opieDi = opieDir( _opieDir );
20
21 QStringList langs; 23 QStringList langs;
22 QDir dir( opieDi + "/i18n/"); 24 QDir dir( opieDi + "/i18n/");
23 if (!dir.exists() ) return langs; 25 if (!dir.exists() ) return langs;
24 langs = dir.entryList( QDir::Dirs ); 26 langs = dir.entryList( QDir::Dirs );
25 27
26 langs.remove("CVS"); // hey this no language 28 langs.remove("CVS"); // hey this no language
@@ -28,12 +30,13 @@ QStringList OPIE::languageList( const QString& _opieDir )const {
28 langs.remove("."); 30 langs.remove(".");
29 langs.remove(".."); 31 langs.remove("..");
30 32
31 33
32 34
33 return langs; 35 return langs;
36#endif
34} 37}
35QString OPIE::opieDir( const QString& _opieDir ) const{ 38QString OPIE::opieDir( const QString& _opieDir ) const{
36 if (!_opieDir.isEmpty() ) return _opieDir; 39 if (!_opieDir.isEmpty() ) return _opieDir;
37 char* dir = ::getenv("OPIEDIR"); 40 char* dir = ::getenv("OPIEDIR");
38 if (!dir ) return QString::null; 41 if (!dir ) return QString::null;
39 return QString::fromLatin1(dir); 42 return QString::fromLatin1(dir);