diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-27 05:58:16 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-27 05:58:16 +0000 |
| commit | f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 (patch) | |
| tree | 5365045e6bce685a7cbaeb81b4797a719e86089f /src/kdiff3_shell.cpp | |
| parent | 63862fdfcb61f302ef69e86d40772bb1318d3763 (diff) | |
| download | kdiff3-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.cpp')
| -rw-r--r-- | src/kdiff3_shell.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index dd83a69..044eb2b 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -55,7 +55,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit) { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadWritePart *>(factory->create(this, + m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this), "kdiff3_part", "KParts::ReadWritePart" )); if (m_part) @@ -68,7 +68,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit) if (bCompleteInit) ((KDiff3App*)m_part->widget())->completeInit(); - connect(((KDiff3App*)m_part->widget()), SIGNAL(createNewInstance(const QString&, const QString&, const QString&)), this, SLOT(slotNewInstance(const QString&, const QString&, const QString&))); + connect(((KDiff3App*)m_part->widget()), TQT_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQT_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&))); } } else @@ -113,7 +113,7 @@ bool KDiff3Shell::queryExit() return true; } -void KDiff3Shell::closeEvent(QCloseEvent*e) +void KDiff3Shell::closeEvent(TQCloseEvent*e) { if ( queryClose() ) { @@ -164,8 +164,8 @@ void KDiff3Shell::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + this, TQT_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -182,7 +182,7 @@ void KDiff3Shell::applyNewToolbarConfig() #endif } -void KDiff3Shell::slotNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 ) +void KDiff3Shell::slotNewInstance( const TQString& fn1, const TQString& fn2, const TQString& fn3 ) { KDiff3Shell* pKDiff3Shell = new KDiff3Shell(false); ((KDiff3App*)pKDiff3Shell->m_part->widget())->completeInit(fn1,fn2,fn3); |