← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/keditbookmarks/bookmarkmodel.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Alessandro Ghersi, Harald Sitter, Jonathan Thomas
  • Date: 2009-10-03 03:45:08 UTC
  • mfrom: (1.1.33 upstream)
  • Revision ID: james.westby@ubuntu.com-20091003034508-ywdmnfa7ollb3ptk
Tags: 4:4.3.2-0ubuntu1
https://launchpad.net/bugs/278722
https://launchpad.net/bugs/421742
[ Alessandro Ghersi ]
* New upstream release
  - Bump build-deps

[ Harald Sitter ]
* Make Lintian happy about the konqueror maintainer scripts
* Add konsole maintainer scripts to register it as x-terminal-emulator
  alternative (LP: #278722)
* Add kubuntu_19_install_flash.diff using update-notifier-kde to recommend
  installation of flash plugin

[ Jonathan Thomas ]
* Bump replaces for konqueror on dolphin to (<< 4:4.2.85) (LP: #421742)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/keditbookmarks/bookmarkmodel.cpp
43
43
    ~Private()
44
44
    {
45
45
        delete mRootItem;
46
 
        
 
46
 
47
47
        //TESTING
48
48
        mRootItem = 0;
49
49
    }
299
299
    QString addr = bk.address();
300
300
    if(bk.isGroup())
301
301
        addr += "/0";
302
 
        
 
302
 
303
303
    if(action == Qt::CopyAction)
304
304
    {
305
305
        KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr);
307
307
    }
308
308
    else if(action == Qt::MoveAction)
309
309
    {
310
 
        KBookmark::List bookmarks;
311
310
        if(data->hasFormat("application/x-keditbookmarks"))
312
311
        {
 
312
            KBookmark::List bookmarks;
313
313
            QList<QByteArray> addresses = data->data("application/x-keditbookmarks").split(';');
314
314
            QList<QByteArray>::const_iterator it, end;
315
315
            end = addresses.constEnd();
321
321
            }
322
322
 
323
323
            KEBMacroCommand * cmd = CmdGen::itemsMoved(bookmarks, addr, false);
324
 
            CmdHistory::self()->didCommand(cmd);            
 
324
            CmdHistory::self()->didCommand(cmd);
325
325
        }
326
326
        else
327
327
        {
328
328
            kDebug()<<"NO FORMAT";
329
 
            bookmarks = KBookmark::List::fromMimeData(data);
330
329
            KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr);
331
330
            CmdHistory::self()->didCommand(cmd);
332
331
        }