diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 93a4d21f4..cd04ea3f1 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -23,10 +23,9 @@ #include "placesitemeditdialog.h" -#include +#include #include #include -#include #include #include #include @@ -161,13 +160,7 @@ void PlacesItemEditDialog::initialize() } if (m_allowGlobal) { - QString appName; - if (KGlobal::mainComponent().aboutData()) { - appName = KGlobal::mainComponent().aboutData()->programName(); - } - if (appName.isEmpty()) { - appName = KGlobal::mainComponent().componentName(); - } + const QString appName = KAboutData::applicationData().displayName(); m_appLocal = new QCheckBox( i18n("&Only show when using this application (%1)", appName ), mainWidget ); m_appLocal->setChecked(false); vBox->addWidget(m_appLocal); diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index cfe6d2e46..0f5854656 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "placesitem.h" #include #include @@ -833,8 +833,8 @@ bool PlacesItemModel::acceptBookmark(const KBookmark& bookmark, const bool deviceAvailable = availableDevices.contains(udi); const bool allowedHere = (appName.isEmpty() - || appName == KGlobal::mainComponent().componentName() - || appName == KGlobal::mainComponent().componentName() + AppNamePrefix) + || appName == KAboutData::applicationData().componentName() + || appName == KAboutData::applicationData().componentName() + AppNamePrefix) && (m_fileIndexingEnabled || (url.scheme() != QLatin1String("timeline") && url.scheme() != QLatin1String("search"))); @@ -853,7 +853,7 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da // As long as the KFilePlacesView from kdelibs is available, the system-bookmarks // for "Recently Saved" and "Search For" should be a setting available only // in the Places Panel (see description of AppNamePrefix for more details). - const QString appName = KGlobal::mainComponent().componentName() + AppNamePrefix; + const QString appName = KAboutData::applicationData().componentName() + AppNamePrefix; bookmark.setMetaDataItem("OnlyInApp", appName); }