summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-02-13 11:10:14 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-02-14 23:20:06 +0900
commit5204caac76753e96dc084bd44675189958a47ecc (patch)
tree744cb5c99443036c0a6078e5e12eafdde348a3e3
parent6836e266d0627038ef2d1e9d70b3cc667c366cd4 (diff)
downloadtdebindings-5204caac76753e96dc084bd44675189958a47ecc.tar.gz
tdebindings-5204caac76753e96dc084bd44675189958a47ecc.zip
Replace Q_WS_* defines with TQ_WS_* equivalents
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 6e47bcc543fd87049798e173bad7e52b46e8cbdd)
-rw-r--r--kalyptus/kalyptus14
-rw-r--r--kjsembed/tools/headers/qpen.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 61fab81b..0ecd65de 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -143,10 +143,10 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
TQM_EXPORT_WORKSPACE => '',
TQT_NO_REMOTE => 'TQT_NO_REMOTE',
QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
- Q_WS_X11 => 'Q_WS_X11',
+ TQ_WS_X11 => 'TQ_WS_X11',
TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
- Q_WS_QWS => 'undef',
- Q_WS_MAC => 'undef',
+ TQ_WS_QWS => 'undef',
+ TQ_WS_MAC => 'undef',
TQ_OBJECT => <<'CODE',
public:
virtual TQMetaObject *metaObject() const;
@@ -588,13 +588,13 @@ LOOP:
else {
# Skip platform-specific stuff, or #if 0 stuff
# or #else of something we parsed (e.g. for TQKeySequence)
- if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or
- $p =~ m/^#\s*if\s+defined\(Q_WS_/ or
+ if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or
+ $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or
($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or
($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or
($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or
- ($p =~ m/^#\s*if\s+defined\(Q_WS_X11_/ and $qt_embedded) or
- ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or
+ ($p =~ m/^#\s*if\s+defined\(TQ_WS_X11_/ and $qt_embedded) or
+ ($p =~ m/^#\s*if\s+defined\(TQ_WS_WIN_/ 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*ifndef\s+TQT_NO_STL/ or
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 28158a8b..17fc002c 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -72,7 +72,7 @@ public:
private:
friend class TQPainter;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
friend class TQFontEngineWin;
#endif