Port away from KGlobal::mainComponent()

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 93a4d21f40ef25fc390ccc858a099a10dce583b4..cd04ea3f1790acccb3d5f6914898d9ff3a387f01 100644 (file)
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -23,10 +23,9 @@
 
 #include "placesitemeditdialog.h"
 
 
 #include "placesitemeditdialog.h"
 

-#include <k4aboutdata.h>
+#include <KAboutData>

 #include <KDebug>
 #include <KFile>
 #include <KDebug>
 #include <KFile>

-#include <KGlobal>

 #include <KIconButton>
 #include <KLocalizedString>
 #include <QMimeDatabase>
 #include <KIconButton>
 #include <KLocalizedString>
 #include <QMimeDatabase>


@@ -161,13 +160,7 @@ void PlacesItemEditDialog::initialize()
     }
 
     if (m_allowGlobal) {
     }
 
     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);
         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 cfe6d2e462dfdeb2d0ea97a4744d718df2737f3b..0f58546566e3ec8ec3c91bdf15209408fa4eb832 100644 (file)
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -35,7 +35,7 @@
 #include <KComponentData>
 #include <QStandardPaths>
 #include <KUser>
 #include <KComponentData>
 #include <QStandardPaths>
 #include <KUser>

-#include <KGlobal>
+#include <KAboutData>

 #include "placesitem.h"
 #include <QAction>
 #include <QDate>
 #include "placesitem.h"
 #include <QAction>
 #include <QDate>


@@ -833,8 +833,8 @@ bool PlacesItemModel::acceptBookmark(const KBookmark& bookmark,
     const bool deviceAvailable = availableDevices.contains(udi);
 
     const bool allowedHere = (appName.isEmpty()
     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")));
 
                              && (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).
         // 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);
     }
 
         bookmark.setMetaDataItem("OnlyInApp", appName);
     }