diff options
| author | Christoph Feck <[email protected]> | 2019-03-18 23:00:25 +0100 |
|---|---|---|
| committer | Christoph Feck <[email protected]> | 2019-03-18 23:00:25 +0100 |
| commit | b2b1f76031f872b42ae060dbb7a2f98d9b90496c (patch) | |
| tree | b175968ed8de0f4cc4f035c986709ee0ea880cd5 /src/dolphinviewcontainer.cpp | |
| parent | 81ff2a73f9d0985bca9e22f4e56d2b6738d15b4c (diff) | |
| parent | 5b463d82fed9a443b098888c0aee8a7b3b322666 (diff) | |
Merge remote-tracking branch 'origin/Applications/19.04'
Diffstat (limited to 'src/dolphinviewcontainer.cpp')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index cdce157eb..e21262977 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -30,6 +30,9 @@ #include "views/viewmodecontroller.h" #include "views/viewproperties.h" +#ifdef HAVE_KACTIVITIES +#include <KActivities/ResourceInstance> +#endif #include <KFileItemActions> #include <KFilePlacesModel> #include <KIO/PreviewJob> @@ -63,8 +66,8 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : m_statusBarTimer(nullptr), m_statusBarTimestamp(), m_autoGrabFocus(true) -#ifdef KActivities_FOUND - , m_activityResourceInstance(0) +#ifdef HAVE_KACTIVITIES + , m_activityResourceInstance(nullptr) #endif { hide(); @@ -221,11 +224,10 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : // Initialize kactivities resource instance - #ifdef KActivities_FOUND - m_activityResourceInstance = new KActivities::ResourceInstance( - window()->winId(), url); +#ifdef HAVE_KACTIVITIES + m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url); m_activityResourceInstance->setParent(this); - #endif +#endif } DolphinViewContainer::~DolphinViewContainer() @@ -243,13 +245,13 @@ void DolphinViewContainer::setActive(bool active) m_urlNavigator->setActive(active); m_view->setActive(active); - #ifdef KActivities_FOUND +#ifdef HAVE_KACTIVITIES if (active) { m_activityResourceInstance->notifyFocusedIn(); } else { m_activityResourceInstance->notifyFocusedOut(); } - #endif +#endif } bool DolphinViewContainer::isActive() const @@ -469,9 +471,9 @@ void DolphinViewContainer::setUrl(const QUrl& newUrl) m_urlNavigator->setLocationUrl(newUrl); } - #ifdef KActivities_FOUND +#ifdef HAVE_KACTIVITIES m_activityResourceInstance->setUri(newUrl); - #endif +#endif } void DolphinViewContainer::setFilterBarVisible(bool visible) |