diff options
| -rw-r--r-- | kjsembed/ksimpleprocess.cpp | 8 | ||||
| -rw-r--r-- | kjsembed/slotutils.cpp | 2 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 10 | ||||
| -rw-r--r-- | qtjava/javalib/qtjava/TQMetaObject.cpp | 2 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/Qt.cpp | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index a1adf3ac..0a7ee1cc 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -61,16 +61,16 @@ KSimpleProcess::~KSimpleProcess() // If a troll sees this, he kills david not me -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); void KSimpleProcess::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); } void KSimpleProcess::slotProcessExited() diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 1ba13188..83af6474 100644 --- a/kjsembed/slotutils.cpp +++ b/kjsembed/slotutils.cpp @@ -841,7 +841,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K } else { kdDebug(80001) << "Call Signature: " << slotname << endl; - obj->qt_invoke( slotid, uo ); + obj->tqt_invoke( slotid, uo ); } // Handle return types TQCString ret( proxyimp->returnType() ); diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index 1ebdcc40..cc3ce2ab 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -1083,7 +1083,7 @@ static VALUE konsole_part_startprogram(VALUE self, VALUE value_program, VALUE value_args) { smokeruby_object * o = value_obj_info(self); - TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("TerminalInterface")); + TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->tqt_cast("TerminalInterface")); TQStrList *args = new TQStrList; @@ -1102,7 +1102,7 @@ static VALUE konsole_part_showshellindir(VALUE self, VALUE value_dir) { smokeruby_object * o = value_obj_info(self); - TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("TerminalInterface")); + TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->tqt_cast("TerminalInterface")); t->showShellInDir(StringValuePtr(value_dir)); return self; } @@ -1111,7 +1111,7 @@ static VALUE konsole_part_sendinput(VALUE self, VALUE value_text) { smokeruby_object * o = value_obj_info(self); - TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("TerminalInterface")); + TerminalInterface * t = static_cast<TerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->tqt_cast("TerminalInterface")); t->sendInput(StringValuePtr(value_text)); return self; } @@ -1121,7 +1121,7 @@ static VALUE konsole_part_setautostartshell(VALUE self, VALUE enabled) { smokeruby_object * o = value_obj_info(self); - ExtTerminalInterface * t = static_cast<ExtTerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("ExtTerminalInterface")); + ExtTerminalInterface * t = static_cast<ExtTerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->tqt_cast("ExtTerminalInterface")); t->setAutoStartShell(enabled == Qtrue); return self; } @@ -1130,7 +1130,7 @@ static VALUE konsole_part_setautodestroy(VALUE self, VALUE enabled) { smokeruby_object * o = value_obj_info(self); - ExtTerminalInterface * t = static_cast<ExtTerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->qt_cast("ExtTerminalInterface")); + ExtTerminalInterface * t = static_cast<ExtTerminalInterface*>(((KParts::ReadOnlyPart*) o->ptr)->tqt_cast("ExtTerminalInterface")); t->setAutoDestroy(enabled == Qtrue); return self; } diff --git a/qtjava/javalib/qtjava/TQMetaObject.cpp b/qtjava/javalib/qtjava/TQMetaObject.cpp index 308f7c58..011eb961 100644 --- a/qtjava/javalib/qtjava/TQMetaObject.cpp +++ b/qtjava/javalib/qtjava/TQMetaObject.cpp @@ -275,7 +275,7 @@ Java_org_kde_qt_QMetaObject_property__IZ(JNIEnv* env, jobject obj, jint index, j JNIEXPORT jboolean JNICALL Java_org_kde_qt_QMetaObject_qt_1static_1property(JNIEnv* env, jobject obj, jobject o, jint id, jint f, jobject v) { - jboolean xret = (jboolean) ((TQMetaObject*) QtSupport::getQt(env, obj))->qt_static_property((TQObject*) QtSupport::getQt(env, o), (int) id, (int) f, (TQVariant*) QtSupport::getQt(env, v)); + jboolean xret = (jboolean) ((TQMetaObject*) QtSupport::getQt(env, obj))->tqt_static_property((TQObject*) QtSupport::getQt(env, o), (int) id, (int) f, (TQVariant*) QtSupport::getQt(env, v)); return xret; } diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index bd9e010a..3d71cfc4 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -1841,7 +1841,7 @@ qt_signal(int argc, VALUE * argv, VALUE self) } static VALUE -qt_invoke(int /*argc*/, VALUE * argv, VALUE self) +tqt_invoke(int /*argc*/, VALUE * argv, VALUE self) { // Arguments: int id, TQUObject *o int id = NUM2INT(argv[0]); @@ -1879,7 +1879,7 @@ qt_invoke(int /*argc*/, VALUE * argv, VALUE self) } // Should never happen.. - rb_raise(rb_eRuntimeError, "Cannot find %s::qt_invoke() method\n", + rb_raise(rb_eRuntimeError, "Cannot find %s::tqt_invoke() method\n", o->smoke->classes[o->classId].className ); } @@ -2272,8 +2272,8 @@ make_metaObject(VALUE /*self*/, VALUE className_value, VALUE parent, VALUE slot_ static VALUE add_metaobject_methods(VALUE self, VALUE klass) { - rb_define_method(klass, "qt_invoke", (VALUE (*) (...)) qt_invoke, -1); - rb_define_method(klass, "qt_emit", (VALUE (*) (...)) qt_invoke, -1); + rb_define_method(klass, "qt_invoke", (VALUE (*) (...)) tqt_invoke, -1); + rb_define_method(klass, "qt_emit", (VALUE (*) (...)) tqt_invoke, -1); rb_define_method(klass, "metaObject", (VALUE (*) (...)) metaObject, 0); return self; } |