Commit 6047f0a7 authored by Volker Krause's avatar Volker Krause
Browse files

Port away from KStandardDirs.

parent 86e2ff70
......@@ -34,7 +34,6 @@
#include <KTimeZone>
#include <KLocalizedString>
#include <kstandarddirs.h>
#include <kio/netaccess.h>
#include <kfileitem.h>
#include <KSharedConfig>
......@@ -591,7 +590,7 @@ bool AlarmCalendar::importAlarms(QWidget* parent, Collection* collection)
if (local)
{
filename = url.toLocalFile();
if (!KStandardDirs::exists(filename))
if (!QFile::exists(filename))
{
qCDebug(KALARM_LOG) << "File '" << url.toDisplayString() <<"' not found";
KAMessageBox::error(parent, xi18nc("@info", "Could not load calendar <filename>%1</filename>.", url.toDisplayString()));
......
......@@ -44,7 +44,6 @@
#include <kalarmcal/karecurrence.h>
#include <KLocalizedString>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <KSharedConfig>
#include <K4AboutData>
......@@ -169,7 +168,7 @@ KAlarmApp::KAlarmApp()
if (!mSpeechEnabled) { qCDebug(KALARM_LOG) << "Speech synthesis disabled (KTTSD not found)"; }
// Check if KOrganizer is installed
const QString korg = QStringLiteral("korganizer");
mKOrganizerEnabled = !QStandardPaths::findExecutable(korg).isNull() || !KStandardDirs::findExe(korg).isNull();
mKOrganizerEnabled = !QStandardPaths::findExecutable(korg).isEmpty();
if (!mKOrganizerEnabled) { qCDebug(KALARM_LOG) << "KOrganizer options disabled (KOrganizer not found)"; }
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment