Fix incorrect conversion

3 files changed, 348 insertions, 348 deletions

diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 4d849725..225adaa8 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -76,13 +76,13 @@ int do_debug = qtdb_gc;
 int do_debug = qtdb_none;
 #endif
 
-TTQPtrDict<VALUE> pointer_map(2179);
+TQPtrDict<VALUE> pointer_map(2179);
 int object_count = 0;
 
-TTQAsciiDict<Smoke::Index> methcache(2179);
-TTQAsciiDict<Smoke::Index> classcache(2179);
+TQAsciiDict<Smoke::Index> methcache(2179);
+TQAsciiDict<Smoke::Index> classcache(2179);
 // Maps from a classname in the form TQt::Widget to an int id
-TTQIntDict<char> classname(2179);
+TQIntDict<char> classname(2179);
 
 extern "C" {
 VALUE qt_module = Qnil;
@@ -138,7 +138,7 @@ void *value_to_ptr(VALUE ruby_value) {  // ptr on success, null on fail
 VALUE getPointerObject(void *ptr);
 
 bool isTQObject(Smoke *smoke, Smoke::Index classId) {
-    if(qstrcmp(smoke->classes[classId].className, "TTQObject") == 0)
+    if(qstrcmp(smoke->classes[classId].className, "TQObject") == 0)
 	return true;
     for(Smoke::Index *p = smoke->inheritanceList + smoke->classes[classId].parents;
 	*p;
@@ -431,7 +431,7 @@ public:
 	if(_called) return;
 	_called = true;
 		
-	TTQString className(_smoke->className(method().classId));
+	TQString className(_smoke->className(method().classId));
 	
 	if (	! className.endsWith(_smoke->methodNames[method().name])
 			&& TYPE(_target) != T_DATA 
@@ -471,10 +471,10 @@ public:
     }
 };
 
-class UnencapsulatedTQObject : public TTQObject {
+class UnencapsulatedTQObject : public TQObject {
 public:
-    TTQConnectionList *public_receivers(int signal) const { return receivers(signal); }
-    void public_activate_signal(TTQConnectionList *clist, TQUObject *o) { activate_signal(clist, o); }
+    TQConnectionList *public_receivers(int signal) const { return receivers(signal); }
+    void public_activate_signal(TQConnectionList *clist, TQUObject *o) { activate_signal(clist, o); }
 };
 
 class EmitSignal : public Marshall {
@@ -487,7 +487,7 @@ class EmitSignal : public Marshall {
     Smoke::Stack _stack;
     bool _called;
 public:
-    EmitSignal(TTQObject *qobj, int id, int items, VALUE args, VALUE *sp) :
+    EmitSignal(TQObject *qobj, int id, int items, VALUE args, VALUE *sp) :
     _qobj((UnencapsulatedTQObject*)qobj), _id(id), _sp(sp), _items(items),
     _cur(-1), _called(false)
     {
@@ -511,7 +511,7 @@ public:
 	if(_called) return;
 	_called = true;
 
-	TTQConnectionList *clist = _qobj->public_receivers(_id);
+	TQConnectionList *clist = _qobj->public_receivers(_id);
 	if(!clist) return;
 
 	TQUObject *o = new TQUObject[_items + 1];
@@ -532,7 +532,7 @@ public:
 		static_QUType_charstar.set(po, (char*)si->s_voidp);
 		break;
 	      case xmoc_QString:
-		static_QUType_TQString.set(po, *(TTQString*)si->s_voidp);
+		static_QUType_TQString.set(po, *(TQString*)si->s_voidp);
 		break;
 	      default:
 		{
@@ -778,7 +778,7 @@ public:
 
 	if (do_debug & qtdb_virtual) {
 		Smoke::Method & meth = smoke->methods[method];
-		TTQCString signature(smoke->methodNames[meth.name]);
+		TQCString signature(smoke->methodNames[meth.name]);
 		signature += "(";
 
 		for (int i = 0; i < meth.numArgs; i++) {
@@ -876,19 +876,19 @@ set_obj_info(const char * className, smokeruby_object * o)
 		o->classId = (int)*r;
 	}
 
-	// If the instance is a subclass of TTQObject, then check to see if the
-	// className from its TTQMetaObject is in the Smoke library. If not then
+	// If the instance is a subclass of TQObject, then check to see if the
+	// className from its TQMetaObject is in the Smoke library. If not then
 	// create a Ruby class for it dynamically. Remove the first letter from 
 	// any class names beginning with 'Q' or 'K' and put them under the TQt:: 
 	// or KDE:: modules respectively.
-	if (isDerivedFrom(o->smoke, o->classId, o->smoke->idClass("TTQObject"))) {
-		TTQObject * qobject = (TTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
-		TTQMetaObject * meta = qobject->metaObject();
+	if (isDerivedFrom(o->smoke, o->classId, o->smoke->idClass("TQObject"))) {
+		TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
+		TQMetaObject * meta = qobject->metaObject();
 		int classId = o->smoke->idClass(meta->className());
 		// The class isn't in the Smoke lib..
 		if (classId == 0) {
 			VALUE new_klass = Qnil;
-			TTQString className(meta->className());
+			TQString className(meta->className());
 			// The konsolePart class is in tdebase, and so it can't be in the Smoke library.
 			// This hack instantiates a Ruby KDE::KonsolePart instance
 			if (className == "konsolePart") {
@@ -908,7 +908,7 @@ set_obj_info(const char * className, smokeruby_object * o)
 			}
 
 			// Add a TQt::Object.metaObject method which will do dynamic despatch on the
-			// metaObject() virtual method so that the true TTQMetaObject of the class 
+			// metaObject() virtual method so that the true TQMetaObject of the class 
 			// is returned, rather than for the one for the parent class that is in
 			// the Smoke library.
 			rb_define_method(klass, "metaObject", (VALUE (*) (...)) qobject_metaobject, 0);
@@ -1012,24 +1012,24 @@ receivers_qobject(VALUE self)
 		
 	smokeruby_object * o = 0;
     Data_Get_Struct(self, smokeruby_object, o);	
-	UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
+	UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
 	VALUE result = rb_hash_new();
-	TTQStrList signalNames = qobject->metaObject()->signalNames(true);
+	TQStrList signalNames = qobject->metaObject()->signalNames(true);
 	
 	for (int sig = 0; sig < qobject->metaObject()->numSignals(true); sig++) {
-		TTQConnectionList * clist = qobject->public_receivers(sig);
+		TQConnectionList * clist = qobject->public_receivers(sig);
 		if (clist != 0) {
 			VALUE name = rb_str_new2(signalNames.at(sig));
 			VALUE members = rb_ary_new();
 			
-			for (	TTQConnection * connection = clist->first(); 
+			for (	TQConnection * connection = clist->first(); 
 					connection != 0; 
 					connection = clist->next() ) 
 			{
 				VALUE obj = getPointerObject(connection);
 				if (obj == Qnil) {
 					smokeruby_object * c = ALLOC(smokeruby_object);
-					c->classId = o->smoke->idClass("TTQConnection");
+					c->classId = o->smoke->idClass("TQConnection");
 					c->smoke = o->smoke;
 					c->ptr = connection;
 					c->allocated = false;
@@ -1046,36 +1046,36 @@ receivers_qobject(VALUE self)
 	return result;
 }
 
-// Takes a variable name and a TQProperty with TTQVariant value, and returns a '
+// Takes a variable name and a TQProperty with TQVariant value, and returns a '
 // variable=value' pair with the value in ruby inspect style
 static TQCString
-inspectProperty(Smoke * smoke, const TTQMetaProperty * property, const char * name, TTQVariant & value)
+inspectProperty(Smoke * smoke, const TQMetaProperty * property, const char * name, TQVariant & value)
 {
 	if (property->isEnumType()) {
-		TTQMetaObject * metaObject = *(property->meta);
-		return TTQCString().sprintf(	" %s=%s::%s",
+		TQMetaObject * metaObject = *(property->meta);
+		return TQCString().sprintf(	" %s=%s::%s",
 									name,
 									smoke->binding->className(smoke->idClass(metaObject->className())), 
 									property->valueToKey(value.toInt()) );
 	}
 	
 	switch (value.type()) {
-	case TTQVariant::String:
-	case TTQVariant::CString:
+	case TQVariant::String:
+	case TQVariant::CString:
 	{
 		if (value.toString().isNull()) {
-			return TTQCString().sprintf(" %s=nil", name); 
+			return TQCString().sprintf(" %s=nil", name); 
 		} else {
-			return TTQCString().sprintf(	" %s=\"%s\"", 
+			return TQCString().sprintf(	" %s=\"%s\"", 
 										name, 
 										value.toString().latin1() );
 		}
 	}
 		
-	case TTQVariant::Bool:
+	case TQVariant::Bool:
 	{
-		TTQString rubyName;
-		TTQRegExp name_re("^(is|has)(.)(.*)");
+		TQString rubyName;
+		TQRegExp name_re("^(is|has)(.)(.*)");
 		
 		if (name_re.search(name) != -1) {
 			rubyName = name_re.cap(2).lower() + name_re.cap(3) + "?";
@@ -1083,86 +1083,86 @@ inspectProperty(Smoke * smoke, const TTQMetaProperty * property, const char * na
 			rubyName = name;
 		}
 		
-		return TTQCString().sprintf(" %s=%s", rubyName.latin1(), value.toString().latin1());
+		return TQCString().sprintf(" %s=%s", rubyName.latin1(), value.toString().latin1());
 	}
 			
-	case TTQVariant::Color:
+	case TQVariant::Color:
 	{
-		TTQColor c = value.toColor();
-		return TTQCString().sprintf(" %s=#<TQt::Color:0x0 %s>", name, c.name().latin1());
+		TQColor c = value.toColor();
+		return TQCString().sprintf(" %s=#<TQt::Color:0x0 %s>", name, c.name().latin1());
 	}
 			
-	case TTQVariant::Cursor:
+	case TQVariant::Cursor:
 	{
-		TTQCursor c = value.toCursor();
-		return TTQCString().sprintf(" %s=#<TQt::Cursor:0x0 shape=%d>", name, c.shape());
+		TQCursor c = value.toCursor();
+		return TQCString().sprintf(" %s=#<TQt::Cursor:0x0 shape=%d>", name, c.shape());
 	}
 	
-	case TTQVariant::Double:
+	case TQVariant::Double:
 	{
-		return TTQCString().sprintf(" %s=%.4f", name, value.toDouble());
+		return TQCString().sprintf(" %s=%.4f", name, value.toDouble());
 	}
 	
-	case TTQVariant::Font:
+	case TQVariant::Font:
 	{
-		TTQFont f = value.toFont();
-		return TTQCString().sprintf(	" %s=#<TQt::Font:0x0 family=%s, pointSize=%d, weight=%d, italic=%s, bold=%s, underline=%s, strikeOut=%s>", 
+		TQFont f = value.toFont();
+		return TQCString().sprintf(	" %s=#<TQt::Font:0x0 family=%s, pointSize=%d, weight=%d, italic=%s, bold=%s, underline=%s, strikeOut=%s>", 
 									name, 
 									f.family().latin1(), f.pointSize(), f.weight(), 
 									f.italic() ? "true" : "false", f.bold() ? "true" : "false",
 									f.underline() ? "true" : "false", f.strikeOut() ? "true" : "false" );
 	}
 	
-	case TTQVariant::Point:
+	case TQVariant::Point:
 	{
-		TTQPoint p = value.toPoint();
-		return TTQCString().sprintf(	" %s=#<TQt::Point:0x0 x=%d, y=%d>", 
+		TQPoint p = value.toPoint();
+		return TQCString().sprintf(	" %s=#<TQt::Point:0x0 x=%d, y=%d>", 
 									name, 
 									p.x(), p.y() );
 	}
 	
-	case TTQVariant::Rect:
+	case TQVariant::Rect:
 	{
-		TTQRect r = value.toRect();
-		return TTQCString().sprintf(	" %s=#<TQt::Rect:0x0 left=%d, right=%d, top=%d, bottom=%d>", 
+		TQRect r = value.toRect();
+		return TQCString().sprintf(	" %s=#<TQt::Rect:0x0 left=%d, right=%d, top=%d, bottom=%d>", 
 									name, 
 									r.left(), r.right(), r.top(), r.bottom() );
 	}
 	
-	case TTQVariant::Size:
+	case TQVariant::Size:
 	{
-		TTQSize s = value.toSize();
-		return TTQCString().sprintf(	" %s=#<TQt::Size:0x0 width=%d, height=%d>", 
+		TQSize s = value.toSize();
+		return TQCString().sprintf(	" %s=#<TQt::Size:0x0 width=%d, height=%d>", 
 									name, 
 									s.width(), s.height() );
 	}
 	
-	case TTQVariant::SizePolicy:
+	case TQVariant::SizePolicy:
 	{
-		TTQSizePolicy s = value.toSizePolicy();
-		return TTQCString().sprintf(	" %s=#<TQt::SizePolicy:0x0 horData=%d, verData=%d>", 
+		TQSizePolicy s = value.toSizePolicy();
+		return TQCString().sprintf(	" %s=#<TQt::SizePolicy:0x0 horData=%d, verData=%d>", 
 									name, 
 									s.horData(), s.verData() );
 	}
 	
-	case TTQVariant::Brush:
-	case TTQVariant::ColorGroup:
-	case TTQVariant::Image:
-	case TTQVariant::Palette:
-	case TTQVariant::Pixmap:
-	case TTQVariant::Region:
+	case TQVariant::Brush:
+	case TQVariant::ColorGroup:
+	case TQVariant::Image:
+	case TQVariant::Palette:
+	case TQVariant::Pixmap:
+	case TQVariant::Region:
 	{
-		return TTQCString().sprintf(" %s=#<TQt::%s:0x0>", name, value.typeName() + 1);
+		return TQCString().sprintf(" %s=#<TQt::%s:0x0>", name, value.typeName() + 1);
 	}
 	
 	default:
-		return TTQCString().sprintf(	" %s=%s", 
+		return TQCString().sprintf(	" %s=%s", 
 									name, 
 									(value.isNull() || value.toString().isNull()) ? "nil" : value.toString().latin1() );
 	}
 }
 
-// Retrieves the properties for a TTQObject and returns them as 'name=value' pairs
+// Retrieves the properties for a TQObject and returns them as 'name=value' pairs
 // in a ruby inspect string. For example:
 //
 //		#<TQt::HBoxLayout:0x30139030 name=unnamed, margin=0, spacing=0, resizeMode=3>
@@ -1181,14 +1181,14 @@ inspect_qobject(VALUE self)
 	
 	smokeruby_object * o = 0;
     Data_Get_Struct(self, smokeruby_object, o);	
-	TTQObject * qobject = (TTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
+	TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
 	
-	TTQCString value_list;
-	value_list.append(TTQCString().sprintf(" name=\"%s\"", qobject->name()));
+	TQCString value_list;
+	value_list.append(TQCString().sprintf(" name=\"%s\"", qobject->name()));
 	
 	if (qobject->isWidgetType()) {
-		TTQWidget * w = (TTQWidget *) qobject;
-		value_list.append(TTQCString().sprintf(	", x=%d, y=%d, width=%d, height=%d", 
+		TQWidget * w = (TQWidget *) qobject;
+		value_list.append(TQCString().sprintf(	", x=%d, y=%d, width=%d, height=%d", 
 												w->x(),
 												w->y(),
 												w->width(),
@@ -1201,7 +1201,7 @@ inspect_qobject(VALUE self)
 	return inspect_str;
 }
 
-// Retrieves the properties for a TTQObject and pretty_prints them as 'name=value' pairs
+// Retrieves the properties for a TQObject and pretty_prints them as 'name=value' pairs
 // For example:
 //
 //		#<TQt::HBoxLayout:0x30139030
@@ -1226,13 +1226,13 @@ pretty_print_qobject(VALUE self, VALUE pp)
 	
 	smokeruby_object * o = 0;
     Data_Get_Struct(self, smokeruby_object, o);	
-	UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
-	TTQStrList names = qobject->metaObject()->propertyNames(true);
+	UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
+	TQStrList names = qobject->metaObject()->propertyNames(true);
 	
-	TTQCString value_list;		
+	TQCString value_list;		
 	
 	if (qobject->parent() != 0) {
-		TTQCString parentInspectString;
+		TQCString parentInspectString;
 		VALUE obj = getPointerObject(qobject->parent());
 		if (obj != Qnil) {
 			VALUE parent_inspect_str = rb_funcall(obj, rb_intern("to_s"), 0, 0);	
@@ -1243,8 +1243,8 @@ pretty_print_qobject(VALUE self, VALUE pp)
 		}
 		
 		if (qobject->parent()->isWidgetType()) {
-			TTQWidget * w = (TTQWidget *) qobject->parent();
-			value_list = TTQCString().sprintf(	"  parent=%s name=\"%s\", x=%d, y=%d, width=%d, height=%d>,\n", 
+			TQWidget * w = (TQWidget *) qobject->parent();
+			value_list = TQCString().sprintf(	"  parent=%s name=\"%s\", x=%d, y=%d, width=%d, height=%d>,\n", 
 												parentInspectString.data(),
 												w->name(),
 												w->x(),
@@ -1252,7 +1252,7 @@ pretty_print_qobject(VALUE self, VALUE pp)
 												w->width(),
 												w->height() );
 		} else {
-			value_list = TTQCString().sprintf(	"  parent=%s name=\"%s\">,\n", 
+			value_list = TQCString().sprintf(	"  parent=%s name=\"%s\">,\n", 
 												parentInspectString.data(),
 												qobject->parent()->name() );
 		}
@@ -1261,23 +1261,23 @@ pretty_print_qobject(VALUE self, VALUE pp)
 	}
 	
 	if (qobject->children() != 0) {
-		value_list = TTQCString().sprintf("  children=Array (%d element(s)),\n", qobject->children()->count());
+		value_list = TQCString().sprintf("  children=Array (%d element(s)),\n", qobject->children()->count());
 		rb_funcall(pp, rb_intern("text"), 1, rb_str_new2(value_list.data()));
 	}
 	
-	value_list = TTQCString("  metaObject=#<TQt::MetaObject:0x0");
-	value_list.append(TTQCString().sprintf(" className=%s", qobject->metaObject()->className()));
+	value_list = TQCString("  metaObject=#<TQt::MetaObject:0x0");
+	value_list.append(TQCString().sprintf(" className=%s", qobject->metaObject()->className()));
 	
 	if (qobject->metaObject()->superClass() != 0) {
-		value_list.append(TTQCString().sprintf(", superClass=#<TQt::MetaObject:0x0>", qobject->metaObject()->superClass()));
+		value_list.append(TQCString().sprintf(", superClass=#<TQt::MetaObject:0x0>", qobject->metaObject()->superClass()));
 	}		
 	
 	if (qobject->metaObject()->numSignals() > 0) {
-		value_list.append(TTQCString().sprintf(", signalNames=Array (%d element(s))", qobject->metaObject()->numSignals()));
+		value_list.append(TQCString().sprintf(", signalNames=Array (%d element(s))", qobject->metaObject()->numSignals()));
 	}		
 	
 	if (qobject->metaObject()->numSlots() > 0) {
-		value_list.append(TTQCString().sprintf(", slotNames=Array (%d element(s))", qobject->metaObject()->numSlots()));
+		value_list.append(TQCString().sprintf(", slotNames=Array (%d element(s))", qobject->metaObject()->numSlots()));
 	}
 	
 	value_list.append(">,\n");
@@ -1285,14 +1285,14 @@ pretty_print_qobject(VALUE self, VALUE pp)
 				
 	int signalCount = 0;
 	for (int sig = 0; sig < qobject->metaObject()->numSignals(true); sig++) {
-		TTQConnectionList * clist = qobject->public_receivers(sig);
+		TQConnectionList * clist = qobject->public_receivers(sig);
 		if (clist != 0) {
 			signalCount++;
 		}
 	}
 	
 	if (signalCount > 0) {
-		value_list = TTQCString().sprintf(" receivers=Hash (%d element(s)),\n", signalCount);
+		value_list = TQCString().sprintf(" receivers=Hash (%d element(s)),\n", signalCount);
 		rb_funcall(pp, rb_intern("text"), 1, rb_str_new2(value_list.data()));
 	}		
 	
@@ -1300,8 +1300,8 @@ pretty_print_qobject(VALUE self, VALUE pp)
 	const char * name = names.first();
 	
 	if (name != 0) {
-		TTQVariant value = qobject->property(name);
-		const TTQMetaProperty * property = qobject->metaObject()->property(index, true);
+		TQVariant value = qobject->property(name);
+		const TQMetaProperty * property = qobject->metaObject()->property(index, true);
 		value_list = " " + inspectProperty(o->smoke, property, name, value);
 		rb_funcall(pp, rb_intern("text"), 1, rb_str_new2(value_list.data()));
 		index++;
@@ -1335,8 +1335,8 @@ static VALUE
 qobject_metaobject(VALUE self)
 {
 	smokeruby_object * o = value_obj_info(self);
-	TTQObject * qobject = (TTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
-	TTQMetaObject * meta = qobject->metaObject();
+	TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
+	TQMetaObject * meta = qobject->metaObject();
 	VALUE obj = getPointerObject(meta);
 	if (obj != Qnil) {
 		return obj;
@@ -1344,7 +1344,7 @@ qobject_metaobject(VALUE self)
 
 	smokeruby_object  * m = (smokeruby_object *) malloc(sizeof(smokeruby_object));
 	m->smoke = o->smoke;
-	m->classId = m->smoke->idClass("TTQMetaObject");
+	m->classId = m->smoke->idClass("TQMetaObject");
 	m->ptr = meta;
 	m->allocated = false;
 	obj = set_obj_info("TQt::MetaObject", m);
@@ -1359,15 +1359,15 @@ static Smoke::Index new_qvariant_qmap = 0;
 
 	if (new_qvariant_qlist == 0) {
 		Smoke::Index nameId = qt_Smoke->idMethodName("TQVariant?");
-		Smoke::Index meth = qt_Smoke->findMethod(qt_Smoke->idClass("TTQVariant"), nameId);
+		Smoke::Index meth = qt_Smoke->findMethod(qt_Smoke->idClass("TQVariant"), nameId);
 		Smoke::Index i = qt_Smoke->methodMaps[meth].method;
 		i = -i;		// turn into ambiguousMethodList index
 		while (qt_Smoke->ambiguousMethodList[i] != 0) {
 			const char * argType = qt_Smoke->types[qt_Smoke->argumentList[qt_Smoke->methods[qt_Smoke->ambiguousMethodList[i]].args]].name;
 
-			if (qstrcmp(argType, "const TTQValueList<TTQVariant>&" ) == 0) {
+			if (qstrcmp(argType, "const TQValueList<TQVariant>&" ) == 0) {
 				new_qvariant_qlist = qt_Smoke->ambiguousMethodList[i];
-			} else if (qstrcmp(argType, "const TTQMap<TTQString,TTQVariant>&" ) == 0) {
+			} else if (qstrcmp(argType, "const TQMap<TQString,TQVariant>&" ) == 0) {
 				new_qvariant_qmap = qt_Smoke->ambiguousMethodList[i];
 			}
 
@@ -1394,13 +1394,13 @@ static Smoke::Index new_qvariant_qmap = 0;
 	return rb_call_super(argc, argv);
 }
 
-static TTQCString *
+static TQCString *
 find_cached_selector(int argc, VALUE * argv, VALUE klass, const char * methodName)
 {
     // Look in the cache
-static TTQCString * mcid = 0;
+static TQCString * mcid = 0;
 	if (mcid == 0) {
-		mcid = new TTQCString();
+		mcid = new TQCString();
 	}
 	*mcid = rb_class2name(klass);
 	*mcid += ';';
@@ -1436,9 +1436,9 @@ method_missing(int argc, VALUE * argv, VALUE self)
     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
 
 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
-static TTQString * pred = 0;
+static TQString * pred = 0;
 	if (pred == 0) {
-		pred = new TTQString();
+		pred = new TQString();
 	}
 	
 	*pred = methodName;
@@ -1452,11 +1452,11 @@ static TTQString * pred = 0;
 		pred->replace(pred->length() - 1, 1, "");
 		
 		pred->replace(0, 1, pred->at(0).upper());
-		pred->replace(0, 0, TTQString("is"));
+		pred->replace(0, 0, TQString("is"));
 		Smoke::Index meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred->latin1());
 		
 		if (meth == 0) {
-			pred->replace(0, 2, TTQString("has"));
+			pred->replace(0, 2, TQString("has"));
 			meth = o->smoke->findMethod(o->smoke->classes[o->classId].className, pred->latin1());
 		}
 		
@@ -1475,7 +1475,7 @@ static TTQString * pred = 0;
     }
 
 	{
-		TTQCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
+		TQCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
 
 		if (_current_method == -1) {
 			// Find the C++ method to call. Do that from Ruby for now
@@ -1505,22 +1505,22 @@ static TTQString * pred = 0;
 					smokeruby_object *o = value_obj_info(self);
 					if (	o != 0 
 							&& o->ptr != 0 
-							&& isDerivedFrom(o->smoke, o->classId, o->smoke->idClass("TTQObject")) )
+							&& isDerivedFrom(o->smoke, o->classId, o->smoke->idClass("TQObject")) )
 					{
-						TTQObject * qobject = (TTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
-static TTQString * prop = 0;
+						TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
+static TQString * prop = 0;
 						if (prop == 0) {
-							prop = new TTQString();
+							prop = new TQString();
 						}
 						
 						*prop = rb_id2name(SYM2ID(argv[0]));
-						TTQMetaObject * meta = qobject->metaObject();
+						TQMetaObject * meta = qobject->metaObject();
 						if (argc == 1) {
 							if (prop->endsWith("?")) {
 								prop->replace(0, 1, pred->at(0).upper());
-								prop->replace(0, 0, TTQString("is"));
+								prop->replace(0, 0, TQString("is"));
 								if (meta->findProperty(prop->latin1(), true) == -1) {
-									prop->replace(0, 2, TTQString("has"));
+									prop->replace(0, 2, TQString("has"));
 								}
 							}
 
@@ -1568,7 +1568,7 @@ class_method_missing(int argc, VALUE * argv, VALUE klass)
     }
 
     {
-		TTQCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
+		TQCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
 
 		if (_current_method == -1) {
 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
@@ -1581,9 +1581,9 @@ class_method_missing(int argc, VALUE * argv, VALUE klass)
 	}
 
     if (_current_method == -1) {
-static TTQRegExp * rx = 0;
+static TQRegExp * rx = 0;
 		if (rx == 0) {
-			rx = new TTQRegExp("[a-zA-Z]+");
+			rx = new TQRegExp("[a-zA-Z]+");
 		}
 
 		if (rx->search(methodName) == -1) {
@@ -1629,7 +1629,7 @@ class LCDRange < TQt::Widget
 		init()
 		...
 
-For a case such as the above, the TTQWidget can't be instantiated until
+For a case such as the above, the TQWidget can't be instantiated until
 the initializer has been run up to the point where 'super(parent, name)'
 is called. Only then, can the number and type of arguments passed to the
 constructor be known. However, the rest of the intializer
@@ -1637,7 +1637,7 @@ can't be run until 'self' is a proper T_DATA object with a wrapped C++
 instance.
 
 The solution is to run the initialize code twice. First, only up to the
-'super(parent, name)' call, where the TTQWidget would get instantiated in
+'super(parent, name)' call, where the TQWidget would get instantiated in
 initialize_qt(). And then rb_throw() jumps out of the
 initializer returning the wrapped object as a result.
 
@@ -1674,7 +1674,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self)
 	{ 
 		// Put this in a C block so that the mcid will be de-allocated at the end of the block,
 		// rather than on f'n exit, to avoid the longjmp problem described below
-		TTQCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
+		TQCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
 
 		if (_current_method == -1) {
 			retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
@@ -1777,7 +1777,7 @@ getmetainfo(VALUE self, int &offset, int &index)
 
     smokeruby_object *ometa = value_obj_info(metaObject_value);
     if(!ometa) return 0;
-    TTQMetaObject *metaobject = (TTQMetaObject*)ometa->ptr;
+    TQMetaObject *metaobject = (TQMetaObject*)ometa->ptr;
 
     offset = metaobject->signalOffset();
 
@@ -1796,7 +1796,7 @@ getslotinfo(VALUE self, int id, char *&slotname, int &index, bool isSignal = fal
     smokeruby_object *ometa = value_obj_info(metaObject_value);
     if(!ometa) return Qnil;
 
-    TTQMetaObject *metaobject = (TTQMetaObject*)ometa->ptr;
+    TQMetaObject *metaobject = (TQMetaObject*)ometa->ptr;
 
     int offset = isSignal ? metaobject->signalOffset() : metaobject->slotOffset();
 
@@ -1819,10 +1819,10 @@ static VALUE
 qt_signal(int argc, VALUE * argv, VALUE self)
 {
 	smokeruby_object *o = value_obj_info(self);
-    TTQObject *qobj = (TTQObject*)o->smoke->cast(
+    TQObject *qobj = (TQObject*)o->smoke->cast(
 	o->ptr,
 	o->classId,
-	o->smoke->idClass("TTQObject")
+	o->smoke->idClass("TQObject")
     );
     if(qobj->signalsBlocked()) return Qfalse;
 
@@ -1853,10 +1853,10 @@ qt_invoke(int /*argc*/, VALUE * argv, VALUE self)
     }
 
     smokeruby_object *o = value_obj_info(self);
-    (void) (TTQObject*)o->smoke->cast(
+    (void) (TQObject*)o->smoke->cast(
 	o->ptr,
 	o->classId,
-	o->smoke->idClass("TTQObject")
+	o->smoke->idClass("TQObject")
     );
 
     // Now, I need to find out if this means me
@@ -1883,10 +1883,10 @@ qt_invoke(int /*argc*/, VALUE * argv, VALUE self)
 			o->smoke->classes[o->classId].className );
     }
 
-    TTQString name(slotname);
-static TTQRegExp * rx = 0;
+    TQString name(slotname);
+static TQRegExp * rx = 0;
 	if (rx == 0) {
-		rx = new TTQRegExp("\\(.*");
+		rx = new TQRegExp("\\(.*");
 	}
 	name.replace(*rx, "");
 
@@ -1951,8 +1951,8 @@ getIsa(VALUE /*self*/, VALUE classId)
     return parents_list;
 }
 
-// Return the class name of a TTQObject. Note that the name will be in the 
-// form of TQt::Widget rather than TTQWidget. Is this a bug or a feature?
+// Return the class name of a TQObject. Note that the name will be in the 
+// form of TQt::Widget rather than TQWidget. Is this a bug or a feature?
 static VALUE
 class_name(VALUE self)
 {
@@ -1986,7 +1986,7 @@ qbytearray_data(VALUE self)
 	if (o == 0 || o->ptr == 0) {
 		return Qnil;
 	}
-	TTQByteArray * dataArray = (TTQByteArray*) o->ptr;
+	TQByteArray * dataArray = (TQByteArray*) o->ptr;
 	return rb_str_new(dataArray->data(), (long) dataArray->size());
 }
 
@@ -1997,7 +1997,7 @@ qbytearray_size(VALUE self)
 	if (o == 0 || o->ptr == 0) {
 		return Qnil;
 	}
-	TTQByteArray * dataArray = (TTQByteArray*) o->ptr;
+	TQByteArray * dataArray = (TQByteArray*) o->ptr;
 	return UINT2NUM(dataArray->size());
 }
 
@@ -2008,7 +2008,7 @@ qbytearray_setRawData(VALUE self, VALUE data)
 	if (o == 0 || o->ptr == 0) {
 		return Qnil;
 	}
-	TTQByteArray * dataArray = (TTQByteArray*) o->ptr;
+	TQByteArray * dataArray = (TQByteArray*) o->ptr;
 	dataArray->setRawData(StringValuePtr(data), RSTRING(data)->len);
 	return self;
 }
@@ -2050,7 +2050,7 @@ setMocType(VALUE /*self*/, VALUE ptr, VALUE idx_value, VALUE name_value, VALUE s
 	arg[idx].argType = xmoc_double;
     else if(qstrcmp(static_type, "char*") == 0)
 	arg[idx].argType = xmoc_charstar;
-    else if(qstrcmp(static_type, "TTQString") == 0)
+    else if(qstrcmp(static_type, "TQString") == 0)
 	arg[idx].argType = xmoc_QString;
     return Qtrue;
 }
@@ -2164,8 +2164,8 @@ make_QUParameter(VALUE /*self*/, VALUE name_value, VALUE type_value, VALUE /*ext
 	p->type = &static_QUType_double;
     else if(qstrcmp(type, "char*") == 0 || qstrcmp(type, "const char*") == 0)
 	p->type = &static_QUType_charstar;
-    else if(qstrcmp(type, "TTQString") == 0 || qstrcmp(type, "TTQString&") == 0 ||
-	    qstrcmp(type, "const TTQString") == 0 || qstrcmp(type, "const TTQString&") == 0)
+    else if(qstrcmp(type, "TQString") == 0 || qstrcmp(type, "TQString&") == 0 ||
+	    qstrcmp(type, "const TQString") == 0 || qstrcmp(type, "const TQString&") == 0)
 	p->type = &static_QUType_TQString;
     else
 	p->type = &static_QUType_ptr;
@@ -2252,8 +2252,8 @@ make_metaObject(VALUE /*self*/, VALUE className_value, VALUE parent, VALUE slot_
     	rb_raise(rb_eRuntimeError, "Cannot create metaObject\n");
     }
     
-	TTQMetaObject *meta = TTQMetaObject::new_metaobject(
-	className, (TTQMetaObject*)po->ptr,
+	TQMetaObject *meta = TQMetaObject::new_metaobject(
+	className, (TQMetaObject*)po->ptr,
 	(const TQMetaData*)slot_tbl, slot_count,	// slots
 	(const TQMetaData*)signal_tbl, signal_count,	// signals
 	0, 0,	// properties
@@ -2262,7 +2262,7 @@ make_metaObject(VALUE /*self*/, VALUE className_value, VALUE parent, VALUE slot_
 
     smokeruby_object * o = (smokeruby_object *) malloc(sizeof(smokeruby_object));
     o->smoke = qt_Smoke;
-    o->classId = qt_Smoke->idClass("TTQMetaObject");
+    o->classId = qt_Smoke->idClass("TQMetaObject");
     o->ptr = meta;
     o->allocated = true;
 
@@ -2534,9 +2534,9 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/)
 static VALUE
 findAllMethodNames(VALUE /*self*/, VALUE result, VALUE classid, VALUE flags_value)
 {
-	TTQRegExp predicate_re("^(is|has)(.)(.*)");
-	TTQRegExp set_re("^(set)([A-Z])(.*)");
-	TTQRegExp op_re("operator(.*)(([-%~/+|&*])|(>>)|(<<)|(&&)|(\\|\\|)|(\\*\\*))=$");
+	TQRegExp predicate_re("^(is|has)(.)(.*)");
+	TQRegExp set_re("^(set)([A-Z])(.*)");
+	TQRegExp op_re("operator(.*)(([-%~/+|&*])|(>>)|(<<)|(&&)|(\\|\\|)|(\\*\\*))=$");
 
 	unsigned short flags = (unsigned short) NUM2UINT(flags_value);
 	if (classid != Qnil) {
@@ -2658,10 +2658,10 @@ static VALUE
 kde_package_to_class(const char * package, VALUE base_class)
 {
 	VALUE klass = Qnil;
-	TTQString packageName(package);
-static TTQRegExp * scope_op = 0;
+	TQString packageName(package);
+static TQRegExp * scope_op = 0;
 	if (scope_op == 0) {
-		scope_op = new TTQRegExp("^([^:]+)::([^:]+)$");
+		scope_op = new TQRegExp("^([^:]+)::([^:]+)$");
 	 }
 
 	if (packageName.startsWith("KDE::ConfigSkeleton::ItemEnum::")) {
@@ -2718,7 +2718,7 @@ static TTQRegExp * scope_op = 0;
 		VALUE module = rb_define_module(scope_op->cap(1).latin1());
 		klass = rb_define_class_under(module, scope_op->cap(2).latin1(), base_class);
 	} else if (	packageName.startsWith("K") 
-				&& packageName.mid(1, 1).contains(TTQRegExp("[A-Z]")) == 1 ) 
+				&& packageName.mid(1, 1).contains(TQRegExp("[A-Z]")) == 1 ) 
 	{
 		klass = rb_define_class_under(kde_module, package+strlen("K"), base_class);
 	} else {
@@ -2735,13 +2735,13 @@ create_qobject_class(VALUE /*self*/, VALUE package_value)
     const char *package = StringValuePtr(package_value);
 	VALUE klass;
 	
-	if (TTQString(package).startsWith("TQt::")) {
+	if (TQString(package).startsWith("TQt::")) {
     	klass = rb_define_class_under(qt_module, package+strlen("TQt::"), qt_base_class);
 		if (qstrcmp(package, "TQt::Application") == 0) {
 			rb_define_singleton_method(klass, "new", (VALUE (*) (...)) new_qapplication, -1);
 			rb_define_method(klass, "ARGV", (VALUE (*) (...)) qapplication_argv, 0);
 		}
-	} else if (TTQString(package).startsWith("Qext::")) {
+	} else if (TQString(package).startsWith("Qext::")) {
 		if (qext_scintilla_module == Qnil) {
 			qext_scintilla_module = rb_define_module("Qext");
 		}
@@ -2767,9 +2767,9 @@ create_qt_class(VALUE /*self*/, VALUE package_value)
     const char *package = StringValuePtr(package_value);
 	VALUE klass;
 	
-	if (TTQString(package).startsWith("TQt::")) {
+	if (TQString(package).startsWith("TQt::")) {
     	klass = rb_define_class_under(qt_module, package+strlen("TQt::"), qt_base_class);
-	} else if (TTQString(package).startsWith("Qext::")) {
+	} else if (TQString(package).startsWith("Qext::")) {
 		if (qext_scintilla_module == Qnil) {
 			qext_scintilla_module = rb_define_module("Qext");
 		}
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 3cb04df8..c3feee77 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -70,16 +70,16 @@ set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, vo
 };
 
 void
-mark_qobject_children(TTQObject * qobject)
+mark_qobject_children(TQObject * qobject)
 {
 	VALUE obj;
 	
-	const TTQObjectList *l = qobject->children();
+	const TQObjectList *l = qobject->children();
 	if (l == 0) {
 		return;
 	}
-	TTQObjectListIt it( *l ); // iterate over the children
-	TTQObject *child;
+	TQObjectListIt it( *l ); // iterate over the children
+	TQObject *child;
 
 	while ( (child = it.current()) != 0 ) {
 		++it;
@@ -103,10 +103,10 @@ smokeruby_mark(void * p)
 	if(do_debug & qtdb_gc) qWarning("Checking for mark (%s*)%p\n", className, o->ptr);
 		
     if(o->ptr && o->allocated) {
-		if (isDerivedFromByName(o->smoke, className, "TTQListView")) {
-			TTQListView * listview = (TTQListView *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQListView"));
-			TTQListViewItemIterator it(listview);
-			TTQListViewItem *item;
+		if (isDerivedFromByName(o->smoke, className, "TQListView")) {
+			TQListView * listview = (TQListView *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQListView"));
+			TQListViewItemIterator it(listview);
+			TQListViewItem *item;
 
 			while ( (item = it.current()) != 0 ) {
 				++it;
@@ -119,9 +119,9 @@ smokeruby_mark(void * p)
 			return;
 		}
 		
-		if (isDerivedFromByName(o->smoke, className, "TTQTable")) {
-			TTQTable * table = (TTQTable *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQTable"));
-			TTQTableItem *item;
+		if (isDerivedFromByName(o->smoke, className, "TQTable")) {
+			TQTable * table = (TQTable *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQTable"));
+			TQTableItem *item;
 
 			for ( int row = 0; row < table->numRows(); row++ ) {
 				for ( int col = 0; col < table->numCols(); col++ ) {
@@ -136,10 +136,10 @@ smokeruby_mark(void * p)
 			return;		
 		}
 		
-		if (isDerivedFromByName(o->smoke, className, "TTQCanvas")) {
-			TTQCanvas * canvas = (TTQCanvas *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQCanvas"));
-    		TTQCanvasItemList list = canvas->allItems();
-    		for ( TTQCanvasItemList::iterator it = list.begin(); it != list.end(); ++it ) {
+		if (isDerivedFromByName(o->smoke, className, "TQCanvas")) {
+			TQCanvas * canvas = (TQCanvas *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQCanvas"));
+    		TQCanvasItemList list = canvas->allItems();
+    		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);
@@ -149,19 +149,19 @@ smokeruby_mark(void * p)
 			return;
 		}
 
-		if (isDerivedFromByName(o->smoke, className, "TTQCanvasItem")) {
-			TTQCanvasItem * item = (TTQCanvasItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQCanvasItem"));
-			TTQCanvas * canvas = item->canvas();
+		if (isDerivedFromByName(o->smoke, className, "TQCanvasItem")) {
+			TQCanvasItem * item = (TQCanvasItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQCanvasItem"));
+			TQCanvas * canvas = item->canvas();
 			obj = getPointerObject(canvas);
 			if (obj != Qnil) {
-				if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", "TTQCanvas", canvas, (void*)obj);
+				if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", "TQCanvas", canvas, (void*)obj);
 				rb_gc_mark(obj);
 			}
 			return;
 		}
 		
-		if (isDerivedFromByName(o->smoke, className, "TTQObject")) {
-			TTQObject * qobject = (TTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
+		if (isDerivedFromByName(o->smoke, className, "TQObject")) {
+			TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
 			mark_qobject_children(qobject);
 			return;
 		}
@@ -184,63 +184,63 @@ smokeruby_free(void * p)
 	unmapPointer(o, o->classId, 0);
 	object_count --;
 	
-	if (	qstrcmp(className, "TTQObject") == 0
-			|| qstrcmp(className, "TTQListBoxItem") == 0
-			|| qstrcmp(className, "TTQStyleSheetItem") == 0
+	if (	qstrcmp(className, "TQObject") == 0
+			|| qstrcmp(className, "TQListBoxItem") == 0
+			|| qstrcmp(className, "TQStyleSheetItem") == 0
 			|| qstrcmp(className, "KCommand") == 0
 			|| qstrcmp(className, "KNamedCommand") == 0
 			|| qstrcmp(className, "KMacroCommand") == 0
 			|| qstrcmp(className, "KAboutData") == 0
 			|| qstrcmp(className, "KCmdLineArgs") == 0
-			|| qstrcmp(className, "TTQSqlCursor") == 0 )
+			|| qstrcmp(className, "TQSqlCursor") == 0 )
 	{
 		// Don't delete instances of these classes for now
 		free(o);
 		return;
-	} else if (isDerivedFromByName(o->smoke, className, "TTQLayoutItem")) {
-		TTQLayoutItem * item = (TTQLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQLayoutItem"));
+	} else if (isDerivedFromByName(o->smoke, className, "TQLayoutItem")) {
+		TQLayoutItem * item = (TQLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQLayoutItem"));
 		if (item->layout() != 0 || item->widget() != 0 || item->spacerItem() != 0) {
 			free(o);
 			return;
 		}
-	} else if (qstrcmp(className, "TTQIconViewItem") == 0) {
-		TTQIconViewItem * item = (TTQIconViewItem *) o->ptr;
+	} else if (qstrcmp(className, "TQIconViewItem") == 0) {
+		TQIconViewItem * item = (TQIconViewItem *) o->ptr;
 		if (item->iconView() != 0) {
 			free(o);
 			return;
 		}
-	} else if (qstrcmp(className, "TTQCheckListItem") == 0) {
-		TTQCheckListItem * item = (TTQCheckListItem *) o->ptr;
+	} else if (qstrcmp(className, "TQCheckListItem") == 0) {
+		TQCheckListItem * item = (TQCheckListItem *) o->ptr;
 		if (item->parent() != 0 || item->listView() != 0) {
 			free(o);
 			return;
 		}
-	} else if (qstrcmp(className, "TTQListViewItem") == 0) {
-		TTQListViewItem * item = (TTQListViewItem *) o->ptr;
+	} else if (qstrcmp(className, "TQListViewItem") == 0) {
+		TQListViewItem * item = (TQListViewItem *) o->ptr;
 		if (item->parent() != 0 || item->listView() != 0) {
 			free(o);
 			return;
 		}
-	} else if (isDerivedFromByName(o->smoke, className, "TTQTableItem")) {
-		TTQTableItem * item = (TTQTableItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQTableItem"));
+	} else if (isDerivedFromByName(o->smoke, className, "TQTableItem")) {
+		TQTableItem * item = (TQTableItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQTableItem"));
 		if (item->table() != 0) {
 			free(o);
 			return;
 		}
-	} else if (qstrcmp(className, "TTQPopupMenu") == 0) {
-		TTQPopupMenu * item = (TTQPopupMenu *) o->ptr;
+	} else if (qstrcmp(className, "TQPopupMenu") == 0) {
+		TQPopupMenu * item = (TQPopupMenu *) o->ptr;
 		if (item->parentWidget(false) != 0) {
 			free(o);
 			return;
 		}
-	} else if (isDerivedFromByName(o->smoke, className, "TTQWidget")) {
-		TTQWidget * qwidget = (TTQWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQWidget"));
+	} else if (isDerivedFromByName(o->smoke, className, "TQWidget")) {
+		TQWidget * qwidget = (TQWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQWidget"));
 		if (qwidget->parentWidget(true) != 0) {
 			free(o);
 			return;
 		}
-	} else if (isDerivedFromByName(o->smoke, className, "TTQObject")) {
-		TTQObject * qobject = (TTQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TTQObject"));
+	} else if (isDerivedFromByName(o->smoke, className, "TQObject")) {
+		TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject"));
 		if (qobject->parent() != 0) {
 			free(o);
 			return;
@@ -273,65 +273,65 @@ smokeruby_free(void * p)
 static const char *
 resolve_classname(Smoke* smoke, int classId, void * ptr)
 {
-	if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TTQEvent")) {
-		TTQEvent * qevent = (TTQEvent *) smoke->cast(ptr, classId, smoke->idClass("TTQEvent"));
+	if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQEvent")) {
+		TQEvent * qevent = (TQEvent *) smoke->cast(ptr, classId, smoke->idClass("TQEvent"));
 		switch (qevent->type()) {
-		case TTQEvent::ChildInserted:
-		case TTQEvent::ChildRemoved:
+		case TQEvent::ChildInserted:
+		case TQEvent::ChildRemoved:
 			return "TQt::ChildEvent";
-		case TTQEvent::Close:
+		case TQEvent::Close:
 			return "TQt::CloseEvent";
-		case TTQEvent::ContextMenu:
+		case TQEvent::ContextMenu:
 			return "TQt::ContextMenuEvent";
-//		case TTQEvent::User:
+//		case TQEvent::User:
 //			return "TQt::CustomEvent";
-		case TTQEvent::DragEnter:
+		case TQEvent::DragEnter:
 			return "TQt::DragEnterEvent";
-		case TTQEvent::DragLeave:
+		case TQEvent::DragLeave:
 			return "TQt::DragLeaveEvent";
-		case TTQEvent::DragMove:
+		case TQEvent::DragMove:
 			return "TQt::DragMoveEvent";
-		case TTQEvent::DragResponse:
+		case TQEvent::DragResponse:
 			return "TQt::DragResponseEvent";
-		case TTQEvent::Drop:
+		case TQEvent::Drop:
 			return "TQt::DropEvent";
-		case TTQEvent::FocusIn:
-		case TTQEvent::FocusOut:
+		case TQEvent::FocusIn:
+		case TQEvent::FocusOut:
 			return "TQt::FocusEvent";
-		case TTQEvent::Hide:
+		case TQEvent::Hide:
 			return "TQt::HideEvent";
-		case TTQEvent::KeyPress:
-		case TTQEvent::KeyRelease:
+		case TQEvent::KeyPress:
+		case TQEvent::KeyRelease:
 			return "TQt::KeyEvent";
-		case TTQEvent::IMStart:
-		case TTQEvent::IMCompose:
-		case TTQEvent::IMEnd:
+		case TQEvent::IMStart:
+		case TQEvent::IMCompose:
+		case TQEvent::IMEnd:
 			return "TQt::IMEvent";
-		case TTQEvent::MouseButtonPress:
-		case TTQEvent::MouseButtonRelease:
-		case TTQEvent::MouseButtonDblClick:
-		case TTQEvent::MouseMove:
+		case TQEvent::MouseButtonPress:
+		case TQEvent::MouseButtonRelease:
+		case TQEvent::MouseButtonDblClick:
+		case TQEvent::MouseMove:
 			return "TQt::MouseEvent";
-		case TTQEvent::Move:
+		case TQEvent::Move:
 			return "TQt::MoveEvent";
-		case TTQEvent::Paint:
+		case TQEvent::Paint:
 			return "TQt::PaintEvent";
-		case TTQEvent::Resize:
+		case TQEvent::Resize:
 			return "TQt::ResizeEvent";
-		case TTQEvent::Show:
+		case TQEvent::Show:
 			return "TQt::ShowEvent";
-	//	case TTQEvent::Tablet:
+	//	case TQEvent::Tablet:
 	//		 return "TQt::TabletEvent";
-		case TTQEvent::Timer:
+		case TQEvent::Timer:
 			return "TQt::TimerEvent";
-		case TTQEvent::Wheel:
+		case TQEvent::Wheel:
 			return "TQt::WheelEvent";
 		default:
 			break;
 		}
-	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TTQObject")) {
-		TTQObject * qobject = (TTQObject *) smoke->cast(ptr, classId, smoke->idClass("TTQObject"));
-		TTQMetaObject * meta = qobject->metaObject();
+	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQObject")) {
+		TQObject * qobject = (TQObject *) smoke->cast(ptr, classId, smoke->idClass("TQObject"));
+		TQMetaObject * meta = qobject->metaObject();
 
 		while (meta != 0) {
 			Smoke::Index classId = smoke->idClass(meta->className());
@@ -341,30 +341,30 @@ resolve_classname(Smoke* smoke, int classId, void * ptr)
 
 			meta = meta->superClass();
 		}
-	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TTQCanvasItem")) {
-		TTQCanvasItem * qcanvasitem = (TTQCanvasItem *) smoke->cast(ptr, classId, smoke->idClass("TTQCanvasItem"));
+	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQCanvasItem")) {
+		TQCanvasItem * qcanvasitem = (TQCanvasItem *) smoke->cast(ptr, classId, smoke->idClass("TQCanvasItem"));
 		switch (qcanvasitem->rtti()) {
-		case TTQCanvasItem::Rtti_Sprite:
+		case TQCanvasItem::Rtti_Sprite:
 			return "TQt::CanvasSprite";
-		case TTQCanvasItem::Rtti_PolygonalItem:
+		case TQCanvasItem::Rtti_PolygonalItem:
 			return "TQt::CanvasPolygonalItem";
-		case TTQCanvasItem::Rtti_Text:
+		case TQCanvasItem::Rtti_Text:
 			return "TQt::CanvasText";
-		case TTQCanvasItem::Rtti_Polygon:
+		case TQCanvasItem::Rtti_Polygon:
 			return "TQt::CanvasPolygon";
-		case TTQCanvasItem::Rtti_Rectangle:
+		case TQCanvasItem::Rtti_Rectangle:
 			return "TQt::CanvasRectangle";
-		case TTQCanvasItem::Rtti_Ellipse:
+		case TQCanvasItem::Rtti_Ellipse:
 			return "TQt::CanvasEllipse";
-		case TTQCanvasItem::Rtti_Line:
+		case TQCanvasItem::Rtti_Line:
 			return "TQt::CanvasLine";
-		case TTQCanvasItem::Rtti_Spline:
+		case TQCanvasItem::Rtti_Spline:
 			return "TQt::CanvasSpline";
 		default:
 			break;
 		}
-	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TTQListViewItem")) {
-		TTQListViewItem * item = (TTQListViewItem *) smoke->cast(ptr, classId, smoke->idClass("TTQListViewItem"));
+	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQListViewItem")) {
+		TQListViewItem * item = (TQListViewItem *) smoke->cast(ptr, classId, smoke->idClass("TQListViewItem"));
 		switch (item->rtti()) {
 		case 0:
 			return "TQt::ListViewItem";
@@ -374,8 +374,8 @@ resolve_classname(Smoke* smoke, int classId, void * ptr)
 			return "TQt::ListViewItem";
 			break;
 		}
-	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TTQTableItem")) {
-		TTQTableItem * item = (TTQTableItem *) smoke->cast(ptr, classId, smoke->idClass("TTQTableItem"));
+	} else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQTableItem")) {
+		TQTableItem * item = (TQTableItem *) smoke->cast(ptr, classId, smoke->idClass("TQTableItem"));
 		switch (item->rtti()) {
 		case 0:
 			return "TQt::TableItem";
@@ -803,41 +803,41 @@ void marshall_ucharP(Marshall *m) {
 }
 
 static const char * KCODE = 0;
-static TTQTextCodec *codec = 0;
+static TQTextCodec *codec = 0;
 
 static void 
 init_codec() {
 	VALUE temp = rb_gv_get("$KCODE");
 	KCODE = StringValuePtr(temp);
 	if (qstrcmp(KCODE, "EUC") == 0) {
-		codec = TTQTextCodec::codecForName("eucJP");
+		codec = TQTextCodec::codecForName("eucJP");
 	} else if (qstrcmp(KCODE, "SJIS") == 0) {
-		codec = TTQTextCodec::codecForName("Shift-JIS");
+		codec = TQTextCodec::codecForName("Shift-JIS");
 	}
 }
 
-TTQString* 
+TQString* 
 qstringFromRString(VALUE rstring) {
 	if (KCODE == 0) {
 		init_codec();
 	}
 	
-	TTQString *	s;
+	TQString *	s;
 	if (qstrcmp(KCODE, "UTF8") == 0)
-		s = new TTQString(TTQString::fromUtf8(StringValuePtr(rstring), RSTRING(rstring)->len));
+		s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING(rstring)->len));
 	else if (qstrcmp(KCODE, "EUC") == 0)
-		s = new TTQString(codec->toUnicode(StringValuePtr(rstring)));
+		s = new TQString(codec->toUnicode(StringValuePtr(rstring)));
 	else if (qstrcmp(KCODE, "SJIS") == 0)
-		s = new TTQString(codec->toUnicode(StringValuePtr(rstring)));
+		s = new TQString(codec->toUnicode(StringValuePtr(rstring)));
 	else if(qstrcmp(KCODE, "NONE") == 0)
-		s = new TTQString(TTQString::fromLatin1(StringValuePtr(rstring)));
+		s = new TQString(TQString::fromLatin1(StringValuePtr(rstring)));
 	else
-		s = new TTQString(TTQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING(rstring)->len));
+		s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING(rstring)->len));
 	return s;
 }
 
 VALUE 
-rstringFromTQString(TTQString * s) {
+rstringFromTQString(TQString * s) {
 	if (KCODE == 0) {
 		init_codec();
 	}
@@ -858,11 +858,11 @@ static void marshall_QString(Marshall *m) {
 	switch(m->action()) {
 	case Marshall::FromVALUE:
 	{
-		TTQString* s = 0;
+		TQString* s = 0;
 		if ( *(m->var()) != Qnil) {
 			s = qstringFromRString(*(m->var()));
 		} else {
-			s = new TTQString(TTQString::null);
+			s = new TQString(TQString::null);
 		}
 		
 		m->item().s_voidp = s;
@@ -881,7 +881,7 @@ static void marshall_QString(Marshall *m) {
 	break;
 	case Marshall::ToVALUE:
 	{
-		TTQString *s = (TTQString*)m->item().s_voidp;
+		TQString *s = (TQString*)m->item().s_voidp;
 		if (s != 0) {
 			if (s->isNull()) {
 				*(m->var()) = Qnil;
@@ -902,8 +902,8 @@ static void marshall_QString(Marshall *m) {
     }
 }
 
-// The only way to convert a TTQChar to a TTQString is to
-// pass a TTQChar to a TTQString constructor. However,
+// The only way to convert a TQChar to a TQString is to
+// pass a TQChar to a TQString constructor. However,
 // TQStrings aren't in the QtRuby api, so add this
 // convenience method 'TQt::Char.to_s' to get a ruby
 // string from a TQt::Char.
@@ -915,8 +915,8 @@ qchar_to_s(VALUE self)
 		return Qnil;
 	}
 
-	TTQChar * qchar = (TTQChar*) o->ptr;
-	TTQString s(*qchar);
+	TQChar * qchar = (TQChar*) o->ptr;
+	TQString s(*qchar);
 	return rstringFromTQString(&s);
 }
 
@@ -938,13 +938,13 @@ static void marshall_QCString(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
-	    TTQCString *s = 0;
+	    TQCString *s = 0;
 	    VALUE rv = *(m->var());
 	    if (rv == Qnil) {
-		s = new TTQCString(); 
+		s = new TQCString(); 
         } else {
-		// Add 1 to the ruby string length to allow for a TTQCString '\0' terminator
-		s = new TTQCString(StringValuePtr(*(m->var())), RSTRING(*(m->var()))->len + 1); 
+		// Add 1 to the ruby string length to allow for a TQCString '\0' terminator
+		s = new TQCString(StringValuePtr(*(m->var())), RSTRING(*(m->var()))->len + 1); 
 		}
 	    m->item().s_voidp = s;
 	    
@@ -960,7 +960,7 @@ static void marshall_QCString(Marshall *m) {
 	break;
       case Marshall::ToVALUE:
 	{
-	    TTQCString *s = (TTQCString*)m->item().s_voidp;
+	    TQCString *s = (TQCString*)m->item().s_voidp;
 	    if(s && (const char *) *s != 0) {
 		*(m->var()) = rb_str_new2((const char *)*s);
 //                const char * p = (const char *)*s;
@@ -968,7 +968,7 @@ static void marshall_QCString(Marshall *m) {
 //                if(not_ascii(p,len))
 //                {
 //                  #if PERL_VERSION == 6 && PERL_SUBVERSION == 0
-//                  TTQTextCodec* c = TTQTextCodec::codecForMib(106); // utf8
+//                  TQTextCodec* c = TQTextCodec::codecForMib(106); // utf8
 //                  if(c->heuristicContentMatch(p,len) >= 0)
 //                  #else
 //                  if(is_utf8_string((U8 *)p,len))
@@ -1208,12 +1208,12 @@ void marshall_QStringList(Marshall *m) {
 	    }
 
 	    int count = RARRAY(list)->len;
-	    TTQStringList *stringlist = new TQStringList;
+	    TQStringList *stringlist = new TQStringList;
 
 	    for(long i = 0; i < count; i++) {
 		VALUE item = rb_ary_entry(list, i);
 		if(TYPE(item) != T_STRING) {
-		    stringlist->append(TTQString());
+		    stringlist->append(TQString());
 		    continue;
 		}
 		stringlist->append(*(qstringFromRString(item)));
@@ -1225,7 +1225,7 @@ void marshall_QStringList(Marshall *m) {
 		
 		if (stringlist != 0 && !m->type().isConst()) {
 			rb_ary_clear(list);
-			for(TTQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it)
+			for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it)
 		    	rb_ary_push(list, rstringFromTQString(&(*it)));
 		}
 			
@@ -1235,14 +1235,14 @@ void marshall_QStringList(Marshall *m) {
       }
       case Marshall::ToVALUE: 
 	{
-	    TTQStringList *stringlist = static_cast<TTQStringList *>(m->item().s_voidp);
+	    TQStringList *stringlist = static_cast<TQStringList *>(m->item().s_voidp);
 	    if(!stringlist) {
 		*(m->var()) = Qnil;
 		break;
 	    }
 
 	    VALUE av = rb_ary_new();
-	    for(TTQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) {
+	    for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) {
 		VALUE rv = rstringFromTQString(&(*it));
 		rb_ary_push(av, rv);
 	    }
@@ -1270,15 +1270,15 @@ void marshall_QStrList(Marshall *m) {
 	    }
 
 	    int count = RARRAY(list)->len;
-	    TTQStrList *stringlist = new TQStrList;
+	    TQStrList *stringlist = new TQStrList;
 
 	    for(long i = 0; i < count; i++) {
 		VALUE item = rb_ary_entry(list, i);
 		if(TYPE(item) != T_STRING) {
-		    stringlist->append(TTQString());
+		    stringlist->append(TQString());
 		    continue;
 		}
-		stringlist->append(TTQString::fromUtf8(StringValuePtr(item), RSTRING(item)->len));
+		stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING(item)->len));
 	    }
 
 	    m->item().s_voidp = stringlist;
@@ -1297,7 +1297,7 @@ void marshall_QStrList(Marshall *m) {
       }
       case Marshall::ToVALUE: 
 	{
-	    TTQStrList *stringlist = static_cast<TTQStrList *>(m->item().s_voidp);
+	    TQStrList *stringlist = static_cast<TQStrList *>(m->item().s_voidp);
 	    if(!stringlist) {
 		*(m->var()) = Qnil;
 		break;
@@ -1422,7 +1422,7 @@ void marshall_QValueListInt(Marshall *m) {
 		break;
 	    }
 	    int count = RARRAY(list)->len;
-	    TTQValueList<int> *valuelist = new TTQValueList<int>;
+	    TQValueList<int> *valuelist = new TQValueList<int>;
 	    long i;
 	    for(i = 0; i < count; i++) {
 		VALUE item = rb_ary_entry(list, i);
@@ -1438,7 +1438,7 @@ void marshall_QValueListInt(Marshall *m) {
 
 		if (!m->type().isConst()) {
 			rb_ary_clear(list);
-			for(TTQValueListIterator<int> it = valuelist->begin();
+			for(TQValueListIterator<int> it = valuelist->begin();
 				it != valuelist->end();
 				++it)
 				rb_ary_push(list, INT2NUM((int)*it));
@@ -1451,7 +1451,7 @@ void marshall_QValueListInt(Marshall *m) {
 	break;
       case Marshall::ToVALUE:
 	{
-	    TTQValueList<int> *valuelist = (TTQValueList<int>*)m->item().s_voidp;
+	    TQValueList<int> *valuelist = (TQValueList<int>*)m->item().s_voidp;
 	    if(!valuelist) {
 		*(m->var()) = Qnil;
 		break;
@@ -1459,7 +1459,7 @@ void marshall_QValueListInt(Marshall *m) {
 
 	    VALUE av = rb_ary_new();
 
-	    for(TTQValueListIterator<int> it = valuelist->begin();
+	    for(TQValueListIterator<int> it = valuelist->begin();
 		it != valuelist->end();
 		++it)
 		rb_ary_push(av, INT2NUM(*it));
@@ -1508,7 +1508,7 @@ void marshall_QMapTQStringTQString(Marshall *m) {
 		break;
 	    }
 		
-		TTQMap<TTQString,TTQString> * map = new TTQMap<TTQString,TTQString>;
+		TQMap<TQString,TQString> * map = new TQMap<TQString,TQString>;
 		
 		// Convert the ruby hash to an array of key/value arrays
 		VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
@@ -1516,7 +1516,7 @@ void marshall_QMapTQStringTQString(Marshall *m) {
 		for (long i = 0; i < RARRAY(temp)->len; i++) {
 			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
 			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
-			(*map)[TTQString(StringValuePtr(key))] = TTQString(StringValuePtr(value));
+			(*map)[TQString(StringValuePtr(key))] = TQString(StringValuePtr(value));
 		}
 	    
 		m->item().s_voidp = map;
@@ -1528,7 +1528,7 @@ void marshall_QMapTQStringTQString(Marshall *m) {
 	break;
       case Marshall::ToVALUE:
 	{
-	    TTQMap<TTQString,TTQString> *map = (TTQMap<TTQString,TTQString>*)m->item().s_voidp;
+	    TQMap<TQString,TQString> *map = (TQMap<TQString,TQString>*)m->item().s_voidp;
 	    if(!map) {
 		*(m->var()) = Qnil;
 		break;
@@ -1536,9 +1536,9 @@ void marshall_QMapTQStringTQString(Marshall *m) {
 		
 	    VALUE hv = rb_hash_new();
 			
-		TTQMap<TTQString,TTQString>::Iterator it;
+		TQMap<TQString,TQString>::Iterator it;
 		for (it = map->begin(); it != map->end(); ++it) {
-			rb_hash_aset(hv, rstringFromTQString((TTQString*)&(it.key())), rstringFromTQString((TTQString*) &(it.data())));
+			rb_hash_aset(hv, rstringFromTQString((TQString*)&(it.key())), rstringFromTQString((TQString*) &(it.data())));
         }
 		
 		*(m->var()) = hv;
@@ -1564,7 +1564,7 @@ void marshall_QMapTQStringTQVariant(Marshall *m) {
 		break;
 	    }
 		
-		TTQMap<TTQString,TTQVariant> * map = new TTQMap<TTQString,TTQVariant>;
+		TQMap<TQString,TQVariant> * map = new TQMap<TQString,TQVariant>;
 		
 		// Convert the ruby hash to an array of key/value arrays
 		VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
@@ -1574,7 +1574,7 @@ void marshall_QMapTQStringTQVariant(Marshall *m) {
 			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
 			
 			smokeruby_object *o = value_obj_info(value);
-			if (!o || !o->ptr || o->classId != o->smoke->idClass("TTQVariant")) {
+			if (!o || !o->ptr || o->classId != o->smoke->idClass("TQVariant")) {
 				// If the value isn't a TQt::Variant, then try and construct
 				// a TQt::Variant from it
 				value = rb_funcall(qvariant_class, rb_intern("new"), 1, value);
@@ -1585,9 +1585,9 @@ void marshall_QMapTQStringTQVariant(Marshall *m) {
 			}
 
 			void * ptr = o->ptr;
-			ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("TTQVariant"));
+			ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("TQVariant"));
 			
-			(*map)[TTQString(StringValuePtr(key))] = (TTQVariant)*(TTQVariant*)ptr;
+			(*map)[TQString(StringValuePtr(key))] = (TQVariant)*(TQVariant*)ptr;
 		}
 	    
 		m->item().s_voidp = map;
@@ -1599,7 +1599,7 @@ void marshall_QMapTQStringTQVariant(Marshall *m) {
 	break;
       case Marshall::ToVALUE:
 	{
-	    TTQMap<TTQString,TTQVariant> *map = (TTQMap<TTQString,TTQVariant>*)m->item().s_voidp;
+	    TQMap<TQString,TQVariant> *map = (TQMap<TQString,TQVariant>*)m->item().s_voidp;
 	    if(!map) {
 		*(m->var()) = Qnil;
 		break;
@@ -1607,21 +1607,21 @@ void marshall_QMapTQStringTQVariant(Marshall *m) {
 		
 	    VALUE hv = rb_hash_new();
 			
-		TTQMap<TTQString,TTQVariant>::Iterator it;
+		TQMap<TQString,TQVariant>::Iterator it;
 		for (it = map->begin(); it != map->end(); ++it) {
-			void *p = new TTQVariant(it.data());
+			void *p = new TQVariant(it.data());
 			VALUE obj = getPointerObject(p);
 				
 			if (obj == Qnil) {
 				smokeruby_object  * o = ALLOC(smokeruby_object);
-				o->classId = m->smoke()->idClass("TTQVariant");
+				o->classId = m->smoke()->idClass("TQVariant");
 				o->smoke = m->smoke();
 				o->ptr = p;
 				o->allocated = true;
 				obj = set_obj_info("TQt::Variant", o);
 			}
 			
-			rb_hash_aset(hv, rstringFromTQString((TTQString*)&(it.key())), obj);
+			rb_hash_aset(hv, rstringFromTQString((TQString*)&(it.key())), obj);
         }
 		
 		*(m->var()) = hv;
@@ -1749,16 +1749,16 @@ void marshall_QPairintint(Marshall *m) {
 #include <tqtabbar.h>
 
 #if QT_VERSION >= 0x030200
-DEF_LIST_MARSHALLER( TQPtrListTQNetworkOperation, TTQPtrList<TTQNetworkOperation>, TTQNetworkOperation, TTQPtrListStdIterator<TTQNetworkOperation> )
-DEF_LIST_MARSHALLER( TQPtrListTQToolBar, TTQPtrList<TTQToolBar>, TTQToolBar, TTQPtrListStdIterator<TTQToolBar> )
-DEF_LIST_MARSHALLER( TQPtrListTQTab, TTQPtrList<TTQTab>, TTQTab, TTQPtrListStdIterator<TTQTab> )
-DEF_LIST_MARSHALLER( TQPtrListTQDockWindow, TTQPtrList<TTQDockWindow>, TTQDockWindow, TTQPtrListStdIterator<TTQDockWindow> )
-DEF_LIST_MARSHALLER( TQFileInfoList, TQFileInfoList, TTQFileInfo, TQFileInfoList::Iterator )
-DEF_LIST_MARSHALLER( TTQObjectList, TTQObjectList, TTQObject, TTQPtrListStdIterator<TTQObject> )
-DEF_LIST_MARSHALLER( TTQWidgetList, TTQWidgetList, TTQWidget, TTQPtrListStdIterator<TTQWidget> )
+DEF_LIST_MARSHALLER( TQPtrListTQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, TQPtrListStdIterator<TQNetworkOperation> )
+DEF_LIST_MARSHALLER( TQPtrListTQToolBar, TQPtrList<TQToolBar>, TQToolBar, TQPtrListStdIterator<TQToolBar> )
+DEF_LIST_MARSHALLER( TQPtrListTQTab, TQPtrList<TQTab>, TQTab, TQPtrListStdIterator<TQTab> )
+DEF_LIST_MARSHALLER( TQPtrListTQDockWindow, TQPtrList<TQDockWindow>, TQDockWindow, TQPtrListStdIterator<TQDockWindow> )
+DEF_LIST_MARSHALLER( TQFileInfoList, TQFileInfoList, TQFileInfo, TQFileInfoList::Iterator )
+DEF_LIST_MARSHALLER( TQObjectList, TQObjectList, TQObject, TQPtrListStdIterator<TQObject> )
+DEF_LIST_MARSHALLER( TQWidgetList, TQWidgetList, TQWidget, TQPtrListStdIterator<TQWidget> )
 #endif
 
-DEF_LIST_MARSHALLER( TTQCanvasItemList, TTQCanvasItemList, TTQCanvasItem, TTQValueListIterator<TTQCanvasItem*> )
+DEF_LIST_MARSHALLER( TQCanvasItemList, TQCanvasItemList, TQCanvasItem, TQValueListIterator<TQCanvasItem*> )
 
 template <class Item, class ItemList, class ItemListIterator, const char *ItemSTR >
 void marshall_ValueItemList(Marshall *m) {
@@ -1778,9 +1778,9 @@ void marshall_ValueItemList(Marshall *m) {
                 // TODO do type checking!
 		smokeruby_object *o = value_obj_info(item);
 
-		// Special case for the TTQValueList<TTQVariant> type
-		if (	qstrcmp(ItemSTR, "TTQVariant") == 0 
-				&& (!o || !o->ptr || o->classId != o->smoke->idClass("TTQVariant")) ) 
+		// Special case for the TQValueList<TQVariant> type
+		if (	qstrcmp(ItemSTR, "TQVariant") == 0 
+				&& (!o || !o->ptr || o->classId != o->smoke->idClass("TQVariant")) ) 
 		{
 			// If the value isn't a TQt::Variant, then try and construct
 			// a TQt::Variant from it
@@ -1871,27 +1871,27 @@ void marshall_ValueItemList(Marshall *m) {
 #define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace dummy { char ListIdent##STR[] = #Item; };  \
         Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,dummy::ListIdent##STR>;
 
-DEF_VALUELIST_MARSHALLER( TQVariantList, TTQValueList<TTQVariant>, TTQVariant, TTQValueList<TTQVariant>::Iterator )
-DEF_VALUELIST_MARSHALLER( TQPixmapList, TTQValueList<TTQPixmap>, TTQPixmap, TTQValueList<TTQPixmap>::Iterator )
-DEF_VALUELIST_MARSHALLER( TQIconDragItemList, TTQValueList<TTQIconDragItem>, TTQIconDragItem, TTQValueList<TTQIconDragItem>::Iterator )
-DEF_VALUELIST_MARSHALLER( TQImageTextKeyLangList, TTQValueList<TTQImageTextKeyLang>, TTQImageTextKeyLang, TTQValueList<TTQImageTextKeyLang>::Iterator )
-DEF_VALUELIST_MARSHALLER( TQUrlInfoList, TTQValueList<TTQUrlInfo>, TTQUrlInfo, TTQValueList<TTQUrlInfo>::Iterator )
-DEF_VALUELIST_MARSHALLER( TQTranslatorMessageList, TTQValueList<TQTranslatorMessage>, TQTranslatorMessage, TTQValueList<TQTranslatorMessage>::Iterator )
-DEF_VALUELIST_MARSHALLER( TQHostAddressList, TTQValueList<TTQHostAddress>, TTQHostAddress, TTQValueList<TTQHostAddress>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQVariantList, TQValueList<TQVariant>, TQVariant, TQValueList<TQVariant>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQPixmapList, TQValueList<TQPixmap>, TQPixmap, TQValueList<TQPixmap>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQIconDragItemList, TQValueList<TQIconDragItem>, TQIconDragItem, TQValueList<TQIconDragItem>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQImageTextKeyLangList, TQValueList<TQImageTextKeyLang>, TQImageTextKeyLang, TQValueList<TQImageTextKeyLang>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQUrlInfoList, TQValueList<TQUrlInfo>, TQUrlInfo, TQValueList<TQUrlInfo>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQTranslatorMessageList, TQValueList<TQTranslatorMessage>, TQTranslatorMessage, TQValueList<TQTranslatorMessage>::Iterator )
+DEF_VALUELIST_MARSHALLER( TQHostAddressList, TQValueList<TQHostAddress>, TQHostAddress, TQValueList<TQHostAddress>::Iterator )
 
 TypeHandler Qt_handlers[] = {
-    { "TTQString", marshall_QString },
-    { "TTQString&", marshall_QString },
-    { "TTQString*", marshall_QString },
-    { "TTQCString", marshall_QCString },
-    { "TTQCString&", marshall_QCString },
-    { "TTQCString*", marshall_QCString },
-    { "TTQStringList", marshall_QStringList },
-    { "TTQStringList&", marshall_QStringList },
-    { "TTQStringList*", marshall_QStringList },
-    { "TTQStrList", marshall_QStrList },
-    { "TTQStrList&", marshall_QStrList },
-    { "TTQStrList*", marshall_QStrList },
+    { "TQString", marshall_QString },
+    { "TQString&", marshall_QString },
+    { "TQString*", marshall_QString },
+    { "TQCString", marshall_QCString },
+    { "TQCString&", marshall_QCString },
+    { "TQCString*", marshall_QCString },
+    { "TQStringList", marshall_QStringList },
+    { "TQStringList&", marshall_QStringList },
+    { "TQStringList*", marshall_QStringList },
+    { "TQStrList", marshall_QStrList },
+    { "TQStrList&", marshall_QStrList },
+    { "TQStrList*", marshall_QStrList },
     { "long long int", marshall_longlong },
     { "long long int&", marshall_longlong },
     { "Q_INT64", marshall_longlong },
@@ -1919,39 +1919,39 @@ TypeHandler Qt_handlers[] = {
     { "TQUObject*", marshall_QUObject },
     { "const TQCOORD*", marshall_QCOORD_array },
     { "void", marshall_void },
-    { "TTQValueList<int>", marshall_QValueListInt },
-    { "TTQValueList<int>&", marshall_QValueListInt },
-    { "TTQValueList<TTQVariant>", marshall_QVariantList },
-    { "TTQValueList<TTQVariant>&", marshall_QVariantList },
-    { "TTQValueList<TTQPixmap>", marshall_QPixmapList },
-    { "TTQValueList<TTQIconDragItem>&", marshall_QIconDragItemList },
-    { "TTQValueList<TTQImageTextKeyLang>", marshall_QImageTextKeyLangList },
-    { "TTQValueList<TTQUrlInfo>&", marshall_QUrlInfoList },
-    { "TTQValueList<TQTranslatorMessage>", marshall_QTranslatorMessageList },
-    { "TTQValueList<TTQHostAddress>", marshall_QHostAddressList },
-    { "TTQCanvasItemList", marshall_TTQCanvasItemList },
-    { "TTQMap<TTQString,TTQString>", marshall_QMapTQStringTQString },
-    { "TTQMap<TTQString,TTQString>&", marshall_QMapTQStringTQString },
-    { "TTQMap<TTQString,TTQVariant>", marshall_QMapTQStringTQVariant },
-    { "TTQMap<TTQString,TTQVariant>&", marshall_QMapTQStringTQVariant },
+    { "TQValueList<int>", marshall_QValueListInt },
+    { "TQValueList<int>&", marshall_QValueListInt },
+    { "TQValueList<TQVariant>", marshall_QVariantList },
+    { "TQValueList<TQVariant>&", marshall_QVariantList },
+    { "TQValueList<TQPixmap>", marshall_QPixmapList },
+    { "TQValueList<TQIconDragItem>&", marshall_QIconDragItemList },
+    { "TQValueList<TQImageTextKeyLang>", marshall_QImageTextKeyLangList },
+    { "TQValueList<TQUrlInfo>&", marshall_QUrlInfoList },
+    { "TQValueList<TQTranslatorMessage>", marshall_QTranslatorMessageList },
+    { "TQValueList<TQHostAddress>", marshall_QHostAddressList },
+    { "TQCanvasItemList", marshall_TQCanvasItemList },
+    { "TQMap<TQString,TQString>", marshall_QMapTQStringTQString },
+    { "TQMap<TQString,TQString>&", marshall_QMapTQStringTQString },
+    { "TQMap<TQString,TQVariant>", marshall_QMapTQStringTQVariant },
+    { "TQMap<TQString,TQVariant>&", marshall_QMapTQStringTQVariant },
 #if QT_VERSION >= 0x030200
-    { "TTQWidgetList", marshall_TTQWidgetList },
-    { "TTQWidgetList*", marshall_TTQWidgetList },
-    { "TTQWidgetList&", marshall_TTQWidgetList },
-    { "TTQObjectList*", marshall_TTQObjectList },
-    { "TTQObjectList&", marshall_TTQObjectList },
+    { "TQWidgetList", marshall_TQWidgetList },
+    { "TQWidgetList*", marshall_TQWidgetList },
+    { "TQWidgetList&", marshall_TQWidgetList },
+    { "TQObjectList*", marshall_TQObjectList },
+    { "TQObjectList&", marshall_TQObjectList },
     { "TQFileInfoList*", marshall_QFileInfoList },
-    { "TTQPtrList<TTQToolBar>", marshall_QPtrListTQToolBar },
-    { "TTQPtrList<TTQTab>*", marshall_QPtrListTQTab },
-    { "TTQPtrList<TTQDockWindow>", marshall_QPtrListTQDockWindow },
-    { "TTQPtrList<TTQDockWindow>*", marshall_QPtrListTQDockWindow },
-    { "TTQPtrList<TTQNetworkOperation>", marshall_QPtrListTQNetworkOperation },
-    { "TTQPtrList<TTQNetworkOperation>&", marshall_QPtrListTQNetworkOperation },
+    { "TQPtrList<TQToolBar>", marshall_QPtrListTQToolBar },
+    { "TQPtrList<TQTab>*", marshall_QPtrListTQTab },
+    { "TQPtrList<TQDockWindow>", marshall_QPtrListTQDockWindow },
+    { "TQPtrList<TQDockWindow>*", marshall_QPtrListTQDockWindow },
+    { "TQPtrList<TQNetworkOperation>", marshall_QPtrListTQNetworkOperation },
+    { "TQPtrList<TQNetworkOperation>&", marshall_QPtrListTQNetworkOperation },
 #endif
     { 0, 0 }
 };
 
-TTQAsciiDict<TypeHandler> type_handlers(199);
+TQAsciiDict<TypeHandler> type_handlers(199);
 
 void install_handlers(TypeHandler *h) {
     while(h->name) {
diff --git a/qtruby/rubylib/qtruby/smokeruby.h b/qtruby/rubylib/qtruby/smokeruby.h
index dcbddf6a..dd3b81bb 100644
--- a/qtruby/rubylib/qtruby/smokeruby.h
+++ b/qtruby/rubylib/qtruby/smokeruby.h
@@ -288,7 +288,7 @@ public:
  * Type handling by moc is simple.
  *
  * If the type name matches /^(?:const\s+)?\Q$types\E&?$/, use the
- * static_QUType, where $types is join('|', qw(bool int double char* TTQString);
+ * static_QUType, where $types is join('|', qw(bool int double char* TQString);
  *
  * Everything else is passed as a pointer! There are types which aren't
  * Smoke::tf_ptr but will have to be passed as a pointer. Make sure to keep