diff options
author | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /tools/designer/uic/main.cpp | |
parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip |
Undo prior accidental commit
Diffstat (limited to 'tools/designer/uic/main.cpp')
-rw-r--r-- | tools/designer/uic/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp index 6a8db05..ace2033 100644 --- a/tools/designer/uic/main.cpp +++ b/tools/designer/uic/main.cpp @@ -265,7 +265,7 @@ int main( int argc, char * argv[] ) if ( !outputFile.isEmpty() ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) { - tqWarning( "uic: Could not open output file '%s'", outputFile.data() ); + qWarning( "uic: Could not open output file '%s'", outputFile.data() ); return 1; } } else { @@ -283,7 +283,7 @@ int main( int argc, char * argv[] ) QFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - tqWarning( "uic: Could not open file '%s'", fileName ); + qWarning( "uic: Could not open file '%s'", fileName ); return 1; } @@ -291,13 +291,13 @@ int main( int argc, char * argv[] ) QString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) { - tqWarning( QString("uic: Failed to parse %s: ") + errMsg + QString (" in line %d"), fileName, errLine ); + qWarning( QString("uic: Failed to parse %s: ") + errMsg + QString (" in line %d"), fileName, errLine ); return 1; } QDomElement e = doc.firstChild().toElement(); if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) { - tqWarning( QString("uic: File generated with too recent version of Qt Designer (%s vs. %s)"), + qWarning( QString("uic: File generated with too recent version of Qt Designer (%s vs. %s)"), e.attribute("version").latin1(), QT_VERSION_STR ); return 1; } @@ -350,7 +350,7 @@ int main( int argc, char * argv[] ) out << "#endif // " << protector << endl; } if ( fileOut.status() != IO_Ok ) { - tqWarning( "uic: Error writing to file" ); + qWarning( "uic: Error writing to file" ); if ( !outputFile.isEmpty() ) remove( outputFile ); } |