diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:05:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:05:29 -0600 |
| commit | e54e867af243223a620f12bf260e1af9ac9f6dc5 (patch) | |
| tree | 0e741cd6800d16c390671051ae525f760d87cdb5 /src/basket.cpp | |
| parent | 934db26c3f8efe148a5680c22f965ee10f818a61 (diff) | |
| download | basket-e54e867af243223a620f12bf260e1af9ac9f6dc5.tar.gz basket-e54e867af243223a620f12bf260e1af9ac9f6dc5.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/basket.cpp')
| -rw-r--r-- | src/basket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basket.cpp b/src/basket.cpp index 69b941e..9d9d744 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -4334,7 +4334,7 @@ void Basket::noteSaveAs() return; // TODO: Convert format, etc. (use NoteContent::saveAs(fileName)) - KIO::copy(url, KURL(fileName)); + TDEIO::copy(url, KURL(fileName)); } Note* Basket::selectedGroup() @@ -4606,13 +4606,13 @@ void Basket::linkLookChanged() relayoutNotes(true); } -void Basket::slotCopyingDone2(KIO::Job *job) +void Basket::slotCopyingDone2(TDEIO::Job *job) { if (job->error()) { DEBUG_WIN << "Copy finished, ERROR"; return; } - KIO::FileCopyJob *fileCopyJob = (KIO::FileCopyJob*)job; + TDEIO::FileCopyJob *fileCopyJob = (TDEIO::FileCopyJob*)job; Note *note = noteForFullPath(fileCopyJob->destURL().path()); DEBUG_WIN << "Copy finished, load note: " + fileCopyJob->destURL().path() + (note ? "" : " --- NO CORRESPONDING NOTE"); if (note != 0L) { @@ -5394,7 +5394,7 @@ bool Basket::saveToFile(const TQString& fullPath, const TQByteArray& array, TQ_U ), (openSuccess ? i18n("Please remove files on the disk <b>%1</b> to let the application safely save your changes.") - .arg(KIO::findPathMountPoint(fullPath)) + .arg(TDEIO::findPathMountPoint(fullPath)) : i18n("File permissions are bad for <b>%1</b>. Please check that you have write access to it and the parent folders.") .arg(fullPath) ), |