From f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 27 Jun 2011 05:58:16 +0000 Subject: TQt4 port kdiff3 This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1238464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdiff3plugin/kdiff3plugin.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'kdiff3plugin/kdiff3plugin.h') diff --git a/kdiff3plugin/kdiff3plugin.h b/kdiff3plugin/kdiff3plugin.h index 14ebf60..e627b9d 100755 --- a/kdiff3plugin/kdiff3plugin.h +++ b/kdiff3plugin/kdiff3plugin.h @@ -23,13 +23,14 @@ #include -class QStringList; +class TQStringList; class KDiff3Plugin : public KonqPopupMenuPlugin { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - KDiff3Plugin (KonqPopupMenu *, const char *name, const QStringList & list); + KDiff3Plugin (KonqPopupMenu *, const char *name, const TQStringList & list); virtual ~KDiff3Plugin(); private slots: @@ -44,7 +45,7 @@ private slots: void slotAbout(); private: - QStringList m_list; - QWidget* m_pParentWidget; + TQStringList m_list; + TQWidget* m_pParentWidget; }; #endif -- cgit v1.2.3