summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-07 15:18:14 (UTC)
committer zecke <zecke>2004-07-07 15:18:14 (UTC)
commitab010081c21f097e436c54ef8786f9abdf764790 (patch) (side-by-side diff)
tree36934a2aecd6e898c09d3414764efce0e2777915
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 (more/less context) (show whitespace changes)
-rw-r--r--development/translation/opie-lupdate/opie-lupdate.pro2
-rw-r--r--development/translation/shared/opie.cpp5
-rw-r--r--development/translation/shared/proparser.cpp1
3 files changed, 6 insertions, 2 deletions
diff --git a/development/translation/opie-lupdate/opie-lupdate.pro b/development/translation/opie-lupdate/opie-lupdate.pro
index ea51c8b..8360f05 100644
--- a/development/translation/opie-lupdate/opie-lupdate.pro
+++ b/development/translation/opie-lupdate/opie-lupdate.pro
@@ -1,21 +1,21 @@
TEMPLATE = app
-CONFIG += qt warn_on console
+CONFIG += qt warn_on console thread
HEADERS = ../shared/metatranslator.h \
../shared/proparser.h \
../shared/opie.h
SOURCES = fetchtr.cpp \
main.cpp \
merge.cpp \
numberh.cpp \
sametexth.cpp \
../shared/metatranslator.cpp \
../shared/proparser.cpp \
../shared/opie.cpp
DEFINES += QT_INTERNAL_XML
TARGET = opie-lupdate
INCLUDEPATH += ../shared
#DESTDIR =
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
@@ -1,40 +1,43 @@
#include <stdlib.h>
#include <qdir.h>
#include "opie.h"
OPIE* OPIE::m_self = 0;
OPIE::OPIE() {
}
OPIE::~OPIE() {
}
OPIE* OPIE::self() {
if (!m_self ) m_self = new OPIE;
return m_self;
}
QStringList OPIE::languageList( const QString& _opieDir )const {
+#if 0
+ return QStringList::split(':',QString(::getenv("OPIE_CREATE_LANGS")));
+#else
QString opieDi = opieDir( _opieDir );
-
QStringList langs;
QDir dir( opieDi + "/i18n/");
if (!dir.exists() ) return langs;
langs = dir.entryList( QDir::Dirs );
langs.remove("CVS"); // hey this no language
langs.remove("unmaintained"); // remove this one too
langs.remove(".");
langs.remove("..");
return langs;
+#endif
}
QString OPIE::opieDir( const QString& _opieDir ) const{
if (!_opieDir.isEmpty() ) return _opieDir;
char* dir = ::getenv("OPIEDIR");
if (!dir ) return QString::null;
return QString::fromLatin1(dir);
}
diff --git a/development/translation/shared/proparser.cpp b/development/translation/shared/proparser.cpp
index f616c5a..bb099bb 100644
--- a/development/translation/shared/proparser.cpp
+++ b/development/translation/shared/proparser.cpp
@@ -114,48 +114,49 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi
}
/*
Expand $$variables within the 'value' part of a 'key = value'
pair.
*/
QRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" );
QMap<QString, QString>::Iterator it;
for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
int i = 0;
while ( (i = var.search((*it), i)) != -1 ) {
int len = var.matchedLength();
QString invocation = var.cap(1);
QString after;
if ( invocation == "system" ) {
// skip system(); it will be handled in the next pass
++i;
} else if ( invocation == "OPIEDIR") {
(*it).replace( i, len, opieDir );
}else {
if ( tagMap.contains(invocation) )
after = tagMap[invocation];
(*it).replace( i, len, after );
+ i += after.length();
}
}
}
/*
Execute system() calls.
*/
QRegExp callToSystem( "\\$\\$system\\s*\\(([^()]*)\\)" );
for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
int i = 0;
while ( (i = callToSystem.search((*it), i)) != -1 ) {
/*
This code is stolen from qmake's project.cpp file.
Ideally we would use the same parser, so we wouldn't
have this code duplication.
*/
QString after;
char buff[256];
FILE *proc = QT_POPEN( callToSystem.cap(1).latin1(), "r" );
while ( proc && !feof(proc) ) {
int read_in = fread( buff, 1, 255, proc );
if ( !read_in )
break;
for ( int i = 0; i < read_in; i++ ) {