diff options
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 22 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 22 | ||||
| -rw-r--r-- | puic/uic.h | 2 | ||||
| -rw-r--r-- | puic/widgetdatabase.cpp | 2 | ||||
| -rw-r--r-- | smoke/tqt/qtguess.pl.in | 4 |
7 files changed, 28 insertions, 28 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 675b572..74e3fe2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1055,7 +1055,7 @@ EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF TQStringList *t = new TQStringList(); - TTQ_UNUSED(t); + TQ_UNUSED(t); EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF @@ -1067,7 +1067,7 @@ EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF TQStringList *t = new TQStringList(); - TTQ_UNUSED(t); + TQ_UNUSED(t); EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index a3cd69d..7d57f37 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -145,18 +145,18 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'TTQ_INT16' => 'short', - 'TTQ_INT32' => 'int', - 'TTQ_INT64' => 'long', - 'TTQ_INT8' => 'char', - 'TTQ_LONG' => 'long', - 'TTQ_LLONG' => 'long', + 'TQ_INT16' => 'short', + 'TQ_INT32' => 'int', + 'TQ_INT64' => 'long', + 'TQ_INT8' => 'char', + 'TQ_LONG' => 'long', + 'TQ_LLONG' => 'long', 'TQ_ULLONG' => 'long', - 'TTQ_UINT16' => 'ushort', - 'TTQ_UINT32' => 'uint', - 'TTQ_UINT64' => 'long', - 'TTQ_UINT8' => 'uchar', - 'TTQ_ULONG' => 'long', + 'TQ_UINT16' => 'ushort', + 'TQ_UINT32' => 'uint', + 'TQ_UINT64' => 'long', + 'TQ_UINT8' => 'uchar', + 'TQ_ULONG' => 'long', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 41e33ef..59a5444 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -143,18 +143,18 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'TTQ_INT16' => 'short', - 'TTQ_INT32' => 'int', - 'TTQ_INT64' => 'long', - 'TTQ_INT8' => 'char', - 'TTQ_LONG' => 'long', - 'TTQ_LLONG' => 'long', + 'TQ_INT16' => 'short', + 'TQ_INT32' => 'int', + 'TQ_INT64' => 'long', + 'TQ_INT8' => 'char', + 'TQ_LONG' => 'long', + 'TQ_LLONG' => 'long', 'TQ_ULLONG' => 'long', - 'TTQ_UINT16' => 'ushort', - 'TTQ_UINT32' => 'uint', - 'TTQ_UINT64' => 'long', - 'TTQ_UINT8' => 'uchar', - 'TTQ_ULONG' => 'long', + 'TQ_UINT16' => 'ushort', + 'TQ_UINT32' => 'uint', + 'TQ_UINT64' => 'long', + 'TQ_UINT8' => 'uchar', + 'TQ_ULONG' => 'long', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -31,7 +31,7 @@ #ifndef TQ_DUMMY_COMPARISON_OPERATOR # warning "Defining TQ_DUMMY_COMPARISON_OPERATOR" -# ifdef TTQ_FULL_TEMPLATE_INSTANTIATION +# ifdef TQ_FULL_TEMPLATE_INSTANTIATION # define TQ_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ tqWarning( #C"::operator==( const "#C"& ) got called." ); \ diff --git a/puic/widgetdatabase.cpp b/puic/widgetdatabase.cpp index e5a0abd..d94ebce 100644 --- a/puic/widgetdatabase.cpp +++ b/puic/widgetdatabase.cpp @@ -103,7 +103,7 @@ void WidgetDatabase::setupDataBase( int id ) { was_in_setup = TRUE; #ifndef UIC - TTQ_UNUSED( id ) + TQ_UNUSED( id ) if ( dbcount ) return; #else diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in index ef88dee..1ebe87b 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tqt/qtguess.pl.in @@ -315,7 +315,7 @@ our %tests = ( TQStringList keys() const { return TQStringList(); }; bool installIOHandler( const TQString &format ) { return true; }; }; - TTQ_EXPORT_PLUGIN( TQFoo ) + TQ_EXPORT_PLUGIN( TQFoo ) �], "TQT_NO_IMAGE_DITHER_TO_1" => ["ntqimage.h", q� TQImage *foo = new TQImage; @@ -476,7 +476,7 @@ our %tests = ( TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;} TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;} }; - TTQ_EXPORT_PLUGIN( TQFoo ) + TQ_EXPORT_PLUGIN( TQFoo ) �], "TQT_NO_TEXTEDIT" => ["ntqtextedit.h", "TQTextEdit foo;", 13], "TQT_NO_TEXTSTREAM" => ["ntqtextstream.h", "TQTextStream foo;", 5], |