diff options
52 files changed, 190 insertions, 190 deletions
diff --git a/dcopjava/dcopidl2java/main.cpp b/dcopjava/dcopidl2java/main.cpp index 913b7e7a..f8351e88 100644 --- a/dcopjava/dcopidl2java/main.cpp +++ b/dcopjava/dcopidl2java/main.cpp @@ -41,7 +41,7 @@ void usage() int main( int argc, char** argv ) { - if ( *qVersion() == '1' ) { + if ( *tqVersion() == '1' ) { fprintf( stderr, "dcopidl2cpp appears to be linked to Qt 1 instead of Qt 2 ! Aborting.\n" ); exit(1); } @@ -80,7 +80,7 @@ int main( int argc, char** argv ) TQFile in( argv[argpos] ); if ( !in.open( IO_ReadOnly ) ) - qFatal("Could not read %s", argv[argpos] ); + tqFatal("Could not read %s", argv[argpos] ); TQDomDocument doc; doc.setContent( &in ); diff --git a/dcopjava/dcopidl2java/skel.cpp b/dcopjava/dcopidl2java/skel.cpp index 4b4a3fd0..2fe7b9b0 100644 --- a/dcopjava/dcopidl2java/skel.cpp +++ b/dcopjava/dcopidl2java/skel.cpp @@ -66,7 +66,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d { TQFile skel( filename ); if ( !skel.open( IO_WriteOnly ) ) - qFatal("Could not write to %s", filename.latin1() ); + tqFatal("Could not write to %s", filename.latin1() ); TQTextStream str( &skel ); diff --git a/dcopjava/dcopidl2java/stubimpl.cpp b/dcopjava/dcopidl2java/stubimpl.cpp index 55e474c9..7764618a 100644 --- a/dcopjava/dcopidl2java/stubimpl.cpp +++ b/dcopjava/dcopidl2java/stubimpl.cpp @@ -109,7 +109,7 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr { TQFile impl( filename ); if ( !impl.open( IO_WriteOnly ) ) - qFatal("Could not write to %s", filename.latin1() ); + tqFatal("Could not write to %s", filename.latin1() ); TQTextStream str( &impl ); diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp index 88e26cc1..c264f954 100644 --- a/dcoppython/shell/pcop.cpp +++ b/dcoppython/shell/pcop.cpp @@ -519,7 +519,7 @@ namespace PythonDCOP { } // for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - // qDebug( "%s", (*it).data() ); + // tqDebug( "%s", (*it).data() ); // } // @@ -528,7 +528,7 @@ namespace PythonDCOP { // ### Check wether that is sane PCOPClass c( funcs ); - // qDebug("Parsing done."); + // tqDebug("Parsing done."); // Does the requested method exist ? const PCOPMethod* m = c.method( funcname, tuple ); diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index f6233022..71757756 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -81,7 +81,7 @@ 2004-06-29 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Java methods now generated for qCompress and tqUncompress methods - Michal Ceresna + * Java methods now generated for tqCompress and tqUncompress methods - Michal Ceresna reported that the methods missing from the QtJava api. 2004-06-25 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index c20a2974..4593f6a5 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -506,19 +506,19 @@ EOF public static native TQApplication tqApp(); - public static native void qDebug(String message); - public static void qDebug(String pattern, Object[] arguments) { - qDebug(MessageFormat.format(pattern, arguments)); + public static native void tqDebug(String message); + public static void tqDebug(String pattern, Object[] arguments) { + tqDebug(MessageFormat.format(pattern, arguments)); } - public static native void qWarning(String message); - public static void qWarning(String pattern, Object[] arguments) { - qWarning(MessageFormat.format(pattern, arguments)); + public static native void tqWarning(String message); + public static void tqWarning(String pattern, Object[] arguments) { + tqWarning(MessageFormat.format(pattern, arguments)); } - public static native void qFatal(String message); - public static void qFatal(String pattern, Object[] arguments) { - qFatal(MessageFormat.format(pattern, arguments)); + public static native void tqFatal(String message); + public static void tqFatal(String pattern, Object[] arguments) { + tqFatal(MessageFormat.format(pattern, arguments)); } private static String sqeezeOut(String from, char toss) { @@ -552,7 +552,7 @@ EOF try { result = new String(bytes, "UTF-8"); } catch (UnsupportedEncodingException e) { - qWarning("UTF-8 encoding not supported"); + tqWarning("UTF-8 encoding not supported"); } finally { return result; } @@ -822,7 +822,7 @@ Java_org_kde_qt_Qt_qDebug(JNIEnv* env, jclass cls, jstring message) { static TQCString * _qstring_message = 0; (void) cls; - qDebug("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); + tqDebug("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; } @@ -831,7 +831,7 @@ Java_org_kde_qt_Qt_qWarning(JNIEnv* env, jclass cls, jstring message) { static TQCString * _qstring_message = 0; (void) cls; - qWarning("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); + tqWarning("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; } @@ -840,7 +840,7 @@ Java_org_kde_qt_Qt_qFatal(JNIEnv* env, jclass cls, jstring message) { static TQCString * _qstring_message = 0; (void) cls; - qFatal("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); + tqFatal("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; } diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 7cfc6261..dcc713e1 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -301,19 +301,19 @@ EOF */ // public static native TQApplication tqApp(); - public static native void qDebug(String message); - public static void qDebug(String pattern, Object[] arguments) { - qDebug(MessageFormat.format(pattern, arguments)); + public static native void tqDebug(String message); + public static void tqDebug(String pattern, Object[] arguments) { + tqDebug(MessageFormat.format(pattern, arguments)); } - public static native void qWarning(String message); - public static void qWarning(String pattern, Object[] arguments) { - qWarning(MessageFormat.format(pattern, arguments)); + public static native void tqWarning(String message); + public static void tqWarning(String pattern, Object[] arguments) { + tqWarning(MessageFormat.format(pattern, arguments)); } - public static native void qFatal(String message); - public static void qFatal(String pattern, Object[] arguments) { - qFatal(MessageFormat.format(pattern, arguments)); + public static native void tqFatal(String message); + public static void tqFatal(String pattern, Object[] arguments) { + tqFatal(MessageFormat.format(pattern, arguments)); } private static String sqeezeOut(String from, char toss) { @@ -347,7 +347,7 @@ EOF try { result = new String(bytes, "UTF-8"); } catch (UnsupportedEncodingException e) { - qWarning("UTF-8 encoding not supported"); + tqWarning("UTF-8 encoding not supported"); } finally { return result; } diff --git a/kdejava/koala/org/kde/koala/KDE.java b/kdejava/koala/org/kde/koala/KDE.java index 7b972a9d..c0f57c5b 100644 --- a/kdejava/koala/org/kde/koala/KDE.java +++ b/kdejava/koala/org/kde/koala/KDE.java @@ -137,10 +137,10 @@ public class KDE { public static native TQDataStream op_write(TQDataStream s, KURL a); public static native TQDataStream op_read(TQDataStream s, KURL a); /** - Locale-independent qstricmp. Use this for comparing ascii keywords + Locale-independent tqstricmp. Use this for comparing ascii keywords in a case-insensitive way. - qstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i' - @short Locale-independent qstricmp. + tqstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i' + @short Locale-independent tqstricmp. */ public static native int kasciistricmp(String str1, String str2); public static native TQDataStream op_write(TQDataStream s, KSSLCertificate r); diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp index b7da9e91..90143e4b 100644 --- a/kjsembed/plugins/imagefx_plugin.cpp +++ b/kjsembed/plugins/imagefx_plugin.cpp @@ -779,7 +779,7 @@ TQImage ImageFX::bumpmap(TQImage &img, TQImage &map, double azimuth, double elev TQImage dst; if ( img.depth() != 32 || img.depth() != 32 ) { - qWarning( "Bump-mapping effect works only with 32 bit images"); + tqWarning( "Bump-mapping effect works only with 32 bit images"); return dst; } diff --git a/korundum/ChangeLog b/korundum/ChangeLog index 3401d5fb..292805ef 100644 --- a/korundum/ChangeLog +++ b/korundum/ChangeLog @@ -203,7 +203,7 @@ 2004-10-30 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * References to Qt.qWarning() changed to qWarning() + * References to Qt.qWarning() changed to tqWarning() 2004-10-24 Richard Dale <Richard_Dale@tipitina.demon.co.uk> @@ -363,7 +363,7 @@ CCMAIL: kde-bindings@kde.org 2004-07-27 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * DCOP error messages now go via qWarning() rather than puts() + * DCOP error messages now go via tqWarning() rather than puts() 2004-07-26 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/korundum/rubylib/korundum/lib/KDE/korundum.rb b/korundum/rubylib/korundum/lib/KDE/korundum.rb index 3e4d9a8c..1974c0d6 100644 --- a/korundum/rubylib/korundum/lib/KDE/korundum.rb +++ b/korundum/rubylib/korundum/lib/KDE/korundum.rb @@ -51,7 +51,7 @@ module KDE args = DCOPClient.normalizeFunctionSignature($3) @k_dcop_signals[$2] = DCOPMember.new($2, $2 + "(" + args + ")", args, $1) else - qWarning( "Invalid DCOP signal format: '#{signal}'" ) + tqWarning( "Invalid DCOP signal format: '#{signal}'" ) end end end @@ -62,7 +62,7 @@ module KDE args = DCOPClient.normalizeFunctionSignature($3) @k_dcop[$2] = DCOPMember.new($2, $1 + ' ' + $2 + "(" + args + ")", args, $1) else - qWarning( "Invalid DCOP slot format: '#{slot}'" ) + tqWarning( "Invalid DCOP slot format: '#{slot}'" ) end end end @@ -250,7 +250,7 @@ module KDE method = @functions[method] if method.nil? - qWarning( "DCOPRef: call #{k[0].id2name}() not found" ) + tqWarning( "DCOPRef: call #{k[0].id2name}() not found" ) return end @@ -289,7 +289,7 @@ module KDE def callExt(fun, *k) if isNull - qWarning( "DCOPRef: call #{fun} on null reference error" ) + tqWarning( "DCOPRef: call #{fun} on null reference error" ) return end sig = fun @@ -298,13 +298,13 @@ module KDE end dc = dcopClient() if !dc || !dc.isAttached - qWarning( "DCOPRef::call(): no DCOP client or client not attached error" ) + tqWarning( "DCOPRef::call(): no DCOP client or client not attached error" ) return end if sig =~ /([^\s]*)(\(.*\))/ full_name = $1+$2 else - qWarning( "DCOPRef: call #{fun} invalid format, expecting '<function_name>(<args>)'" ) + tqWarning( "DCOPRef: call #{fun} invalid format, expecting '<function_name>(<args>)'" ) return end return KDE::dcop_call( self, @@ -315,7 +315,7 @@ module KDE def send(fun, *k) if isNull - qWarning( "DCOPRef: send #{fun} on null reference error" ) + tqWarning( "DCOPRef: send #{fun} on null reference error" ) end sig = fun if fun.index('(') == nil @@ -323,11 +323,11 @@ module KDE end dc = dcopClient() if !dc || !dc.isAttached - qWarning( "DCOPRef::send(): no DCOP client or client not attached error" ) + tqWarning( "DCOPRef::send(): no DCOP client or client not attached error" ) return end if !sig =~ /^([^\s]*)(\(.*\))/ - qWarning( "DCOPRef: send #{sig} invalid format, expecting '<function_name>(<args>)'" ) + tqWarning( "DCOPRef: send #{sig} invalid format, expecting '<function_name>(<args>)'" ) return end return KDE::dcop_send( self, diff --git a/korundum/rubylib/rbkconfig_compiler/example.rb b/korundum/rubylib/rbkconfig_compiler/example.rb index d7ef38b1..9ed4d9c4 100644 --- a/korundum/rubylib/rbkconfig_compiler/example.rb +++ b/korundum/rubylib/rbkconfig_compiler/example.rb @@ -36,5 +36,5 @@ require 'exampleprefs_base.rb' prefs.setAnotherOption(17) - qWarning("Another Option = %d" % prefs.anotherOption()) - qWarning("Another Option2 = %d" % prefs.anotherOption2()) + tqWarning("Another Option = %d" % prefs.anotherOption()) + tqWarning("Another Option2 = %d" % prefs.anotherOption2()) diff --git a/korundum/rubylib/tutorials/p5/p5.rb b/korundum/rubylib/tutorials/p5/p5.rb index 25dd9190..40fb91a5 100644 --- a/korundum/rubylib/tutorials/p5/p5.rb +++ b/korundum/rubylib/tutorials/p5/p5.rb @@ -64,7 +64,7 @@ class MainWindow < KDE::MainWindow def bookLocation()
dcopRef = KDE::DCOPRef.new("p6", "BookMarkList")
if ! dcopRef.add(@location.text())
- qWarning("Error with DCOP\n")
+ tqWarning("Error with DCOP\n")
end
end
end
diff --git a/korundum/rubylib/tutorials/p7/p7.rb b/korundum/rubylib/tutorials/p7/p7.rb index 1dca0ddd..6c73c9c9 100644 --- a/korundum/rubylib/tutorials/p7/p7.rb +++ b/korundum/rubylib/tutorials/p7/p7.rb @@ -101,7 +101,7 @@ class Browser < KDE::MainWindow def bookLocation()
dcopRef = KDE::DCOPRef.new("p8", "BookMarkList")
if ! dcopRef.add(@location.text())
- qWarning("Error with DCOP\n")
+ tqWarning("Error with DCOP\n")
end
end
diff --git a/korundum/rubylib/tutorials/p8/p8.rb b/korundum/rubylib/tutorials/p8/p8.rb index 0d0e5342..1839e697 100644 --- a/korundum/rubylib/tutorials/p8/p8.rb +++ b/korundum/rubylib/tutorials/p8/p8.rb @@ -20,7 +20,7 @@ class BookMarkList < KDE::ListView if item.nil? then return end
dcopRef = KDE::DCOPRef.new("p7", "Browser")
if ! dcopRef.setURL(item.text(0))
- qWarning("Error with DCOP\n")
+ tqWarning("Error with DCOP\n")
end
end
end
diff --git a/korundum/rubylib/tutorials/p9/p9.rb b/korundum/rubylib/tutorials/p9/p9.rb index 5ddfeae3..e395e19c 100644 --- a/korundum/rubylib/tutorials/p9/p9.rb +++ b/korundum/rubylib/tutorials/p9/p9.rb @@ -75,7 +75,7 @@ class Browser < KDE::MainWindow def bookLocation()
dcopRef = KDE::DCOPRef.new("p8", "BookMarkList")
if ! dcopRef.add(@location.text())
- qWarning("Error with DCOP\n")
+ tqWarning("Error with DCOP\n")
end
end
diff --git a/qtjava/ChangeLog b/qtjava/ChangeLog index bd8ebd6c..9a2bf33e 100644 --- a/qtjava/ChangeLog +++ b/qtjava/ChangeLog @@ -408,7 +408,7 @@ Wed Nov 30 23:45:00 2000 Richard Dale <Richard_Dale@tipitina.demon.co.uk> * Improved code generation for strings and lists. Now more compact and doesn't seg fault when passed nulls * Added uic Java code generation as a patch - * Added qDebug(), qWarning() and qFatal(). + * Added tqDebug(), tqWarning() and tqFatal(). * Qt classes are in the package 'org.kde.qt' * KDE classes are in the package 'org.kde.koala'. * Fixed bug where widgets with parents were being destroyed twice. diff --git a/qtjava/designer/juic/java/put.xsl b/qtjava/designer/juic/java/put.xsl index 1f2e25a9..7e2bd73a 100644 --- a/qtjava/designer/juic/java/put.xsl +++ b/qtjava/designer/juic/java/put.xsl @@ -419,7 +419,7 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="$method"/> { - qWarning("Warning: SLOT \"<xsl:value-of select="$method"/>\" must be overridden"); + tqWarning("Warning: SLOT \"<xsl:value-of select="$method"/>\" must be overridden"); <xsl:if test="not($return = 'void')"> <xsl:choose> <xsl:when test="$return = 'byte' or $return = 'short' or $return = 'int' or $return = 'long'"> diff --git a/qtjava/javalib/examples/iconview/ListenDND.java b/qtjava/javalib/examples/iconview/ListenDND.java index e6bec795..c3ee925f 100644 --- a/qtjava/javalib/examples/iconview/ListenDND.java +++ b/qtjava/javalib/examples/iconview/ListenDND.java @@ -17,18 +17,18 @@ public ListenDND( TQWidget w ) {view = w;} void dropped( TQDropEvent mime ) { - qDebug( "Dropped Mimesource {0} into the view {1}", new Object[] { mime, view } ); - qDebug( " Formats:" ); + tqDebug( "Dropped Mimesource {0} into the view {1}", new Object[] { mime, view } ); + tqDebug( " Formats:" ); int i = 0; String str = mime.format( i ); - qDebug( " " + str ); + tqDebug( " " + str ); while ( str != null ) { - qDebug( " " + str ); + tqDebug( " " + str ); str = mime.format( ++i ); } }; void moved() { - qDebug( "All selected items were moved to another widget" ); + tqDebug( "All selected items were moved to another widget" ); } protected TQWidget view; diff --git a/qtjava/javalib/examples/widgets/WidgetView.java b/qtjava/javalib/examples/widgets/WidgetView.java index 77382908..f8261edf 100644 --- a/qtjava/javalib/examples/widgets/WidgetView.java +++ b/qtjava/javalib/examples/widgets/WidgetView.java @@ -794,21 +794,21 @@ void dummy() void selectionChanged() { - //qDebug("selectionChanged"); + //tqDebug("selectionChanged"); } void selectionChanged( TQListViewItem item) { - //qDebug("selectionChanged %p", item ); + //tqDebug("selectionChanged %p", item ); } void clicked( TQListViewItem item ) { - //qDebug("clicked %p", item ); + //tqDebug("clicked %p", item ); } void mySelectionChanged( TQListViewItem item ) { - //qDebug("mySelectionChanged %p", item ); + //tqDebug("mySelectionChanged %p", item ); } void showProperties() @@ -824,6 +824,6 @@ void showProperties() + " (read-" + (p.writable() ? "write" : "only") + ", " + p.type() + ")"; output += tmp; } - qDebug( output ); + tqDebug( output ); } } diff --git a/qtjava/javalib/org/kde/qt/Qt.java b/qtjava/javalib/org/kde/qt/Qt.java index 3c8c8115..886fbb70 100644 --- a/qtjava/javalib/org/kde/qt/Qt.java +++ b/qtjava/javalib/org/kde/qt/Qt.java @@ -765,11 +765,11 @@ public class Qt implements QtSupport { public static native TQDataStream op_write(TQDataStream arg1, TQCursor arg2); public static native TQDataStream op_read(TQDataStream arg1, TQCursor arg2); public static native String tqAppName(); - // void qAddPostRoutine(QtCleanUpFunction arg1); >>>> NOT CONVERTED - // void qRemovePostRoutine(QtCleanUpFunction arg1); >>>> NOT CONVERTED - public static native byte[] qCompress(char[] data, int nbytes); + // void tqAddPostRoutine(QtCleanUpFunction arg1); >>>> NOT CONVERTED + // void tqRemovePostRoutine(QtCleanUpFunction arg1); >>>> NOT CONVERTED + public static native byte[] tqCompress(char[] data, int nbytes); public static native byte[] tqUncompress(char[] data, int nbytes); - public static native byte[] qCompress(byte[] data); + public static native byte[] tqCompress(byte[] data); public static native byte[] tqUncompress(byte[] data); public static native TQTextStream op_write(TQTextStream arg1, TQDomNode arg2); public static native TQWMatrix op_mult(TQWMatrix arg1, TQWMatrix arg2); @@ -879,7 +879,7 @@ public class Qt implements QtSupport { /** ************************************************* $Id$ - * Definition of qInitNetworkProtocols function. + * Definition of tqInitNetworkProtocols function. * Created : 970521 @@ -913,7 +913,7 @@ public class Qt implements QtSupport { ********************************************** @short $Id: qt/qnetwork. */ - public static native void qInitNetworkProtocols(); + public static native void tqInitNetworkProtocols(); /** ************************************************** TQPointArray stream functions ************************************************** @short TQPointArray stream functions @@ -965,26 +965,26 @@ public class Qt implements QtSupport { // TQDataStream& op_read(TQDataStream& arg1,TQGVector& arg2); >>>> NOT CONVERTED // TQDataStream& op_write(TQDataStream& arg1,const TQGVector& arg2); >>>> NOT CONVERTED public static native int tqRound(double d); - public static native String qVersion(); - public static native boolean qSysInfo(int[] wordSize, boolean[] bigEndian); - public static native boolean qSharedBuild(); - public static native void qSystemWarning(String arg1, int code); - public static native void qSystemWarning(String arg1); + public static native String tqVersion(); + public static native boolean tqSysInfo(int[] wordSize, boolean[] bigEndian); + public static native boolean tqSharedBuild(); + public static native void tqSystemWarning(String arg1, int code); + public static native void tqSystemWarning(String arg1); // QtMsgHandler qInstallMsgHandler(QtMsgHandler arg1); >>>> NOT CONVERTED - public static native void qSuppressObsoleteWarnings(boolean arg1); - public static native void qSuppressObsoleteWarnings(); - public static native void qObsolete(String arg1, String oldfunc, String newfunc); - public static native void qObsolete(String arg1, String oldfunc); - public static native void qObsolete(String message); - public static native String qInstallPath(); - public static native String qInstallPathDocs(); - public static native String qInstallPathHeaders(); - public static native String qInstallPathLibs(); - public static native String qInstallPathBins(); - public static native String qInstallPathPlugins(); - public static native String qInstallPathData(); - public static native String qInstallPathTranslations(); - public static native String qInstallPathSysconf(); + public static native void tqSuppressObsoleteWarnings(boolean arg1); + public static native void tqSuppressObsoleteWarnings(); + public static native void tqObsolete(String arg1, String oldfunc, String newfunc); + public static native void tqObsolete(String arg1, String oldfunc); + public static native void tqObsolete(String message); + public static native String tqInstallPath(); + public static native String tqInstallPathDocs(); + public static native String tqInstallPathHeaders(); + public static native String tqInstallPathLibs(); + public static native String tqInstallPathBins(); + public static native String tqInstallPathPlugins(); + public static native String tqInstallPathData(); + public static native String tqInstallPathTranslations(); + public static native String tqInstallPathSysconf(); public static native TQTextStream op_write(TQTextStream arg1, TQDockArea arg2); public static native TQTextStream op_read(TQTextStream arg1, TQDockArea arg2); public static native void bitBlt(TQPaintDeviceInterface dst, int dx, int dy, TQPaintDeviceInterface src, int sx, int sy, int sw, int sh, int arg9, boolean ignoreMask); @@ -1085,19 +1085,19 @@ public class Qt implements QtSupport { public static native TQApplication tqApp(); - public static native void qDebug(String message); - public static void qDebug(String pattern, Object[] arguments) { - qDebug(MessageFormat.format(pattern, arguments)); + public static native void tqDebug(String message); + public static void tqDebug(String pattern, Object[] arguments) { + tqDebug(MessageFormat.format(pattern, arguments)); } - public static native void qWarning(String message); - public static void qWarning(String pattern, Object[] arguments) { - qWarning(MessageFormat.format(pattern, arguments)); + public static native void tqWarning(String message); + public static void tqWarning(String pattern, Object[] arguments) { + tqWarning(MessageFormat.format(pattern, arguments)); } - public static native void qFatal(String message); - public static void qFatal(String pattern, Object[] arguments) { - qFatal(MessageFormat.format(pattern, arguments)); + public static native void tqFatal(String message); + public static void tqFatal(String pattern, Object[] arguments) { + tqFatal(MessageFormat.format(pattern, arguments)); } private static String sqeezeOut(String from, char toss) { @@ -1131,7 +1131,7 @@ public class Qt implements QtSupport { try { result = new String(bytes, "UTF-8"); } catch (UnsupportedEncodingException e) { - qWarning("UTF-8 encoding not supported"); + tqWarning("UTF-8 encoding not supported"); } finally { return result; } diff --git a/qtjava/javalib/qtjava/Qt.cpp b/qtjava/javalib/qtjava/Qt.cpp index 86c6b1df..c5f3bf36 100644 --- a/qtjava/javalib/qtjava/Qt.cpp +++ b/qtjava/javalib/qtjava/Qt.cpp @@ -1024,7 +1024,7 @@ Java_org_kde_qt_Qt_qCompress___3B(JNIEnv* env, jclass cls, jbyteArray data) TQByteArray _qbyteArray; (void) cls; static TQByteArray* _qbyteArray_data = 0; - _qbyteArray = ::qCompress((const TQByteArray&)*(TQByteArray*) QtSupport::toTQByteArray(env, data, &_qbyteArray_data)); + _qbyteArray = ::tqCompress((const TQByteArray&)*(TQByteArray*) QtSupport::toTQByteArray(env, data, &_qbyteArray_data)); return QtSupport::fromTQByteArray(env, &_qbyteArray); } @@ -1034,7 +1034,7 @@ Java_org_kde_qt_Qt_qCompress___3CI(JNIEnv* env, jclass cls, jcharArray data, jin TQByteArray _qbyteArray; (void) cls; static TQByteArray* _qbytearray_data = 0; - _qbyteArray = ::qCompress((const uchar*) QtSupport::toUcharArray(env, data, &_qbytearray_data), (int) nbytes); + _qbyteArray = ::tqCompress((const uchar*) QtSupport::toUcharArray(env, data, &_qbytearray_data), (int) nbytes); return QtSupport::fromTQByteArray(env, &_qbyteArray); } @@ -1466,7 +1466,7 @@ Java_org_kde_qt_Qt_qInitNetworkProtocols(JNIEnv* env, jclass cls) { (void) cls; (void) env; - ::qInitNetworkProtocols(); + ::tqInitNetworkProtocols(); return; } @@ -1475,7 +1475,7 @@ Java_org_kde_qt_Qt_qInstallPathBins(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathBins(); + _qstring = ::tqInstallPathBins(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1484,7 +1484,7 @@ Java_org_kde_qt_Qt_qInstallPathData(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathData(); + _qstring = ::tqInstallPathData(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1493,7 +1493,7 @@ Java_org_kde_qt_Qt_qInstallPathDocs(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathDocs(); + _qstring = ::tqInstallPathDocs(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1502,7 +1502,7 @@ Java_org_kde_qt_Qt_qInstallPathHeaders(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathHeaders(); + _qstring = ::tqInstallPathHeaders(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1511,7 +1511,7 @@ Java_org_kde_qt_Qt_qInstallPathLibs(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathLibs(); + _qstring = ::tqInstallPathLibs(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1520,7 +1520,7 @@ Java_org_kde_qt_Qt_qInstallPathPlugins(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathPlugins(); + _qstring = ::tqInstallPathPlugins(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1529,7 +1529,7 @@ Java_org_kde_qt_Qt_qInstallPathSysconf(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathSysconf(); + _qstring = ::tqInstallPathSysconf(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1538,7 +1538,7 @@ Java_org_kde_qt_Qt_qInstallPathTranslations(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPathTranslations(); + _qstring = ::tqInstallPathTranslations(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1547,7 +1547,7 @@ Java_org_kde_qt_Qt_qInstallPath(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qInstallPath(); + _qstring = ::tqInstallPath(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1574,7 +1574,7 @@ Java_org_kde_qt_Qt_qObsolete__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstri { (void) cls; static TQCString* _qstring_message = 0; - ::qObsolete((const char*) QtSupport::toCharString(env, message, &_qstring_message)); + ::tqObsolete((const char*) QtSupport::toCharString(env, message, &_qstring_message)); return; } @@ -1584,7 +1584,7 @@ Java_org_kde_qt_Qt_qObsolete__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env (void) cls; static TQCString* _qstring_arg1 = 0; static TQCString* _qstring_oldfunc = 0; - ::qObsolete((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (const char*) QtSupport::toCharString(env, oldfunc, &_qstring_oldfunc)); + ::tqObsolete((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (const char*) QtSupport::toCharString(env, oldfunc, &_qstring_oldfunc)); return; } @@ -1595,7 +1595,7 @@ Java_org_kde_qt_Qt_qObsolete__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_S static TQCString* _qstring_arg1 = 0; static TQCString* _qstring_oldfunc = 0; static TQCString* _qstring_newfunc = 0; - ::qObsolete((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (const char*) QtSupport::toCharString(env, oldfunc, &_qstring_oldfunc), (const char*) QtSupport::toCharString(env, newfunc, &_qstring_newfunc)); + ::tqObsolete((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (const char*) QtSupport::toCharString(env, oldfunc, &_qstring_oldfunc), (const char*) QtSupport::toCharString(env, newfunc, &_qstring_newfunc)); return; } @@ -1640,7 +1640,7 @@ Java_org_kde_qt_Qt_qSharedBuild(JNIEnv* env, jclass cls) { (void) cls; (void) env; - jboolean xret = (jboolean) ::qSharedBuild(); + jboolean xret = (jboolean) ::tqSharedBuild(); return xret; } @@ -1649,7 +1649,7 @@ Java_org_kde_qt_Qt_qSuppressObsoleteWarnings__(JNIEnv* env, jclass cls) { (void) cls; (void) env; - ::qSuppressObsoleteWarnings(); + ::tqSuppressObsoleteWarnings(); return; } @@ -1658,7 +1658,7 @@ Java_org_kde_qt_Qt_qSuppressObsoleteWarnings__Z(JNIEnv* env, jclass cls, jboolea { (void) cls; (void) env; - ::qSuppressObsoleteWarnings((bool) arg1); + ::tqSuppressObsoleteWarnings((bool) arg1); return; } @@ -1668,7 +1668,7 @@ Java_org_kde_qt_Qt_qSysInfo(JNIEnv* env, jclass cls, jintArray wordSize, jboolea (void) cls; int* _int_wordSize = QtSupport::toIntPtr(env, wordSize); bool* _bool_bigEndian = QtSupport::toBooleanPtr(env, bigEndian); - jboolean xret = (jboolean) ::qSysInfo( (int*) _int_wordSize, (bool*) _bool_bigEndian); + jboolean xret = (jboolean) ::tqSysInfo( (int*) _int_wordSize, (bool*) _bool_bigEndian); env->SetIntArrayRegion(wordSize, 0, 1, (jint *) _int_wordSize); env->SetBooleanArrayRegion(bigEndian, 0, 1, (jboolean*) _bool_bigEndian); return xret; @@ -1679,7 +1679,7 @@ Java_org_kde_qt_Qt_qSystemWarning__Ljava_lang_String_2(JNIEnv* env, jclass cls, { (void) cls; static TQCString* _qstring_arg1 = 0; - ::qSystemWarning((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1)); + ::tqSystemWarning((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1)); return; } @@ -1688,7 +1688,7 @@ Java_org_kde_qt_Qt_qSystemWarning__Ljava_lang_String_2I(JNIEnv* env, jclass cls, { (void) cls; static TQCString* _qstring_arg1 = 0; - ::qSystemWarning((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (int) code); + ::tqSystemWarning((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (int) code); return; } @@ -1717,7 +1717,7 @@ Java_org_kde_qt_Qt_qVersion(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qVersion(); + _qstring = ::tqVersion(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1998,7 +1998,7 @@ Java_org_kde_qt_Qt_qDebug(JNIEnv* env, jclass cls, jstring message) { static TQCString * _qstring_message = 0; (void) cls; - qDebug("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); + tqDebug("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; } @@ -2007,7 +2007,7 @@ Java_org_kde_qt_Qt_qWarning(JNIEnv* env, jclass cls, jstring message) { static TQCString * _qstring_message = 0; (void) cls; - qWarning("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); + tqWarning("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; } @@ -2016,7 +2016,7 @@ Java_org_kde_qt_Qt_qFatal(JNIEnv* env, jclass cls, jstring message) { static TQCString * _qstring_message = 0; (void) cls; - qFatal("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); + tqFatal("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; } diff --git a/qtjava/javalib/test/AppWizardBase.java b/qtjava/javalib/test/AppWizardBase.java index 9cdb47cb..2dbe0e75 100644 --- a/qtjava/javalib/test/AppWizardBase.java +++ b/qtjava/javalib/test/AppWizardBase.java @@ -198,12 +198,12 @@ AppWizardBase( TQWidget parent, String name, boolean modal, int fl ) public void slotLoadHeader() { - qWarning( "AppWizardBase.slotLoadHeader(): Not implemented yet!" ); + tqWarning( "AppWizardBase.slotLoadHeader(): Not implemented yet!" ); } public void slotNewHeader() { - qWarning( "AppWizardBase.slotNewHeader(): Not implemented yet!" ); + tqWarning( "AppWizardBase.slotNewHeader(): Not implemented yet!" ); } } diff --git a/qtjava/javalib/test/FilePropsPageBase.java b/qtjava/javalib/test/FilePropsPageBase.java index ba0a8f9e..076ab62b 100644 --- a/qtjava/javalib/test/FilePropsPageBase.java +++ b/qtjava/javalib/test/FilePropsPageBase.java @@ -126,12 +126,12 @@ public FilePropsPageBase( TQWidget parent, String name, int fl ) public void slotSelectionChanged() { - qWarning( "FilePropsPageBase.slotSelectionChanged(): Not implemented yet!" ); + tqWarning( "FilePropsPageBase.slotSelectionChanged(): Not implemented yet!" ); } public void slotClassnameChanged(java.lang.String string) { - qWarning( "FilePropsPageBase.slotClassnameChanged(java.lang.String string): Not implemented yet!" ); + tqWarning( "FilePropsPageBase.slotClassnameChanged(java.lang.String string): Not implemented yet!" ); } } diff --git a/qtjava/javalib/test/Foo.java b/qtjava/javalib/test/Foo.java index 3d4e5784..19460c6d 100644 --- a/qtjava/javalib/test/Foo.java +++ b/qtjava/javalib/test/Foo.java @@ -17,14 +17,14 @@ Foo( TQWidget parent, String name, boolean modal, int fl ) */ public void slotLoadHeader() { - qWarning( "AppWizardBase.slotLoadHeader() not yet implemented!" ); + tqWarning( "AppWizardBase.slotLoadHeader() not yet implemented!" ); } /* * public slot */ public void slotNewHeader() { - qWarning( "AppWizardBase.slotNewHeader() not yet implemented!" ); + tqWarning( "AppWizardBase.slotNewHeader() not yet implemented!" ); } } diff --git a/qtjava/javalib/tutorial/t10/LCDRange.java b/qtjava/javalib/tutorial/t10/LCDRange.java index 8f422515..f6b6f8d1 100644 --- a/qtjava/javalib/tutorial/t10/LCDRange.java +++ b/qtjava/javalib/tutorial/t10/LCDRange.java @@ -28,7 +28,7 @@ public class LCDRange extends TQVBox { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtjava/javalib/tutorial/t11/LCDRange.java b/qtjava/javalib/tutorial/t11/LCDRange.java index 8f422515..f6b6f8d1 100644 --- a/qtjava/javalib/tutorial/t11/LCDRange.java +++ b/qtjava/javalib/tutorial/t11/LCDRange.java @@ -28,7 +28,7 @@ public class LCDRange extends TQVBox { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtjava/javalib/tutorial/t12/LCDRange.java b/qtjava/javalib/tutorial/t12/LCDRange.java index a2b81bd4..4a8823a7 100644 --- a/qtjava/javalib/tutorial/t12/LCDRange.java +++ b/qtjava/javalib/tutorial/t12/LCDRange.java @@ -42,7 +42,7 @@ public class LCDRange extends TQVBox { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtjava/javalib/tutorial/t13/LCDRange.java b/qtjava/javalib/tutorial/t13/LCDRange.java index f55e7b0c..ab684991 100644 --- a/qtjava/javalib/tutorial/t13/LCDRange.java +++ b/qtjava/javalib/tutorial/t13/LCDRange.java @@ -47,7 +47,7 @@ public class LCDRange extends TQWidget { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtjava/javalib/tutorial/t14/LCDRange.java b/qtjava/javalib/tutorial/t14/LCDRange.java index f55e7b0c..ab684991 100644 --- a/qtjava/javalib/tutorial/t14/LCDRange.java +++ b/qtjava/javalib/tutorial/t14/LCDRange.java @@ -47,7 +47,7 @@ public class LCDRange extends TQWidget { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtjava/javalib/tutorial/t8/LCDRange.java b/qtjava/javalib/tutorial/t8/LCDRange.java index 8f422515..f6b6f8d1 100644 --- a/qtjava/javalib/tutorial/t8/LCDRange.java +++ b/qtjava/javalib/tutorial/t8/LCDRange.java @@ -28,7 +28,7 @@ public class LCDRange extends TQVBox { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtjava/javalib/tutorial/t9/LCDRange.java b/qtjava/javalib/tutorial/t9/LCDRange.java index 8f422515..f6b6f8d1 100644 --- a/qtjava/javalib/tutorial/t9/LCDRange.java +++ b/qtjava/javalib/tutorial/t9/LCDRange.java @@ -28,7 +28,7 @@ public class LCDRange extends TQVBox { public void setRange(int minVal, int maxVal) { if (minVal < 0 || maxVal > 99 || minVal > maxVal) { - qWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ + tqWarning("LCDRange::setRange("+minVal+","+maxVal+")\n"+ "\tRange must be 0..99\n"+ "\tand minVal must not be greater than maxVal"); return; diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index 1e44544e..ebb11426 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -221,7 +221,7 @@ 2005-12-16 Richard Dale <Richard_Dale@tipitina.demon.co.uk> * The logger_backend() function has been removed and replaced with - qWarning() calls. This was because of problems with getting the + tqWarning() calls. This was because of problems with getting the logger_backend() code to work on Windows. 2005-12-16 Richard Dale <Richard_Dale@tipitina.demon.co.uk> @@ -637,7 +637,7 @@ 2004-10-30 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * qError(), qWarning() and qFatal() are now Object instance methods, rather than Qt module + * qError(), tqWarning() and tqFatal() are now Object instance methods, rather than Qt module methods. This means they don't need to be referenced with an ugly 'Qt.' module scope anymore. 2004-10-21 Richard Dale <Richard_Dale@tipitina.demon.co.uk> @@ -1041,7 +1041,7 @@ 2004-07-27 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Added qDebug(), qFatal() and qWarning() module methods + * Added tqDebug(), tqFatal() and tqWarning() module methods 2004-07-26 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/qtruby/rubylib/designer/rbuic/embed.cpp b/qtruby/rubylib/designer/rbuic/embed.cpp index dda9a5ee..02b88de4 100644 --- a/qtruby/rubylib/designer/rbuic/embed.cpp +++ b/qtruby/rubylib/designer/rbuic/embed.cpp @@ -74,7 +74,7 @@ static TQString convertToCIdentifier( const char *s ) static ulong embedData( TQTextStream& out, const uchar* input, int nbytes ) { #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION - TQByteArray bazip( qCompress( input, nbytes ) ); + TQByteArray bazip( tqCompress( input, nbytes ) ); ulong len = bazip.size(); #else ulong len = nbytes; diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp index 13241e82..937c32eb 100644 --- a/qtruby/rubylib/designer/rbuic/form.cpp +++ b/qtruby/rubylib/designer/rbuic/form.cpp @@ -241,7 +241,7 @@ void Uic::createFormImpl( const TQDomElement &e ) // children if( !objectNames.isEmpty() ) - qWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__); + tqWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__); nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget diff --git a/qtruby/rubylib/designer/rbuic/main.cpp b/qtruby/rubylib/designer/rbuic/main.cpp index e06ff586..ed74aece 100644 --- a/qtruby/rubylib/designer/rbuic/main.cpp +++ b/qtruby/rubylib/designer/rbuic/main.cpp @@ -189,7 +189,7 @@ int main( int argc, char * argv[] ) if ( outputFile ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "rbuic: Could not open output file '%s'", outputFile ); + tqFatal( "rbuic: Could not open output file '%s'", outputFile ); } else { fileOut.open( IO_WriteOnly, stdout ); } @@ -205,13 +205,13 @@ int main( int argc, char * argv[] ) out.setEncoding( TQTextStream::UnicodeUTF8 ); TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) - qFatal( "rbuic: Could not open file '%s' ", fileName ); + tqFatal( "rbuic: Could not open file '%s' ", fileName ); TQDomDocument doc; TQString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) - qFatal( TQString("rbuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine ); + tqFatal( TQString("rbuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine ); DomTool::fixDocument( doc ); diff --git a/qtruby/rubylib/examples/network/clientserver/server/server.rb b/qtruby/rubylib/examples/network/clientserver/server/server.rb index e2d142bd..4a53fbf0 100644 --- a/qtruby/rubylib/examples/network/clientserver/server/server.rb +++ b/qtruby/rubylib/examples/network/clientserver/server/server.rb @@ -47,7 +47,7 @@ class SimpleServer < TQt::ServerSocket def initialize( parent=nil ) super( 4242, 1, parent ) if !ok() - qWarning("Failed to bind to port 4242") + tqWarning("Failed to bind to port 4242") exit(1) end end 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 diff --git a/qtruby/rubylib/tutorial/t10/lcdrange.rb b/qtruby/rubylib/tutorial/t10/lcdrange.rb index 94e61af5..85ed3c0b 100644 --- a/qtruby/rubylib/tutorial/t10/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t10/lcdrange.rb @@ -25,7 +25,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/qtruby/rubylib/tutorial/t11/lcdrange.rb index 94e61af5..85ed3c0b 100644 --- a/qtruby/rubylib/tutorial/t11/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t11/lcdrange.rb @@ -25,7 +25,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/qtruby/rubylib/tutorial/t12/lcdrange.rb index 7c1c340d..54654165 100644 --- a/qtruby/rubylib/tutorial/t12/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t12/lcdrange.rb @@ -32,7 +32,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t13/lcdrange.rb b/qtruby/rubylib/tutorial/t13/lcdrange.rb index 223efe7f..39eb9b1d 100644 --- a/qtruby/rubylib/tutorial/t13/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t13/lcdrange.rb @@ -40,7 +40,7 @@ class LCDRange < TQt::Widget def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t14/lcdrange.rb b/qtruby/rubylib/tutorial/t14/lcdrange.rb index e7955aaf..9cb54b39 100644 --- a/qtruby/rubylib/tutorial/t14/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t14/lcdrange.rb @@ -40,7 +40,7 @@ class LCDRange < TQt::Widget def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/qtruby/rubylib/tutorial/t8/lcdrange.rb b/qtruby/rubylib/tutorial/t8/lcdrange.rb index a03e9c31..4e3d856f 100644 --- a/qtruby/rubylib/tutorial/t8/lcdrange.rb +++ b/qtruby/rubylib/tutorial/t8/lcdrange.rb @@ -25,7 +25,7 @@ class LCDRange < TQt::VBox def setRange( minVal, maxVal ) if minVal < 0 || maxVal > 99 || minVal > maxVal - qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + + tqWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" + "\tRange must be 0..99\n" + "\tand minVal must not be greater than maxVal" ) return diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp index 8eba1441..cb61e5e3 100644 --- a/xparts/mozilla/kmozillapart.cpp +++ b/xparts/mozilla/kmozillapart.cpp @@ -26,9 +26,9 @@ KMozillaPart::KMozillaPart(TQWidget *parentWidget, const char *widgetName, << kapp->dcopClient()->appId() << objId(); m_partProcess->start(); - qDebug("---->>>>>> enter loop"); + tqDebug("---->>>>>> enter loop"); kapp->enter_loop(); - qDebug("----<<<<<< left loop"); + tqDebug("----<<<<<< left loop"); } KMozillaPart::~KMozillaPart() @@ -39,7 +39,7 @@ KMozillaPart::~KMozillaPart() void KMozillaPart::createActions( const TQCString &xmlActions ) { XPartHost_KPart::createActions( xmlActions ); - qDebug("----<<<<<< exit loop"); + tqDebug("----<<<<<< exit loop"); kapp->exit_loop(); } diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index e3f87279..c644715d 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -50,7 +50,7 @@ public slots: } void mergeGUI() { - qDebug("initGUI"); + tqDebug("initGUI"); setXMLFile("/home/lars/kmozilla/kmozilla/parthost.rc"); createGUI( m_host ); } diff --git a/xparts/src/kde/kbrowsersignals.cpp b/xparts/src/kde/kbrowsersignals.cpp index 18c58362..59a688e4 100644 --- a/xparts/src/kde/kbrowsersignals.cpp +++ b/xparts/src/kde/kbrowsersignals.cpp @@ -6,7 +6,7 @@ KBrowserSignals::KBrowserSignals( XPartHost_KPart *_part, DCOPRef extension ) : KParts::BrowserExtension( _part ) { - qDebug("KBrowserSignals constructor"); + tqDebug("KBrowserSignals constructor"); part = _part; ext = new XBrowserExtension_stub( extension.app(), extension.object() ); ext->setBrowserSignals( DCOPRef( this ) ); diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp index cd9ca39e..79815337 100644 --- a/xparts/src/kde/xparthost_kpart.cpp +++ b/xparts/src/kde/xparthost_kpart.cpp @@ -50,7 +50,7 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part ) embed->show(); DCOPRef ref = m_stub->queryExtension("browserextension"); if( !ref.isNull() ) { - qDebug(" found browser extension "); + tqDebug(" found browser extension "); be = new KBrowserSignals( this, ref ); } return DCOPRef( kapp->dcopClient()->appId(), objId() ); @@ -59,7 +59,7 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part ) void XPartHost_KPart::createActions( const TQCString &xmlActions ) { - qDebug("--> createActions"); + tqDebug("--> createActions"); // creates a set of actions and adds them to the actionCollection TQDomDocument d; d.setContent( xmlActions ); @@ -119,7 +119,7 @@ void XPartHost_KPart::canceled( const TQString &errMsg ) bool XPartHost_KPart::openURL( const KURL &url ) { - qDebug("XPartHost_KPart::openUrl()"); + tqDebug("XPartHost_KPart::openUrl()"); return m_stub->openURL( url.url().latin1() ); } diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index d043d766..2513fc51 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -57,7 +57,7 @@ void ShellWindow::slotOpenUrl( const TQString &url ) void ShellWindow::mergeGUI() { - qDebug("initGUI"); + tqDebug("initGUI"); setXMLFile("shell_xparthost.rc"); createGUI( m_host ); m_host->widget()->setFocus(); diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp index 59cf0499..799c83f8 100644 --- a/xparts/xpart_notepad/xp_notepad_factory.cpp +++ b/xparts/xpart_notepad/xp_notepad_factory.cpp @@ -52,9 +52,9 @@ XP_NotepadPart::XP_NotepadPart(TQWidget *parentWidget, const char *widgetName, << kapp->dcopClient()->appId() << objId(); m_partProcess->start(); - qDebug("---->>>>>> enter loop"); + tqDebug("---->>>>>> enter loop"); kapp->enter_loop(); - qDebug("----<<<<<< left loop"); + tqDebug("----<<<<<< left loop"); } XP_NotepadPart::~XP_NotepadPart() @@ -65,7 +65,7 @@ XP_NotepadPart::~XP_NotepadPart() void XP_NotepadPart::createActions( const TQCString &xmlActions ) { XPartHost_KPart::createActions( xmlActions ); - qDebug("----<<<<<< exit loop"); + tqDebug("----<<<<<< exit loop"); kapp->exit_loop(); } |