From 32459311b349db581cc5fb0d80739a95b3d998b4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:30:40 -0600 Subject: Rename additional global TQt functions --- qtruby/rubylib/designer/rbuic/embed.cpp | 2 +- qtruby/rubylib/designer/rbuic/form.cpp | 2 +- qtruby/rubylib/designer/rbuic/main.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'qtruby/rubylib/designer') diff --git a/qtruby/rubylib/designer/rbuic/embed.cpp b/qtruby/rubylib/designer/rbuic/embed.cpp index dda9a5ee..02b88de4 100644 --- a/qtruby/rubylib/designer/rbuic/embed.cpp +++ b/qtruby/rubylib/designer/rbuic/embed.cpp @@ -74,7 +74,7 @@ static TQString convertToCIdentifier( const char *s ) static ulong embedData( TQTextStream& out, const uchar* input, int nbytes ) { #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION - TQByteArray bazip( qCompress( input, nbytes ) ); + TQByteArray bazip( tqCompress( input, nbytes ) ); ulong len = bazip.size(); #else ulong len = nbytes; diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp index 13241e82..937c32eb 100644 --- a/qtruby/rubylib/designer/rbuic/form.cpp +++ b/qtruby/rubylib/designer/rbuic/form.cpp @@ -241,7 +241,7 @@ void Uic::createFormImpl( const TQDomElement &e ) // children if( !objectNames.isEmpty() ) - qWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__); + tqWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__); nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget diff --git a/qtruby/rubylib/designer/rbuic/main.cpp b/qtruby/rubylib/designer/rbuic/main.cpp index e06ff586..ed74aece 100644 --- a/qtruby/rubylib/designer/rbuic/main.cpp +++ b/qtruby/rubylib/designer/rbuic/main.cpp @@ -189,7 +189,7 @@ int main( int argc, char * argv[] ) if ( outputFile ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "rbuic: Could not open output file '%s'", outputFile ); + tqFatal( "rbuic: Could not open output file '%s'", outputFile ); } else { fileOut.open( IO_WriteOnly, stdout ); } @@ -205,13 +205,13 @@ int main( int argc, char * argv[] ) out.setEncoding( TQTextStream::UnicodeUTF8 ); TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) - qFatal( "rbuic: Could not open file '%s' ", fileName ); + tqFatal( "rbuic: Could not open file '%s' ", fileName ); TQDomDocument doc; TQString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) - qFatal( TQString("rbuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine ); + tqFatal( TQString("rbuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine ); DomTool::fixDocument( doc ); -- cgit v1.2.3