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/notedrag.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/notedrag.cpp')
| -rw-r--r-- | src/notedrag.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/notedrag.cpp b/src/notedrag.cpp index 3b4ad3d..8b87ea8 100644 --- a/src/notedrag.cpp +++ b/src/notedrag.cpp @@ -115,7 +115,7 @@ void NoteDrag::serializeNotes(NoteSelection *noteList, TQDataStream &stream, boo if (cutting) { // Move file in a temporary place: TQString fullPath = Global::tempCutFolder() + Tools::fileNameForNewFile(content->fileName(), Global::tempCutFolder()); - KIO::move(KURL(content->fullPath()), KURL(fullPath), /*showProgressInfo=*/false); + TDEIO::move(KURL(content->fullPath()), KURL(fullPath), /*showProgressInfo=*/false); node->fullPath = fullPath; stream << fullPath; } else @@ -482,10 +482,10 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF if (note->basket() != parent) { TQString newFileName = NoteFactory::createFileForNewNote(parent, "", fileName); note->content()->setFileName(newFileName); - KIO::FileCopyJob *copyJob = KIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName), + TDEIO::FileCopyJob *copyJob = TDEIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName), /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false); - parent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)), - parent, TQT_SLOT(slotCopyingDone2(KIO::Job *)) ); + parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)), + parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) ); } note->setGroupWidth(groupWidth); note->setParentNote(0); @@ -503,15 +503,15 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF // Later on, file_copy/file_move will copy/move the file to the new location. TQString newFileName = NoteFactory::createFileForNewNote(parent, "", fileName); note = NoteFactory::loadFile(newFileName, (NoteType::Id)type, parent); - KIO::FileCopyJob *copyJob; + TDEIO::FileCopyJob *copyJob; if (moveFiles) - copyJob = KIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName), + copyJob = TDEIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName), /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false); else - copyJob = KIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName), + copyJob = TDEIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName), /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false); - parent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)), - parent, TQT_SLOT(slotCopyingDone2(KIO::Job *)) ); + parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)), + parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) ); note->setGroupWidth(groupWidth); note->setAddedDate(addedDate); note->setLastModificationDate(lastModificationDate); |