From a9e5b8a1a4d945937591617257df835dd29c298b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 6 Sep 2023 12:47:00 +0900 Subject: [PATCH] Replace various Q_* and QT_* defines with TQ_* and TQT_* Signed-off-by: Michele Calgaro (cherry picked from commit 283ace14edb9d461661aaf7e91f4463c8f4debd3) --- kalyptus/kalyptus | 6 +++--- kalyptus/kalyptusCxxToCSharp.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 00918a0..1c8e24f 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -132,7 +132,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); QT_STATIC_CONST => 'static const', Q_EXPORT => '', Q_EXPORT_CODECS_BIG5 => '', - Q_REFCOUNT => '', + TQ_REFCOUNT => '', TQM_EXPORT_CANVAS => '', TQM_EXPORT_DNS => '', TQM_EXPORT_ICONVIEW => '', @@ -544,7 +544,7 @@ LOOP: || $p =~ /^\s*Q_GADGET/ || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE || $p =~ /^\s*TQ_SETS/ - || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ + || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*KSVG_/ # and KSVG stuff ;) @@ -862,7 +862,7 @@ sub identifyDecl (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? (?:\s*TQ_PACKED)? - (?:\s*Q_REFCOUNT)? + (?:\s*TQ_REFCOUNT)? \s+([\w_]+ # 3 name (?:<[\w_ :,]+?>)? # maybe explicit template # (eat chars between <> non-hungry) diff --git a/kalyptus/kalyptusCxxToCSharp.pm b/kalyptus/kalyptusCxxToCSharp.pm index 6c8ce4c..d077fb5 100644 --- a/kalyptus/kalyptusCxxToCSharp.pm +++ b/kalyptus/kalyptusCxxToCSharp.pm @@ -117,7 +117,7 @@ sub cplusplusToCSharp return "IntPtr"; } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { + } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^EventRef/ ) { return "IntPtr"; @@ -223,7 +223,7 @@ sub cplusplusToPInvoke return "RawObject"; } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { + } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^EventRef/ ) { return "RawObject";