Differential D10954 Diff 28357 krusader/BookMan/krbookmarkhandler.cpp

Changeset View

Standalone View

View Options

krusader/BookMan/krbookmarkhandler.cpp

Context not available.
58 _privateCollection = new KActionCollection(this); 58​ _privateCollection = new KActionCollection(this);
59 _collection = _mainWindow->actions(); 59​ _collection = _mainWindow->actions();
60 60​
61​ _menuSearch = new QString();
62​
61 // create _root: father of all bookmarks. it is a dummy bookmark and never shown 63​ // create _root: father of all bookmarks. it is a dummy bookmark and never shown
62 _root = new KrBookmark(i18n("Bookmarks")); 64​ _root = new KrBookmark(i18n("Bookmarks"));
63 _root->setParent(this); 65​ _root->setParent(this);
Context not available.
75{ 77​{
76 delete manager; 78​ delete manager;
77 delete _privateCollection; 79​ delete _privateCollection;
80​ delete _menuSearch;
78} 81​}
79 82​
80void KrBookmarkHandler::bookmarkCurrent(QUrl url) 83​void KrBookmarkHandler::bookmarkCurrent(QUrl url)
Context not available.
471 474​
472bool KrBookmarkHandler::eventFilter(QObject *obj, QEvent *ev) 475​bool KrBookmarkHandler::eventFilter(QObject *obj, QEvent *ev)
473{ 476​{
477​ if(ev->type() == QEvent::Show){
478​ *_menuSearch = "";
479​ }
480​
481​ //Having it occur on keypress is consistent with other shortcuts,
nmelAuthorUnsubmitted
Done

space: // Ha...

nmel: space: // Ha...
482​ //such as ctrl+w and the '&' bookmark shortcut standard
483​ //(&movies makes m a shortcut for said bookmark)
484​ if(ev->type() == QEvent::KeyPress && obj->inherits("QMenu")){
nmelAuthorUnsubmitted
Done

Please use the following style for all ifs:

if (cond) {
    body;
}

i.e. fix spaces.

nmel: Please use the following style for all ifs: ``` if (cond) { body; } ``` i.e. fix spaces.
485​ QKeyEvent* kev = static_cast<QKeyEvent *>(ev);
nmelAuthorUnsubmitted
Done

style: QKeyEvent *kev

nmel: style: QKeyEvent *kev
486​ if( kev->modifiers() != Qt::NoModifier ||
487​ kev->text().isEmpty() ||
488​ kev->key() == Qt::Key_Delete){
489​ return QObject::eventFilter(obj, ev);
490​ }
491​ if (kev->key() == Qt::Key_Backspace){
492​ _menuSearch->chop(1);
493​ }
494​ else {
495​ _menuSearch->append(kev->text());
496​ }
497​
martinkostolnyUnsubmitted
Done

one space behind if :)

martinkostolny: one space behind `if` :)
498​ QMenu *menu = static_cast<QMenu *>(obj);
499​ QList<QAction*> acts = menu->actions();
nmelAuthorUnsubmitted
Done

style: QList<QAction *>

nmel: style: QList<QAction *>
500​ QAction* found = NULL;
501​ int menuSearchLength = _menuSearch->length();
502​ for (auto& act : acts){
nmelAuthorUnsubmitted
Done

auto act

since act is a pointer

nmel: > auto act since act is a pointer
503​ if (_specialBookmarks.contains(act) || act->isSeparator()) continue;
nmelAuthorUnsubmitted
Done

remove double space

nmel: remove double space
504​ if(act->text().left(menuSearchLength).compare(_menuSearch, Qt::CaseInsensitive) == 0){
505​ if (!found){
506​ found = act;
507​ } else {
508​ menu->setActiveAction(found);
509​ return QObject::eventFilter(obj, ev);
510​ }
511​ }
512​ }
513​ if (found){
514​ found->activate(QAction::Trigger);
515​ menu->close();
516​ } else {
517​ *_menuSearch = "";
518​ }
519​ return QObject::eventFilter(obj, ev);
520​ }
521​
474 if (ev->type() == QEvent::MouseButtonRelease) { 522​ if (ev->type() == QEvent::MouseButtonRelease) {
475 switch (static_cast<QMouseEvent *>(ev)->button()) { 523​ switch (static_cast<QMouseEvent *>(ev)->button()) {
476 case Qt::RightButton: 524​ case Qt::RightButton:
Context not available.
nmelAuthorUnsubmitted
Done

join 'i=', 'while', '++i' into a single 'for'

nmel: join 'i=', 'while', '++i' into a single 'for'
martinkostolnyUnsubmitted
Done

I'm suggesting this instead of line 536:

if ((bool) found->menu()) {
    menu->setActiveAction(found);
} else {
    found->activate(QAction::Trigger);
}

It will open a folder menu when such menu entry is "activated".

martinkostolny: I'm suggesting this instead of line 536: ``` if ((bool) found->menu()) { menu…