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/ChangeLog | 6 ++-- qtruby/rubylib/designer/rbuic/embed.cpp | 2 +- qtruby/rubylib/designer/rbuic/form.cpp | 2 +- qtruby/rubylib/designer/rbuic/main.cpp | 6 ++-- .../examples/network/clientserver/server/server.rb | 2 +- qtruby/rubylib/qtruby/Qt.cpp | 32 +++++++++++----------- qtruby/rubylib/qtruby/handlers.cpp | 18 ++++++------ qtruby/rubylib/qtruby/lib/Qt/qtruby.rb | 4 +-- qtruby/rubylib/tutorial/t10/lcdrange.rb | 2 +- qtruby/rubylib/tutorial/t11/lcdrange.rb | 2 +- qtruby/rubylib/tutorial/t12/lcdrange.rb | 2 +- qtruby/rubylib/tutorial/t13/lcdrange.rb | 2 +- qtruby/rubylib/tutorial/t14/lcdrange.rb | 2 +- qtruby/rubylib/tutorial/t8/lcdrange.rb | 2 +- 14 files changed, 42 insertions(+), 42 deletions(-) (limited to 'qtruby') diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index 1e44544e..ebb11426 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -221,7 +221,7 @@ 2005-12-16 Richard Dale * The logger_backend() function has been removed and replaced with - qWarning() calls. This was because of problems with getting the + tqWarning() calls. This was because of problems with getting the logger_backend() code to work on Windows. 2005-12-16 Richard Dale @@ -637,7 +637,7 @@ 2004-10-30 Richard Dale - * qError(), qWarning() and qFatal() are now Object instance methods, rather than Qt module + * qError(), tqWarning() and tqFatal() are now Object instance methods, rather than Qt module methods. This means they don't need to be referenced with an ugly 'Qt.' module scope anymore. 2004-10-21 Richard Dale @@ -1041,7 +1041,7 @@ 2004-07-27 Richard Dale - * Added qDebug(), qFatal() and qWarning() module methods + * Added tqDebug(), tqFatal() and tqWarning() module methods 2004-07-26 Richard Dale 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 ); diff --git a/qtruby/rubylib/examples/network/clientserver/server/server.rb b/qtruby/rubylib/examples/network/clientserver/server/server.rb index e2d142bd..4a53fbf0 100644 --- a/qtruby/rubylib/examples/network/clientserver/server/server.rb +++ b/qtruby/rubylib/examples/network/clientserver/server/server.rb @@ -47,7 +47,7 @@ class SimpleServer < TQt::ServerSocket def initialize( parent=nil ) super( 4242, 1, parent ) if !ok() - qWarning("Failed to bind to port 4242") + tqWarning("Failed to bind to port 4242") exit(1) end end diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index 0c33796f..bd9e010a 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -188,7 +188,7 @@ void unmapPointer(smokeruby_object *o, Smoke::Index classId, void *lastptr) { if (do_debug & qtdb_gc) { const char *className = o->smoke->classes[o->classId].className; - qWarning("unmapPointer (%s*)%p -> %p", className, ptr, obj_ptr); + tqWarning("unmapPointer (%s*)%p -> %p", className, ptr, obj_ptr); } pointer_map.remove(ptr); @@ -215,7 +215,7 @@ void mapPointer(VALUE obj, smokeruby_object *o, Smoke::Index classId, void *last if (do_debug & qtdb_gc) { const char *className = o->smoke->classes[o->classId].className; - qWarning("mapPointer (%s*)%p -> %p", className, ptr, (void*)obj); + tqWarning("mapPointer (%s*)%p -> %p", className, ptr, (void*)obj); } pointer_map.insert(ptr, obj_ptr); @@ -763,7 +763,7 @@ public: VALUE obj = getPointerObject(ptr); smokeruby_object *o = value_obj_info(obj); if(do_debug & qtdb_gc) { - qWarning("%p->~%s()", ptr, smoke->className(classId)); + tqWarning("%p->~%s()", ptr, smoke->className(classId)); } if(!o || !o->ptr) { return; @@ -791,7 +791,7 @@ public: signature += " const"; } - qWarning( "virtual %p->%s::%s called", + tqWarning( "virtual %p->%s::%s called", ptr, smoke->classes[smoke->methods[method].classId].className, (const char *) signature ); @@ -799,7 +799,7 @@ public: if(!o) { if( do_debug & qtdb_virtual ) // if not in global destruction - qWarning("Cannot find object for virtual method %p -> %p", ptr, &obj); + tqWarning("Cannot find object for virtual method %p -> %p", ptr, &obj); return false; } @@ -838,21 +838,21 @@ extern "C" { static VALUE qdebug(VALUE klass, VALUE msg) { - qDebug("%s", StringValuePtr(msg)); + tqDebug("%s", StringValuePtr(msg)); return klass; } static VALUE qfatal(VALUE klass, VALUE msg) { - qFatal("%s", StringValuePtr(msg)); + tqFatal("%s", StringValuePtr(msg)); return klass; } static VALUE qwarning(VALUE klass, VALUE msg) { - qWarning("%s", StringValuePtr(msg)); + tqWarning("%s", StringValuePtr(msg)); return klass; } @@ -1413,13 +1413,13 @@ static TQCString * mcid = 0; Smoke::Index *rcid = methcache.find((const char *)*mcid); #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("method_missing mcid: %s", (const char *) *mcid); + if (do_debug & qtdb_calls) tqWarning("method_missing mcid: %s", (const char *) *mcid); #endif if (rcid) { // Got a hit #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("method_missing cache hit, mcid: %s", (const char *) *mcid); + if (do_debug & qtdb_calls) tqWarning("method_missing cache hit, mcid: %s", (const char *) *mcid); #endif _current_method = *rcid; } else { @@ -1945,7 +1945,7 @@ getIsa(VALUE /*self*/, VALUE classId) qt_Smoke->classes[NUM2INT(classId)].parents; while(*parents) { - //qWarning("\tparent: %s", qt_Smoke->classes[*parents].className); + //tqWarning("\tparent: %s", qt_Smoke->classes[*parents].className); rb_ary_push(parents_list, rb_str_new2(qt_Smoke->classes[*parents++].className)); } return parents_list; @@ -2384,12 +2384,12 @@ findMethod(VALUE /*self*/, VALUE c_value, VALUE name_value) VALUE result = rb_ary_new(); Smoke::Index meth = qt_Smoke->findMethod(c, name); #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("DAMNIT on %s::%s => %d", c, name, meth); + if (do_debug & qtdb_calls) tqWarning("DAMNIT on %s::%s => %d", c, name, meth); #endif if(!meth) { meth = qt_Smoke->findMethod("TQGlobalSpace", name); #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("DAMNIT on TQGlobalSpace::%s => %d", name, meth); + if (do_debug & qtdb_calls) tqWarning("DAMNIT on TQGlobalSpace::%s => %d", name, meth); #endif } @@ -2412,7 +2412,7 @@ findMethod(VALUE /*self*/, VALUE c_value, VALUE name_value) if ((methodRef.flags & Smoke::mf_internal) == 0) { rb_ary_push(result, INT2NUM(qt_Smoke->ambiguousMethodList[i])); #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("Ambiguous Method %s::%s => %d", c, name, qt_Smoke->ambiguousMethodList[i]); + if (do_debug & qtdb_calls) tqWarning("Ambiguous Method %s::%s => %d", c, name, qt_Smoke->ambiguousMethodList[i]); #endif } @@ -2439,7 +2439,7 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) if(argc > 1 && TYPE(argv[1]) == T_STRING) pat = StringValuePtr(argv[1]); #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("findAllMethods called with classid = %d, pat == %s", c, pat); + if (do_debug & qtdb_calls) tqWarning("findAllMethods called with classid = %d, pat == %s", c, pat); #endif Smoke::Index imax = qt_Smoke->numMethodMaps; Smoke::Index imin = 0, icur = -1, methmin, methmax; @@ -2545,7 +2545,7 @@ findAllMethodNames(VALUE /*self*/, VALUE result, VALUE classid, VALUE flags_valu return Qnil; } #ifdef DEBUG - if (do_debug & qtdb_calls) qWarning("findAllMethodNames called with classid = %d", c); + if (do_debug & qtdb_calls) tqWarning("findAllMethodNames called with classid = %d", c); #endif Smoke::Index imax = qt_Smoke->numMethodMaps; Smoke::Index imin = 0, icur = -1, methmin, methmax; diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 1c1733c6..5b86ed39 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -85,7 +85,7 @@ mark_qobject_children(TQObject * qobject) ++it; obj = getPointerObject(child); if (obj != Qnil) { - if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", child->className(), child, (void*)obj); + if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", child->className(), child, (void*)obj); rb_gc_mark(obj); } @@ -100,7 +100,7 @@ smokeruby_mark(void * p) smokeruby_object * o = (smokeruby_object *) p; const char *className = o->smoke->classes[o->classId].className; - if(do_debug & qtdb_gc) qWarning("Checking for mark (%s*)%p\n", className, o->ptr); + if(do_debug & qtdb_gc) tqWarning("Checking for mark (%s*)%p\n", className, o->ptr); if(o->ptr && o->allocated) { if (isDerivedFromByName(o->smoke, className, "TQListView")) { @@ -112,7 +112,7 @@ smokeruby_mark(void * p) ++it; obj = getPointerObject(item); if (obj != Qnil) { - if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); + if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); rb_gc_mark(obj); } } @@ -128,7 +128,7 @@ smokeruby_mark(void * p) item = table->item(row, col); obj = getPointerObject(item); if (obj != Qnil) { - if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); + if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); rb_gc_mark(obj); } } @@ -142,7 +142,7 @@ smokeruby_mark(void * p) for ( TQCanvasItemList::iterator it = list.begin(); it != list.end(); ++it ) { obj = getPointerObject(*it); if (obj != Qnil) { - if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", className, *it, (void*)obj); + if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, *it, (void*)obj); rb_gc_mark(obj); } } @@ -154,7 +154,7 @@ smokeruby_mark(void * p) TQCanvas * canvas = item->canvas(); obj = getPointerObject(canvas); if (obj != Qnil) { - if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", "TQCanvas", canvas, (void*)obj); + if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", "TQCanvas", canvas, (void*)obj); rb_gc_mark(obj); } return; @@ -174,7 +174,7 @@ smokeruby_free(void * p) smokeruby_object *o = (smokeruby_object*)p; const char *className = o->smoke->classes[o->classId].className; - if(do_debug & qtdb_gc) qWarning("Checking for delete (%s*)%p allocated: %s\n", className, o->ptr, o->allocated ? "true" : "false"); + if(do_debug & qtdb_gc) tqWarning("Checking for delete (%s*)%p allocated: %s\n", className, o->ptr, o->allocated ? "true" : "false"); if(application_terminated || !o->allocated || o->ptr == 0) { free(o); @@ -247,7 +247,7 @@ smokeruby_free(void * p) } } - if(do_debug & qtdb_gc) qWarning("Deleting (%s*)%p\n", className, o->ptr); + if(do_debug & qtdb_gc) tqWarning("Deleting (%s*)%p\n", className, o->ptr); char *methodName = new char[strlen(className) + 2]; methodName[0] = '~'; @@ -717,7 +717,7 @@ marshall_basetype(Marshall *m) obj = set_obj_info(classname, o); if (do_debug & qtdb_calls) { - qWarning("allocating %s %p -> %p\n", classname, o->ptr, (void*)obj); + tqWarning("allocating %s %p -> %p\n", classname, o->ptr, (void*)obj); } if(m->type().isStack()) { diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb index d673facc..e6a1cc82 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb @@ -1801,7 +1801,7 @@ module Qt if signal =~ /([^\s]*)\((.*)\)/ @signals.push TQObjectMember.new($1, signal, $2) else - qWarning( "#{@klass.name}: Invalid signal format: '#{signal}'" ) + tqWarning( "#{@klass.name}: Invalid signal format: '#{signal}'" ) end end end @@ -1829,7 +1829,7 @@ module Qt if slot =~ /([^\s]*)\((.*)\)/ @slots.push TQObjectMember.new($1, slot, $2) else - qWarning( "#{@klass.name}: Invalid slot format: '#{slot}'" ) + tqWarning( "#{@klass.name}: Invalid slot format: '#{slot}'" ) end end end diff --git a/qtruby/rubylib/tutorial/t10/lcdrange.rb b/qtruby/rubylib/tutorial/t10/lcdrange.rb index 94e61af5..85ed3c0b 100644 --- a/qtruby/rubylib/tutorial/t10/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t10/lcdrange.rb @@ -25,7 +25,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/qtruby/rubylib/tutorial/t11/lcdrange.rb index 94e61af5..85ed3c0b 100644 --- a/qtruby/rubylib/tutorial/t11/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t11/lcdrange.rb @@ -25,7 +25,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/qtruby/rubylib/tutorial/t12/lcdrange.rb index 7c1c340d..54654165 100644 --- a/qtruby/rubylib/tutorial/t12/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t12/lcdrange.rb @@ -32,7 +32,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t13/lcdrange.rb b/qtruby/rubylib/tutorial/t13/lcdrange.rb index 223efe7f..39eb9b1d 100644 --- a/qtruby/rubylib/tutorial/t13/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t13/lcdrange.rb @@ -40,7 +40,7 @@ class LCDRange < TQt::Widget def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t14/lcdrange.rb b/qtruby/rubylib/tutorial/t14/lcdrange.rb index e7955aaf..9cb54b39 100644 --- a/qtruby/rubylib/tutorial/t14/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t14/lcdrange.rb @@ -40,7 +40,7 @@ class LCDRange < TQt::Widget def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t8/lcdrange.rb b/qtruby/rubylib/tutorial/t8/lcdrange.rb index a03e9c31..4e3d856f 100644 --- a/qtruby/rubylib/tutorial/t8/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t8/lcdrange.rb @@ -25,7 +25,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return -- cgit v1.2.3