diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-12 15:18:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-12 15:18:27 -0600 |
| commit | 30e60192e820e0b123816fdb3be24880972b6e83 (patch) | |
| tree | 5b249450b44d3cc9ee02dc5b5cde9433d4b7edaf | |
| parent | 29e9d054581d9443b30eaf5eac33e80f8b890532 (diff) | |
| download | tqt3-30e60192e820e0b123816fdb3be24880972b6e83.tar.gz tqt3-30e60192e820e0b123816fdb3be24880972b6e83.zip | |
Update tqt3 from qt3
| -rw-r--r-- | src/tools/qcstring.h | 6 | ||||
| -rw-r--r-- | tools/linguist/shared/proparser.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/qcstring.h b/src/tools/qcstring.h index a396f64b3..96eb9f801 100644 --- a/src/tools/qcstring.h +++ b/src/tools/qcstring.h @@ -164,7 +164,11 @@ public: TQCString copy() const; - TQCString &sprintf( const char *format, ... ); + TQCString &sprintf( const char *format, ... ) +#if defined(Q_CC_GNU) && !defined(__INSURE__) + __attribute__ ((format (printf, 2, 3))) +#endif + ; int find( char c, int index=0, bool cs=TRUE ) const; int find( const char *str, int index=0, bool cs=TRUE ) const; diff --git a/tools/linguist/shared/proparser.cpp b/tools/linguist/shared/proparser.cpp index ec75b1d32..6095d48de 100644 --- a/tools/linguist/shared/proparser.cpp +++ b/tools/linguist/shared/proparser.cpp @@ -207,6 +207,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) buff[read_in] = '\0'; after += buff; } + pclose( proc ); (*it).replace( i, callToSystem.matchedLength(), after ); i += after.length(); } |