diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
| commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
| tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /kompare/komparepart/kompare_part.cpp | |
| parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
| download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparepart/kompare_part.cpp')
| -rw-r--r-- | kompare/komparepart/kompare_part.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 0c565820..c9e1f19b 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -264,7 +264,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) TQString tempFileName( "" ); if ( !url.isLocalFile() ) { - if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) ) + if ( ! TDEIO::NetAccess::download( url, tempFileName, widget() ) ) { slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) ); tempFileName = ""; @@ -288,9 +288,9 @@ void KomparePart::cleanUpTemporaryFiles() { // i hope a local file will not be removed if it was not downloaded... if ( !m_info.localSource.isEmpty() ) - KIO::NetAccess::removeTempFile( m_info.localSource ); + TDEIO::NetAccess::removeTempFile( m_info.localSource ); if ( !m_info.localDestination.isEmpty() ) - KIO::NetAccess::removeTempFile( m_info.localDestination ); + TDEIO::NetAccess::removeTempFile( m_info.localDestination ); } void KomparePart::compare( const KURL& source, const KURL& destination ) @@ -433,7 +433,7 @@ void KomparePart::saveDiff() if( dlg->exec() ) { w->saveOptions(); - KConfig* config = instance()->config(); + TDEConfig* config = instance()->config(); saveProperties( config ); config->sync(); @@ -441,7 +441,7 @@ void KomparePart::saveDiff() { KURL url = KFileDialog::getSaveURL( m_info.destination.url(), i18n("*.diff *.dif *.patch|Patch Files"), widget(), i18n( "Save .diff" ) ); - if ( KIO::NetAccess::exists( url, false, widget() ) ) + if ( TDEIO::NetAccess::exists( url, false, widget() ) ) { int result = KMessageBox::warningYesNoCancel( widget(), i18n("The file exists or is write-protected; do you want to overwrite it?"), i18n("File Exists"), i18n("Overwrite"), i18n("Do Not Overwrite") ); if ( result == KMessageBox::Cancel ) @@ -722,7 +722,7 @@ bool KomparePart::queryClose() return true; } -int KomparePart::readProperties( KConfig *config ) +int KomparePart::readProperties( TDEConfig *config ) { m_viewSettings->loadSettings( config ); m_diffSettings->loadSettings( config ); @@ -730,7 +730,7 @@ int KomparePart::readProperties( KConfig *config ) return 0; } -int KomparePart::saveProperties( KConfig *config ) +int KomparePart::saveProperties( TDEConfig *config ) { m_viewSettings->saveSettings( config ); m_diffSettings->saveSettings( config ); |