Rename additional global TQt functions

3 files changed, 27 insertions, 27 deletions

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