Differential D8619 Diff 21776 src/filewidgets/kfileplacesview.cpp

Changeset View

Standalone View

View Options

src/filewidgets/kfileplacesview.cpp

Context not available.
506 void fadeCapacityBar(const QModelIndex &index, FadeType fadeType); 506​ void fadeCapacityBar(const QModelIndex &index, FadeType fadeType);
507 int sectionsCount() const; 507​ int sectionsCount() const;
508 508​
509​ void addDisappearingItem(KFilePlacesViewDelegate *delegate, const QModelIndex &index);
510​
509 // based on dolphin urls 511​ // based on dolphin urls
510 QUrl convertUrl(const QUrl &url) const; 512​ QUrl convertUrl(const QUrl &url) const;
511 QUrl createTimelineUrl(const QUrl &url) const; 513​ QUrl createTimelineUrl(const QUrl &url) const;
Context not available.
633 635​
634void KFilePlacesView::setUrl(const QUrl &url) 636​void KFilePlacesView::setUrl(const QUrl &url)
635{ 637​{
636 QUrl oldUrl = d->currentUrl; ​
637 KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(model()); 638​ KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(model());
638 639​
639 if (placesModel == nullptr) { 640​ if (placesModel == nullptr) {
Context not available.
646 if (index.isValid()) { 647​ if (index.isValid()) {
647 if (current != index && placesModel->isHidden(current) && !d->showAll) { 648​ if (current != index && placesModel->isHidden(current) && !d->showAll) {
648 KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate()); 649​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate());
649 delegate->addDisappearingItem(current); 650​ d->addDisappearingItem(delegate, current);
650 ​
651 if (d->itemDisappearTimeline.state() != QTimeLine::Running) { ​
652 delegate->setDisappearingItemProgress(0.0); ​
653 d->itemDisappearTimeline.start(); ​
654 } ​
655 } 651​ }
656 652​
657 if (current != index && placesModel->isHidden(index) && !d->showAll) { 653​ if (current != index && placesModel->isHidden(index) && !d->showAll) {
658 KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate()); 654​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate());
659 delegate->addAppearingItem(index); 655​ d->addDisappearingItem(delegate, current);
660 ​
661 if (d->itemAppearTimeline.state() != QTimeLine::Running) { ​
662 delegate->setAppearingItemProgress(0.0); ​
663 d->itemAppearTimeline.start(); ​
664 } ​
665 656​
666 setRowHidden(index.row(), false); 657​ setRowHidden(index.row(), false);
667 } 658​ }
Context not available.
733void KFilePlacesView::contextMenuEvent(QContextMenuEvent *event) 724​void KFilePlacesView::contextMenuEvent(QContextMenuEvent *event)
734{ 725​{
735 KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(model()); 726​ KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(model());
736 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(itemDelegate()); ​
737 727​
738 if (placesModel == nullptr) { 728​ if (!placesModel) {
729​ return;
730​ }
731​
732​ KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(itemDelegate());
733​ if (!delegate) {
739 return; 734​ return;
740 } 735​ }
741 736​
dfaureUnsubmitted
Done

You use qobject_cast elsewhere, why not here too?

Or even... you use static_cast for the delegate in 90% of the code, why two uses of qobject_cast?

If it's mandatory for the delegate to be a KFilePlacesViewDelegate, it's mandatory everywhere, right?

(too bad setItemDelegate isn't virtual, we could have caught it there...)

dfaure: You use qobject_cast elsewhere, why not here too? Or even... you use static_cast for the…
Context not available.
826 821​
827 QAction *result = menu.exec(event->globalPos()); 822​ QAction *result = menu.exec(event->globalPos());
828 823​
829 if (emptyTrash != nullptr && result == emptyTrash) { 824​ if (emptyTrash && (result == emptyTrash)) {
830 825​
831 KIO::JobUiDelegate uiDelegate; 826​ KIO::JobUiDelegate uiDelegate;
832 uiDelegate.setWindow(window()); 827​ uiDelegate.setWindow(window());
Context not available.
835 KJobWidgets::setWindow(job, window()); 830​ KJobWidgets::setWindow(job, window());
836 job->uiDelegate()->setAutoErrorHandlingEnabled(true); 831​ job->uiDelegate()->setAutoErrorHandlingEnabled(true);
837 } 832​ }
838 } else if (edit != nullptr && result == edit) { 833​ } else if (edit && (result == edit)) {
839 KBookmark bookmark = placesModel->bookmarkForIndex(index); 834​ KBookmark bookmark = placesModel->bookmarkForIndex(index);
840 QUrl url = bookmark.url(); 835​ QUrl url = bookmark.url();
841 QString label = bookmark.text(); 836​ QString label = bookmark.text();
Context not available.
859 placesModel->setPlaceGroupHidden(type, hideSection->isChecked()); 854​ placesModel->setPlaceGroupHidden(type, hideSection->isChecked());
860 855​
861 if (!d->showAll && hideSection->isChecked()) { 856​ if (!d->showAll && hideSection->isChecked()) {
862 delegate->addDisappearingItemGroup(index); 857​ d->addDisappearingItem(delegate, index);
863 if (d->itemDisappearTimeline.state() != QTimeLine::Running) { ​
864 delegate->setDisappearingItemProgress(0.0); ​
865 d->itemDisappearTimeline.start(); ​
866 } ​
867 } 858​ }
868 } else if (hide && (result == hide)) { 859​ } else if (hide && (result == hide)) {
869 placesModel->setPlaceHidden(index, hide->isChecked()); 860​ placesModel->setPlaceHidden(index, hide->isChecked());
870 QModelIndex current = placesModel->closestItem(d->currentUrl); 861​ QModelIndex current = placesModel->closestItem(d->currentUrl);
871 862​
872 if (index != current && !d->showAll && hide->isChecked()) { 863​ if (index != current && !d->showAll && hide->isChecked()) {
873 delegate->addDisappearingItem(index); 864​ d->addDisappearingItem(delegate, index);
874 ​
875 if (d->itemDisappearTimeline.state() != QTimeLine::Running) { ​
876 delegate->setDisappearingItemProgress(0.0); ​
877 d->itemDisappearTimeline.start(); ​
878 } ​
879 } 865​ }
880 } else if (showAll != nullptr && result == showAll) { 866​ } else if (showAll && (result == showAll)) {
881 setShowAll(showAll->isChecked()); 867​ setShowAll(showAll->isChecked());
882 } else if (teardown != nullptr && result == teardown) { 868​ } else if (teardown && (result == teardown)) {
883 placesModel->requestTeardown(index); 869​ placesModel->requestTeardown(index);
884 } else if (eject != nullptr && result == eject) { 870​ } else if (eject && (result == eject)) {
885 placesModel->requestEject(index); 871​ placesModel->requestEject(index);
886 } else if (add != nullptr && result == add) { 872​ } else if (add && (result == add)) {
887 QUrl url = d->currentUrl; 873​ QUrl url = d->currentUrl;
888 QString label; 874​ QString label;
889 QString iconName = QStringLiteral("folder"); 875​ QString iconName = QStringLiteral("folder");
Context not available.
926 QListView::dragEnterEvent(event); 912​ QListView::dragEnterEvent(event);
927 d->dragging = true; 913​ d->dragging = true;
928 914​
929 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(itemDelegate()); 915​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate());
930 delegate->setShowHoverIndication(false); 916​ delegate->setShowHoverIndication(false);
931 917​
932 d->dropRect = QRect(); 918​ d->dropRect = QRect();
Context not available.
937 QListView::dragLeaveEvent(event); 923​ QListView::dragLeaveEvent(event);
938 d->dragging = false; 924​ d->dragging = false;
939 925​
940 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(itemDelegate()); 926​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate());
941 delegate->setShowHoverIndication(true); 927​ delegate->setShowHoverIndication(true);
942 928​
943 setDirtyRegion(d->dropRect); 929​ setDirtyRegion(d->dropRect);
Context not available.
988 QListView::dropEvent(event); 974​ QListView::dropEvent(event);
989 d->dragging = false; 975​ d->dragging = false;
990 976​
991 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(itemDelegate()); 977​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate());
992 delegate->setShowHoverIndication(true); 978​ delegate->setShowHoverIndication(true);
993} 979​}
994 980​
Context not available.
1071 QListView::rowsInserted(parent, start, end); 1057​ QListView::rowsInserted(parent, start, end);
1072 setUrl(d->currentUrl); 1058​ setUrl(d->currentUrl);
1073 1059​
1074 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(itemDelegate()); 1060​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(itemDelegate());
1075 KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(model()); 1061​ KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(model());
1076 1062​
1077 for (int i = start; i <= end; ++i) { 1063​ for (int i = start; i <= end; ++i) {
Context not available.
1112 return QSize(iconSize + textWidth + fm.height() / 2, height); 1098​ return QSize(iconSize + textWidth + fm.height() / 2, height);
1113} 1099​}
1114 1100​
1101​void KFilePlacesView::Private::addDisappearingItem(KFilePlacesViewDelegate *delegate, const QModelIndex &index)
1102​{
1103​ delegate->addDisappearingItem(index);
1104​ if (itemDisappearTimeline.state() != QTimeLine::Running) {
1105​ delegate->setDisappearingItemProgress(0.0);
1106​ itemDisappearTimeline.start();
1107​ }
1108​}
1109​
1115void KFilePlacesView::Private::setCurrentIndex(const QModelIndex &index) 1110​void KFilePlacesView::Private::setCurrentIndex(const QModelIndex &index)
1116{ 1111​{
1117 KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(q->model()); 1112​ KFilePlacesModel *placesModel = qobject_cast<KFilePlacesModel *>(q->model());
Context not available.
1467 1462​
1468 int size = oldSize + add; 1463​ int size = oldSize + add;
1469 1464​
1470 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(q->itemDelegate()); 1465​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(q->itemDelegate());
1471 delegate->setIconSize(size); 1466​ delegate->setIconSize(size);
1472 q->scheduleDelayedItemsLayout(); 1467​ q->scheduleDelayedItemsLayout();
1473} 1468​}
1474 1469​
1475void KFilePlacesView::Private::_k_itemAppearUpdate(qreal value) 1470​void KFilePlacesView::Private::_k_itemAppearUpdate(qreal value)
1476{ 1471​{
1477 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(q->itemDelegate()); 1472​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(q->itemDelegate());
1478 1473​
1479 delegate->setAppearingItemProgress(value); 1474​ delegate->setAppearingItemProgress(value);
1480 q->scheduleDelayedItemsLayout(); 1475​ q->scheduleDelayedItemsLayout();
Context not available.
1482 1477​
1483void KFilePlacesView::Private::_k_itemDisappearUpdate(qreal value) 1478​void KFilePlacesView::Private::_k_itemDisappearUpdate(qreal value)
1484{ 1479​{
1485 KFilePlacesViewDelegate *delegate = dynamic_cast<KFilePlacesViewDelegate *>(q->itemDelegate()); 1480​ KFilePlacesViewDelegate *delegate = static_cast<KFilePlacesViewDelegate *>(q->itemDelegate());
1486 1481​
1487 delegate->setDisappearingItemProgress(value); 1482​ delegate->setDisappearingItemProgress(value);
1488 1483​
Context not available.