diff options
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/dolphinfileitemlistwidget.cpp | 14 | ||||
| -rw-r--r-- | src/views/dolphinitemlistview.cpp | 6 | ||||
| -rw-r--r-- | src/views/dolphinremoteencoding.cpp | 8 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 15 | ||||
| -rw-r--r-- | src/views/dolphinviewactionhandler.cpp | 88 | ||||
| -rw-r--r-- | src/views/draganddrophelper.cpp | 10 | ||||
| -rw-r--r-- | src/views/renamedialog.cpp | 6 | ||||
| -rw-r--r-- | src/views/tooltips/filemetadatatooltip.cpp | 2 | ||||
| -rw-r--r-- | src/views/versioncontrol/versioncontrolobserver.cpp | 2 | ||||
| -rw-r--r-- | src/views/viewproperties.cpp | 23 |
10 files changed, 90 insertions, 84 deletions
diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index f15230841..e7398af2d 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -93,25 +93,25 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe QString iconName; switch (version) { case KVersionControlPlugin::NormalVersion: - iconName = "vcs-normal"; + iconName = QStringLiteral("vcs-normal"); break; case KVersionControlPlugin::UpdateRequiredVersion: - iconName = "vcs-update-required"; + iconName = QStringLiteral("vcs-update-required"); break; case KVersionControlPlugin::LocallyModifiedVersion: - iconName = "vcs-locally-modified"; + iconName = QStringLiteral("vcs-locally-modified"); break; case KVersionControlPlugin::LocallyModifiedUnstagedVersion: - iconName = "vcs-locally-modified-unstaged"; + iconName = QStringLiteral("vcs-locally-modified-unstaged"); break; case KVersionControlPlugin::AddedVersion: - iconName = "vcs-added"; + iconName = QStringLiteral("vcs-added"); break; case KVersionControlPlugin::RemovedVersion: - iconName = "vcs-removed"; + iconName = QStringLiteral("vcs-removed"); break; case KVersionControlPlugin::ConflictingVersion: - iconName = "vcs-conflicting"; + iconName = QStringLiteral("vcs-conflicting"); break; case KVersionControlPlugin::UnversionedVersion: case KVersionControlPlugin::IgnoredVersion: diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp index 60c8bb97c..a3740cb26 100644 --- a/src/views/dolphinitemlistview.cpp +++ b/src/views/dolphinitemlistview.cpp @@ -95,9 +95,9 @@ void DolphinItemListView::readSettings() const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings"); const QStringList plugins = globalConfig.readEntry("Plugins", QStringList() - << "directorythumbnail" - << "imagethumbnail" - << "jpegthumbnail"); + << QStringLiteral("directorythumbnail") + << QStringLiteral("imagethumbnail") + << QStringLiteral("jpegthumbnail")); setEnabledPlugins(plugins); endTransaction(); diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 961a7c800..116168a4b 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -39,7 +39,7 @@ #include <KIO/Scheduler> #include <KConfigGroup> -#define DATA_KEY QLatin1String("Charset") +#define DATA_KEY QStringLiteral("Charset") DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionHandler* actionHandler) :QObject(parent), @@ -47,8 +47,8 @@ DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionH m_loaded(false), m_idDefault(0) { - m_menu = new KActionMenu(QIcon::fromTheme("character-set"), i18n("Select Remote Charset"), this); - m_actionHandler->actionCollection()->addAction("change_remote_encoding", m_menu); + m_menu = new KActionMenu(QIcon::fromTheme(QStringLiteral("character-set")), i18n("Select Remote Charset"), this); + m_actionHandler->actionCollection()->addAction(QStringLiteral("change_remote_encoding"), m_menu); connect(m_menu->menu(), &QMenu::aboutToShow, this, &DolphinRemoteEncoding::slotAboutToShow); @@ -206,7 +206,7 @@ void DolphinRemoteEncoding::slotDefault() break; } - domains << partList.join("."); + domains << partList.join(QLatin1Char('.')); partList.erase(partList.begin()); } diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 5023859df..c3df3a9a8 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -349,7 +349,9 @@ KFileItemList DolphinView::selectedItems() const const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); KFileItemList selectedItems; - foreach (int index, selectionManager->selectedItems()) { + const auto items = selectionManager->selectedItems(); + selectedItems.reserve(items.count()); + for (int index : items) { selectedItems.append(m_model->fileItem(index)); } return selectedItems; @@ -671,7 +673,7 @@ void DolphinView::trashSelectedItems() uiDelegate.setWindow(window()); if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) { KIO::Job* job = KIO::trash(list); - KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl("trash:/"), job); + KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job); KJobWidgets::setWindow(job, this); connect(job, &KIO::Job::result, this, &DolphinView::slotTrashFileFinished); @@ -816,7 +818,7 @@ void DolphinView::slotItemsActivated(const KItemSet& indexes) KFileItemList items; items.reserve(indexes.count()); - foreach (int index, indexes) { + for (int index : indexes) { KFileItem item = m_model->fileItem(index); const QUrl& url = openItemAsFolderUrl(item); @@ -939,6 +941,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) // Apply the current column-widths as custom column-widths and turn // off the automatic resizing of the columns QList<int> columnWidths; + columnWidths.reserve(view->visibleRoles().count()); foreach (const QByteArray& role, view->visibleRoles()) { columnWidths.append(header->columnWidth(role)); } @@ -960,6 +963,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) QList<int> columnWidths; if (!header->automaticColumnResizing()) { + columnWidths.reserve(view->visibleRoles().count()); foreach (const QByteArray& role, view->visibleRoles()) { columnWidths.append(header->columnWidth(role)); } @@ -1404,7 +1408,7 @@ void DolphinView::slotRenamingResult(KJob* job) const int index = m_model->index(newUrl); if (index >= 0) { QHash<QByteArray, QVariant> data; - const QUrl oldUrl = copyJob->srcUrls().first(); + const QUrl oldUrl = copyJob->srcUrls().at(0); data.insert("text", oldUrl.fileName()); m_model->setData(index, data); } @@ -1427,7 +1431,7 @@ void DolphinView::slotDirectoryLoadingCompleted() { // Update the view-state. This has to be done asynchronously // because the view might not be in its final state yet. - QTimer::singleShot(0, this, SLOT(updateViewState())); + QTimer::singleShot(0, this, &DolphinView::updateViewState); emit directoryLoadingCompleted(); @@ -1671,6 +1675,7 @@ QList<QUrl> DolphinView::simplifiedSelectedUrls() const QList<QUrl> urls; const KFileItemList items = selectedItems(); + urls.reserve(items.count()); foreach (const KFileItem& item, items) { urls.append(item.url()); } diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 99214d61b..858f9299b 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -97,30 +97,30 @@ void DolphinViewActionHandler::createActions() { // This action doesn't appear in the GUI, it's for the shortcut only. // KNewFileMenu takes care of the GUI stuff. - QAction* newDirAction = m_actionCollection->addAction("create_dir"); + QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir")); newDirAction->setText(i18nc("@action", "Create Folder...")); m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10); - newDirAction->setIcon(QIcon::fromTheme("folder-new")); + newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new"))); newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectory); // File menu - QAction* rename = m_actionCollection->addAction("rename"); + QAction* rename = m_actionCollection->addAction(QStringLiteral("rename")); rename->setText(i18nc("@action:inmenu File", "Rename...")); m_actionCollection->setDefaultShortcut(rename, Qt::Key_F2); - rename->setIcon(QIcon::fromTheme("edit-rename")); + rename->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename"))); connect(rename, &QAction::triggered, this, &DolphinViewActionHandler::slotRename); - QAction* moveToTrash = m_actionCollection->addAction("move_to_trash"); + QAction* moveToTrash = m_actionCollection->addAction(QStringLiteral("move_to_trash")); moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); - moveToTrash->setIcon(QIcon::fromTheme("user-trash")); + moveToTrash->setIcon(QIcon::fromTheme(QStringLiteral("user-trash"))); m_actionCollection->setDefaultShortcut(moveToTrash, QKeySequence::Delete); connect(moveToTrash, &QAction::triggered, this, &DolphinViewActionHandler::slotTrashActivated); - QAction* deleteAction = m_actionCollection->addAction("delete"); - deleteAction->setIcon(QIcon::fromTheme("edit-delete")); + QAction* deleteAction = m_actionCollection->addAction(QStringLiteral("delete")); + deleteAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete"))); deleteAction->setText(i18nc("@action:inmenu File", "Delete")); m_actionCollection->setDefaultShortcut(deleteAction, Qt::SHIFT | Qt::Key_Delete); connect(deleteAction, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems); @@ -129,17 +129,17 @@ void DolphinViewActionHandler::createActions() // disabled and "delete" is enabled (e.g. non-local files), so that Key_Del // can be used for deleting the file (#76016). It needs to be a separate action // so that the Edit menu isn't affected. - QAction* deleteWithTrashShortcut = m_actionCollection->addAction("delete_shortcut"); + QAction* deleteWithTrashShortcut = m_actionCollection->addAction(QStringLiteral("delete_shortcut")); // The descriptive text is just for the shortcuts editor. deleteWithTrashShortcut->setText(i18nc("@action \"Move to Trash\" for non-local files, etc.", "Delete (using shortcut for Trash)")); m_actionCollection->setDefaultShortcut(deleteWithTrashShortcut, QKeySequence::Delete); deleteWithTrashShortcut->setEnabled(false); connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems); - QAction *propertiesAction = m_actionCollection->addAction( "properties" ); + QAction *propertiesAction = m_actionCollection->addAction( QStringLiteral("properties") ); // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :) propertiesAction->setText( i18nc("@action:inmenu File", "Properties") ); - propertiesAction->setIcon(QIcon::fromTheme("document-properties")); + propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties"))); m_actionCollection->setDefaultShortcuts(propertiesAction, {Qt::ALT + Qt::Key_Return, Qt::ALT + Qt::Key_Enter}); connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties); @@ -148,7 +148,7 @@ void DolphinViewActionHandler::createActions() KToggleAction* compactAction = compactModeAction(); KToggleAction* detailsAction = detailsModeAction(); - KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>("view_mode"); + KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode")); viewModeActions->setText(i18nc("@action:intoolbar", "View Mode")); viewModeActions->addAction(iconsAction); viewModeActions->addAction(compactAction); @@ -164,24 +164,24 @@ void DolphinViewActionHandler::createActions() SLOT(zoomOut()), m_actionCollection); - KToggleAction* showPreview = m_actionCollection->add<KToggleAction>("show_preview"); + KToggleAction* showPreview = m_actionCollection->add<KToggleAction>(QStringLiteral("show_preview")); showPreview->setText(i18nc("@action:intoolbar", "Preview")); showPreview->setToolTip(i18nc("@info", "Show preview of files and folders")); - showPreview->setIcon(QIcon::fromTheme("view-preview")); + showPreview->setIcon(QIcon::fromTheme(QStringLiteral("view-preview"))); connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview); - KToggleAction* sortDescending = m_actionCollection->add<KToggleAction>("descending"); + KToggleAction* sortDescending = m_actionCollection->add<KToggleAction>(QStringLiteral("descending")); sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); connect(sortDescending, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortOrder); - KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>("folders_first"); + KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>(QStringLiteral("folders_first")); sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First")); connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst); // View -> Sort By - QActionGroup* sortByActionGroup = createFileItemRolesActionGroup("sort_by_"); + QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_")); - KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>("sort"); + KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("sort")); sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By")); sortByActionMenu->setDelayed(false); @@ -193,9 +193,9 @@ void DolphinViewActionHandler::createActions() sortByActionMenu->addAction(sortFoldersFirst); // View -> Additional Information - QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup("show_"); + QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_")); - KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>("additional_info"); + KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("additional_info")); visibleRolesMenu->setText(i18nc("@action:inmenu View", "Additional Information")); visibleRolesMenu->setDelayed(false); @@ -203,18 +203,18 @@ void DolphinViewActionHandler::createActions() visibleRolesMenu->addAction(action); } - KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>("show_in_groups"); - showInGroups->setIcon(QIcon::fromTheme("view-group")); + KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups")); + showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group"))); showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting); - KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files"); + KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>(QStringLiteral("show_hidden_files")); showHiddenFiles->setText(i18nc("@action:inmenu View", "Hidden Files")); showHiddenFiles->setToolTip(i18nc("@info", "Visibility of hidden files and folders")); m_actionCollection->setDefaultShortcuts(showHiddenFiles, {Qt::ALT + Qt::Key_Period, Qt::Key_F8}); connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles); - QAction* adjustViewProps = m_actionCollection->addAction("view_properties"); + QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties")); adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties); } @@ -301,7 +301,7 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) const DolphinView::Mode mode = action->data().value<DolphinView::Mode>(); m_currentView->setMode(mode); - QAction* viewModeMenu = m_actionCollection->action("view_mode"); + QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode")); viewModeMenu->setIcon(action->icon()); } @@ -341,11 +341,11 @@ QString DolphinViewActionHandler::currentViewModeActionName() const { switch (m_currentView->mode()) { case DolphinView::IconsView: - return "icons"; + return QStringLiteral("icons"); case DolphinView::DetailsView: - return "details"; + return QStringLiteral("details"); case DolphinView::CompactView: - return "compact"; + return QStringLiteral("compact"); default: Q_ASSERT(false); break; @@ -364,11 +364,11 @@ void DolphinViewActionHandler::updateViewActions() if (viewModeAction) { viewModeAction->setChecked(true); - QAction* viewModeMenu = m_actionCollection->action("view_mode"); + QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode")); viewModeMenu->setIcon(viewModeAction->icon()); } - QAction* showPreviewAction = m_actionCollection->action("show_preview"); + QAction* showPreviewAction = m_actionCollection->action(QStringLiteral("show_preview")); showPreviewAction->setChecked(m_currentView->previewsShown()); slotSortOrderChanged(m_currentView->sortOrder()); @@ -412,14 +412,14 @@ void DolphinViewActionHandler::toggleSortFoldersFirst() void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order) { - QAction* descending = m_actionCollection->action("descending"); + QAction* descending = m_actionCollection->action(QStringLiteral("descending")); const bool sortDescending = (order == Qt::DescendingOrder); descending->setChecked(sortDescending); } void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst) { - m_actionCollection->action("folders_first")->setChecked(foldersFirst); + m_actionCollection->action(QStringLiteral("folders_first"))->setChecked(foldersFirst); } void DolphinViewActionHandler::toggleVisibleRole(QAction* action) @@ -466,7 +466,7 @@ void DolphinViewActionHandler::toggleGroupedSorting(bool grouped) void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting) { - QAction* showInGroupsAction = m_actionCollection->action("show_in_groups"); + QAction* showInGroupsAction = m_actionCollection->action(QStringLiteral("show_in_groups")); showInGroupsAction->setChecked(groupedSorting); } @@ -478,46 +478,46 @@ void DolphinViewActionHandler::toggleShowHiddenFiles(bool show) void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) { - QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); + QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files")); showHiddenFilesAction->setChecked(shown); - showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? "visibility" : "hint")); + showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("visibility") : QStringLiteral("hint"))); } void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) { - m_actionCollection->action("create_dir")->setEnabled(isFolderWritable); + m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable); } KToggleAction* DolphinViewActionHandler::iconsModeAction() { - KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons"); + KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("icons")); iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); iconsView->setToolTip(i18nc("@info", "Icons view mode")); m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_1); - iconsView->setIcon(QIcon::fromTheme("view-list-icons")); + iconsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-icons"))); iconsView->setData(QVariant::fromValue(DolphinView::IconsView)); return iconsView; } KToggleAction* DolphinViewActionHandler::compactModeAction() { - KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("compact"); + KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("compact")); iconsView->setText(i18nc("@action:inmenu View Mode", "Compact")); iconsView->setToolTip(i18nc("@info", "Compact view mode")); m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_2); - iconsView->setIcon(QIcon::fromTheme("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name + iconsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-details"))); // TODO: discuss with Oxygen-team the wrong (?) name iconsView->setData(QVariant::fromValue(DolphinView::CompactView)); return iconsView; } KToggleAction* DolphinViewActionHandler::detailsModeAction() { - KToggleAction* detailsView = m_actionCollection->add<KToggleAction>("details"); + KToggleAction* detailsView = m_actionCollection->add<KToggleAction>(QStringLiteral("details")); detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); detailsView->setToolTip(i18nc("@info", "Details view mode")); m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL | Qt::Key_3); - detailsView->setIcon(QIcon::fromTheme("view-list-tree")); + detailsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-tree"))); detailsView->setData(QVariant::fromValue(DolphinView::DetailsView)); return detailsView; } @@ -529,7 +529,7 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role) action->setChecked(true); if (!action->icon().isNull()) { - QAction* sortByMenu = m_actionCollection->action("sort"); + QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort")); sortByMenu->setIcon(action->icon()); } } @@ -557,7 +557,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action) // action-group that assures an exclusive toggle-state between the main-menu // actions and the sub-menu-actions. If an action gets checked, it must // be assured that all other actions get unchecked. - QAction* sortByMenu = m_actionCollection->action("sort"); + QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort")); foreach (QAction* groupAction, sortByMenu->menu()->actions()) { KActionMenu* actionMenu = qobject_cast<KActionMenu*>(groupAction); if (actionMenu) { diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index c0044c96e..01b41f8b2 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -32,13 +32,13 @@ KIO::DropJob* DragAndDropHelper::dropUrls(const QUrl& destUrl, QDropEvent* event, QWidget* window) { const QMimeData* mimeData = event->mimeData(); - if (mimeData->hasFormat("application/x-kde-ark-dndextract-service") && - mimeData->hasFormat("application/x-kde-ark-dndextract-path")) { - const QString remoteDBusClient = mimeData->data("application/x-kde-ark-dndextract-service"); - const QString remoteDBusPath = mimeData->data("application/x-kde-ark-dndextract-path"); + if (mimeData->hasFormat(QStringLiteral("application/x-kde-ark-dndextract-service")) && + mimeData->hasFormat(QStringLiteral("application/x-kde-ark-dndextract-path"))) { + const QString remoteDBusClient = mimeData->data(QStringLiteral("application/x-kde-ark-dndextract-service")); + const QString remoteDBusPath = mimeData->data(QStringLiteral("application/x-kde-ark-dndextract-path")); QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath, - "org.kde.ark.DndExtract", "extractSelectedFilesTo"); + QStringLiteral("org.kde.ark.DndExtract"), QStringLiteral("extractSelectedFilesTo")); message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)}); QDBusConnection::sessionBus().call(message); } else { diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 60b7b16c1..a514ede1e 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -60,11 +60,11 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : m_okButton = buttonBox->button(QDialogButtonBox::Ok); m_okButton->setDefault(true); m_okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccepted())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + connect(buttonBox, &QDialogButtonBox::accepted, this, &RenameDialog::slotAccepted); + connect(buttonBox, &QDialogButtonBox::rejected, this, &RenameDialog::reject); m_okButton->setDefault(true); - KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), "dialog-ok-apply")); + KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), QStringLiteral("dialog-ok-apply"))); QWidget* page = new QWidget(this); mainLayout->addWidget(page); diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp index 11b9ecd1d..8fbca290d 100644 --- a/src/views/tooltips/filemetadatatooltip.cpp +++ b/src/views/tooltips/filemetadatatooltip.cpp @@ -134,7 +134,7 @@ void FileMetaDataToolTip::setName(const QString& name) QTextLine line = textLayout.createLine(); while (line.isValid()) { line.setLineWidth(m_name->maximumWidth()); - wrappedText += processedName.mid(line.textStart(), line.textLength()); + wrappedText += processedName.midRef(line.textStart(), line.textLength()); line = textLayout.createLine(); if (line.isValid()) { diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 4b0d65029..c79440882 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -274,7 +274,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director // all fileview version control plugins and remember them in 'plugins'. const QStringList enabledPlugins = VersionControlSettings::enabledPlugins(); - const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin"); + const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin")); for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) { if (enabledPlugins.contains((*it)->name())) { KVersionControlPlugin* plugin = (*it)->createInstance<KVersionControlPlugin>(); diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 05c993585..597baa293 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -59,12 +59,12 @@ ViewProperties::ViewProperties(const QUrl& url) : // If the directory is not writable by the user or the directory is not local, // we store the properties information in a local file. if (useGlobalViewProps) { - m_filePath = destinationDir("global"); - } else if (url.scheme().contains("search")) { - m_filePath = destinationDir("search/") + directoryHashForUrl(url); + m_filePath = destinationDir(QStringLiteral("global")); + } else if (url.scheme().contains(QStringLiteral("search"))) { + m_filePath = destinationDir(QStringLiteral("search/")) + directoryHashForUrl(url); useDetailsViewWithPath = true; } else if (url.scheme() == QLatin1String("trash")) { - m_filePath = destinationDir("trash"); + m_filePath = destinationDir(QStringLiteral("trash")); useDetailsViewWithPath = true; } else if (url.isLocalFile()) { m_filePath = url.toLocalFile(); @@ -79,10 +79,10 @@ ViewProperties::ViewProperties(const QUrl& url) : // m_filePath probably begins with C:/ - the colon is not a valid character for paths though m_filePath = QDir::separator() + m_filePath.remove(QLatin1Char(':')); #endif - m_filePath = destinationDir("local") + m_filePath; + m_filePath = destinationDir(QStringLiteral("local")) + m_filePath; } } else { - m_filePath = destinationDir("remote") + m_filePath; + m_filePath = destinationDir(QStringLiteral("remote")) + m_filePath; } const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName; @@ -249,6 +249,7 @@ void ViewProperties::setVisibleRoles(const QList<QByteArray>& roles) } // Add the updated values for the current view-mode + newVisibleRoles.reserve(roles.count()); foreach (const QByteArray& role, roles) { newVisibleRoles.append(prefix + role); } @@ -385,9 +386,9 @@ QString ViewProperties::viewModePrefix() const QString prefix; switch (m_node->viewMode()) { - case DolphinView::IconsView: prefix = "Icons_"; break; - case DolphinView::CompactView: prefix = "Compact_"; break; - case DolphinView::DetailsView: prefix = "Details_"; break; + case DolphinView::IconsView: prefix = QStringLiteral("Icons_"); break; + case DolphinView::CompactView: prefix = QStringLiteral("Compact_"); break; + case DolphinView::DetailsView: prefix = QStringLiteral("Details_"); break; default: qCWarning(DolphinDebug) << "Unknown view-mode of the view properties"; } @@ -411,7 +412,7 @@ void ViewProperties::convertAdditionalInfo() if (index >= 0 && index + 1 < visibleRole.length()) { ++index; if (visibleRole[index] == QLatin1Char('L')) { - visibleRole.replace("LinkDestination", "destination"); + visibleRole.replace(QLatin1String("LinkDestination"), QLatin1String("destination")); } else { visibleRole[index] = visibleRole[index].toLower(); } @@ -438,7 +439,7 @@ void ViewProperties::convertNameRoleToTextRole() QString sortRole = m_node->sortRole(); if (sortRole == QLatin1String("name")) { - sortRole = QLatin1String("text"); + sortRole = QStringLiteral("text"); } m_node->setVisibleRoles(visibleRoles); |