kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix TODO, unused "bool copy"

Browse source
This commit is contained in:
David Faure 2013-10-15 09:04:49 +02:00
parent ae76d6f3ff
commit 0e92874175
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
keditbookmarks/kbookmarkmodel/commands.cpp
View file

@ -511,20 +511,23 @@ KEBMacroCommand* CmdGen::insertMimeSource(KBookmarkModel* model, const QString &
}
//FIXME copy=true needed? what is the difference with insertMimeSource
KEBMacroCommand* CmdGen::itemsMoved(KBookmarkModel* model, const QList<KBookmark> & items,
const QString &newAddress, bool copy) {
const QString &newAddress, bool copy)
{
Q_ASSERT(!copy); // always called for a move, never for a copy (that's what insertMimeSource is about)
Q_UNUSED(copy); // TODO: remove
KEBMacroCommand *mcmd = new KEBMacroCommand(copy ? i18nc("(qtundo-format)", "Copy Items")
: i18nc("(qtundo-format)", "Move Items"));
QString bkInsertAddr = newAddress;
foreach (const KBookmark &bk, items) {
CreateCommand *cmd = new CreateCommand(model,
bkInsertAddr,
KBookmark(bk.internalElement().cloneNode(true).toElement()),
bk.text(), mcmd);
new CreateCommand(model, bkInsertAddr,
KBookmark(bk.internalElement().cloneNode(true).toElement()),
bk.text(), mcmd);
bkInsertAddr = KBookmark::nextAddress(bkInsertAddr);
}
// Do the copying, and get the updated addresses of the bookmarks to remove.
mcmd->redo();
QStringList addresses;
foreach (const KBookmark &bk, items) {
@ -532,10 +535,8 @@ KEBMacroCommand* CmdGen::itemsMoved(KBookmarkModel* model, const QList<KBookmark
}
mcmd->undo();
if (!copy) { // move
foreach (const QString &address, addresses) {
new DeleteCommand(model, address, false, mcmd);
}
foreach (const QString &address, addresses) {
new DeleteCommand(model, address, false, mcmd);
}
return mcmd;

1
keditbookmarks/kbookmarkmodel/commands.h
View file

@ -153,6 +153,7 @@ class KBOOKMARKMODEL_EXPORT CmdGen {
public:
static KEBMacroCommand* setAsToolbar(KBookmarkModel* model, const KBookmark &bk);
static KEBMacroCommand* insertMimeSource(KBookmarkModel* model, const QString &cmdName, const QMimeData *data, const QString &addr);
// TODO remove "bool copy"
static KEBMacroCommand* itemsMoved(KBookmarkModel* model, const QList<KBookmark> & items, const QString &newAddress, bool copy);
private:
CmdGen() {}