From e63beeb5bdb82987b1e00bc35178667786fbad48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 16:20:48 -0600 Subject: Fix incorrect conversion --- qtruby/rubylib/designer/uilib/qui.cpp | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'qtruby/rubylib/designer/uilib') diff --git a/qtruby/rubylib/designer/uilib/qui.cpp b/qtruby/rubylib/designer/uilib/qui.cpp index 912918f6..05b094bb 100644 --- a/qtruby/rubylib/designer/uilib/qui.cpp +++ b/qtruby/rubylib/designer/uilib/qui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - tqui.cpp - A ruby wrapper for the TTQWidgetFactory class + tqui.cpp - A ruby wrapper for the TQWidgetFactory class ------------------- begin : Wed Mar 14 2004 copyright : (C) 2004 by Richard Dale @@ -47,31 +47,31 @@ static VALUE qwidget_factory_class; static VALUE create(int argc, VALUE * argv, VALUE /*klass*/) { - TTQWidget * topLevelWidget = 0; + TQWidget * topLevelWidget = 0; VALUE result = Qnil; if (argc == 0 || argc > 4) { rb_raise(rb_eArgError, "wrong number of arguments (%d)\n", argc); } - TTQObject * connector = 0; + TQObject * connector = 0; if (argc >= 2) { if (TYPE(argv[1]) == T_DATA) { smokeruby_object *o = value_obj_info(argv[1]); if (o != 0) { - connector = (TTQObject *) o->ptr; + connector = (TQObject *) o->ptr; } } else { rb_raise(rb_eArgError, "invalid argument type\n"); } } - TTQWidget * parent = 0; + TQWidget * parent = 0; if (argc >= 3) { if (TYPE(argv[2]) == T_DATA) { smokeruby_object *o = value_obj_info(argv[2]); if (o != 0) { - parent = (TTQWidget *) o->ptr; + parent = (TQWidget *) o->ptr; } } else { rb_raise(rb_eArgError, "invalid argument type\n"); @@ -88,18 +88,18 @@ create(int argc, VALUE * argv, VALUE /*klass*/) } if (TYPE(argv[0]) == T_STRING) { - topLevelWidget = TTQWidgetFactory::create(TTQString(StringValuePtr(argv[0])), connector, parent, name); + topLevelWidget = TQWidgetFactory::create(TQString(StringValuePtr(argv[0])), connector, parent, name); } else if (TYPE(argv[0]) == T_DATA) { - TTQIODevice * dev = 0; + TQIODevice * dev = 0; smokeruby_object *o = value_obj_info(argv[0]); if (o != 0 && o->ptr != 0 && o->classId == qt_Smoke->idClass("TQIODevice")) { - dev = (TTQIODevice *) o->ptr; + dev = (TQIODevice *) o->ptr; } else { rb_raise(rb_eArgError, "invalid argument type\n"); } - topLevelWidget = TTQWidgetFactory::create(dev, connector, parent, name); + topLevelWidget = TQWidgetFactory::create(dev, connector, parent, name); } else { rb_raise(rb_eArgError, "invalid argument type\n"); } @@ -121,7 +121,7 @@ create(int argc, VALUE * argv, VALUE /*klass*/) static VALUE load_images(VALUE klass, VALUE dir) { - TTQWidgetFactory::loadImages(TTQString(StringValuePtr(dir))); + TQWidgetFactory::loadImages(TQString(StringValuePtr(dir))); return klass; } @@ -129,14 +129,14 @@ static VALUE widgets(VALUE /*self*/) { VALUE result = rb_ary_new(); - TTQStringList widgetList = TTQWidgetFactory::widgets(); + TQStringList widgetList = TQWidgetFactory::widgets(); - for (TTQStringList::Iterator it = widgetList.begin(); it != widgetList.end(); ++it) { - TTQString widgetName = *it; + for (TQStringList::Iterator it = widgetList.begin(); it != widgetList.end(); ++it) { + TQString widgetName = *it; if (widgetName.startsWith("Q")) { - widgetName.replace(0, 1, TTQString("TQt::")); + widgetName.replace(0, 1, TQString("TQt::")); } else if (widgetName.startsWith("K")) { - widgetName.replace(0, 1, TTQString("KDE::")); + widgetName.replace(0, 1, TQString("KDE::")); } rb_ary_push(result, rb_str_new2(widgetName.latin1())); } @@ -147,15 +147,15 @@ widgets(VALUE /*self*/) static VALUE supports_widget(VALUE /*self*/, VALUE widget) { - TTQString widgetName(StringValuePtr(widget)); + TQString widgetName(StringValuePtr(widget)); if (widgetName.startsWith("TQt::")) { - widgetName.replace(0, 4, TTQString("Q")); + widgetName.replace(0, 4, TQString("Q")); } else if (widgetName.startsWith("KDE::")) { - widgetName.replace(0, 5, TTQString("K")); + widgetName.replace(0, 5, TQString("K")); } - return TTQWidgetFactory::supportsWidget(widgetName) ? Qtrue : Qfalse; + return TQWidgetFactory::supportsWidget(widgetName) ? Qtrue : Qfalse; } void -- cgit v1.2.1