Test Plan: Compiled.

Reviewers: #plasma, mart

Reviewed By: mart

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D2849
wilder-5.14
David Edmundson 10 years ago
parent bea84c8940
commit dc1e6ae260
  1. 6
      drkonqi/bugzillaintegration/reportassistantpages_base.cpp
  2. 3
      drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp
  3. 2
      klipper/clipcommandprocess.h
  4. 3
      runners/bookmarks/bookmarksrunner.cpp
  5. 2
      runners/windows/windowsrunner.cpp
  6. 1
      systemmonitor/kdedksysguard.cpp

@ -23,6 +23,7 @@
#include <QLabel> #include <QLabel>
#include <QCheckBox> #include <QCheckBox>
#include <QToolTip> #include <QToolTip>
#include <QDesktopServices>
#include <KToolInvocation> #include <KToolInvocation>
#include <KMessageBox> #include <KMessageBox>
@ -237,10 +238,11 @@ void ConclusionPage::finishClicked()
subject= subject.arg(crashedApp->datetime().toString(QStringLiteral("yyyy-MM-dd"))); subject= subject.arg(crashedApp->datetime().toString(QStringLiteral("yyyy-MM-dd")));
KToolInvocation::invokeMailer(reportAddress, QLatin1String(""), QLatin1String("") , subject, report); KToolInvocation::invokeMailer(reportAddress, QLatin1String(""), QLatin1String("") , subject, report);
} else { } else {
QUrl url(reportAddress);
if (QUrl(reportAddress).isRelative()) { //Scheme is missing if (QUrl(reportAddress).isRelative()) { //Scheme is missing
reportAddress = QString::fromLatin1("http://%1").arg(reportAddress); url = QUrl(QString::fromLatin1("http://%1").arg(reportAddress));
} }
KToolInvocation::invokeBrowser(reportAddress); QDesktopServices::openUrl(url);
} }
//Show a copy of the bug reported //Show a copy of the bug reported

@ -28,6 +28,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QTextBrowser> #include <QTextBrowser>
#include <QDesktopServices>
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply> #include <QtDBus/QDBusReply>
@ -759,7 +760,7 @@ void BugzillaSendPage::sendError(const QString & errorString, const QString & ex
void BugzillaSendPage::finishClicked() void BugzillaSendPage::finishClicked()
{ {
if (ui.m_launchPageOnFinish->isChecked() && !reportUrl.isEmpty()) { if (ui.m_launchPageOnFinish->isChecked() && !reportUrl.isEmpty()) {
KToolInvocation::invokeBrowser(reportUrl); QDesktopServices::openUrl(QUrl(reportUrl));
} }
if (ui.m_restartAppOnFinish->isChecked()) { if (ui.m_restartAppOnFinish->isChecked()) {
DrKonqi::crashedApplication()->restart(); DrKonqi::crashedApplication()->restart();

@ -25,7 +25,7 @@
class ClipAction; class ClipAction;
class History; class History;
class ClipCommand; struct ClipCommand;
class HistoryItem; class HistoryItem;
class ClipCommandProcess : public KProcess class ClipCommandProcess : public KProcess

@ -26,6 +26,7 @@
#include <QDir> #include <QDir>
#include <QUrl> #include <QUrl>
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <KLocalizedString> #include <KLocalizedString>
#include <KMimeTypeTrader> #include <KMimeTypeTrader>
@ -129,7 +130,7 @@ void BookmarksRunner::run(const Plasma::RunnerContext &context, const Plasma::Qu
url.setScheme(QStringLiteral("http")); url.setScheme(QStringLiteral("http"));
} }
KToolInvocation::invokeBrowser(url.url()); QDesktopServices::openUrl(url);
} }
QMimeData * BookmarksRunner::mimeDataForMatch(const Plasma::QueryMatch &match) QMimeData * BookmarksRunner::mimeDataForMatch(const Plasma::QueryMatch &match)

@ -75,7 +75,7 @@ void WindowsRunner::gatherInfo()
} }
foreach (const WId w, KWindowSystem::windows()) { foreach (const WId w, KWindowSystem::windows()) {
KWindowInfo info = KWindowSystem::windowInfo(w, NET::WMWindowType | NET::WMDesktop | KWindowInfo info(w, NET::WMWindowType | NET::WMDesktop |
NET::WMState | NET::XAWMState | NET::WMState | NET::XAWMState |
NET::WMName, NET::WMName,
NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2AllowedActions); NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2AllowedActions);

@ -38,6 +38,7 @@ K_PLUGIN_FACTORY_WITH_JSON(KSysGuardFactory,
registerPlugin<KDEDKSysGuard>();) registerPlugin<KDEDKSysGuard>();)
KDEDKSysGuard::KDEDKSysGuard(QObject* parent, const QVariantList&) KDEDKSysGuard::KDEDKSysGuard(QObject* parent, const QVariantList&)
: KDEDModule(parent)
{ {
QTimer::singleShot(0, this, &KDEDKSysGuard::init); QTimer::singleShot(0, this, &KDEDKSysGuard::init);
} }

Loading…
Cancel
Save