From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'filesharing/advanced/kcm_sambaconf/sambafile.cpp') diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 3a865c62..6252209e 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -199,9 +199,9 @@ bool SambaFile::slotApply() KURL srcURL; srcURL.setPath( _tempFile->name() ); - KIO::FileCopyJob * job = KIO::file_copy( srcURL, url, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotSaveJobFinished ( KIO::Job * ) ) ); + TDEIO::FileCopyJob * job = TDEIO::file_copy( srcURL, url, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) ); return (job->error()==0); } @@ -459,12 +459,12 @@ TQString SambaFile::findSambaConf() return KSambaShare::instance()->smbConfPath(); } -void SambaFile::slotSaveJobFinished( KIO::Job * job ) { +void SambaFile::slotSaveJobFinished( TDEIO::Job * job ) { delete _tempFile; _tempFile = 0; } -void SambaFile::slotJobFinished( KIO::Job * job ) +void SambaFile::slotJobFinished( TDEIO::Job * job ) { if (job->error()) emit canceled( job->errorString() ); @@ -488,9 +488,9 @@ bool SambaFile::load() localPath = tempFile.name(); KURL destURL; destURL.setPath( localPath ); - KIO::FileCopyJob * job = KIO::file_copy( url, destURL, 0600, true, false, true ); + TDEIO::FileCopyJob * job = TDEIO::file_copy( url, destURL, 0600, true, false, true ); // emit started( d->m_job ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } else { localPath = path; -- cgit v1.2.1