diff options
| -rw-r--r-- | src/admin/bar.cpp | 2 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistview.h | 2 | ||||
| -rw-r--r-- | src/search/widgetmenu.cpp | 2 | ||||
| -rw-r--r-- | src/selectionmode/bottombar.cpp | 5 | ||||
| -rw-r--r-- | src/selectionmode/bottombarcontentscontainer.cpp | 33 | ||||
| -rw-r--r-- | src/selectionmode/topbar.cpp | 2 | ||||
| -rw-r--r-- | src/settings/contextmenu/contextmenusettingspage.cpp | 3 | ||||
| -rw-r--r-- | src/views/dolphinitemlistview.cpp | 18 |
8 files changed, 43 insertions, 24 deletions
diff --git a/src/admin/bar.cpp b/src/admin/bar.cpp index e01ef81a5..34b7b5028 100644 --- a/src/admin/bar.cpp +++ b/src/admin/bar.cpp @@ -102,7 +102,7 @@ bool Bar::event(QEvent *event) void Bar::resizeEvent(QResizeEvent *resizeEvent) { updateLabelString(); - return QWidget::resizeEvent(resizeEvent); + QWidget::resizeEvent(resizeEvent); } void Bar::hideTheNextTimeAuthorizationExpires() diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index 541ee4e9e..415710e02 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -904,7 +904,7 @@ void KItemListWidgetCreator<T>::calculateItemSizeHints(QVector<std::pair<qreal, qreal &logicalWidthHint, const KItemListView *view) const { - return m_informant->calculateItemSizeHints(logicalHeightHints, logicalWidthHint, view); + m_informant->calculateItemSizeHints(logicalHeightHints, logicalWidthHint, view); } template<class T> diff --git a/src/search/widgetmenu.cpp b/src/search/widgetmenu.cpp index 5624e2dfc..9d2359d6b 100644 --- a/src/search/widgetmenu.cpp +++ b/src/search/widgetmenu.cpp @@ -36,7 +36,7 @@ bool WidgetMenu::focusNextPrevChild(bool next) void WidgetMenu::mouseReleaseEvent(QMouseEvent *event) { - return QWidget::mouseReleaseEvent(event); + QWidget::mouseReleaseEvent(event); } void WidgetMenu::resizeToFitContents() diff --git a/src/selectionmode/bottombar.cpp b/src/selectionmode/bottombar.cpp index ee63246ca..1c53e6069 100644 --- a/src/selectionmode/bottombar.cpp +++ b/src/selectionmode/bottombar.cpp @@ -108,12 +108,13 @@ void BottomBar::resizeEvent(QResizeEvent *resizeEvent) { if (resizeEvent->oldSize().width() == resizeEvent->size().width()) { // The width() didn't change so our custom override isn't needed. - return AnimatedHeightWidget::resizeEvent(resizeEvent); + AnimatedHeightWidget::resizeEvent(resizeEvent); + return; } m_contentsContainer->adaptToNewBarWidth(width()); - return AnimatedHeightWidget::resizeEvent(resizeEvent); + AnimatedHeightWidget::resizeEvent(resizeEvent); } int BottomBar::preferredHeight() const diff --git a/src/selectionmode/bottombarcontentscontainer.cpp b/src/selectionmode/bottombarcontentscontainer.cpp index c9068138a..14dba3c36 100644 --- a/src/selectionmode/bottombarcontentscontainer.cpp +++ b/src/selectionmode/bottombarcontentscontainer.cpp @@ -47,27 +47,38 @@ void BottomBarContentsContainer::resetContents(BottomBar::Contents contents) m_contents = contents; switch (contents) { case BottomBar::CopyContents: - return addCopyContents(); + addCopyContents(); + break; case BottomBar::CopyLocationContents: - return addCopyLocationContents(); + addCopyLocationContents(); + break; case BottomBar::CopyToOtherViewContents: - return addCopyToOtherViewContents(); + addCopyToOtherViewContents(); + break; case BottomBar::CutContents: - return addCutContents(); + addCutContents(); + break; case BottomBar::DeleteContents: - return addDeleteContents(); + addDeleteContents(); + break; case BottomBar::DuplicateContents: - return addDuplicateContents(); + addDuplicateContents(); + break; case BottomBar::GeneralContents: - return addGeneralContents(); + addGeneralContents(); + break; case BottomBar::PasteContents: - return addPasteContents(); + addPasteContents(); + break; case BottomBar::MoveToOtherViewContents: - return addMoveToOtherViewContents(); + addMoveToOtherViewContents(); + break; case BottomBar::MoveToTrashContents: - return addMoveToTrashContents(); + addMoveToTrashContents(); + break; case BottomBar::RenameContents: - return addRenameContents(); + addRenameContents(); + break; } } diff --git a/src/selectionmode/topbar.cpp b/src/selectionmode/topbar.cpp index 7ef507910..07ac6b4e3 100644 --- a/src/selectionmode/topbar.cpp +++ b/src/selectionmode/topbar.cpp @@ -70,7 +70,7 @@ TopBar::TopBar(QWidget *parent) void TopBar::resizeEvent(QResizeEvent *resizeEvent) { updateLabelString(); - return AnimatedHeightWidget::resizeEvent(resizeEvent); + AnimatedHeightWidget::resizeEvent(resizeEvent); } void TopBar::updateLabelString() diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp index cd22d9054..eaa636db4 100644 --- a/src/settings/contextmenu/contextmenusettingspage.cpp +++ b/src/settings/contextmenu/contextmenusettingspage.cpp @@ -141,7 +141,8 @@ void ContextMenuSettingsPage::setEntryVisible(const QString &id, bool visible) } else if (id == "open_in_new_window") { ContextMenuSettings::setShowOpenInNewWindow(visible); } else if (id == "open_in_split_view") { - return ContextMenuSettings::setShowOpenInSplitView(visible); + ContextMenuSettings::setShowOpenInSplitView(visible); + return; } else if (id == "copy_location") { ContextMenuSettings::setShowCopyLocation(visible); } else if (id == "duplicate") { diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp index 23d9eb753..1aa0df736 100644 --- a/src/views/dolphinitemlistview.cpp +++ b/src/views/dolphinitemlistview.cpp @@ -66,12 +66,18 @@ void DolphinItemListView::setEnabledSelectionToggles(DolphinItemListView::Select { m_selectionTogglesEnabled = selectionTogglesEnabled; switch (m_selectionTogglesEnabled) { - case True: - return setEnabledSelectionToggles(true); - case False: - return setEnabledSelectionToggles(false); - case FollowSetting: - return setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); + case True: { + setEnabledSelectionToggles(true); + return; + } + case False: { + setEnabledSelectionToggles(false); + return; + } + case FollowSetting: { + setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); + return; + } } } |