Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: call QCoreApplication::applicationName() as static method

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-19 01:12:54 +03:00
parent f2badd9016
commit e5f56675d2
7 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdecore/kernel/kcomponentdata.cpp
View file

@ -168,7 +168,6 @@ KStandardDirs *KComponentData::dirs() const
{
Q_ASSERT(d);
d->lazyInit(*this);
return d->dirs;
}
@ -176,7 +175,6 @@ const KSharedConfig::Ptr &KComponentData::config() const
{
Q_ASSERT(d);
d->lazyInit(*this);
return d->sharedConfig;
}

4
kdecore/kernel/kcomponentdata_p.h
View file

@ -31,7 +31,7 @@ class KComponentDataPrivate
{
public:
KComponentDataPrivate(const KAboutData &aboutData_)
: dirs(0),
: dirs(nullptr),
aboutData(aboutData_),
refCount(1)
{
@ -40,7 +40,7 @@ public:
shouldRemoveCatalog = true;
} else {
shouldRemoveCatalog = false;
}
}
}
~KComponentDataPrivate()

13
kdecore/kernel/kglobal.cpp
View file

@ -53,8 +53,8 @@ class KGlobalPrivate
{
public:
inline KGlobalPrivate()
: locale(0),
charsets(0),
: locale(nullptr),
charsets(nullptr),
localeIsFromFakeComponent(false)
{
// the umask is read here before any threads are created to avoid race conditions
@ -66,9 +66,9 @@ class KGlobalPrivate
inline ~KGlobalPrivate()
{
delete locale;
locale = 0;
locale = nullptr;
delete charsets;
charsets = 0;
charsets = nullptr;
}
KComponentData activeComponent;
@ -275,10 +275,9 @@ QString KGlobal::caption()
} else if (d->mainComponent.isValid() && d->mainComponent.aboutData()) {
// We have some about data ?
return d->mainComponent.aboutData()->programName();
} else {
// Last resort : application name
return QCoreApplication::instance()->applicationName();
}
// Last resort : application name
return QCoreApplication::applicationName();
}
/**

2
kdecore/kernel/ktoolinvocation.cpp
View file

@ -215,7 +215,7 @@ void KToolInvocation::invokeHelp(const QString &anchor,
QString appname;
QString docPath;
if (_appname.isEmpty()) {
appname = QCoreApplication::instance()->applicationName();
appname = QCoreApplication::applicationName();
} else {
appname = _appname;
}

2
kdeui/actions/kstandardaction.cpp
View file

@ -119,7 +119,7 @@ KAction *create(StandardAction id, const QObject *recvr, const char *slot, QObje
else
aboutData = KGlobal::aboutData();
*/
QString appName = (aboutData) ? aboutData->programName() : qApp->applicationName();
QString appName = (aboutData) ? aboutData->programName() : QCoreApplication::applicationName();
sLabel = i18n( pInfo->psLabel, appName );
}
break;

8
kdeui/kernel/kapplication.cpp
View file

@ -292,7 +292,7 @@ QString KApplicationPrivate::sessionConfigName() const
QString sessKey = q->sessionKey();
if ( sessKey.isEmpty() && !sessionKey.isEmpty() )
sessKey = sessionKey;
return QString::fromLatin1("session/%1_%2_%3").arg(q->applicationName()).arg(q->sessionId()).arg(sessKey);
return QString::fromLatin1("session/%1_%2_%3").arg(QCoreApplication::applicationName()).arg(q->sessionId()).arg(sessKey);
}
#ifdef Q_WS_X11
@ -440,7 +440,7 @@ void KApplicationPrivate::init()
reversedDomain.prepend(s);
}
const QString pidSuffix = QString::number( getpid() ).prepend( QLatin1String("-") );
const QString serviceName = reversedDomain + q->applicationName() + pidSuffix;
const QString serviceName = reversedDomain + QCoreApplication::applicationName() + pidSuffix;
if ( bus->registerService(serviceName) == QDBusConnectionInterface::ServiceNotRegistered ) {
kError() << "Couldn't register name '" << serviceName << "' with DBUS - another process owns it already!";
::exit(126);
@ -456,7 +456,7 @@ void KApplicationPrivate::init()
KSharedConfig::Ptr config = componentData.config();
QByteArray readOnly = qgetenv("KDE_HOME_READONLY");
if (readOnly.isEmpty() && q->applicationName() != QLatin1String("kdialog"))
if (readOnly.isEmpty() && QCoreApplication::applicationName() != QLatin1String("kdialog"))
{
config->isConfigWritable(true);
}
@ -477,7 +477,7 @@ void KApplicationPrivate::init()
// HACK: KLauncher creates KApplication instance and KToolInvocation creates KLauncher instance
// (i.e recursion)
if (q->applicationName() != QLatin1String("klauncher")) {
if (QCoreApplication::applicationName() != QLatin1String("klauncher")) {
q->connect(
KToolInvocation::self(), SIGNAL(kapplication_hook(QStringList&,QByteArray&)),
q, SLOT(_k_KToolInvocation_hook(QStringList&,QByteArray&))

2
kdeui/widgets/kmainwindow.cpp
View file

@ -352,7 +352,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
q->winId(); // workaround for setWindowRole() crashing, and set also window role, just in case TT
q->setWindowRole( s ); // will keep insisting that object name suddenly should not be used for window role
dbusName = '/' + qApp->applicationName() + '/' + q->objectName().replace(QLatin1Char('/'), QLatin1Char('_'));
dbusName = '/' + QCoreApplication::applicationName() + '/' + q->objectName().replace(QLatin1Char('/'), QLatin1Char('_'));
// Clean up for dbus usage: any non-alphanumeric char should be turned into '_'
const int len = dbusName.length();
for ( int i = 0; i < len; ++i ) {