Replace various Q_* and QT_* defines with TQ_* and TQT_*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cc5cf548f1)
pull/232/head
Michele Calgaro 1 year ago
parent 7f3bcfe100
commit c7cf5fd96d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -34,7 +34,7 @@ endif( )
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp )
# hide "#define" to allow strings to be extracted using xgettext
file( READ ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp _tqt_qxml )
string( REGEX REPLACE "\n(#define[^\n]*)(QT_TRANSLATE_NOOP)" "\n/*\\1*/\\2" _tqt_qxml ${_tqt_qxml} )
string( REGEX REPLACE "\n(#define[^\n]*)(TQT_TRANSLATE_NOOP)" "\n/*\\1*/\\2" _tqt_qxml ${_tqt_qxml} )
file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp.tde_l10n "${_tqt_qxml}" )
endif( )
@ -127,7 +127,7 @@ tde_l10n_create_template(
KEYWORDS
tr tr:1,2
translate translate:1,2
QT_TRANSLATE_NOOP QT_TRANSLATE_NOOP:1,2
TQT_TRANSLATE_NOOP TQT_TRANSLATE_NOOP:1,2
X-POT "-"
)

@ -100,7 +100,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
_STYLE_WINDOWS => '',
QT_STATIC_CONST => 'static const',
Q_EXPORT => '',
Q_REFCOUNT => '',
TQ_REFCOUNT => '',
QM_EXPORT_CANVAS => '',
QM_EXPORT_DNS => '',
QM_EXPORT_ICONVIEW => '',
@ -426,7 +426,7 @@ LOOP:
|| $p =~ /^\s*TQ_PROPERTY/ # and TQ_PROPERTY
|| $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 ;)
@ -708,7 +708,7 @@ sub identifyDecl
\s*(class|struct|union|namespace) # 2 struct type
\s*([A-Z_]*EXPORT[A-Z_]*)? # 3 export
(?:\s*TQ_PACKED)?
(?:\s*Q_REFCOUNT)?
(?:\s*TQ_REFCOUNT)?
\s+([\w_]+ # 4 name
(?:<[\w_ :,]+?>)? # maybe explicit template
# (eat chars between <> non-hungry)

Loading…
Cancel
Save