qt -> tqt conversion:

QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 7 years ago
parent aac4148223
commit 574903aecb
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -586,7 +586,7 @@ LOOP:
($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or
$p =~ m/^#\s*ifndef\s+QT_NO_STL/ or $p =~ m/^#\s*ifndef\s+TQT_NO_STL/ or
$p =~ m/^#\s*if\s+defined\s*\(Q_OS_/ or $p =~ m/^#\s*if\s+defined\s*\(Q_OS_/ or
$p =~ m/^#\s*if\s+defined\(Q_CC_/ or $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
$p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or

@ -4,7 +4,7 @@ AM_CXXFLAGS = -frtti
# Make sure the include path includes Qt's uilib # Make sure the include path includes Qt's uilib
INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes) INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes)
INCLUDES += -DQT_NO_ASCII_CAST INCLUDES += -DTQT_NO_ASCII_CAST
SUBDIRS = bindings builtins qtbindings . plugin plugins tdescript stdlib cpptests docs SUBDIRS = bindings builtins qtbindings . plugin plugins tdescript stdlib cpptests docs

@ -1,6 +1,6 @@
INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST -Wno-unused
noinst_LTLIBRARIES = libkjsembedbindings.la noinst_LTLIBRARIES = libkjsembedbindings.la

@ -1,5 +1,5 @@
INCLUDES= -I$(srcdir)/../.. -I.. -I$(top_srcdir)/kjsembed $(all_includes) INCLUDES= -I$(srcdir)/../.. -I.. -I$(top_srcdir)/kjsembed $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST -Wno-unused
noinst_LTLIBRARIES = libkjsembedbuiltins.la noinst_LTLIBRARIES = libkjsembedbuiltins.la

@ -3,7 +3,7 @@
# Make sure the include path includes Qt's uilib # Make sure the include path includes Qt's uilib
INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes) INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes)
INCLUDES += -DQT_NO_ASCII_CAST INCLUDES += -DTQT_NO_ASCII_CAST
noinst_PROGRAMS = jsaccess noinst_PROGRAMS = jsaccess

@ -223,7 +223,7 @@
2004-12-04 Saturday 02:34 geiseri 2004-12-04 Saturday 02:34 geiseri
QT_NO_ASCII_CAST build fix. TQT_NO_ASCII_CAST build fix.
2004-12-04 Saturday 02:25 geiseri 2004-12-04 Saturday 02:25 geiseri
@ -509,7 +509,7 @@
2004-11-24 Wednesday 01:59 staikos 2004-11-24 Wednesday 01:59 staikos
QT_NO_COMPAT fix (untested, but at least it compiles now): TQT_NO_COMPAT fix (untested, but at least it compiles now):
int match ( const TQString & str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const (obsolete) int match ( const TQString & str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const (obsolete)
int search ( const TQString & str, int offset = 0, CaretMode caretMode = CaretAtZero ) const int search ( const TQString & str, int offset = 0, CaretMode caretMode = CaretAtZero ) const
@ -4013,7 +4013,7 @@
- Moved loadScript(filename) from main.cpp into the KPart, and renamed - Moved loadScript(filename) from main.cpp into the KPart, and renamed
the existing loadXX() to executeXX() which is better anyway. the existing loadXX() to executeXX() which is better anyway.
- Added -DQT_NO_ASCII_CAST to the build flags. - Added -DTQT_NO_ASCII_CAST to the build flags.
- Added a standalone factory class. This class is responsible for - Added a standalone factory class. This class is responsible for
creating the various objects, and for creating bindings. creating the various objects, and for creating bindings.

@ -3,7 +3,7 @@
# Make sure the include path includes Qt's uilib # Make sure the include path includes Qt's uilib
INCLUDES= -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes) INCLUDES= -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes)
INCLUDES += -DQT_NO_ASCII_CAST INCLUDES += -DTQT_NO_ASCII_CAST
kde_module_LTLIBRARIES = libjsconsoleplugin.la kde_module_LTLIBRARIES = libjsconsoleplugin.la

@ -1,5 +1,5 @@
INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST
kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la

@ -1,6 +1,6 @@
INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused KDE_CXXFLAGS = -DTQT_NO_ASCII_CAST -Wno-unused
noinst_LTLIBRARIES = libkjsembedqtbindings.la noinst_LTLIBRARIES = libkjsembedqtbindings.la

@ -133,7 +133,7 @@ public:
virtual void setActive(bool yes); virtual void setActive(bool yes);
bool isActive() const bool isActive() const
{ return (bool)act; } { return (bool)act; }
#ifndef QT_NO_COMPAT #ifndef TQT_NO_COMPAT
bool visible() const bool visible() const
{ return (bool)vis; } { return (bool)vis; }
bool selected() const bool selected() const

@ -263,7 +263,7 @@ our %tests = (
£, 5], £, 5],
"QT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12], "QT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12],
"QT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10], "QT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
"QT_NO_COMPAT" => ["qfontmetrics.h", q£ "TQT_NO_COMPAT" => ["qfontmetrics.h", q£
TQFontMetrics *foo= new TQFontMetrics( TQFont() ); TQFontMetrics *foo= new TQFontMetrics( TQFont() );
int bar = foo->width( 'c' ); int bar = foo->width( 'c' );
£, 0], £, 0],

@ -263,7 +263,7 @@ our %tests = (
£, 5], £, 5],
"QT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12], "QT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12],
"QT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10], "QT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
"QT_NO_COMPAT" => ["qfontmetrics.h", q£ "TQT_NO_COMPAT" => ["qfontmetrics.h", q£
TQFontMetrics *foo= new TQFontMetrics( TQFont() ); TQFontMetrics *foo= new TQFontMetrics( TQFont() );
int bar = foo->width( 'c' ); int bar = foo->width( 'c' );
£, 0], £, 0],

Loading…
Cancel
Save