author | zecke <zecke> | 2004-01-09 19:13:35 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-01-09 19:13:35 (UTC) |
commit | 56bb9961db1158250bbfe971f4556b56c0bd6581 (patch) (unidiff) | |
tree | a4f40da98f695b5aadd845b68aaab41ac3d81826 /development/translation/shared | |
parent | 6875988077013544246ae0df7cc2e5d538a7f152 (diff) | |
download | opie-56bb9961db1158250bbfe971f4556b56c0bd6581.zip opie-56bb9961db1158250bbfe971f4556b56c0bd6581.tar.gz opie-56bb9961db1158250bbfe971f4556b56c0bd6581.tar.bz2 |
Update lupdate and shared to Qt3.3 qt-copy sources
Some special replacement for $$(OPIEDIR) to make ar_* happy
Diffstat (limited to 'development/translation/shared') (more/less context) (ignore whitespace changes)
-rw-r--r-- | development/translation/shared/metatranslator.cpp | 34 | ||||
-rw-r--r-- | development/translation/shared/metatranslator.h | 16 | ||||
-rw-r--r-- | development/translation/shared/opie.h | 2 | ||||
-rw-r--r-- | development/translation/shared/proparser.cpp | 111 | ||||
-rw-r--r-- | development/translation/shared/proparser.h | 8 |
5 files changed, 144 insertions, 27 deletions
diff --git a/development/translation/shared/metatranslator.cpp b/development/translation/shared/metatranslator.cpp index a01e1eb..51270c5 100644 --- a/development/translation/shared/metatranslator.cpp +++ b/development/translation/shared/metatranslator.cpp | |||
@@ -7,12 +7,18 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | ||
12 | ** licenses may use this file in accordance with the Qt Commercial License | ||
13 | ** Agreement provided with the Software. | ||
14 | ** | ||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 15 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 16 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 17 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 18 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
19 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | ||
20 | ** information about Qt Commercial License Agreements. | ||
15 | ** | 21 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 22 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 23 | ** not clear to you. |
18 | ** | 24 | ** |
@@ -137,13 +143,15 @@ bool TsHandler::endElement( const QString& /* namespaceURI */, | |||
137 | if ( inMessage ) { | 143 | if ( inMessage ) { |
138 | comment = accum; | 144 | comment = accum; |
139 | } else { | 145 | } else { |
140 | if ( contextIsUtf8 ) | 146 | if ( contextIsUtf8 ) |
141 | tor->insert( MetaTranslatorMessage(context.utf8(), "", | 147 | tor->insert( MetaTranslatorMessage(context.utf8(), |
148 | ContextComment, | ||
142 | accum.utf8(), QString::null, TRUE, | 149 | accum.utf8(), QString::null, TRUE, |
143 | MetaTranslatorMessage::Unfinished) ); | 150 | MetaTranslatorMessage::Unfinished) ); |
144 | else | 151 | else |
145 | tor->insert( MetaTranslatorMessage(context.ascii(), "", | 152 | tor->insert( MetaTranslatorMessage(context.ascii(), |
153 | ContextComment, | ||
146 | accum.ascii(), QString::null, FALSE, | 154 | accum.ascii(), QString::null, FALSE, |
147 | MetaTranslatorMessage::Unfinished) ); | 155 | MetaTranslatorMessage::Unfinished) ); |
148 | } | 156 | } |
149 | } else if ( qName == QString("translation") ) { | 157 | } else if ( qName == QString("translation") ) { |
@@ -314,16 +322,15 @@ bool MetaTranslatorMessage::operator<( const MetaTranslatorMessage& m ) const | |||
314 | return delta < 0; | 322 | return delta < 0; |
315 | } | 323 | } |
316 | 324 | ||
317 | MetaTranslator::MetaTranslator() | 325 | MetaTranslator::MetaTranslator() |
318 | : codecName( "ISO-8859-1" ), codec( 0 ) | ||
319 | { | 326 | { |
327 | clear(); | ||
320 | } | 328 | } |
321 | 329 | ||
322 | MetaTranslator::MetaTranslator( const MetaTranslator& tor ) | 330 | MetaTranslator::MetaTranslator( const MetaTranslator& tor ) |
323 | : mm( tor.mm ), codecName( tor.codecName ), codec( tor.codec ) | 331 | : mm( tor.mm ), codecName( tor.codecName ), codec( tor.codec ) |
324 | { | 332 | { |
325 | |||
326 | } | 333 | } |
327 | 334 | ||
328 | MetaTranslator& MetaTranslator::operator=( const MetaTranslator& tor ) | 335 | MetaTranslator& MetaTranslator::operator=( const MetaTranslator& tor ) |
329 | { | 336 | { |
@@ -332,20 +339,24 @@ MetaTranslator& MetaTranslator::operator=( const MetaTranslator& tor ) | |||
332 | codec = tor.codec; | 339 | codec = tor.codec; |
333 | return *this; | 340 | return *this; |
334 | } | 341 | } |
335 | 342 | ||
336 | bool MetaTranslator::load( const QString& filename ) | 343 | void MetaTranslator::clear() |
337 | { | 344 | { |
338 | mm.clear(); | 345 | mm.clear(); |
346 | codecName = "ISO-8859-1"; | ||
347 | codec = 0; | ||
348 | } | ||
339 | 349 | ||
350 | bool MetaTranslator::load( const QString& filename ) | ||
351 | { | ||
340 | QFile f( filename ); | 352 | QFile f( filename ); |
341 | if ( !f.open(IO_ReadOnly) ) | 353 | if ( !f.open(IO_ReadOnly) ) |
342 | return FALSE; | 354 | return FALSE; |
343 | 355 | ||
344 | QTextStream t( &f ); | 356 | QTextStream t( &f ); |
345 | QXmlInputSource in( t ); | 357 | QXmlInputSource in( t ); |
346 | QXmlSimpleReader reader; | 358 | QXmlSimpleReader reader; |
347 | // don't click on these! | ||
348 | reader.setFeature( "http://xml.org/sax/features/namespaces", FALSE ); | 359 | reader.setFeature( "http://xml.org/sax/features/namespaces", FALSE ); |
349 | reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", TRUE ); | 360 | reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", TRUE ); |
350 | reader.setFeature( "http://trolltech.com/xml/features/report-whitespace" | 361 | reader.setFeature( "http://trolltech.com/xml/features/report-whitespace" |
351 | "-only-CharData", FALSE ); | 362 | "-only-CharData", FALSE ); |
@@ -357,10 +368,8 @@ bool MetaTranslator::load( const QString& filename ) | |||
357 | reader.setContentHandler( 0 ); | 368 | reader.setContentHandler( 0 ); |
358 | reader.setErrorHandler( 0 ); | 369 | reader.setErrorHandler( 0 ); |
359 | delete hand; | 370 | delete hand; |
360 | f.close(); | 371 | f.close(); |
361 | if ( !ok ) | ||
362 | mm.clear(); | ||
363 | return ok; | 372 | return ok; |
364 | } | 373 | } |
365 | 374 | ||
366 | bool MetaTranslator::save( const QString& filename ) const | 375 | bool MetaTranslator::save( const QString& filename ) const |
@@ -383,9 +392,9 @@ bool MetaTranslator::save( const QString& filename ) const | |||
383 | QCString context = m.key().context(); | 392 | QCString context = m.key().context(); |
384 | QCString comment = ""; | 393 | QCString comment = ""; |
385 | 394 | ||
386 | do { | 395 | do { |
387 | if ( QCString(m.key().sourceText()).isEmpty() ) { | 396 | if ( QCString(m.key().sourceText()) == ContextComment ) { |
388 | if ( m.key().type() != MetaTranslatorMessage::Obsolete ) { | 397 | if ( m.key().type() != MetaTranslatorMessage::Obsolete ) { |
389 | contextIsUtf8 = m.key().utf8(); | 398 | contextIsUtf8 = m.key().utf8(); |
390 | comment = QCString( m.key().comment() ); | 399 | comment = QCString( m.key().comment() ); |
391 | } | 400 | } |
@@ -436,9 +445,10 @@ bool MetaTranslator::save( const QString& filename ) const | |||
436 | f.close(); | 445 | f.close(); |
437 | return TRUE; | 446 | return TRUE; |
438 | } | 447 | } |
439 | 448 | ||
440 | bool MetaTranslator::release( const QString& filename, bool verbose ) const | 449 | bool MetaTranslator::release( const QString& filename, bool verbose, |
450 | QTranslator::SaveMode mode ) const | ||
441 | { | 451 | { |
442 | QTranslator tor( 0 ); | 452 | QTranslator tor( 0 ); |
443 | int finished = 0; | 453 | int finished = 0; |
444 | int unfinished = 0; | 454 | int unfinished = 0; |
@@ -478,9 +488,9 @@ bool MetaTranslator::release( const QString& filename, bool verbose ) const | |||
478 | } | 488 | } |
479 | } | 489 | } |
480 | } | 490 | } |
481 | 491 | ||
482 | bool saved = tor.save( filename, QTranslator::Stripped ); | 492 | bool saved = tor.save( filename, mode ); |
483 | if ( saved && verbose ) | 493 | if ( saved && verbose ) |
484 | fprintf( stderr, | 494 | fprintf( stderr, |
485 | " %d finished, %d unfinished and %d untranslated messages\n", | 495 | " %d finished, %d unfinished and %d untranslated messages\n", |
486 | finished, unfinished, untranslated ); | 496 | finished, unfinished, untranslated ); |
@@ -522,9 +532,9 @@ void MetaTranslator::stripEmptyContexts() | |||
522 | TMM newmm; | 532 | TMM newmm; |
523 | 533 | ||
524 | TMM::Iterator m = mm.begin(); | 534 | TMM::Iterator m = mm.begin(); |
525 | while ( m != mm.end() ) { | 535 | while ( m != mm.end() ) { |
526 | if ( QCString(m.key().sourceText()).isEmpty() ) { | 536 | if ( QCString(m.key().sourceText()) == ContextComment ) { |
527 | TMM::Iterator n = m; | 537 | TMM::Iterator n = m; |
528 | ++n; | 538 | ++n; |
529 | // the context comment is followed by other messages | 539 | // the context comment is followed by other messages |
530 | if ( n != newmm.end() && | 540 | if ( n != newmm.end() && |
diff --git a/development/translation/shared/metatranslator.h b/development/translation/shared/metatranslator.h index d35b202..a13f462 100644 --- a/development/translation/shared/metatranslator.h +++ b/development/translation/shared/metatranslator.h | |||
@@ -7,12 +7,18 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | ||
12 | ** licenses may use this file in accordance with the Qt Commercial License | ||
13 | ** Agreement provided with the Software. | ||
14 | ** | ||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 15 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 16 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 17 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 18 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
19 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | ||
20 | ** information about Qt Commercial License Agreements. | ||
15 | ** | 21 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 22 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 23 | ** not clear to you. |
18 | ** | 24 | ** |
@@ -69,11 +75,13 @@ public: | |||
69 | MetaTranslator( const MetaTranslator& tor ); | 75 | MetaTranslator( const MetaTranslator& tor ); |
70 | 76 | ||
71 | MetaTranslator& operator=( const MetaTranslator& tor ); | 77 | MetaTranslator& operator=( const MetaTranslator& tor ); |
72 | 78 | ||
79 | void clear(); | ||
73 | bool load( const QString& filename ); | 80 | bool load( const QString& filename ); |
74 | bool save( const QString& filename ) const; | 81 | bool save( const QString& filename ) const; |
75 | bool release( const QString& filename, bool verbose = FALSE ) const; | 82 | bool release( const QString& filename, bool verbose = FALSE, |
83 | QTranslator::SaveMode mode = QTranslator::Stripped ) const; | ||
76 | 84 | ||
77 | bool contains( const char *context, const char *sourceText, | 85 | bool contains( const char *context, const char *sourceText, |
78 | const char *comment ) const; | 86 | const char *comment ) const; |
79 | void insert( const MetaTranslatorMessage& m ); | 87 | void insert( const MetaTranslatorMessage& m ); |
@@ -95,5 +103,11 @@ private: | |||
95 | QCString codecName; | 103 | QCString codecName; |
96 | QTextCodec *codec; | 104 | QTextCodec *codec; |
97 | }; | 105 | }; |
98 | 106 | ||
107 | /* | ||
108 | This is a quick hack. The proper way to handle this would be | ||
109 | to extend MetaTranslator's interface. | ||
110 | */ | ||
111 | #define ContextComment "QT_LINGUIST_INTERNAL_CONTEXT_COMMENT" | ||
112 | |||
99 | #endif | 113 | #endif |
diff --git a/development/translation/shared/opie.h b/development/translation/shared/opie.h index 4646bb0..28b2a61 100644 --- a/development/translation/shared/opie.h +++ b/development/translation/shared/opie.h | |||
@@ -8,9 +8,9 @@ class OPIE { | |||
8 | public: | 8 | public: |
9 | static OPIE* self(); | 9 | static OPIE* self(); |
10 | /** get the list of languages */ | 10 | /** get the list of languages */ |
11 | QStringList languageList(const QString& opiedir = QString::null)const; | 11 | QStringList languageList(const QString& opiedir = QString::null)const; |
12 | QString opieDir(const QString& opieDir)const; | 12 | QString opieDir(const QString& opieDir = QString::null)const; |
13 | 13 | ||
14 | private: | 14 | private: |
15 | OPIE(); | 15 | OPIE(); |
16 | ~OPIE(); | 16 | ~OPIE(); |
diff --git a/development/translation/shared/proparser.cpp b/development/translation/shared/proparser.cpp index 21d2f86..f616c5a 100644 --- a/development/translation/shared/proparser.cpp +++ b/development/translation/shared/proparser.cpp | |||
@@ -7,47 +7,92 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | ||
12 | ** licenses may use this file in accordance with the Qt Commercial License | ||
13 | ** Agreement provided with the Software. | ||
14 | ** | ||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 15 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 16 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 17 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 18 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
19 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | ||
20 | ** information about Qt Commercial License Agreements. | ||
15 | ** | 21 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 22 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 23 | ** not clear to you. |
18 | ** | 24 | ** |
19 | **********************************************************************/ | 25 | **********************************************************************/ |
20 | 26 | ||
21 | #include "proparser.h" | 27 | #include "proparser.h" |
22 | 28 | ||
29 | #include <qfile.h> | ||
23 | #include <qregexp.h> | 30 | #include <qregexp.h> |
24 | #include <qstringlist.h> | 31 | #include <qstringlist.h> |
32 | #include <qtextstream.h> | ||
33 | |||
34 | #ifdef Q_OS_UNIX | ||
35 | #include <unistd.h> | ||
36 | #endif | ||
37 | |||
38 | #ifdef Q_OS_WIN32 | ||
39 | #define QT_POPEN _popen | ||
40 | #else | ||
41 | #define QT_POPEN popen | ||
42 | #endif | ||
43 | |||
44 | QString loadFile( const QString &fileName ) | ||
45 | { | ||
46 | QFile file( fileName ); | ||
47 | if ( !file.open(IO_ReadOnly) ) { | ||
48 | fprintf( stderr, "error: Cannot load '%s': %s\n", | ||
49 | file.name().latin1(), | ||
50 | file.errorString().latin1() ); | ||
51 | return QString(); | ||
52 | } | ||
53 | |||
54 | QTextStream in( &file ); | ||
55 | return in.read(); | ||
56 | } | ||
25 | 57 | ||
26 | QMap<QString, QString> proFileTagMap( const QString& text ) | 58 | QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDir ) |
27 | { | 59 | { |
28 | QString t = text; | 60 | QString t = text; |
29 | 61 | ||
30 | /* | 62 | /* |
63 | Process include() commands. | ||
64 | */ | ||
65 | QRegExp callToInclude("include\\s*\\(\\s*([^()\\s]+)\\s*\\)"); | ||
66 | int i = 0; | ||
67 | while ( (i = callToInclude.search(t, i)) != -1 ) { | ||
68 | QString after = loadFile( callToInclude.cap(1) ); | ||
69 | t.replace( i, callToInclude.matchedLength(), after ); | ||
70 | i += after.length(); | ||
71 | } | ||
72 | |||
73 | /* | ||
31 | Strip comments, merge lines ending with backslash, add | 74 | Strip comments, merge lines ending with backslash, add |
32 | spaces around '=' and '+=', replace '\n' with ';', and | 75 | spaces around '=' and '+=', replace '\n' with ';', and |
33 | simplify white spaces. | 76 | simplify white spaces. |
34 | */ | 77 | */ |
35 | t.replace( QRegExp(QString("#[^\n]$")), QString(" ") ); | 78 | t.replace( QRegExp(QString("#[^\n]*\n")), QString(" ") ); |
36 | t.replace( QRegExp(QString("\\\\\\s*\n")), QString(" ") ); | 79 | t.replace( QRegExp(QString("\\\\[^\n\\S]*\n")), QString(" ") ); |
37 | t.replace( "=", QString(" = ") ); | 80 | t.replace( "=", QString(" = ") ); |
38 | t.replace( "+ =", QString(" += ") ); | 81 | t.replace( "+ =", QString(" += ") ); |
39 | t.replace( "\n", QString(";") ); | 82 | t.replace( "\n", QString(";") ); |
40 | t = t.simplifyWhiteSpace(); | 83 | t = t.simplifyWhiteSpace(); |
41 | 84 | ||
85 | /* | ||
86 | Populate tagMap with 'key = value' entries. | ||
87 | */ | ||
42 | QMap<QString, QString> tagMap; | 88 | QMap<QString, QString> tagMap; |
43 | |||
44 | QStringList lines = QStringList::split( QChar(';'), t ); | 89 | QStringList lines = QStringList::split( QChar(';'), t ); |
45 | QStringList::Iterator line; | 90 | QStringList::Iterator line; |
46 | for ( line = lines.begin(); line != lines.end(); ++line ) { | 91 | for ( line = lines.begin(); line != lines.end(); ++line ) { |
47 | QStringList toks = QStringList::split( QChar(' '), *line ); | 92 | QStringList toks = QStringList::split( QChar(' '), *line ); |
48 | 93 | ||
49 | if ( toks.count() >= 3 && | 94 | if ( toks.count() >= 3 && |
50 | (toks[1] == QString("=") || toks[1] == QString("+=")) ) { | 95 | (toks[1] == QString("=") || toks[1] == QString("+=")) ) { |
51 | QString tag = toks.first(); | 96 | QString tag = toks.first(); |
52 | int k = tag.findRev( QChar(':') ); // as in 'unix:' | 97 | int k = tag.findRev( QChar(':') ); // as in 'unix:' |
53 | if ( k != -1 ) | 98 | if ( k != -1 ) |
@@ -67,21 +112,63 @@ QMap<QString, QString> proFileTagMap( const QString& text ) | |||
67 | } | 112 | } |
68 | } | 113 | } |
69 | } | 114 | } |
70 | 115 | ||
71 | QRegExp var( "\\$\\$[a-zA-Z0-9_]+" ); | 116 | /* |
117 | Expand $$variables within the 'value' part of a 'key = value' | ||
118 | pair. | ||
119 | */ | ||
120 | QRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" ); | ||
72 | QMap<QString, QString>::Iterator it; | 121 | QMap<QString, QString>::Iterator it; |
73 | for ( it = tagMap.begin(); it != tagMap.end(); ++it ) { | 122 | for ( it = tagMap.begin(); it != tagMap.end(); ++it ) { |
74 | int i = 0; | 123 | int i = 0; |
75 | 124 | while ( (i = var.search((*it), i)) != -1 ) { | |
76 | while ( (i = var.search(it.data(), i)) != -1 ) { | ||
77 | int len = var.matchedLength(); | 125 | int len = var.matchedLength(); |
78 | QString invocation = (*it).mid( i + 2, len - 2 ); | 126 | QString invocation = var.cap(1); |
79 | QString after; | 127 | QString after; |
80 | if ( tagMap.contains(invocation) ) | 128 | |
81 | after = tagMap[invocation]; | 129 | if ( invocation == "system" ) { |
82 | (*it).replace( i, len, after ); | 130 | // skip system(); it will be handled in the next pass |
131 | ++i; | ||
132 | } else if ( invocation == "OPIEDIR") { | ||
133 | (*it).replace( i, len, opieDir ); | ||
134 | }else { | ||
135 | if ( tagMap.contains(invocation) ) | ||
136 | after = tagMap[invocation]; | ||
137 | (*it).replace( i, len, after ); | ||
138 | } | ||
139 | } | ||
140 | } | ||
141 | |||
142 | /* | ||
143 | Execute system() calls. | ||
144 | */ | ||
145 | QRegExp callToSystem( "\\$\\$system\\s*\\(([^()]*)\\)" ); | ||
146 | for ( it = tagMap.begin(); it != tagMap.end(); ++it ) { | ||
147 | int i = 0; | ||
148 | while ( (i = callToSystem.search((*it), i)) != -1 ) { | ||
149 | /* | ||
150 | This code is stolen from qmake's project.cpp file. | ||
151 | Ideally we would use the same parser, so we wouldn't | ||
152 | have this code duplication. | ||
153 | */ | ||
154 | QString after; | ||
155 | char buff[256]; | ||
156 | FILE *proc = QT_POPEN( callToSystem.cap(1).latin1(), "r" ); | ||
157 | while ( proc && !feof(proc) ) { | ||
158 | int read_in = fread( buff, 1, 255, proc ); | ||
159 | if ( !read_in ) | ||
160 | break; | ||
161 | for ( int i = 0; i < read_in; i++ ) { | ||
162 | if ( buff[i] == '\n' || buff[i] == '\t' ) | ||
163 | buff[i] = ' '; | ||
164 | } | ||
165 | buff[read_in] = '\0'; | ||
166 | after += buff; | ||
167 | } | ||
168 | (*it).replace( i, callToSystem.matchedLength(), after ); | ||
83 | i += after.length(); | 169 | i += after.length(); |
84 | } | 170 | } |
85 | } | 171 | } |
172 | |||
86 | return tagMap; | 173 | return tagMap; |
87 | } | 174 | } |
diff --git a/development/translation/shared/proparser.h b/development/translation/shared/proparser.h index 6a61d90..e5678d6 100644 --- a/development/translation/shared/proparser.h +++ b/development/translation/shared/proparser.h | |||
@@ -7,12 +7,18 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | ||
12 | ** licenses may use this file in accordance with the Qt Commercial License | ||
13 | ** Agreement provided with the Software. | ||
14 | ** | ||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 15 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 16 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 17 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 18 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
19 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | ||
20 | ** information about Qt Commercial License Agreements. | ||
15 | ** | 21 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 22 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 23 | ** not clear to you. |
18 | ** | 24 | ** |
@@ -23,7 +29,7 @@ | |||
23 | 29 | ||
24 | #include <qmap.h> | 30 | #include <qmap.h> |
25 | #include <qstring.h> | 31 | #include <qstring.h> |
26 | 32 | ||
27 | QMap<QString, QString> proFileTagMap( const QString& text ); | 33 | QMap<QString, QString> proFileTagMap( const QString& text, const QString& = QString::null ); |
28 | 34 | ||
29 | #endif | 35 | #endif |