From 399c4b22ea9947047c7d2777d7f361df6b5e9636 Mon Sep 17 00:00:00 2001 From: Dawit Alemayehu Date: Wed, 12 Sep 2012 15:54:37 -0400 Subject: Corrected the compile fix commit, rev 965fc6b3. (cherry picked from commit 1e45cb9019e08ca574a997f2e41da5e3e47928b4) --- src/dolphinpart.cpp | 87 +++-------------------------------------------------- 1 file changed, 5 insertions(+), 82 deletions(-) (limited to 'src/dolphinpart.cpp') diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index a7e8bffec..ccc91fd7d 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -40,6 +40,11 @@ #include #include #include +#include + +#if KDE_IS_VERSION(4, 9, 2) +#include "dolphinpart_ext.h" +#endif #include "views/dolphinview.h" #include "views/dolphinviewactionhandler.h" @@ -664,86 +669,4 @@ KFileItemList DolphinPartFileInfoExtension::queryFor(KParts::FileInfoExtension:: return list; } -#if KDE_IS_VERSION(4, 9, 2) - -DolphinPartListingFilterExtension::DolphinPartListingFilterExtension (DolphinPart* part) - : KParts::ListingFilterExtension(part) - , m_part(part) -{ -} - -KParts::ListingFilterExtension::FilterModes DolphinPartListingFilterExtension::supportedFilterModes() const -{ - return (KParts::ListingFilterExtension::MimeType | - KParts::ListingFilterExtension::SubString | - KParts::ListingFilterExtension::WildCard); -} - -bool DolphinPartListingFilterExtension::supportsMultipleFilters (KParts::ListingFilterExtension::FilterMode mode) const -{ - if (mode == KParts::ListingFilterExtension::MimeType) - return true; - - return false; -} - -QVariant DolphinPartListingFilterExtension::filter (KParts::ListingFilterExtension::FilterMode mode) const -{ - QVariant result; - - switch (mode) { - case KParts::ListingFilterExtension::MimeType: - result = m_part->view()->mimeTypeFilters(); - break; - case KParts::ListingFilterExtension::SubString: - case KParts::ListingFilterExtension::WildCard: - result = m_part->view()->nameFilter(); - break; - default: - break; - } - - return result; -} - -void DolphinPartListingFilterExtension::setFilter (KParts::ListingFilterExtension::FilterMode mode, const QVariant& filter) -{ - switch (mode) { - case KParts::ListingFilterExtension::MimeType: - m_part->view()->setMimeTypeFilters(filter.toStringList()); - break; - case KParts::ListingFilterExtension::SubString: - case KParts::ListingFilterExtension::WildCard: - m_part->view()->setNameFilter(filter.toString()); - break; - default: - break; - } -} - -//// - -DolphinPartListingNotificationExtension::DolphinPartListingNotificationExtension(DolphinPart* part) - :KParts::ListingNotificationExtension(part) -{ -} - -KParts::ListingNotificationExtension::NotificationEventTypes DolphinPartListingNotificationExtension::supportedNotificationEventTypes() const -{ - return (KParts::ListingNotificationExtension::ItemsAdded | - KParts::ListingNotificationExtension::ItemsDeleted); -} - -void DolphinPartListingNotificationExtension::slotNewItems(const KFileItemList& items) -{ - emit listingEvent(KParts::ListingNotificationExtension::ItemsAdded, items); -} - -void DolphinPartListingNotificationExtension::slotItemsDeleted(const KFileItemList& items) -{ - emit listingEvent(KParts::ListingNotificationExtension::ItemsDeleted, items); -} - -#endif - #include "dolphinpart.moc" -- cgit v1.3