diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kdeui/qxembed.h | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/qxembed.h')
| -rw-r--r-- | kdeui/qxembed.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kdeui/qxembed.h b/kdeui/qxembed.h index 3b345554f..c9dcac05d 100644 --- a/kdeui/qxembed.h +++ b/kdeui/qxembed.h @@ -25,6 +25,10 @@ #include <tqwidget.h> #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 class QXEmbedData; @@ -55,9 +59,10 @@ class QXEmbedData; * * @short The QXEmbed widget is a graphical socket that can embed an external X-Window. */ -class KDEUI_EXPORT QXEmbed : public QWidget +class KDEUI_EXPORT QXEmbed : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -183,8 +188,8 @@ public: bool autoDelete() const; /* Reimp */ - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; TQSizePolicy sizePolicy() const; bool eventFilter( TQObject *, TQEvent * ); bool customWhatsThis() const; |