diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /vcs/subversion/subversion_core.cpp | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip | |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs/subversion/subversion_core.cpp')
| -rw-r--r-- | vcs/subversion/subversion_core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 4b16e68f..f49ac302 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ if ( where=="HEAD"){ diffTo=i18n("the current svn HEAD version."); } - KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") ); + KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") ); } diffresult.clear(); } @@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv void subversionCore::slotEndCheckout( KIO::Job * job ) { if ( job->error() ) { job->showErrorDialog( m_part->mainWindow()->main() ); - emit checkoutFinished( TQString::null ); + emit checkoutFinished( TQString() ); } else emit checkoutFinished(wcPath); } @@ -700,7 +700,7 @@ void subversionCore::slotDiffResult( KIO::Job * job ) p->start(); } else { //else do it with message box - KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString::null , "userDoesNotWantKompare" ); + KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString() , "userDoesNotWantKompare" ); Subversion_Diff df; for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { df.text->append( *it2 ); |