From b069fb9b43072ebdb0cd292f224c4f4ca96e48f8 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Thu, 10 Apr 2014 02:57:01 +0200 Subject: dolphin: convert panels/ and filterbar to qt signal/slot syntax TerminalPanel connections to konsole part were not converted since there is no header available that defines these function, we have to keep the old syntax here. Additionally the new syntax no longer accepts QPointer arguments, we have to explicitly call .data() there. --- src/filterbar/filterbar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/filterbar/filterbar.cpp') diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 6de6fbe5c..8ef26435c 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -38,7 +38,7 @@ FilterBar::FilterBar(QWidget* parent) : closeButton->setAutoRaise(true); closeButton->setIcon(KIcon("dialog-close")); closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar")); - connect(closeButton, SIGNAL(clicked()), this, SIGNAL(closeRequest())); + connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest); // Create button to lock text when changing folders m_lockButton = new QToolButton(this); @@ -46,7 +46,7 @@ FilterBar::FilterBar(QWidget* parent) : m_lockButton->setCheckable(true); m_lockButton->setIcon(KIcon("object-unlocked")); m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders")); - connect(m_lockButton, SIGNAL(toggled(bool)), this, SLOT(slotToggleLockButton(bool))); + connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton); // Create label QLabel* filterLabel = new QLabel(i18nc("@label:textbox", "Filter:"), this); @@ -55,8 +55,8 @@ FilterBar::FilterBar(QWidget* parent) : m_filterInput = new KLineEdit(this); m_filterInput->setLayoutDirection(Qt::LeftToRight); m_filterInput->setClearButtonShown(true); - connect(m_filterInput, SIGNAL(textChanged(QString)), - this, SIGNAL(filterChanged(QString))); + connect(m_filterInput, &KLineEdit::textChanged, + this, &FilterBar::filterChanged); setFocusProxy(m_filterInput); // Apply layout -- cgit v1.3 From a7692611315065b308cd8243563cc50d40bd0f71 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 29 Jun 2014 10:36:32 +0200 Subject: Remove the automoc noise --- src/dolphinapplication.cpp | 1 - src/dolphincontextmenu.cpp | 1 - src/dolphindockwidget.cpp | 1 - src/dolphinmainwindow.cpp | 1 - src/dolphinnewfilemenu.cpp | 1 - src/dolphinpart_ext.cpp | 1 - src/dolphinviewcontainer.cpp | 1 - src/filterbar/filterbar.cpp | 1 - src/kitemviews/kfileitemlistview.cpp | 1 - src/kitemviews/kfileitemlistwidget.cpp | 1 - src/kitemviews/kfileitemmodel.cpp | 1 - src/kitemviews/kfileitemmodelrolesupdater.cpp | 1 - src/kitemviews/kitemlistcontainer.cpp | 1 - src/kitemviews/kitemlistcontroller.cpp | 1 - src/kitemviews/kitemlistgroupheader.cpp | 1 - src/kitemviews/kitemlistheader.cpp | 1 - src/kitemviews/kitemlistselectionmanager.cpp | 2 +- src/kitemviews/kitemlistview.cpp | 1 - src/kitemviews/kitemlistwidget.cpp | 1 - src/kitemviews/kitemmodelbase.cpp | 1 - src/kitemviews/kstandarditemlistgroupheader.cpp | 1 - src/kitemviews/kstandarditemlistview.cpp | 1 - src/kitemviews/kstandarditemlistwidget.cpp | 1 - src/kitemviews/kstandarditemmodel.cpp | 2 -- src/kitemviews/private/kfileitemclipboard.cpp | 1 - src/kitemviews/private/kfileitemmodeldirlister.cpp | 1 - src/kitemviews/private/kitemlistheaderwidget.cpp | 1 - src/kitemviews/private/kitemlistroleeditor.cpp | 1 - src/kitemviews/private/kitemlistrubberband.cpp | 1 - src/kitemviews/private/kitemlistselectiontoggle.cpp | 1 - src/kitemviews/private/kitemlistsmoothscroller.cpp | 1 - src/kitemviews/private/kitemlistviewanimation.cpp | 1 - src/kitemviews/private/kitemlistviewlayouter.cpp | 1 - src/panels/folders/foldersitemlistwidget.cpp | 1 - src/panels/folders/folderspanel.cpp | 1 - src/panels/folders/treeviewcontextmenu.cpp | 1 - src/panels/information/filemetadataconfigurationdialog.cpp | 1 - src/panels/information/informationpanel.cpp | 1 - src/panels/information/informationpanelcontent.cpp | 1 - src/panels/information/pixmapviewer.cpp | 1 - src/panels/panel.cpp | 1 - src/panels/places/placesitemeditdialog.cpp | 1 - src/panels/places/placesitemlistgroupheader.cpp | 1 - src/panels/places/placesitemlistwidget.cpp | 1 - src/panels/places/placesitemmodel.cpp | 1 - src/panels/places/placesitemsignalhandler.cpp | 1 - src/panels/places/placespanel.cpp | 1 - src/panels/places/placesview.cpp | 1 - src/panels/terminal/terminalpanel.cpp | 1 - src/search/dolphinfacetswidget.cpp | 1 - src/search/dolphinsearchbox.cpp | 1 - src/settings/additionalinfodialog.cpp | 1 - src/settings/applyviewpropsjob.cpp | 1 - src/settings/dolphinsettingsdialog.cpp | 1 - src/settings/general/behaviorsettingspage.cpp | 1 - src/settings/general/configurepreviewplugindialog.cpp | 1 - src/settings/general/confirmationssettingspage.cpp | 1 - src/settings/general/generalsettingspage.cpp | 1 - src/settings/general/previewssettingspage.cpp | 1 - src/settings/general/statusbarsettingspage.cpp | 1 - src/settings/navigation/navigationsettingspage.cpp | 1 - src/settings/serviceitemdelegate.cpp | 1 - src/settings/servicemodel.cpp | 1 - src/settings/services/servicessettingspage.cpp | 1 - src/settings/settingspagebase.cpp | 1 - src/settings/startup/startupsettingspage.cpp | 1 - src/settings/trash/trashsettingspage.cpp | 1 - src/settings/viewmodes/dolphinfontrequester.cpp | 1 - src/settings/viewmodes/viewsettingspage.cpp | 1 - src/settings/viewmodes/viewsettingstab.cpp | 2 +- src/settings/viewpropertiesdialog.cpp | 1 - src/settings/viewpropsprogressinfo.cpp | 1 - src/statusbar/dolphinstatusbar.cpp | 1 - src/statusbar/statusbarspaceinfo.cpp | 1 - src/views/dolphinfileitemlistwidget.cpp | 1 - src/views/dolphinitemlistview.cpp | 1 - src/views/dolphinnewfilemenuobserver.cpp | 1 - src/views/dolphinremoteencoding.cpp | 1 - src/views/dolphinview.cpp | 1 - src/views/renamedialog.cpp | 1 - src/views/tooltips/filemetadatatooltip.cpp | 1 - src/views/tooltips/tooltipmanager.cpp | 1 - src/views/versioncontrol/updateitemstatesthread.cpp | 1 - src/views/versioncontrol/versioncontrolobserver.cpp | 1 - src/views/viewmodecontroller.cpp | 1 - 85 files changed, 2 insertions(+), 86 deletions(-) (limited to 'src/filterbar/filterbar.cpp') diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp index 8144da8a0..200824e0c 100644 --- a/src/dolphinapplication.cpp +++ b/src/dolphinapplication.cpp @@ -100,4 +100,3 @@ void DolphinApplication::restoreSession() } } -#include "dolphinapplication.moc" diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 952ffcc99..cf9270fa8 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -530,4 +530,3 @@ void DolphinContextMenu::addCustomActions() } } -#include "dolphincontextmenu.moc" diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index 6495c8da9..1e83ef841 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -91,4 +91,3 @@ bool DolphinDockWidget::isLocked() const return m_locked; } -#include "dolphindockwidget.moc" diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 7c9001b68..52cc83a09 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -2155,4 +2155,3 @@ void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) } } -#include "dolphinmainwindow.moc" diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp index da57ca946..87f0932d8 100644 --- a/src/dolphinnewfilemenu.cpp +++ b/src/dolphinnewfilemenu.cpp @@ -45,4 +45,3 @@ void DolphinNewFileMenu::slotResult(KJob* job) } } -#include "dolphinnewfilemenu.moc" diff --git a/src/dolphinpart_ext.cpp b/src/dolphinpart_ext.cpp index fb7a4d2ea..8e2985878 100644 --- a/src/dolphinpart_ext.cpp +++ b/src/dolphinpart_ext.cpp @@ -190,4 +190,3 @@ void DolphinPartListingNotificationExtension::slotItemsDeleted(const KFileItemLi emit listingEvent(KParts::ListingNotificationExtension::ItemsDeleted, items); } -#include "dolphinpart_ext.moc" diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 761062585..c1677dc43 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -725,4 +725,3 @@ void DolphinViewContainer::saveViewState() m_urlNavigator->saveLocationState(locationState); } -#include "dolphinviewcontainer.moc" diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 8ef26435c..827721360 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -140,4 +140,3 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event) } } -#include "filterbar.moc" diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 933518a69..0a92e75e5 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -423,4 +423,3 @@ QSize KFileItemListView::availableIconSize() const return QSize(iconSize, iconSize); } -#include "kfileitemlistview.moc" diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp index fe8c7e997..1ea537d1d 100644 --- a/src/kitemviews/kfileitemlistwidget.cpp +++ b/src/kitemviews/kfileitemlistwidget.cpp @@ -161,4 +161,3 @@ int KFileItemListWidget::selectionLength(const QString& text) const return selectionLength; } -#include "kfileitemlistwidget.moc" diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 33b29c9fc..13057cbbd 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -2246,4 +2246,3 @@ bool KFileItemModel::isConsistent() const return true; } -#include "kfileitemmodel.moc" diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index fb39fd225..5c212a984 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -1170,4 +1170,3 @@ QList KFileItemModelRolesUpdater::indexesToResolve() const return result; } -#include "kfileitemmodelrolesupdater.moc" diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index 39e62962e..765b366d1 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -413,4 +413,3 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy() } } -#include "kitemlistcontainer.moc" diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index e90f301a9..854a0087a 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -1310,4 +1310,3 @@ void KItemListController::updateExtendedSelectionRegion() } } -#include "kitemlistcontroller.moc" diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp index 17c95a97c..accaf9ecf 100644 --- a/src/kitemviews/kitemlistgroupheader.cpp +++ b/src/kitemviews/kitemlistgroupheader.cpp @@ -233,4 +233,3 @@ QColor KItemListGroupHeader::baseColor() const return styleOption().palette.color(group, normalBaseColorRole()); } -#include "kitemlistgroupheader.moc" diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp index dd865f3a4..a3fa14d35 100644 --- a/src/kitemviews/kitemlistheader.cpp +++ b/src/kitemviews/kitemlistheader.cpp @@ -85,4 +85,3 @@ KItemListHeader::KItemListHeader(KItemListView* listView) : this, &KItemListHeader::columnWidthChanged); } -#include "kitemlistheader.moc" diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index 1f0a89d06..ba524a6bf 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -396,4 +396,4 @@ int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRa } return qBound(-1, index - dec, m_model->count() - 1); } -#include "kitemlistselectionmanager.moc" + diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 39aed1620..fed9b7729 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -2717,4 +2717,3 @@ void KItemListGroupHeaderCreatorBase::recycle(KItemListGroupHeader* header) pushRecycleableWidget(header); } -#include "kitemlistview.moc" diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp index a703c2b23..19807a404 100644 --- a/src/kitemviews/kitemlistwidget.cpp +++ b/src/kitemviews/kitemlistwidget.cpp @@ -526,4 +526,3 @@ void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QS widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget); } -#include "kitemlistwidget.moc" diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp index 4312640e4..bf41b1c84 100644 --- a/src/kitemviews/kitemmodelbase.cpp +++ b/src/kitemviews/kitemmodelbase.cpp @@ -159,4 +159,3 @@ void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder pre Q_UNUSED(previous); } -#include "kitemmodelbase.moc" diff --git a/src/kitemviews/kstandarditemlistgroupheader.cpp b/src/kitemviews/kstandarditemlistgroupheader.cpp index 1e23c0a56..99457c9b8 100644 --- a/src/kitemviews/kstandarditemlistgroupheader.cpp +++ b/src/kitemviews/kstandarditemlistgroupheader.cpp @@ -122,4 +122,3 @@ void KStandardItemListGroupHeader::updateCache() } } -#include "kstandarditemlistgroupheader.moc" diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp index 135cd0b7d..1c07d5327 100644 --- a/src/kitemviews/kstandarditemlistview.cpp +++ b/src/kitemviews/kstandarditemlistview.cpp @@ -179,4 +179,3 @@ void KStandardItemListView::updateLayoutOfVisibleItems() } } -#include "kstandarditemlistview.moc" diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index a13cb33f4..f7cf52484 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1464,4 +1464,3 @@ qreal KStandardItemListWidget::columnPadding(const KItemListStyleOption& option) return option.padding * 6; } -#include "kstandarditemlistwidget.moc" diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp index e8c1b6204..060440aec 100644 --- a/src/kitemviews/kstandarditemmodel.cpp +++ b/src/kitemviews/kstandarditemmodel.cpp @@ -237,5 +237,3 @@ void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem) Q_UNUSED(removedItem); } - -#include "kstandarditemmodel.moc" diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp index 69df5dee7..1fb147716 100644 --- a/src/kitemviews/private/kfileitemclipboard.cpp +++ b/src/kitemviews/private/kfileitemclipboard.cpp @@ -83,4 +83,3 @@ KFileItemClipboard::KFileItemClipboard() : this, &KFileItemClipboard::updateCutItems); } -#include "kfileitemclipboard.moc" diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp index 3d36386a9..9dfd17d8e 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.cpp +++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp @@ -45,4 +45,3 @@ void KFileItemModelDirLister::handleError(KIO::Job* job) } } -#include "kfileitemmodeldirlister.moc" diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp index 809c4105b..01d0084c8 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.cpp +++ b/src/kitemviews/private/kitemlistheaderwidget.cpp @@ -569,4 +569,3 @@ qreal KItemListHeaderWidget::roleXPosition(const QByteArray& role) const return -1; } -#include "kitemlistheaderwidget.moc" diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp index 8d5f514d2..6e7e89c17 100644 --- a/src/kitemviews/private/kitemlistroleeditor.cpp +++ b/src/kitemviews/private/kitemlistroleeditor.cpp @@ -148,4 +148,3 @@ void KItemListRoleEditor::emitRoleEditingFinished() } } -#include "kitemlistroleeditor.moc" diff --git a/src/kitemviews/private/kitemlistrubberband.cpp b/src/kitemviews/private/kitemlistrubberband.cpp index 58567c460..702873126 100644 --- a/src/kitemviews/private/kitemlistrubberband.cpp +++ b/src/kitemviews/private/kitemlistrubberband.cpp @@ -88,4 +88,3 @@ bool KItemListRubberBand::isActive() const return m_active; } -#include "kitemlistrubberband.moc" diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp index accbe5181..c33c15ec2 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.cpp +++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp @@ -115,4 +115,3 @@ int KItemListSelectionToggle::iconSize() const return iconSize; } -#include "kitemlistselectiontoggle.moc" diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp index 994d86174..24eea0cef 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.cpp +++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp @@ -209,4 +209,3 @@ void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event) event->accept(); } -#include "kitemlistsmoothscroller.moc" diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp index 43eed98c5..336ba38ad 100644 --- a/src/kitemviews/private/kitemlistviewanimation.cpp +++ b/src/kitemviews/private/kitemlistviewanimation.cpp @@ -242,4 +242,3 @@ void KItemListViewAnimation::slotFinished() Q_ASSERT(false); } -#include "kitemlistviewanimation.moc" diff --git a/src/kitemviews/private/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp index 04325c7d0..e2dcc62e7 100644 --- a/src/kitemviews/private/kitemlistviewlayouter.cpp +++ b/src/kitemviews/private/kitemlistviewlayouter.cpp @@ -621,4 +621,3 @@ qreal KItemListViewLayouter::minimumGroupHeaderWidth() const return 100; } -#include "kitemlistviewlayouter.moc" diff --git a/src/panels/folders/foldersitemlistwidget.cpp b/src/panels/folders/foldersitemlistwidget.cpp index b4f9a5be8..5b2b20698 100644 --- a/src/panels/folders/foldersitemlistwidget.cpp +++ b/src/panels/folders/foldersitemlistwidget.cpp @@ -33,4 +33,3 @@ QPalette::ColorRole FoldersItemListWidget::normalTextColorRole() const return QPalette::WindowText; } -#include "foldersitemlistwidget.moc" diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index 0b2ea3888..1f7d007ca 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -328,4 +328,3 @@ void FoldersPanel::updateCurrentItem(int index) m_controller->view()->scrollToItem(index); } -#include "folderspanel.moc" diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 3f69ac22a..ff0801d1a 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -210,4 +210,3 @@ void TreeViewContextMenu::setAutoScrolling(bool enable) m_parent->setAutoScrolling(enable); } -#include "treeviewcontextmenu.moc" diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index 1ab2bd15c..15f1f4f5f 100644 --- a/src/panels/information/filemetadataconfigurationdialog.cpp +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -99,4 +99,3 @@ QString FileMetaDataConfigurationDialog::description() const return m_descriptionLabel->text(); } -#include "filemetadataconfigurationdialog.moc" diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index 4ad1276a5..5c4da7fbc 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -361,4 +361,3 @@ void InformationPanel::init() m_initialized = true; } -#include "informationpanel.moc" diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 1e660d5c9..75052021b 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -440,4 +440,3 @@ void InformationPanelContent::adjustWidgetSizes(int width) } } -#include "informationpanelcontent.moc" diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp index db3a63331..221db8c70 100644 --- a/src/panels/information/pixmapviewer.cpp +++ b/src/panels/information/pixmapviewer.cpp @@ -127,4 +127,3 @@ void PixmapViewer::checkPendingPixmaps() } } -#include "pixmapviewer.moc" diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp index 14b7c0230..767313445 100644 --- a/src/panels/panel.cpp +++ b/src/panels/panel.cpp @@ -76,4 +76,3 @@ void Panel::readSettings() } -#include "panel.moc" diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 0a66ef7de..350f39089 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -169,4 +169,3 @@ void PlacesItemEditDialog::initialize() setMainWidget(mainWidget); } -#include "placesitemeditdialog.moc" diff --git a/src/panels/places/placesitemlistgroupheader.cpp b/src/panels/places/placesitemlistgroupheader.cpp index ec7c4b18c..e17fd4d66 100644 --- a/src/panels/places/placesitemlistgroupheader.cpp +++ b/src/panels/places/placesitemlistgroupheader.cpp @@ -42,4 +42,3 @@ QPalette::ColorRole PlacesItemListGroupHeader::normalTextColorRole() const return QPalette::WindowText; } -#include "placesitemlistgroupheader.moc" diff --git a/src/panels/places/placesitemlistwidget.cpp b/src/panels/places/placesitemlistwidget.cpp index e33d1daf9..83b00d798 100644 --- a/src/panels/places/placesitemlistwidget.cpp +++ b/src/panels/places/placesitemlistwidget.cpp @@ -40,4 +40,3 @@ QPalette::ColorRole PlacesItemListWidget::normalTextColorRole() const return QPalette::WindowText; } -#include "placesitemlistwidget.moc" diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 39dd372a8..2c984ee40 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -1228,4 +1228,3 @@ void PlacesItemModel::showModelState() } #endif -#include "placesitemmodel.moc" diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp index 54a916de7..c9bc0db3f 100644 --- a/src/panels/places/placesitemsignalhandler.cpp +++ b/src/panels/places/placesitemsignalhandler.cpp @@ -47,4 +47,3 @@ void PlacesItemSignalHandler::onTrashDirListerCompleted() } } -#include "placesitemsignalhandler.moc" diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index d3614c9ce..487751931 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -546,4 +546,3 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button) } -#include "placespanel.moc" diff --git a/src/panels/places/placesview.cpp b/src/panels/places/placesview.cpp index a298a5250..7c455b4bc 100644 --- a/src/panels/places/placesview.cpp +++ b/src/panels/places/placesview.cpp @@ -49,4 +49,3 @@ int PlacesView::iconSize() const return option.iconSize; } -#include "placesview.moc" diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index 5c726527e..1ac5925bf 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -195,4 +195,3 @@ void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir) } } -#include "terminalpanel.moc" diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp index fa46a50e8..8e1a9c470 100644 --- a/src/search/dolphinfacetswidget.cpp +++ b/src/search/dolphinfacetswidget.cpp @@ -300,4 +300,3 @@ QRadioButton* DolphinFacetsWidget::createRadioButton(const QString& text, return button; } -#include "dolphinfacetswidget.moc" diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 78a3569a9..ae93030ac 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -513,4 +513,3 @@ void DolphinSearchBox::updateFacetsToggleButton() m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options")); } -#include "dolphinsearchbox.moc" diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 910df7b22..9cce603f5 100644 --- a/src/settings/additionalinfodialog.cpp +++ b/src/settings/additionalinfodialog.cpp @@ -110,4 +110,3 @@ void AdditionalInfoDialog::slotOk() } } -#include "additionalinfodialog.moc" diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp index 9849216d2..d33d4430f 100644 --- a/src/settings/applyviewpropsjob.cpp +++ b/src/settings/applyviewpropsjob.cpp @@ -76,4 +76,3 @@ void ApplyViewPropsJob::slotResult(KJob* job) emitResult(); } -#include "applyviewpropsjob.moc" diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index f248335e9..8c20a9148 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -148,4 +148,3 @@ void DolphinSettingsDialog::restoreDefaults() } } -#include "dolphinsettingsdialog.moc" diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 7633b824f..635a1b2c4 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -141,4 +141,3 @@ void BehaviorSettingsPage::loadSettings() m_renameInline->setChecked(GeneralSettings::renameInline()); } -#include "behaviorsettingspage.moc" diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index 090b415e0..ce70e2bad 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -79,4 +79,3 @@ void ConfigurePreviewPluginDialog::slotOk() } -#include "configurepreviewplugindialog.moc" diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index c74efedc2..532821159 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -111,4 +111,3 @@ void ConfirmationsSettingsPage::loadSettings() m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs()); } -#include "confirmationssettingspage.moc" diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 8a8adf84f..3b196e837 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -89,4 +89,3 @@ void GeneralSettingsPage::restoreDefaults() } } -#include "generalsettingspage.moc" diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 5085173a7..428e4fe28 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -201,4 +201,3 @@ void PreviewsSettingsPage::loadSettings() m_remoteFileSizeBox->setValue(maxRemoteMByteSize); } -#include "previewssettingspage.moc" diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp index e9a9a3573..78ee3856b 100644 --- a/src/settings/general/statusbarsettingspage.cpp +++ b/src/settings/general/statusbarsettingspage.cpp @@ -73,4 +73,3 @@ void StatusBarSettingsPage::loadSettings() m_showSpaceInfo->setChecked(GeneralSettings::showSpaceInfo()); } -#include "statusbarsettingspage.moc" diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 32f437d96..5894599a1 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -115,4 +115,3 @@ void NavigationSettingsPage::loadSettings() m_autoExpandFolders->setChecked(GeneralSettings::autoExpandFolders()); } -#include "navigationsettingspage.moc" diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp index 5b8b582fe..43406eeda 100644 --- a/src/settings/serviceitemdelegate.cpp +++ b/src/settings/serviceitemdelegate.cpp @@ -129,4 +129,3 @@ void ServiceItemDelegate::slotConfigureButtonClicked() emit requestServiceConfiguration(focusedIndex()); } -#include "serviceitemdelegate.moc" diff --git a/src/settings/servicemodel.cpp b/src/settings/servicemodel.cpp index 315b90dff..e3b015147 100644 --- a/src/settings/servicemodel.cpp +++ b/src/settings/servicemodel.cpp @@ -105,4 +105,3 @@ int ServiceModel::rowCount(const QModelIndex& parent) const return m_items.count(); } -#include "servicemodel.moc" diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index 4110d1f5e..481c8af4a 100644 --- a/src/settings/services/servicessettingspage.cpp +++ b/src/settings/services/servicessettingspage.cpp @@ -273,4 +273,3 @@ void ServicesSettingsPage::addRow(const QString& icon, m_serviceModel->setData(index, checked, Qt::CheckStateRole); } -#include "servicessettingspage.moc" diff --git a/src/settings/settingspagebase.cpp b/src/settings/settingspagebase.cpp index 6f8dcbfb6..70549fd2c 100644 --- a/src/settings/settingspagebase.cpp +++ b/src/settings/settingspagebase.cpp @@ -28,4 +28,3 @@ SettingsPageBase::~SettingsPageBase() {} -#include "settingspagebase.moc" diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index 7f8c2d5f5..8e8cf9e73 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -181,4 +181,3 @@ void StartupSettingsPage::loadSettings() m_filterBar->setChecked(GeneralSettings::filterBar()); } -#include "startupsettingspage.moc" diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp index d42ae8f0c..bd01d56b5 100644 --- a/src/settings/trash/trashsettingspage.cpp +++ b/src/settings/trash/trashsettingspage.cpp @@ -67,4 +67,3 @@ void TrashSettingsPage::loadSettings() m_proxy->load(); } -#include "trashsettingspage.moc" diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index fe5184a56..660aacdf9 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -104,4 +104,3 @@ void DolphinFontRequester::changeMode(int index) emit changed(); } -#include "dolphinfontrequester.moc" diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index dfce43b4d..941b211ef 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -80,4 +80,3 @@ void ViewSettingsPage::restoreDefaults() } } -#include "viewsettingspage.moc" diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 70238e82f..6f442099f 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -289,4 +289,4 @@ void ViewSettingsTab::showToolTip(QSlider* slider, int value) QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global)); QApplication::sendEvent(slider, &toolTipEvent); } -#include "viewsettingstab.moc" + diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 593d1c4a8..41a39f2a7 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -408,4 +408,3 @@ void ViewPropertiesDialog::loadSettings() markAsDirty(false); } -#include "viewpropertiesdialog.moc" diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index a4a45da26..13998cf87 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -145,4 +145,3 @@ void ViewPropsProgressInfo::cancelApplying() } } -#include "viewpropsprogressinfo.moc" diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 9f17c8ecd..21f657ada 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -356,4 +356,3 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) m_zoomSlider->setVisible(showZoomSlider); } -#include "dolphinstatusbar.moc" diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 3692947b1..ea8b4704c 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -87,4 +87,3 @@ void StatusBarSpaceInfo::slotValuesChanged() } } -#include "statusbarspaceinfo.moc" diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index 33ee6a277..f4efa5233 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -126,4 +126,3 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin2::ItemV return KIcon(iconName).pixmap(QSize(overlayHeight, overlayHeight)); } -#include "dolphinfileitemlistwidget.moc" diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp index 9f600e43f..eeef45d92 100644 --- a/src/views/dolphinitemlistview.cpp +++ b/src/views/dolphinitemlistview.cpp @@ -263,4 +263,3 @@ ViewModeSettings::ViewMode DolphinItemListView::viewMode() const return mode; } -#include "dolphinitemlistview.moc" diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp index 353f1f33c..855f2675a 100644 --- a/src/views/dolphinnewfilemenuobserver.cpp +++ b/src/views/dolphinnewfilemenuobserver.cpp @@ -63,4 +63,3 @@ DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver() { } -#include "dolphinnewfilemenuobserver.moc" diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index bf00e33fe..ceb189494 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -235,4 +235,3 @@ void DolphinRemoteEncoding::updateView() m_actionHandler->currentView()->reload(); } -#include "dolphinremoteencoding.moc" diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 6d718f02c..ce8e08210 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1683,4 +1683,3 @@ KUrl DolphinView::viewPropertiesUrl() const return url; } -#include "dolphinview.moc" diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 3b94e01e5..bd0a31d11 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -219,4 +219,3 @@ QString RenameDialog::indexedName(const QString& name, int index, const QChar& i return newName; } -#include "renamedialog.moc" diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp index 9efbe8a4f..afb1a32d3 100644 --- a/src/views/tooltips/filemetadatatooltip.cpp +++ b/src/views/tooltips/filemetadatatooltip.cpp @@ -180,4 +180,3 @@ void FileMetaDataToolTip::showEvent(QShowEvent *) KWindowEffects::enableBlurBehind(winId(), true, mask()); } -#include "filemetadatatooltip.moc" diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 1f213dc5c..c005979d5 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -267,4 +267,3 @@ void ToolTipManager::showToolTip() m_toolTipRequested = false; } -#include "tooltipmanager.moc" diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp index 51a277831..7b806a592 100644 --- a/src/views/versioncontrol/updateitemstatesthread.cpp +++ b/src/views/versioncontrol/updateitemstatesthread.cpp @@ -76,4 +76,3 @@ QMap > UpdateItemStatesThrea return m_itemStates; } -#include "updateitemstatesthread.moc" diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 9033e19da..c41803c16 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -366,4 +366,3 @@ bool VersionControlObserver::isVersioned() const return m_versionedDirectory && m_plugin; } -#include "versioncontrolobserver.moc" diff --git a/src/views/viewmodecontroller.cpp b/src/views/viewmodecontroller.cpp index 26e181888..da6066887 100644 --- a/src/views/viewmodecontroller.cpp +++ b/src/views/viewmodecontroller.cpp @@ -85,4 +85,3 @@ void ViewModeController::setUrl(const KUrl& url) } } -#include "viewmodecontroller.moc" -- cgit v1.3 From 4de8cf43e62e23b766d9d457e060670401ce6128 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Fri, 12 Sep 2014 13:02:43 +0200 Subject: Ported KIcon to QIcon REVIEW: 120159 --- src/dolphinmainwindow.cpp | 4 ++-- src/dolphinmainwindow.h | 2 +- src/dolphintabbar.cpp | 10 ++++---- src/filterbar/filterbar.cpp | 10 ++++---- src/kitemviews/kfileitemlistview.cpp | 4 ++-- src/kitemviews/kstandarditemlistwidget.cpp | 4 ++-- src/panels/folders/treeviewcontextmenu.cpp | 16 ++++++------- src/panels/information/informationpanelcontent.cpp | 12 ++++++---- src/panels/information/phononwidget.cpp | 6 ++--- src/panels/places/placesitem.cpp | 2 +- src/panels/places/placesitemmodel.cpp | 6 ++--- src/panels/places/placespanel.cpp | 16 ++++++------- src/search/dolphinsearchbox.cpp | 6 ++--- src/settings/dolphinsettingsdialog.cpp | 14 +++++------ src/settings/kcm/kcmdolphinviewmodes.cpp | 8 +++---- src/settings/serviceitemdelegate.cpp | 6 ++--- src/settings/services/servicessettingspage.cpp | 2 +- src/statusbar/dolphinstatusbar.cpp | 4 ++-- src/views/dolphinfileitemlistwidget.cpp | 4 ++-- src/views/dolphinremoteencoding.cpp | 4 ++-- src/views/dolphinviewactionhandler.cpp | 28 +++++++++++----------- src/views/tooltips/tooltipmanager.cpp | 4 ++-- 22 files changed, 87 insertions(+), 85 deletions(-) (limited to 'src/filterbar/filterbar.cpp') diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index f9ebe33ac..5e5eeb031 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1461,11 +1461,11 @@ void DolphinMainWindow::updateSplitAction() if (tabPage->primaryViewActive()) { splitAction->setText(i18nc("@action:intoolbar Close left view", "Close")); splitAction->setToolTip(i18nc("@info", "Close left view")); - splitAction->setIcon(KIcon("view-left-close")); + splitAction->setIcon(QIcon::fromTheme("view-left-close")); } else { splitAction->setText(i18nc("@action:intoolbar Close right view", "Close")); splitAction->setToolTip(i18nc("@info", "Close right view")); - splitAction->setIcon(KIcon("view-right-close")); + splitAction->setIcon(QIcon::fromTheme("view-right-close")); } } else { splitAction->setText(i18nc("@action:intoolbar Split view", "Split")); diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index fd231cf0b..ae3019794 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp index 78bd5edcb..c72168431 100644 --- a/src/dolphintabbar.cpp +++ b/src/dolphintabbar.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include DolphinTabBar::DolphinTabBar(QWidget* parent) : @@ -124,10 +124,10 @@ void DolphinTabBar::contextMenuEvent(QContextMenuEvent* event) // Tab context menu KMenu menu(this); - QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab")); - QAction* detachTabAction = menu.addAction(KIcon("tab-detach"), i18nc("@action:inmenu", "Detach Tab")); - QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs")); - QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab")); + QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab")); + QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab")); + QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs")); + QAction* closeTabAction = menu.addAction(QIcon::fromTheme("tab-close"), i18nc("@action:inmenu", "Close Tab")); QAction* selectedAction = menu.exec(event->globalPos()); if (selectedAction == newTabAction) { diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 827721360..720a5a76a 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ FilterBar::FilterBar(QWidget* parent) : // Create close button QToolButton *closeButton = new QToolButton(this); closeButton->setAutoRaise(true); - closeButton->setIcon(KIcon("dialog-close")); + closeButton->setIcon(QIcon::fromTheme("dialog-close")); closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar")); connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest); @@ -44,7 +44,7 @@ FilterBar::FilterBar(QWidget* parent) : m_lockButton = new QToolButton(this); m_lockButton->setAutoRaise(true); m_lockButton->setCheckable(true); - m_lockButton->setIcon(KIcon("object-unlocked")); + m_lockButton->setIcon(QIcon::fromTheme("object-unlocked")); m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders")); connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton); @@ -103,9 +103,9 @@ void FilterBar::slotUrlChanged() void FilterBar::slotToggleLockButton(bool checked) { if (checked) { - m_lockButton->setIcon(KIcon("object-locked")); + m_lockButton->setIcon(QIcon::fromTheme("object-locked")); } else { - m_lockButton->setIcon(KIcon("object-unlocked")); + m_lockButton->setIcon(QIcon::fromTheme("object-unlocked")); clear(); } } diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 0a92e75e5..aee10b5bd 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -27,7 +27,7 @@ #include "private/kpixmapmodifier.h" #include -#include +#include #include #include #include @@ -171,7 +171,7 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const foreach (int index, indexes) { QPixmap pixmap = model()->data(index).value("iconPixmap").value(); if (pixmap.isNull()) { - KIcon icon(model()->data(index).value("iconName").toString()); + QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString()); pixmap = icon.pixmap(size, size); } else { KPixmapModifier::scale(pixmap, QSize(size, size)); diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 8633a2571..eaed056e5 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -22,7 +22,7 @@ #include "kfileitemlistview.h" #include "kfileitemmodel.h" -#include +#include #include #include #include @@ -1440,7 +1440,7 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin QPixmap pixmap; if (!QPixmapCache::find(key, pixmap)) { - const KIcon icon(name); + const QIcon icon = QIcon::fromTheme(name); int requestedSize; if (size <= KIconLoader::SizeSmall) { diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 9450d3e17..35e39c14a 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,15 +64,15 @@ void TreeViewContextMenu::open() KFileItemListProperties capabilities(KFileItemList() << m_fileItem); // insert 'Cut', 'Copy' and 'Paste' - QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this); + QAction* cutAction = new QAction(QIcon::fromTheme("edit-cut"), i18nc("@action:inmenu", "Cut"), this); cutAction->setEnabled(capabilities.supportsMoving()); connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut); - QAction* copyAction = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this); + QAction* copyAction = new QAction(QIcon::fromTheme("edit-copy"), i18nc("@action:inmenu", "Copy"), this); connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy); const QPair pasteInfo = KonqOperations::pasteInfo(m_fileItem.url()); - QAction* pasteAction = new QAction(KIcon("edit-paste"), pasteInfo.second, this); + QAction* pasteAction = new QAction(QIcon::fromTheme("edit-paste"), pasteInfo.second, this); connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste); pasteAction->setEnabled(pasteInfo.first); @@ -84,7 +84,7 @@ void TreeViewContextMenu::open() // insert 'Rename' QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this); renameAction->setEnabled(capabilities.supportsMoving()); - renameAction->setIcon(KIcon("edit-rename")); + renameAction->setIcon(QIcon::fromTheme("edit-rename")); connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename); popup->addAction(renameAction); @@ -95,7 +95,7 @@ void TreeViewContextMenu::open() const KUrl url = m_fileItem.url(); if (url.isLocalFile()) { - QAction* moveToTrashAction = new QAction(KIcon("user-trash"), + QAction* moveToTrashAction = new QAction(QIcon::fromTheme("user-trash"), i18nc("@action:inmenu", "Move to Trash"), this); const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); moveToTrashAction->setEnabled(enableMoveToTrash); @@ -106,7 +106,7 @@ void TreeViewContextMenu::open() } if (showDeleteCommand) { - QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this); + QAction* deleteAction = new QAction(QIcon::fromTheme("edit-delete"), i18nc("@action:inmenu", "Delete"), this); deleteAction->setEnabled(capabilities.supportsDeleting()); connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem); popup->addAction(deleteAction); @@ -134,7 +134,7 @@ void TreeViewContextMenu::open() if (!m_fileItem.isNull()) { // insert 'Properties' entry QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this); - propertiesAction->setIcon(KIcon("document-properties")); + propertiesAction->setIcon(QIcon::fromTheme("document-properties")); connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties); popup->addAction(propertiesAction); } diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 75052021b..327e72ba9 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -297,7 +297,7 @@ void InformationPanelContent::configureSettings(const QList& customCon previewAction->setChecked(InformationPanelSettings::previewsShown()); QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure...")); - configureAction->setIcon(KIcon("configure")); + configureAction->setIcon(QIcon::fromTheme("configure")); popup.addSeparator(); foreach (QAction* action, customContextMenuActions) { @@ -332,8 +332,10 @@ void InformationPanelContent::showIcon(const KFileItem& item) { m_outdatedPreviewTimer->stop(); if (!applyPlace(item.targetUrl())) { - KIcon icon(item.iconName(), KIconLoader::global(), item.overlays()); - m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous)); + const QPixmap icon = KIconLoader::global()->loadIcon(item.iconName(), KIconLoader::Desktop, + KIconLoader::SizeEnormous, KIconLoader::DefaultState, + item.overlays()); + m_preview->setPixmap(icon); } } @@ -376,7 +378,7 @@ bool InformationPanelContent::applyPlace(const KUrl& url) const PlacesItem* item = m_placesItemModel->placesItem(i); if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) { setNameLabelText(item->text()); - m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128)); + m_preview->setPixmap(QIcon::fromTheme(item->icon()).pixmap(128, 128)); return true; } } diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 4b2cc28c5..16dbabfed 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -129,13 +129,13 @@ void PhononWidget::showEvent(QShowEvent *event) m_playButton->setToolTip(i18n("play")); m_playButton->setIconSize(buttonSize); - m_playButton->setIcon(KIcon("media-playback-start")); + m_playButton->setIcon(QIcon::fromTheme("media-playback-start")); m_playButton->setAutoRaise(true); connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play); m_stopButton->setToolTip(i18n("stop")); m_stopButton->setIconSize(buttonSize); - m_stopButton->setIcon(KIcon("media-playback-stop")); + m_stopButton->setIcon(QIcon::fromTheme("media-playback-stop")); m_stopButton->setAutoRaise(true); m_stopButton->hide(); connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop); diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 0fd430abc..b82e50256 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "placesitemsignalhandler.h" #include diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 3eedec5e6..8eb79a8a8 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -255,7 +255,7 @@ QAction* PlacesItemModel::ejectAction(int index) const { const PlacesItem* item = placesItem(index); if (item && item->device().is()) { - return new QAction(KIcon("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0); + return new QAction(QIcon::fromTheme("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0); } return 0; @@ -304,7 +304,7 @@ QAction* PlacesItemModel::teardownAction(int index) const return new QAction(text, 0); } - return new QAction(KIcon(iconName), text, 0); + return new QAction(QIcon::fromTheme(iconName), text, 0); } void PlacesItemModel::requestEject(int index) diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 37965eb90..0c111390c 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -185,25 +185,25 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) } } else { if (item->url() == KUrl("trash:/")) { - emptyTrashAction = menu.addAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash")); + emptyTrashAction = menu.addAction(QIcon::fromTheme("trash-empty"), i18nc("@action:inmenu", "Empty Trash")); emptyTrashAction->setEnabled(item->icon() == "user-trash-full"); menu.addSeparator(); } - addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry...")); + addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry...")); mainSeparator = menu.addSeparator(); - editAction = menu.addAction(KIcon("document-properties"), i18nc("@item:inmenu", "Edit '%1'...", label)); + editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit '%1'...", label)); } if (!addAction) { - addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry...")); + addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry...")); } QAction* openInNewTabAction = menu.addAction(i18nc("@item:inmenu", "Open '%1' in New Tab", label)); - openInNewTabAction->setIcon(KIcon("tab-new")); + openInNewTabAction->setIcon(QIcon::fromTheme("tab-new")); QAction* removeAction = 0; if (!isDevice && !item->isSystemItem()) { - removeAction = menu.addAction(KIcon("edit-delete"), i18nc("@item:inmenu", "Remove '%1'", label)); + removeAction = menu.addAction(QIcon::fromTheme("edit-delete"), i18nc("@item:inmenu", "Remove '%1'", label)); } QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide '%1'", label)); @@ -305,7 +305,7 @@ void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos) { KMenu menu(this); - QAction* addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry...")); + QAction* addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry...")); QAction* showAllAction = 0; if (m_model->hiddenCount() > 0) { diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 0ab4d86cd..0fb1e41d7 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -22,7 +22,7 @@ #include "dolphin_searchsettings.h" #include "dolphinfacetswidget.h" -#include +#include #include #include #include @@ -332,7 +332,7 @@ void DolphinSearchBox::init() // Create close button QToolButton* closeButton = new QToolButton(this); closeButton->setAutoRaise(true); - closeButton->setIcon(KIcon("dialog-close")); + closeButton->setIcon(QIcon::fromTheme("dialog-close")); closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching")); connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest); @@ -534,7 +534,7 @@ void DolphinSearchBox::updateFacetsToggleButton() { const bool facetsIsVisible = SearchSettings::showFacetsWidget(); m_facetsToggleButton->setChecked(facetsIsVisible ? true : false); - m_facetsToggleButton->setIcon(KIcon(facetsIsVisible ? "arrow-up-double" : "arrow-down-double")); + m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? "arrow-up-double" : "arrow-down-double")); m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options")); } diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 8c20a9148..533a7f089 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include @@ -61,42 +61,42 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) : StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this); KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage, i18nc("@title:group", "Startup")); - startupSettingsFrame->setIcon(KIcon("go-home")); + startupSettingsFrame->setIcon(QIcon::fromTheme("go-home")); connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // View Modes ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this); KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage, i18nc("@title:group", "View Modes")); - viewSettingsFrame->setIcon(KIcon("view-choose")); + viewSettingsFrame->setIcon(QIcon::fromTheme("view-choose")); connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Navigation NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this); KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage, i18nc("@title:group", "Navigation")); - navigationSettingsFrame->setIcon(KIcon("input-mouse")); + navigationSettingsFrame->setIcon(QIcon::fromTheme("input-mouse")); connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Services ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this); KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage, i18nc("@title:group", "Services")); - servicesSettingsFrame->setIcon(KIcon("services")); + servicesSettingsFrame->setIcon(QIcon::fromTheme("services")); connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Trash TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this); KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage, i18nc("@title:group", "Trash")); - trashSettingsFrame->setIcon(KIcon("user-trash")); + trashSettingsFrame->setIcon(QIcon::fromTheme("user-trash")); connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // General GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this); KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage, i18nc("@title:group General settings", "General")); - generalSettingsFrame->setIcon(KIcon("system-run")); + generalSettingsFrame->setIcon(QIcon::fromTheme("system-run")); connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog"); diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 44a551544..ec862957b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -56,17 +56,17 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons // Initialize 'Icons' tab ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); - tabWidget->addTab(iconsTab, KIcon("view-list-icons"), i18nc("@title:tab", "Icons")); + tabWidget->addTab(iconsTab, QIcon::fromTheme("view-list-icons"), i18nc("@title:tab", "Icons")); connect(iconsTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged); // Initialize 'Compact' tab ViewSettingsTab* compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget); - tabWidget->addTab(compactTab, KIcon("view-list-details"), i18nc("@title:tab", "Compact")); + tabWidget->addTab(compactTab, QIcon::fromTheme("view-list-details"), i18nc("@title:tab", "Compact")); connect(compactTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged); // Initialize 'Details' tab ViewSettingsTab* detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget); - tabWidget->addTab(detailsTab, KIcon("view-list-tree"), i18nc("@title:tab", "Details")); + tabWidget->addTab(detailsTab, QIcon::fromTheme("view-list-tree"), i18nc("@title:tab", "Details")); connect(detailsTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged); m_tabs.append(iconsTab); diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp index 43406eeda..9b2cbd890 100644 --- a/src/settings/serviceitemdelegate.cpp +++ b/src/settings/serviceitemdelegate.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include "servicemodel.h" @@ -94,7 +94,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList widgets, checkBox->setText(model->data(index).toString()); const QString iconName = model->data(index, Qt::DecorationRole).toString(); if (!iconName.isEmpty()) { - checkBox->setIcon(KIcon(iconName)); + checkBox->setIcon(QIcon::fromTheme(iconName)); } checkBox->setChecked(model->data(index, Qt::CheckStateRole).toBool()); @@ -110,7 +110,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList widgets, // Update the configuration button if (configurable) { configureButton->setEnabled(checkBox->isChecked()); - configureButton->setIcon(KIcon("configure")); + configureButton->setIcon(QIcon::fromTheme("configure")); configureButton->resize(configureButton->sizeHint()); configureButton->move(option.rect.right() - configureButton->width(), (itemHeight - configureButton->height()) / 2); diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index 481c8af4a..78a865d43 100644 --- a/src/settings/services/servicessettingspage.cpp +++ b/src/settings/services/servicessettingspage.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index ea94e68b4..050550396 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -22,7 +22,7 @@ #include "dolphin_generalsettings.h" #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : // Initialize progress information m_stopButton = new QToolButton(this); - m_stopButton->setIcon(KIcon("process-stop")); + m_stopButton->setIcon(QIcon::fromTheme("process-stop")); m_stopButton->setAccessibleName(i18n("Stop")); m_stopButton->setAutoRaise(true); m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading")); diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index f4efa5233..de927d91f 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -19,7 +19,7 @@ #include "dolphinfileitemlistwidget.h" -#include +#include #include #include #include @@ -123,6 +123,6 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin2::ItemV break; } - return KIcon(iconName).pixmap(QSize(overlayHeight, overlayHeight)); + return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight)); } diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index ceb189494..9a1560003 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionH m_loaded(false), m_idDefault(0) { - m_menu = new KActionMenu(KIcon("character-set"), i18n("Select Remote Charset"), this); + m_menu = new KActionMenu(QIcon::fromTheme("character-set"), i18n("Select Remote Charset"), this); m_actionHandler->actionCollection()->addAction("change_remote_encoding", m_menu); connect(m_menu->menu(), &QMenu::aboutToShow, this, &DolphinRemoteEncoding::slotAboutToShow); diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 2879d51d5..028a0a763 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include @@ -101,7 +101,7 @@ void DolphinViewActionHandler::createActions() QAction* newDirAction = m_actionCollection->addAction("create_dir"); newDirAction->setText(i18nc("@action", "Create Folder...")); newDirAction->setShortcut(Qt::Key_F10); - newDirAction->setIcon(KIcon("folder-new")); + newDirAction->setIcon(QIcon::fromTheme("folder-new")); newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectory); @@ -110,18 +110,18 @@ void DolphinViewActionHandler::createActions() QAction* rename = m_actionCollection->addAction("rename"); rename->setText(i18nc("@action:inmenu File", "Rename...")); rename->setShortcut(Qt::Key_F2); - rename->setIcon(KIcon("edit-rename")); + rename->setIcon(QIcon::fromTheme("edit-rename")); connect(rename, &QAction::triggered, this, &DolphinViewActionHandler::slotRename); QAction* moveToTrash = m_actionCollection->addAction("move_to_trash"); moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); - moveToTrash->setIcon(KIcon("user-trash")); + moveToTrash->setIcon(QIcon::fromTheme("user-trash")); moveToTrash->setShortcut(QKeySequence::Delete); connect(moveToTrash, &QAction::triggered, this, &DolphinViewActionHandler::slotTrashActivated); QAction* deleteAction = m_actionCollection->addAction("delete"); - deleteAction->setIcon(KIcon("edit-delete")); + deleteAction->setIcon(QIcon::fromTheme("edit-delete")); deleteAction->setText(i18nc("@action:inmenu File", "Delete")); deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); connect(deleteAction, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems); @@ -140,7 +140,7 @@ void DolphinViewActionHandler::createActions() QAction *propertiesAction = m_actionCollection->addAction( "properties" ); // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :) propertiesAction->setText( i18nc("@action:inmenu File", "Properties") ); - propertiesAction->setIcon(KIcon("document-properties")); + propertiesAction->setIcon(QIcon::fromTheme("document-properties")); propertiesAction->setShortcuts(QList() << Qt::ALT + Qt::Key_Return << Qt::ALT + Qt::Key_Enter); connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties); @@ -168,7 +168,7 @@ void DolphinViewActionHandler::createActions() KToggleAction* showPreview = m_actionCollection->add("show_preview"); showPreview->setText(i18nc("@action:intoolbar", "Preview")); showPreview->setToolTip(i18nc("@info", "Show preview of files and folders")); - showPreview->setIcon(KIcon("view-preview")); + showPreview->setIcon(QIcon::fromTheme("view-preview")); connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview); KToggleAction* sortDescending = m_actionCollection->add("descending"); @@ -205,7 +205,7 @@ void DolphinViewActionHandler::createActions() } KToggleAction* showInGroups = m_actionCollection->add("show_in_groups"); - showInGroups->setIcon(KIcon("view-group")); + showInGroups->setIcon(QIcon::fromTheme("view-group")); showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting); @@ -302,7 +302,7 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) m_currentView->setMode(mode); QAction* viewModeMenu = m_actionCollection->action("view_mode"); - viewModeMenu->setIcon(KIcon(action->icon())); + viewModeMenu->setIcon(action->icon()); } void DolphinViewActionHandler::slotRename() @@ -365,7 +365,7 @@ void DolphinViewActionHandler::updateViewActions() viewModeAction->setChecked(true); QAction* viewModeMenu = m_actionCollection->action("view_mode"); - viewModeMenu->setIcon(KIcon(viewModeAction->icon())); + viewModeMenu->setIcon(viewModeAction->icon()); } QAction* showPreviewAction = m_actionCollection->action("show_preview"); @@ -493,7 +493,7 @@ KToggleAction* DolphinViewActionHandler::iconsModeAction() iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); iconsView->setToolTip(i18nc("@info", "Icons view mode")); iconsView->setShortcut(Qt::CTRL | Qt::Key_1); - iconsView->setIcon(KIcon("view-list-icons")); + iconsView->setIcon(QIcon::fromTheme("view-list-icons")); iconsView->setData(QVariant::fromValue(DolphinView::IconsView)); return iconsView; } @@ -504,7 +504,7 @@ KToggleAction* DolphinViewActionHandler::compactModeAction() iconsView->setText(i18nc("@action:inmenu View Mode", "Compact")); iconsView->setToolTip(i18nc("@info", "Compact view mode")); iconsView->setShortcut(Qt::CTRL | Qt::Key_2); - iconsView->setIcon(KIcon("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name + iconsView->setIcon(QIcon::fromTheme("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name iconsView->setData(QVariant::fromValue(DolphinView::CompactView)); return iconsView; } @@ -515,7 +515,7 @@ KToggleAction* DolphinViewActionHandler::detailsModeAction() detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); detailsView->setToolTip(i18nc("@info", "Details view mode")); detailsView->setShortcut(Qt::CTRL | Qt::Key_3); - detailsView->setIcon(KIcon("view-list-tree")); + detailsView->setIcon(QIcon::fromTheme("view-list-tree")); detailsView->setData(QVariant::fromValue(DolphinView::DetailsView)); return detailsView; } @@ -528,7 +528,7 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role) if (!action->icon().isNull()) { QAction* sortByMenu = m_actionCollection->action("sort"); - sortByMenu->setIcon(KIcon(action->icon())); + sortByMenu->setIcon(action->icon()); } } } diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index c005979d5..25fa8e0ed 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -20,7 +20,7 @@ #include "tooltipmanager.h" #include "filemetadatatooltip.h" -#include +#include #include #include #include @@ -167,7 +167,7 @@ void ToolTipManager::previewFailed() return; } - const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128); + const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128); m_fileMetaDataToolTip->setPreview(pixmap); if (!m_showToolTipTimer->isActive()) { showToolTip(); -- cgit v1.3 From 6f6b1bbb69ba6653879431b1c4dcb22c89efba81 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 10 Oct 2014 23:36:36 +0200 Subject: Clean includes + port to QMenu --- src/dolphincontextmenu.cpp | 8 +++---- src/dolphincontextmenu.h | 4 ++-- src/dolphinmainwindow.cpp | 26 +++++++++++----------- src/dolphinmainwindow.h | 2 +- src/dolphinpart.cpp | 2 +- src/dolphinrecenttabsmenu.cpp | 2 +- src/dolphintabbar.cpp | 4 ++-- src/filterbar/filterbar.cpp | 3 +-- src/kitemviews/kitemlistcontainer.h | 1 - src/kitemviews/kitemlistcontroller.h | 1 - src/kitemviews/kitemlistview.h | 1 - src/kitemviews/private/kitemlistheaderwidget.cpp | 2 +- src/kitemviews/private/kitemlistselectiontoggle.h | 1 - src/kitemviews/private/kitemlistviewanimation.h | 1 - src/panels/folders/treeviewcontextmenu.cpp | 6 ++--- src/panels/information/informationpanelcontent.cpp | 4 ++-- src/panels/places/placespanel.cpp | 8 +++---- src/settings/additionalinfodialog.h | 1 - src/settings/general/behaviorsettingspage.h | 1 - src/settings/services/servicessettingspage.h | 2 -- src/statusbar/dolphinstatusbar.cpp | 4 ++-- src/views/dolphinnewfilemenuobserver.h | 1 - src/views/dolphinremoteencoding.cpp | 2 +- src/views/dolphinview.cpp | 4 ++-- src/views/dolphinview.h | 1 - src/views/dolphinviewactionhandler.cpp | 2 +- src/views/draganddrophelper.h | 1 - src/views/tooltips/tooltipmanager.h | 4 ---- 28 files changed, 41 insertions(+), 58 deletions(-) (limited to 'src/filterbar/filterbar.cpp') diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index ccfd290e0..84a09f4d2 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,7 +66,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, const QPoint& pos, const KFileItem& fileInfo, const KUrl& baseUrl) : - KMenu(parent), + QMenu(parent), m_pos(pos), m_mainWindow(parent), m_fileInfo(fileInfo), @@ -131,7 +131,7 @@ void DolphinContextMenu::keyPressEvent(QKeyEvent *ev) if (m_removeAction && ev->key() == Qt::Key_Shift) { m_removeAction->update(); } - KMenu::keyPressEvent(ev); + QMenu::keyPressEvent(ev); } void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev) @@ -139,7 +139,7 @@ void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev) if (m_removeAction && ev->key() == Qt::Key_Shift) { m_removeAction->update(); } - KMenu::keyReleaseEvent(ev); + QMenu::keyReleaseEvent(ev); } void DolphinContextMenu::openTrashContextMenu() diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 3646ebcb5..62dffd074 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include @@ -50,7 +50,7 @@ class DolphinRemoveAction; * - 'Actions': Contains all actions which can be applied to the * given item. */ -class DolphinContextMenu : public KMenu +class DolphinContextMenu : public QMenu { Q_OBJECT diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index ac1cdff2e..e99788621 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include @@ -797,10 +797,10 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos, void DolphinMainWindow::updateControlMenu() { - KMenu* menu = qobject_cast(sender()); + QMenu* menu = qobject_cast(sender()); Q_ASSERT(menu); - // All actions get cleared by KMenu::clear(). The sub-menus are deleted + // All actions get cleared by QMenu::clear(). The sub-menus are deleted // by connecting to the aboutToHide() signal from the parent-menu. menu->clear(); @@ -842,7 +842,7 @@ void DolphinMainWindow::updateControlMenu() } addActionToMenu(ac->action("panels"), menu); - KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu); + QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu); locationBarMenu->addAction(ac->action("editable_location")); locationBarMenu->addAction(ac->action("replace_location")); menu->addMenu(locationBarMenu); @@ -850,8 +850,8 @@ void DolphinMainWindow::updateControlMenu() menu->addSeparator(); // Add "Go" menu - KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu); - connect(menu, &KMenu::aboutToHide, goMenu, &KMenu::deleteLater); + QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu); + connect(menu, &QMenu::aboutToHide, goMenu, &QMenu::deleteLater); goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); @@ -860,8 +860,8 @@ void DolphinMainWindow::updateControlMenu() menu->addMenu(goMenu); // Add "Tool" menu - KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu); - connect(menu, &KMenu::aboutToHide, toolsMenu, &KMenu::deleteLater); + QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); + connect(menu, &QMenu::aboutToHide, toolsMenu, &QMenu::deleteLater); toolsMenu->addAction(ac->action("show_filter_bar")); toolsMenu->addAction(ac->action("compare_files")); toolsMenu->addAction(ac->action("open_terminal")); @@ -874,8 +874,8 @@ void DolphinMainWindow::updateControlMenu() addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); // Add "Help" menu - KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu); - connect(menu, &KMenu::aboutToHide, helpMenu, &KMenu::deleteLater); + QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu); + connect(menu, &QMenu::aboutToHide, helpMenu, &QMenu::deleteLater); helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents))); helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis))); helpMenu->addSeparator(); @@ -1352,8 +1352,8 @@ void DolphinMainWindow::createControlButton() m_controlButton->setPopupMode(QToolButton::InstantPopup); m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle()); - KMenu* controlMenu = new KMenu(m_controlButton); - connect(controlMenu, &KMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu); + QMenu* controlMenu = new QMenu(m_controlButton); + connect(controlMenu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu); m_controlButton->setMenu(controlMenu); @@ -1381,7 +1381,7 @@ void DolphinMainWindow::deleteControlButton() m_updateToolBarTimer = 0; } -bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu) +bool DolphinMainWindow::addActionToMenu(QAction* action, QMenu* menu) { Q_ASSERT(action); Q_ASSERT(menu); diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index e7a366800..3ea4e0e17 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -448,7 +448,7 @@ private: * case if it has not added already to the toolbar. * @return True if the action has been added to the menu. */ - bool addActionToMenu(QAction* action, KMenu* menu); + bool addActionToMenu(QAction* action, QMenu* menu); /** * Connects the signals from the created DolphinView with diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 28259aaee..e3479d3b8 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp index 5440a1b37..f4492a214 100644 --- a/src/dolphinrecenttabsmenu.cpp +++ b/src/dolphinrecenttabsmenu.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) : KActionMenu(QIcon::fromTheme("edit-undo"), i18n("Recently Closed Tabs"), parent) diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp index c72168431..8e5fb2dce 100644 --- a/src/dolphintabbar.cpp +++ b/src/dolphintabbar.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -122,7 +122,7 @@ void DolphinTabBar::contextMenuEvent(QContextMenuEvent* event) if (index >= 0) { // Tab context menu - KMenu menu(this); + QMenu menu(this); QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab")); QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab")); diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 720a5a76a..b850469bf 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -20,15 +20,14 @@ ***************************************************************************/ #include "filterbar.h" -#include #include #include #include +#include #include #include #include -#include FilterBar::FilterBar(QWidget* parent) : QWidget(parent) diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 474a9ecc0..e599992df 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -32,7 +32,6 @@ class KItemListController; class KItemListSmoothScroller; class KItemListView; class KItemModelBase; -class QPropertyAnimation; /** * @brief Provides a QWidget based scrolling view for a KItemListController. diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index e9b70cdda..b07f117d0 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -44,7 +44,6 @@ class QGraphicsSceneWheelEvent; class QHideEvent; class QInputMethodEvent; class QKeyEvent; -class QMimeData; class QShowEvent; class QTransform; diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index cf6f27c03..c8054a691 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -44,7 +44,6 @@ class KItemListViewLayouter; class KItemListWidget; class KItemListWidgetInformant; class KItemListWidgetCreatorBase; -class KItemListViewCreatorBase; class QTimer; /** diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp index 319d9dae3..6b6530fd2 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.cpp +++ b/src/kitemviews/private/kitemlistheaderwidget.cpp @@ -19,7 +19,7 @@ #include "kitemlistheaderwidget.h" -#include +#include #include #include diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h index 758dc63bb..8a1a857f6 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.h +++ b/src/kitemviews/private/kitemlistselectiontoggle.h @@ -25,7 +25,6 @@ #include #include -class QPropertyAnimation; /** * @brief Allows to toggle between the selected and unselected state of an item. diff --git a/src/kitemviews/private/kitemlistviewanimation.h b/src/kitemviews/private/kitemlistviewanimation.h index a3aceb0f5..e2e533850 100644 --- a/src/kitemviews/private/kitemlistviewanimation.h +++ b/src/kitemviews/private/kitemlistviewanimation.h @@ -28,7 +28,6 @@ class KItemListView; class QGraphicsWidget; -class QPointF; class QPropertyAnimation; /** diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 35e39c14a..56e6d44b3 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ TreeViewContextMenu::~TreeViewContextMenu() void TreeViewContextMenu::open() { - KMenu* popup = new KMenu(m_parent); + QMenu* popup = new QMenu(m_parent); if (!m_fileItem.isNull()) { KFileItemListProperties capabilities(KFileItemList() << m_fileItem); @@ -147,7 +147,7 @@ void TreeViewContextMenu::open() } } - QWeakPointer popupPtr = popup; + QWeakPointer popupPtr = popup; popup->exec(QCursor::pos()); if (popupPtr.data()) { popupPtr.data()->deleteLater(); diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 6a9439b8e..259b672d3 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -289,7 +289,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event) void InformationPanelContent::configureSettings(const QList& customContextMenuActions) { - KMenu popup(this); + QMenu popup(this); QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview")); previewAction->setIcon(QIcon::fromTheme("view-preview")); diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 0c111390c..3ef93e250 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include "placesitem.h" @@ -155,7 +155,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) return; } - KMenu menu(this); + QMenu menu(this); QAction* emptyTrashAction = 0; QAction* addAction = 0; @@ -221,7 +221,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) } menu.addSeparator(); - KMenu* iconSizeSubMenu = new KMenu(i18nc("@item:inmenu", "Icon Size"), &menu); + QMenu* iconSizeSubMenu = new QMenu(i18nc("@item:inmenu", "Icon Size"), &menu); struct IconSizeInfo { @@ -303,7 +303,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos) { - KMenu menu(this); + QMenu menu(this); QAction* addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry...")); diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h index dd51768e5..4197d4794 100644 --- a/src/settings/additionalinfodialog.h +++ b/src/settings/additionalinfodialog.h @@ -24,7 +24,6 @@ #include #include -class QCheckBox; /** * @brief Dialog for changing the additional information shown in the view. diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h index 7a9c2f027..2221862e0 100644 --- a/src/settings/general/behaviorsettingspage.h +++ b/src/settings/general/behaviorsettingspage.h @@ -23,7 +23,6 @@ #include #include -class KComboBox; class QCheckBox; class QLabel; class QRadioButton; diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h index 80af42f88..7a56abd68 100644 --- a/src/settings/services/servicessettingspage.h +++ b/src/settings/services/servicessettingspage.h @@ -24,8 +24,6 @@ #include #include -class QCheckBox; -class QGroupBox; class QListView; class QSortFilterProxyModel; class ServiceModel; diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 050550396..fd5ecd152 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "statusbarspaceinfo.h" @@ -259,7 +259,7 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) { Q_UNUSED(event); - KMenu menu(this); + QMenu menu(this); QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h index 3b5014ae9..b9b18e229 100644 --- a/src/views/dolphinnewfilemenuobserver.h +++ b/src/views/dolphinnewfilemenuobserver.h @@ -25,7 +25,6 @@ #include "libdolphin_export.h" class DolphinNewFileMenu; -class KUrl; /** * @brief Allows to observe new file items that have been created diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 8fe66b92d..97a15313a 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 1586dfc88..b3df1ebd6 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include @@ -874,7 +874,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) { ViewProperties props(viewPropertiesUrl()); - QPointer menu = new KMenu(QApplication::activeWindow()); + QPointer menu = new QMenu(QApplication::activeWindow()); KItemListView* view = m_container->controller()->view(); const QSet visibleRolesSet = view->visibleRoles().toSet(); diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 1c5ecd57e..1616bcaa6 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -40,7 +40,6 @@ typedef KIO::FileUndoManager::CommandType CommandType; class DolphinItemListView; -class KActionCollection; class KFileItemModel; class KItemListContainer; class KItemModelBase; diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index d99c78cdd..41c3a5dca 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h index eda5fc5c2..a6fbb7c7f 100644 --- a/src/views/draganddrophelper.h +++ b/src/views/draganddrophelper.h @@ -28,7 +28,6 @@ class KFileItem; class KUrl; class QDropEvent; -class QWidget; class KonqOperations; class LIBDOLPHINPRIVATE_EXPORT DragAndDropHelper diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h index 4fd8f843e..f6d8b8f26 100644 --- a/src/views/tooltips/tooltipmanager.h +++ b/src/views/tooltips/tooltipmanager.h @@ -25,11 +25,7 @@ #include -class DolphinModel; -class DolphinSortFilterProxyModel; class FileMetaDataToolTip; -class QAbstractItemView; -class QModelIndex; class QTimer; /** -- cgit v1.3 From 31a0c4fbd59c93a48f093be62b8ef19e6839de37 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 18 Oct 2014 14:42:41 +0200 Subject: Fix includes --- src/dolphincontextmenu.cpp | 2 +- src/dolphinmainwindow.cpp | 2 +- src/dolphinpart.cpp | 2 +- src/dolphinviewcontainer.cpp | 2 +- src/filterbar/filterbar.cpp | 2 +- src/kitemviews/kfileitemlistview.cpp | 2 +- src/kitemviews/kfileitemmodel.cpp | 2 +- src/kitemviews/kstandarditemlistwidget.cpp | 2 +- src/kitemviews/private/kbaloorolesprovider.cpp | 2 +- src/kitemviews/private/kfileitemmodeldirlister.cpp | 2 +- src/main.cpp | 2 +- src/panels/folders/treeviewcontextmenu.cpp | 2 +- src/panels/information/filemetadataconfigurationdialog.cpp | 4 ++-- src/panels/information/informationpanelcontent.cpp | 2 +- src/panels/information/phononwidget.cpp | 2 +- src/panels/places/placesitem.cpp | 2 +- src/panels/places/placesitemeditdialog.cpp | 2 +- src/panels/places/placesitemmodel.cpp | 2 +- src/panels/places/placespanel.cpp | 2 +- src/search/dolphinfacetswidget.cpp | 2 +- src/search/dolphinsearchbox.cpp | 2 +- src/settings/additionalinfodialog.cpp | 3 ++- src/settings/dolphinsettingsdialog.cpp | 2 +- src/settings/general/behaviorsettingspage.cpp | 2 +- src/settings/general/configurepreviewplugindialog.cpp | 2 +- src/settings/general/confirmationssettingspage.cpp | 2 +- src/settings/general/generalsettingspage.cpp | 2 +- src/settings/general/previewssettingspage.cpp | 2 +- src/settings/general/statusbarsettingspage.cpp | 2 +- src/settings/kcm/kcmdolphingeneral.cpp | 2 +- src/settings/kcm/kcmdolphinnavigation.cpp | 2 +- src/settings/kcm/kcmdolphinservices.cpp | 2 +- src/settings/kcm/kcmdolphinviewmodes.cpp | 2 +- src/settings/navigation/navigationsettingspage.cpp | 2 +- src/settings/services/servicessettingspage.cpp | 2 +- src/settings/startup/startupsettingspage.cpp | 2 +- src/settings/viewmodes/dolphinfontrequester.cpp | 2 +- src/settings/viewmodes/viewsettingspage.cpp | 2 +- src/settings/viewmodes/viewsettingstab.cpp | 2 +- src/settings/viewpropertiesdialog.cpp | 2 +- src/settings/viewpropsprogressinfo.cpp | 2 +- src/statusbar/dolphinstatusbar.cpp | 2 +- src/statusbar/statusbarspaceinfo.cpp | 2 +- src/views/dolphinremoteencoding.cpp | 2 +- src/views/dolphinview.cpp | 2 +- src/views/dolphinviewactionhandler.cpp | 2 +- src/views/draganddrophelper.cpp | 2 +- src/views/renamedialog.cpp | 2 +- src/views/versioncontrol/versioncontrolobserver.cpp | 2 +- src/views/viewproperties.cpp | 2 +- 50 files changed, 52 insertions(+), 51 deletions(-) (limited to 'src/filterbar/filterbar.cpp') diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 84a09f4d2..f3337a691 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index e99788621..e6ef74ef3 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index e3479d3b8..9d4de3fe9 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 0f3aa9761..25207b5b7 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index b850469bf..4a43dbd23 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include FilterBar::FilterBar(QWidget* parent) : diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index aee10b5bd..bb918d0de 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -22,7 +22,7 @@ #include "kfileitemmodelrolesupdater.h" #include "kfileitemlistwidget.h" #include "kfileitemmodel.h" -#include +#include #include #include "private/kpixmapmodifier.h" diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 4d5879f4d..25507c23d 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -22,7 +22,7 @@ #include "kfileitemmodel.h" #include -#include +#include #include #include #include //TODO: port to QCollator diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index eaed056e5..b8557c67f 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index 74f789e23..5ca56c58b 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp index 9dfd17d8e..d5c8bbb18 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.cpp +++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "kfileitemmodeldirlister.h" -#include +#include #include KFileItemModelDirLister::KFileItemModelDirLister(QObject* parent) : diff --git a/src/main.cpp b/src/main.cpp index ca047bd16..91d32a08a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 56e6d44b3..445b261b9 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index 15f1f4f5f..08723bc0c 100644 --- a/src/panels/information/filemetadataconfigurationdialog.cpp +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -24,8 +24,8 @@ #else #include #endif - -#include +#include +#include #include #include diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 259b672d3..0ec82a424 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 16dbabfed..27cd3e746 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include class EmbeddedVideoPlayer : public Phonon::VideoWidget { diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index b82e50256..e667af302 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "placesitemsignalhandler.h" #include #include diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 9a239b786..87fbf4c29 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index aa7f720b4..344e176a3 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 16686f92e..cdc1ebb1a 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp index 8e1a9c470..b183eb8a1 100644 --- a/src/search/dolphinfacetswidget.cpp +++ b/src/search/dolphinfacetswidget.cpp @@ -19,7 +19,7 @@ #include "dolphinfacetswidget.h" -#include +#include #include #include #include diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index b8b1dbbca..94365c7de 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 9cce603f5..4d1b69c83 100644 --- a/src/settings/additionalinfodialog.cpp +++ b/src/settings/additionalinfodialog.cpp @@ -21,7 +21,8 @@ #include -#include +#include +#include #include "kitemviews/kfileitemmodel.h" #include #include diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 533a7f089..43d95a0c6 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -30,7 +30,7 @@ #include "viewmodes/viewsettingspage.h" #include "trash/trashsettingspage.h" -#include +#include #include #include diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 635a1b2c4..af5308028 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index ce70e2bad..9e0f5152b 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -20,7 +20,7 @@ #include "configurepreviewplugindialog.h" #include -#include +#include #include #include diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index 532821159..b04ab6192 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 3b196e837..07a31bc49 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -27,7 +27,7 @@ #include "statusbarsettingspage.h" #include -#include +#include #include #include diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 7ca5506fa..bd087f1ea 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp index 78ee3856b..cb6ae6cd4 100644 --- a/src/settings/general/statusbarsettingspage.cpp +++ b/src/settings/general/statusbarsettingspage.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 821e37a04..82b216c3c 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index 6265df586..e7892a246 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index 150ea6d6d..ff0b09318 100644 --- a/src/settings/kcm/kcmdolphinservices.cpp +++ b/src/settings/kcm/kcmdolphinservices.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 9f2829c1b..83d697712 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 5894599a1..10e009faa 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index da49c7d0a..f258b53e2 100644 --- a/src/settings/services/servicessettingspage.cpp +++ b/src/settings/services/servicessettingspage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index 8e8cf9e73..f1cdfecb8 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index 278fb0933..e5427f9f3 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 941b211ef..2639c8bb4 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 6f442099f..2169ca955 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -25,7 +25,7 @@ #include "dolphin_iconsmodesettings.h" #include -#include +#include #include #include diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 576154f2b..20229a34b 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index 13998cf87..a75547609 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 5feeaa361..4892ee7a8 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 43d9f342d..dd909beb4 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -22,7 +22,7 @@ #include "spaceinfoobserver.h" -#include +#include #include #include diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 97a15313a..059b898e5 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index b3df1ebd6..189849376 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 41c3a5dca..c3d4319a2 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 5bae50ef7..0dada5e55 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -21,7 +21,7 @@ #include "draganddrophelper.h" #include -#include +#include #include #include #include diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index e9fda4a56..82c4c8b9d 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -20,7 +20,7 @@ #include "renamedialog.h" #include -#include +#include #include #include #include diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index c7677de53..dca99ed11 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -21,7 +21,7 @@ #include "dolphin_versioncontrolsettings.h" -#include +#include #include #include #include diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 95c44bc84..06097977d 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -24,7 +24,7 @@ #include "dolphin_generalsettings.h" #include -#include +#include #include #include #include -- cgit v1.3 From 02c08351489ed7b649e6409bf529773bab5136d8 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 10 Nov 2014 09:08:04 +0100 Subject: KLineEdit to QLineEdit --- src/dolphinmainwindow.cpp | 2 +- src/filterbar/filterbar.cpp | 8 ++++---- src/filterbar/filterbar.h | 4 ++-- src/panels/places/placesitemeditdialog.cpp | 8 ++++---- src/panels/places/placesitemeditdialog.h | 4 ++-- src/search/dolphinsearchbox.cpp | 10 +++++----- src/settings/startup/startupsettingspage.cpp | 8 ++++---- src/settings/startup/startupsettingspage.h | 4 ++-- src/views/renamedialog.cpp | 6 +++--- src/views/renamedialog.h | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/filterbar/filterbar.cpp') diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 637d46a01..81aa1e810 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 4a43dbd23..82d5f549e 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include FilterBar::FilterBar(QWidget* parent) : QWidget(parent) @@ -51,10 +51,10 @@ FilterBar::FilterBar(QWidget* parent) : QLabel* filterLabel = new QLabel(i18nc("@label:textbox", "Filter:"), this); // Create filter editor - m_filterInput = new KLineEdit(this); + m_filterInput = new QLineEdit(this); m_filterInput->setLayoutDirection(Qt::LeftToRight); - m_filterInput->setClearButtonShown(true); - connect(m_filterInput, &KLineEdit::textChanged, + m_filterInput->setClearButtonEnabled(true); + connect(m_filterInput, &QLineEdit::textChanged, this, &FilterBar::filterChanged); setFocusProxy(m_filterInput); diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h index dd9b8b8bb..a275d1ea4 100644 --- a/src/filterbar/filterbar.h +++ b/src/filterbar/filterbar.h @@ -24,7 +24,7 @@ #include -class KLineEdit; +class QLineEdit; class QToolButton; /** @@ -78,7 +78,7 @@ protected: virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; private: - KLineEdit* m_filterInput; + QLineEdit* m_filterInput; QToolButton* m_lockButton; }; diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 59085e474..93a4d21f4 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) : QDialog(parent), @@ -137,17 +137,17 @@ void PlacesItemEditDialog::initialize() QFormLayout* formLayout = new QFormLayout(); vBox->addLayout( formLayout ); - m_textEdit = new KLineEdit(mainWidget); + m_textEdit = new QLineEdit(mainWidget); formLayout->addRow(i18nc("@label", "Label:"), m_textEdit); m_textEdit->setText(m_text); - m_textEdit->setClickMessage(i18n("Enter descriptive label here")); + m_textEdit->setPlaceholderText(i18n("Enter descriptive label here")); m_urlEdit = new KUrlRequester(m_url, mainWidget); m_urlEdit->setMode(KFile::Directory); formLayout->addRow(i18nc("@label", "Location:"), m_urlEdit); // Provide room for at least 40 chars (average char width is half of height) m_urlEdit->setMinimumWidth(m_urlEdit->fontMetrics().height() * (40 / 2)); - connect(m_urlEdit->lineEdit(), &KLineEdit::textChanged, this, &PlacesItemEditDialog::slotUrlChanged); + connect(m_urlEdit, &KUrlRequester::textChanged, this, &PlacesItemEditDialog::slotUrlChanged); m_iconButton = new KIconButton(mainWidget); formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton); diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h index f2bba546b..8a0dc0471 100644 --- a/src/panels/places/placesitemeditdialog.h +++ b/src/panels/places/placesitemeditdialog.h @@ -28,8 +28,8 @@ #include class KIconButton; -class KLineEdit; class KUrlRequester; +class QLineEdit; class QCheckBox; class QPushButton; @@ -69,7 +69,7 @@ private: bool m_allowGlobal; KUrlRequester* m_urlEdit; - KLineEdit* m_textEdit; + QLineEdit* m_textEdit; KIconButton* m_iconButton; QCheckBox* m_appLocal; QPushButton *m_okButton; diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 65d35539c..fe298312f 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -23,7 +23,7 @@ #include "dolphinfacetswidget.h" #include -#include +#include #include #include @@ -346,13 +346,13 @@ void DolphinSearchBox::init() connect(m_searchInput, &Baloo::QueryBuilder::textChanged, this, &DolphinSearchBox::slotSearchTextChanged); #else - m_searchInput = new KLineEdit(this); + m_searchInput = new QLineEdit(this); m_searchInput->installEventFilter(this); - m_searchInput->setClearButtonShown(true); + m_searchInput->setClearButtonEnabled(true); m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont)); - connect(m_searchInput, &KLineEdit::returnPressed, + connect(m_searchInput, &QLineEdit::returnPressed, this, &DolphinSearchBox::slotReturnPressed); - connect(m_searchInput, &KLineEdit::textChanged, + connect(m_searchInput, &QLineEdit::textChanged, this, &DolphinSearchBox::slotSearchTextChanged); #endif setFocusProxy(m_searchInput); diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index b4ca9ac2c..f7bcbc685 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -61,8 +61,8 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : homeUrlBox->setSpacing(spacing); new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox); - m_homeUrl = new KLineEdit(homeUrlBox); - m_homeUrl->setClearButtonShown(true); + m_homeUrl = new QLineEdit(homeUrlBox); + m_homeUrl->setClearButtonEnabled(true); QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme("folder-open"), QString(), homeUrlBox); @@ -102,7 +102,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : loadSettings(); - connect(m_homeUrl, &KLineEdit::textChanged, this, &StartupSettingsPage::slotSettingsChanged); + connect(m_homeUrl, &QLineEdit::textChanged, this, &StartupSettingsPage::slotSettingsChanged); connect(m_splitView, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_editableUrl, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_showFullPath, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h index aeb5d6333..9bcc31131 100644 --- a/src/settings/startup/startupsettingspage.h +++ b/src/settings/startup/startupsettingspage.h @@ -22,7 +22,7 @@ #include #include -class KLineEdit; +class QLineEdit; class QCheckBox; /** @@ -56,7 +56,7 @@ private: private: QUrl m_url; - KLineEdit* m_homeUrl; + QLineEdit* m_homeUrl; QCheckBox* m_splitView; QCheckBox* m_editableUrl; diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 7fdb486e1..c5001af08 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -19,7 +19,6 @@ #include "renamedialog.h" -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include #include RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : @@ -88,9 +88,9 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : page); } - m_lineEdit = new KLineEdit(page); + m_lineEdit = new QLineEdit(page); mainLayout->addWidget(m_lineEdit); - connect(m_lineEdit, &KLineEdit::textChanged, this, &RenameDialog::slotTextChanged); + connect(m_lineEdit, &QLineEdit::textChanged, this, &RenameDialog::slotTextChanged); int selectionLength = m_newName.length(); if (m_renameOneItem) { diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h index 045161ae4..86318c5c4 100644 --- a/src/views/renamedialog.h +++ b/src/views/renamedialog.h @@ -24,11 +24,11 @@ #include #include +#include -class KLineEdit; +class QLineEdit; class KIntSpinBox; class QPushButton; -#include /** * @brief Dialog for renaming a variable number of files. @@ -61,7 +61,7 @@ private: private: bool m_renameOneItem; QString m_newName; - KLineEdit* m_lineEdit; + QLineEdit* m_lineEdit; KFileItemList m_items; bool m_allExtensionsDifferent; KIntSpinBox* m_spinBox; -- cgit v1.3