From f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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
---
 src/kdiff3_shell.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/kdiff3_shell.h')

diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h
index 42a324b..e8fa8ec 100644
--- a/src/kdiff3_shell.h
+++ b/src/kdiff3_shell.h
@@ -39,6 +39,7 @@ class KToggleAction;
 class KDiff3Shell : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
@@ -52,7 +53,7 @@ public:
 
     bool queryClose();
     bool queryExit();
-    virtual void closeEvent(QCloseEvent*e);
+    virtual void closeEvent(TQCloseEvent*e);
 
 private slots:
     void optionsShowToolbar();
@@ -61,7 +62,7 @@ private slots:
     void optionsConfigureToolbars();
 
     void applyNewToolbarConfig();
-    void slotNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 );
+    void slotNewInstance( const TQString& fn1, const TQString& fn2, const TQString& fn3 );
 
 private:
     KParts::ReadWritePart *m_part;
-- 
cgit v1.2.1