summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kalyptus/kalyptus12
-rw-r--r--kdejava/koala/org/kde/koala/KRegExpEditorInterface.java4
-rw-r--r--qtjava/javalib/org/kde/qt/TQMetaObject.java2
-rw-r--r--qtruby/ChangeLog12
4 files changed, 15 insertions, 15 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 261c1795..3de8b858 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -71,10 +71,10 @@ $exe = basename $0;
public:
virtual TQMetaObject *metaObject() const;
virtual const char *className() const;
- virtual void* qt_cast( const char* );
- virtual bool qt_invoke( int, TQUObject* );
- virtual bool qt_emit( int, TQUObject* );
- virtual bool qt_property( int, int, TQVariant* );
+ virtual void* tqt_cast( const char* );
+ virtual bool tqt_invoke( int, TQUObject* );
+ virtual bool tqt_emit( int, TQUObject* );
+ virtual bool tqt_property( int, int, TQVariant* );
static TQMetaObject* staticMetaObject();
TQObject* qObject();
static TQString tr( const char *, const char * = 0 );
@@ -149,8 +149,8 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
public:
virtual TQMetaObject *metaObject() const;
virtual const char *className() const;
- virtual bool qt_invoke( int, TQUObject* );
- virtual bool qt_emit( int, TQUObject* );
+ virtual bool tqt_invoke( int, TQUObject* );
+ virtual bool tqt_emit( int, TQUObject* );
static TQString tr( const char *, const char * = 0 );
static TQString trUtf8( const char *, const char * = 0 );
private:
diff --git a/kdejava/koala/org/kde/koala/KRegExpEditorInterface.java b/kdejava/koala/org/kde/koala/KRegExpEditorInterface.java
index 981fd713..6a4d5409 100644
--- a/kdejava/koala/org/kde/koala/KRegExpEditorInterface.java
+++ b/kdejava/koala/org/kde/koala/KRegExpEditorInterface.java
@@ -20,7 +20,7 @@ import org.kde.qt.QtSupport;
TQDialog editorDialog = KParts.ComponentFactory.createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
if ( editorDialog ) {
// tdeutils was installed, so the dialog was found fetch the editor interface
- KRegExpEditorInterface editor = (KRegExpEditorInterface)( editorDialog.qt_cast( "KRegExpEditorInterface" ) );
+ KRegExpEditorInterface editor = (KRegExpEditorInterface)( editorDialog.tqt_cast( "KRegExpEditorInterface" ) );
Q_ASSERT( editor ); // This should not fail!
// now use the editor.
editor.setRegExp("^kde$");
@@ -43,7 +43,7 @@ import org.kde.qt.QtSupport;
"KRegExpEditor/KRegExpEditor", null, parent );
if ( editorWidget ) {
// tdeutils was installed, so the widget was found fetch the editor interface
- KRegExpEditorInterface editor = (KRegExpEditorInterface)( editorWidget.qt_cast( "KRegExpEditorInterface" ) );
+ KRegExpEditorInterface editor = (KRegExpEditorInterface)( editorWidget.tqt_cast( "KRegExpEditorInterface" ) );
Q_ASSERT( editor ); // This should not fail!
// now use the editor.
editor.setRegExp("^kde$");
diff --git a/qtjava/javalib/org/kde/qt/TQMetaObject.java b/qtjava/javalib/org/kde/qt/TQMetaObject.java
index 66323b15..47ba9c90 100644
--- a/qtjava/javalib/org/kde/qt/TQMetaObject.java
+++ b/qtjava/javalib/org/kde/qt/TQMetaObject.java
@@ -57,7 +57,7 @@ public class TQMetaObject implements QtSupport {
public native int numEnumerators();
public native TQMetaEnum enumerator(String name, boolean arg2);
public native TQMetaEnum enumerator(String name);
- public native boolean qt_static_property(TQObject o, int id, int f, TQVariant v);
+ public native boolean tqt_static_property(TQObject o, int id, int f, TQVariant v);
// TQMetaObject* new_metaobject(const char* arg1,TQMetaObject* arg2,const TQMetaData* arg3,int arg4,const TQMetaData* arg5,int arg6,const TQMetaProperty* arg7,int arg8,const TQMetaEnum* arg9,int arg10,const TQClassInfo* arg11,int arg12); >>>> NOT CONVERTED
public static native TQMetaObject metaObject(String class_name);
public static native boolean hasMetaObject(String class_name);
diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog
index ebb11426..b42a8aba 100644
--- a/qtruby/ChangeLog
+++ b/qtruby/ChangeLog
@@ -122,7 +122,7 @@
2006-06-04 Richard Dale <rdale@foton.es>
* For TQt::TQObject classes which are immediate subclasses of TQt::Base,
- don't add C metaObject() and qt_invoke() methods as they aren't
+ don't add C metaObject() and tqt_invoke() methods as they aren't
needed. This means that a TQMetaObject is no longer constructed for
these classes, and the one that the corresponding C++ class has is
returned instead.
@@ -165,11 +165,11 @@
2006-05-03 Richard Dale <rdale@foton.es>
- * The qt_emit() and qt_invoke() methods are overriden by the QtRuby
+ * The tqt_emit() and tqt_invoke() methods are overriden by the QtRuby
runtime. When they are called the runtime looks for a Ruby slot or
signal matching the call, and invokes it if found. If a Ruby version
- wasn't found for a signal however, the qt_invoke() method was being
- called in the Smoke library instead of qt_emit(). This occasionally
+ wasn't found for a signal however, the tqt_invoke() method was being
+ called in the Smoke library instead of tqt_emit(). This occasionally
caused a crash in code using KDE::HTMLPart.
2006-04-17 Richard Dale <rdale@foton.es>
@@ -226,7 +226,7 @@
2005-12-16 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Improved the code to call a C++ slot via qt_invoke() when a ruby slot hasn't
+ * Improved the code to call a C++ slot via tqt_invoke() when a ruby slot hasn't
been defined. It now invokes the method in the Smoke lib directly, rather
than going via method_missing().
@@ -1353,7 +1353,7 @@
2003-10-14 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* Fixed serious random crash problem
- - qt_invoke() and qt_emit() were not calling super if a ruby signal or
+ - tqt_invoke() and tqt_emit() were not calling super if a ruby signal or
slot hadn't been found, which stopped C++ signals from working.
- This prevented destroy() signals from invoking event filter list clean
up when a TQObject was deleted, leaving deleted instances in the list.