From: Dawit Alemayehu Date: Tue, 11 Sep 2012 20:40:32 +0000 (-0400) Subject: Fix compile against the minimum required kdelibs version (v4.7.97) X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7bccdf85f792ede6a66f7001f60278091b0df87b Fix compile against the minimum required kdelibs version (v4.7.97) --- diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index a957fa665..a7e8bffec 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -120,6 +120,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // Create file info and listing filter extensions. // NOTE: Listing filter needs to be instantiated after the creation of the view. new DolphinPartFileInfoExtension(this); + +#if KDE_IS_VERSION(4, 9, 2) new DolphinPartListingFilterExtension(this); KDirLister* lister = m_view->m_model->m_dirLister; @@ -130,6 +132,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL } else { kWarning() << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported"; } +#endif createActions(); m_actionHandler->updateViewActions(); @@ -661,6 +664,8 @@ KFileItemList DolphinPartFileInfoExtension::queryFor(KParts::FileInfoExtension:: return list; } +#if KDE_IS_VERSION(4, 9, 2) + DolphinPartListingFilterExtension::DolphinPartListingFilterExtension (DolphinPart* part) : KParts::ListingFilterExtension(part) , m_part(part) @@ -739,4 +744,6 @@ void DolphinPartListingNotificationExtension::slotItemsDeleted(const KFileItemLi emit listingEvent(KParts::ListingNotificationExtension::ItemsDeleted, items); } +#endif + #include "dolphinpart.moc" diff --git a/src/dolphinpart.h b/src/dolphinpart.h index 6cf9fe324..0895686b8 100644 --- a/src/dolphinpart.h +++ b/src/dolphinpart.h @@ -20,10 +20,15 @@ #ifndef DOLPHINPART_H #define DOLPHINPART_H +#include + #include #include #include + +#if KDE_IS_VERSION(4, 9, 2) #include +#endif #include @@ -282,6 +287,7 @@ protected: DolphinPart* part() const; }; +#if KDE_IS_VERSION(4, 9, 2) class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension { Q_OBJECT @@ -309,5 +315,6 @@ public Q_SLOTS: void slotNewItems(const KFileItemList&); void slotItemsDeleted(const KFileItemList&); }; +#endif #endif /* DOLPHINPART_H */