summaryrefslogtreecommitdiffstats
path: root/src/kdiff3_shell.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-27 05:58:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-27 05:58:16 +0000
commitf636ba5ba2df9d34d56b1c85f24c6598fa1cb645 (patch)
tree5365045e6bce685a7cbaeb81b4797a719e86089f /src/kdiff3_shell.h
parent63862fdfcb61f302ef69e86d40772bb1318d3763 (diff)
downloadkdiff3-f636ba5ba2df9d34d56b1c85f24c6598fa1cb645.tar.gz
kdiff3-f636ba5ba2df9d34d56b1c85f24c6598fa1cb645.zip
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
Diffstat (limited to 'src/kdiff3_shell.h')
-rw-r--r--src/kdiff3_shell.h5
1 files changed, 3 insertions, 2 deletions
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;