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/libdiff2/komparemodellist.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/libdiff2/komparemodellist.cpp')
| -rw-r--r-- | kompare/libdiff2/komparemodellist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 4d76e07f..20d7e551 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -360,22 +360,22 @@ bool KompareModelList::saveDestination( DiffModel* model ) TQString destination = model->destinationPath() + model->destinationFile(); kdDebug(8101) << "Tempfilename : " << temp->name() << endl; kdDebug(8101) << "DestinationURL : " << destination << endl; - KIO::UDSEntry entry; - if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) ) + TDEIO::UDSEntry entry; + if ( !TDEIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) ) { - if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) ) + if ( !TDEIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) ) { emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) ); return false; } } - result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() ); + result = TDEIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() ); } else { kdDebug(8101) << "Tempfilename : " << temp->name() << endl; kdDebug(8101) << "DestinationURL : " << m_destination << endl; - result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() ); + result = TDEIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() ); } if ( !result ) @@ -613,7 +613,7 @@ void KompareModelList::slotWriteDiffOutput( bool success ) emit error( i18n( "Could not write to the temporary file." ) ); } - KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() ); + TDEIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() ); emit status( Kompare::FinishedWritingDiff ); } |