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

KGlobal::mainComponent().componentName() should be replaced with QCoreApplication::instance()->applicationName()

Browse Source
This commit is contained in:
Jignesh Kakadiya 2012-06-18 13:11:26 +05:30
parent 5534b9cfa0
commit 362a0a9372
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
abstracttoolbox.cpp
View File

@ -19,6 +19,8 @@
#include "abstracttoolbox.h" #include "abstracttoolbox.h"
#include <QCoreApplication>
#include "containment.h" #include "containment.h"
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
@ -78,7 +80,7 @@ KPluginInfo::List AbstractToolBox::listToolBoxInfo(const QString
{ {
KPluginInfo::List list; KPluginInfo::List list;
if (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName()) { if (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName()) {
list = KPluginInfo::List(); list = KPluginInfo::List();
} }

5
coronabase.cpp
View File

@ -35,7 +35,6 @@
#include <kaction.h> #include <kaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kshortcutsdialog.h> #include <kshortcutsdialog.h>
@ -91,7 +90,7 @@ void CoronaBase::setDefaultContainmentPlugin(const QString &name)
{ {
// we could check if it is in: // we could check if it is in:
// Containment::listContainments().contains(name) || // Containment::listContainments().contains(name) ||
// Containment::listContainments(QString(), KGlobal::mainComponent().componentName()).contains(name) // Containment::listContainments(QString(), QCoreApplication::instance()->applicationName()).contains(name)
// but that seems like overkill // but that seems like overkill
d->defaultContainmentPlugin = name; d->defaultContainmentPlugin = name;
} }
@ -454,7 +453,7 @@ CoronaBasePrivate::CoronaBasePrivate(CoronaBase *corona)
actions(corona) actions(corona)
{ {
if (KGlobal::hasMainComponent()) { if (KGlobal::hasMainComponent()) {
configName = KGlobal::mainComponent().componentName() + "-appletsrc"; configName = QCoreApplication::instance()->applicationName() + "-appletsrc";
} else { } else {
configName = "plasma-appletsrc"; configName = "plasma-appletsrc";
} }

9
pluginloader.cpp
View File

@ -20,7 +20,6 @@
#include "pluginloader.h" #include "pluginloader.h"
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h>
#include <kservice.h> #include <kservice.h>
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -401,7 +400,7 @@ KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QS
{ {
KPluginInfo::List list; KPluginInfo::List list;
if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) { if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
list = internalAppletInfo(category); list = internalAppletInfo(category);
} }
@ -435,7 +434,7 @@ KPluginInfo::List PluginLoader::listDataEngineInfo(const QString &parentApp)
{ {
KPluginInfo::List list; KPluginInfo::List list;
if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) { if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
list = internalDataEngineInfo(); list = internalDataEngineInfo();
} }
@ -454,7 +453,7 @@ KPluginInfo::List PluginLoader::listRunnerInfo(const QString &parentApp)
{ {
KPluginInfo::List list; KPluginInfo::List list;
if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) { if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
list = internalRunnerInfo(); list = internalRunnerInfo();
} }
@ -473,7 +472,7 @@ KPluginInfo::List PluginLoader::listContainmentActionsInfo(const QString &parent
{ {
KPluginInfo::List list; KPluginInfo::List list;
if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) { if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
list = internalContainmentActionsInfo(); list = internalContainmentActionsInfo();
} }