diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kate/app/katemwmodonhddialog.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kate/app/katemwmodonhddialog.cpp')
-rw-r--r-- | kate/app/katemwmodonhddialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index 0ea7cdc71..e8bee5a35 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -212,16 +212,16 @@ void KateMwModOnHdDialog::slotDiff() if ( KateDocManager::self()->documentInfo( doc )->modifiedOnDiscReason == 3 ) return; - // Start a KProcess that creates a diff + // Start a TDEProcess that creates a diff KProcIO *p = new KProcIO(); - p->setComm( KProcess::All ); + p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << doc->url().path(); - connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) ); + connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); - p->start( KProcess::NotifyOnExit, true ); + p->start( TDEProcess::NotifyOnExit, true ); uint lastln = doc->numLines(); for ( uint l = 0; l < lastln; l++ ) @@ -247,7 +247,7 @@ void KateMwModOnHdDialog::slotPRead( KProcIO *p) p->ackRead(); } -void KateMwModOnHdDialog::slotPDone( KProcess *p ) +void KateMwModOnHdDialog::slotPDone( TDEProcess *p ) { setCursor( ArrowCursor ); if( ! m_tmpfile ) |