From 5c1b5a284ff2158e87f5b89a47ade74646ba6cb2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 15 Mar 2024 05:02:56 +0200 Subject: [PATCH] generic: remove konqueror leftovers Signed-off-by: Ivailo Monev --- .../src/settings/kcm/kcmdolphinviewmodes.cpp | 10 ---------- dolphin/src/settings/kcm/kcmdolphinviewmodes.h | 3 --- keditfiletype/filetypesview.cpp | 17 +---------------- keditfiletype/keditfiletype.cpp | 8 +------- kurifilter-plugins/shorturi/kshorturifilter.cpp | 2 +- libs/konq/tests/konqpopupmenutest.cpp | 6 +++--- 6 files changed, 6 insertions(+), 40 deletions(-) diff --git a/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp b/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp index a64a1fe9..d5fbdd45 100644 --- a/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -28,8 +28,6 @@ #include -#include -#include #include #include #include @@ -84,7 +82,6 @@ void DolphinViewModesConfigModule::save() foreach (ViewSettingsTab* tab, m_tabs) { tab->applySettings(); } - reparseConfiguration(); } void DolphinViewModesConfigModule::defaults() @@ -92,13 +89,6 @@ void DolphinViewModesConfigModule::defaults() foreach (ViewSettingsTab* tab, m_tabs) { tab->restoreDefaultSettings(); } - reparseConfiguration(); -} - -void DolphinViewModesConfigModule::reparseConfiguration() -{ - QDBusMessage message = QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration"); - QDBusConnection::sessionBus().send(message); } void DolphinViewModesConfigModule::viewModeChanged() diff --git a/dolphin/src/settings/kcm/kcmdolphinviewmodes.h b/dolphin/src/settings/kcm/kcmdolphinviewmodes.h index 3181198f..24e8b816 100644 --- a/dolphin/src/settings/kcm/kcmdolphinviewmodes.h +++ b/dolphin/src/settings/kcm/kcmdolphinviewmodes.h @@ -38,9 +38,6 @@ public: virtual void save(); virtual void defaults(); -private: - void reparseConfiguration(); - private Q_SLOTS: void viewModeChanged(); diff --git a/keditfiletype/filetypesview.cpp b/keditfiletype/filetypesview.cpp index deda37d5..8dfeed8d 100644 --- a/keditfiletype/filetypesview.cpp +++ b/keditfiletype/filetypesview.cpp @@ -26,10 +26,8 @@ // Qt #include #include -#include +#include #include -#include -#include // KDE #include @@ -398,11 +396,9 @@ void FileTypesView::save() { bool needUpdateMimeDb = false; bool needUpdateSycoca = false; - bool didIt = false; // first, remove those items which we are asked to remove. Q_FOREACH(const QString& mime, removedList) { MimeTypeWriter::removeOwnMimeType(mime); - didIt = true; needUpdateMimeDb = true; needUpdateSycoca = true; // remove offers for this mimetype } @@ -417,7 +413,6 @@ void FileTypesView::save() kDebug() << "Entry " << tli->name() << " is dirty. Saving."; if (tli->mimeTypeData().sync()) needUpdateMimeDb = true; - didIt = true; } ++it1; } @@ -428,7 +423,6 @@ void FileTypesView::save() kDebug() << "Entry " << tli->name() << " is dirty. Saving."; if (tli->mimeTypeData().sync()) needUpdateMimeDb = true; - didIt = true; } } @@ -443,15 +437,6 @@ void FileTypesView::save() KBuildSycocaProgressDialog::rebuildKSycoca(this); } - if (didIt) { // TODO make more specific: only if autoEmbed changed? Well, maybe this is useful for icon and glob changes too... - // Trigger reparseConfiguration of filetypesrc in konqueror - // TODO: the same for dolphin. Or we should probably define a global signal for this. - // Or a KGlobalSettings thing. - QDBusMessage message = - QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration"); - QDBusConnection::sessionBus().send(message); - } - updateDisplay(typesLV->currentItem()); } diff --git a/keditfiletype/keditfiletype.cpp b/keditfiletype/keditfiletype.cpp index 8632492b..b6408770 100644 --- a/keditfiletype/keditfiletype.cpp +++ b/keditfiletype/keditfiletype.cpp @@ -22,9 +22,7 @@ #include "mimetypewriter.h" // Qt -#include -#include -#include +#include // KDE #include @@ -80,10 +78,6 @@ void FileTypeDialog::save() MimeTypeWriter::runUpdateMimeDatabase(); if (servicesDirty) KBuildSycocaProgressDialog::rebuildKSycoca(this); - // Trigger reparseConfiguration of filetypesrc in konqueror - QDBusMessage message = - QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration"); - QDBusConnection::sessionBus().send(message); } } diff --git a/kurifilter-plugins/shorturi/kshorturifilter.cpp b/kurifilter-plugins/shorturi/kshorturifilter.cpp index 1f6419c9..7f9c696a 100644 --- a/kurifilter-plugins/shorturi/kshorturifilter.cpp +++ b/kurifilter-plugins/shorturi/kshorturifilter.cpp @@ -325,7 +325,7 @@ bool KShortUriFilter::filterUri( KUriFilterData& data ) const exists = ( KDE::stat( path, &buff ) == 0 ); if ( !exists ) { - // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter + // Support for name filter (/foo/*.txt) // If the app using this filter doesn't support it, well, it'll simply error out itself int lastSlash = path.lastIndexOf( '/' ); if ( lastSlash > -1 && path.indexOf( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments diff --git a/libs/konq/tests/konqpopupmenutest.cpp b/libs/konq/tests/konqpopupmenutest.cpp index d882d518..173179e7 100644 --- a/libs/konq/tests/konqpopupmenutest.cpp +++ b/libs/konq/tests/konqpopupmenutest.cpp @@ -315,7 +315,7 @@ void KonqPopupMenuTest::testViewDirectory() beflags |= KonqPopupMenu::ShowUrlOperations; beflags |= KonqPopupMenu::ShowProperties; - // KonqMainWindow says: doTabHandling = !openedForViewURL && ... So we don't add tabhandling here + // doTabHandling = !openedForViewURL && ... So we don't add tabhandling here KonqPopupMenu::ActionGroupMap actionGroups; actionGroups.insert("preview", m_previewActions->actions()); @@ -359,7 +359,7 @@ void KonqPopupMenuTest::testViewReadOnlyDirectory() beflags |= KonqPopupMenu::ShowUrlOperations; beflags |= KonqPopupMenu::ShowProperties; - // KonqMainWindow says: doTabHandling = !openedForViewURL && ... So we don't add tabhandling here + // doTabHandling = !openedForViewURL && ... So we don't add tabhandling here KonqPopupMenu::ActionGroupMap actionGroups; actionGroups.insert("preview", m_previewActions->actions()); @@ -430,7 +430,7 @@ void KonqPopupMenuTest::testHtmlPage() beflags |= KonqPopupMenu::ShowNavigationItems; KonqPopupMenu::ActionGroupMap actionGroups; - // KonqMainWindow says: doTabHandling = !openedForViewURL && ... So we don't add tabhandling here + // doTabHandling = !openedForViewURL && ... So we don't add tabhandling here // TODO we could just move that logic to KonqPopupMenu... //actionGroups.insert("tabhandling", m_tabHandlingActions->actions()); actionGroups.insert("preview", m_previewActions->actions());