alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use QCoreApplication::applicationName() instead of KAboutData

Browse Source
This commit is contained in:
Aaron Seigo 2012-09-23 17:21:18 +02:00
parent 5652490a0e
commit 35590c27eb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
private/applet_p.cpp
View File

@ -28,12 +28,19 @@
#include <QGraphicsLayout> #include <QGraphicsLayout>
#include <QGraphicsView> #include <QGraphicsView>
#include <QHostInfo> #include <QHostInfo>
#include <qstandardpaths.h>
#include <kaction.h>
#include <kdebug.h>
#include <kkeysequencewidget.h>
#include <kstandarddirs.h>
#include "abstracttoolbox.h" #include "abstracttoolbox.h"
#include "containment.h" #include "containment.h"
#include "corona.h" #include "corona.h"
#include "pluginloader.h" #include "pluginloader.h"
#include "scripting/scriptengine.h" #include "scripting/scriptengine.h"
#include "scripting/appletscript.h"
#include "private/containment_p.h" #include "private/containment_p.h"
#if ENABLE_REMOTE_WIDGETS #if ENABLE_REMOTE_WIDGETS
@ -42,12 +49,6 @@
#include "remote/authorizationrule.h" #include "remote/authorizationrule.h"
#endif #endif
#include <kaction.h>
#include <kkeysequencewidget.h>
#include <kstandarddirs.h>
#include <kaboutdata.h>
#include <qstandardpaths.h>
namespace Plasma namespace Plasma
{ {
@ -566,8 +567,13 @@ void AppletPrivate::filterOffers(QList<KService::Ptr> &offers)
QString AppletPrivate::parentAppConstraint(const QString &parentApp) QString AppletPrivate::parentAppConstraint(const QString &parentApp)
{ {
if (parentApp.isEmpty()) { if (parentApp.isEmpty()) {
QCoreApplication *app = QCoreApplication::instance();
if (!app) {
return QString();
}
return QString("((not exist [X-KDE-ParentApp] or [X-KDE-ParentApp] == '') or [X-KDE-ParentApp] == '%1')") return QString("((not exist [X-KDE-ParentApp] or [X-KDE-ParentApp] == '') or [X-KDE-ParentApp] == '%1')")
.arg(KComponentData::mainComponent().aboutData()->appName()); .arg(app->applicationName());
} }
return QString("[X-KDE-ParentApp] == '%1'").arg(parentApp); return QString("[X-KDE-ParentApp] == '%1'").arg(parentApp);