From f4cef1e75dc1c4228301ac99a46d61f94ce56862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukas@kde.org>
Date: Mon, 16 Jun 2014 23:48:15 +0200
Subject: [PATCH] i18n and deprecation fixes

---
 dataengines/time/Messages.sh          |  2 ++
 soliduiserver/CMakeLists.txt          |  3 +-
 soliduiserver/deviceaction.cpp        |  5 ----
 soliduiserver/deviceactionsdialog.cpp |  4 ---
 soliduiserver/deviceserviceaction.cpp | 18 +++++------
 soliduiserver/soliduiserver.cpp       | 43 +++++++++++----------------
 6 files changed, 29 insertions(+), 46 deletions(-)
 create mode 100755 dataengines/time/Messages.sh

diff --git a/dataengines/time/Messages.sh b/dataengines/time/Messages.sh
new file mode 100755
index 000000000..5ece181fc
--- /dev/null
+++ b/dataengines/time/Messages.sh
@@ -0,0 +1,2 @@
+#! /usr/bin/env bash
+$XGETTEXT *.cpp -o $podir/plasma_engine_time.pot
diff --git a/soliduiserver/CMakeLists.txt b/soliduiserver/CMakeLists.txt
index 82dc17c75..7d58db81a 100644
--- a/soliduiserver/CMakeLists.txt
+++ b/soliduiserver/CMakeLists.txt
@@ -11,7 +11,7 @@ set(kded_soliduiserver_SRCS
 ki18n_wrap_ui(kded_soliduiserver_SRCS deviceactionsdialogview.ui)
 
 add_library(kded_soliduiserver MODULE ${kded_soliduiserver_SRCS})
-
+kservice_desktop_to_json(kded_soliduiserver soliduiserver.desktop)
 
 target_link_libraries(kded_soliduiserver KF5::Solid KF5::DBusAddons KF5::KDELibs4Support KF5::Wallet KF5::KIOCore)
 
@@ -21,4 +21,3 @@ install(TARGETS kded_soliduiserver DESTINATION ${PLUGIN_INSTALL_DIR})
 ########### install files ###############
 
 install(FILES soliduiserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
-
diff --git a/soliduiserver/deviceaction.cpp b/soliduiserver/deviceaction.cpp
index 29545135d..f07213488 100644
--- a/soliduiserver/deviceaction.cpp
+++ b/soliduiserver/deviceaction.cpp
@@ -19,11 +19,6 @@
 
 #include "deviceaction.h"
 
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kicontheme.h>
-#include <kcomponentdata.h>
-
 DeviceAction::DeviceAction()
 {
 }
diff --git a/soliduiserver/deviceactionsdialog.cpp b/soliduiserver/deviceactionsdialog.cpp
index d7c6baa70..33eaddc72 100644
--- a/soliduiserver/deviceactionsdialog.cpp
+++ b/soliduiserver/deviceactionsdialog.cpp
@@ -20,10 +20,6 @@
 #include "deviceactionsdialog.h"
 #include <QLayout>
 
-#include <krun.h>
-#include <klocale.h>
-
-#include <kio/global.h>
 #include <klistwidget.h>
 #include <kicon.h>
 #include <QCheckBox>
diff --git a/soliduiserver/deviceserviceaction.cpp b/soliduiserver/deviceserviceaction.cpp
index d50924c3b..a410fa90c 100644
--- a/soliduiserver/deviceserviceaction.cpp
+++ b/soliduiserver/deviceserviceaction.cpp
@@ -19,11 +19,11 @@
 
 #include "deviceserviceaction.h"
 
-#include <kdesktopfile.h>
-#include <klocale.h>
+#include <QDebug>
+
+#include <KLocalizedString>
 #include <kmacroexpander.h>
 #include <krun.h>
-#include <kdebug.h>
 #include <solid/storageaccess.h>
 #include <solid/block.h>
 
@@ -111,8 +111,8 @@ int MacroExpander::expandEscapedMacro(const QString &str, int pos, QStringList &
         if (m_device.is<Solid::StorageAccess>()) {
             ret << m_device.as<Solid::StorageAccess>()->filePath();
         } else {
-            kWarning() << "DeviceServiceAction::execute: " << m_device.udi()
-                       << " is not a StorageAccess device" << endl;
+            qWarning() << "DeviceServiceAction::execute: " << m_device.udi()
+                       << " is not a StorageAccess device";
         }
         break;
     case 'd': // Device node
@@ -120,8 +120,8 @@ int MacroExpander::expandEscapedMacro(const QString &str, int pos, QStringList &
         if (m_device.is<Solid::Block>()) {
             ret << m_device.as<Solid::Block>()->device();
         } else {
-            kWarning() << "DeviceServiceAction::execute: " << m_device.udi()
-                       << " is not a Block device" << endl;
+            qWarning() << "DeviceServiceAction::execute: " << m_device.udi()
+                       << " is not a Block device";
         }
         break;
     case 'i': // UDI
@@ -141,7 +141,7 @@ DelayedExecutor::DelayedExecutor(const KServiceAction &service, Solid::Device &d
     : m_service(service)
 {
     if (device.is<Solid::StorageAccess>()
-     && !device.as<Solid::StorageAccess>()->isAccessible()) {
+            && !device.as<Solid::StorageAccess>()->isAccessible()) {
         Solid::StorageAccess *access = device.as<Solid::StorageAccess>();
 
         connect(access, SIGNAL(setupDone(Solid::ErrorType, QVariant, const QString &)),
@@ -162,7 +162,7 @@ void DelayedExecutor::delayedExecute(const QString &udi)
     MacroExpander mx(device);
 
     if (!mx.expandMacrosShellQuote(exec)) {
-        kWarning() << ", Syntax error:" << m_service.exec();
+        qWarning() << ", Syntax error:" << m_service.exec();
         return;
     }
 
diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
index bf7c55502..93d6b69ef 100644
--- a/soliduiserver/soliduiserver.cpp
+++ b/soliduiserver/soliduiserver.cpp
@@ -2,7 +2,7 @@
    Copyright (c) 2005 Jean-Remy Falleri <jr.falleri@laposte.net>
    Copyright (c) 2005-2007 Kevin Ottens <ervin@kde.org>
    Copyright (c) 2007 Alexis Ménard <darktears31@gmail.com>
-   Copyright (c) 2011 Lukas Tinkl <ltinkl@redhat.com>
+   Copyright (c) 2011, 2014 Lukas Tinkl <ltinkl@redhat.com>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -22,18 +22,14 @@
 #include "soliduiserver.h"
 
 #include <QFile>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusError>
-#include <kjobuidelegate.h>
-
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kprocess.h>
-#include <krun.h>
-#include <kmessagebox.h>
-#include <kstandardguiitem.h>
+#include <QStandardPaths>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDBusError>
+
+#include <KPluginFactory>
+#include <KLocalizedString>
+#include <KUserTimestamp>
 
 #include <kdesktopfileactions.h>
 #include <kwindowsystem.h>
@@ -47,16 +43,11 @@
 #include "deviceserviceaction.h"
 #include "devicenothingaction.h"
 
-
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
-#include <QStandardPaths>
-
-K_PLUGIN_FACTORY(SolidUiServerFactory,
-                 registerPlugin<SolidUiServer>();
-    )
-K_EXPORT_PLUGIN(SolidUiServerFactory("soliduiserver"))
-
+#define TRANSLATION_DOMAIN "soliduiserver"
+K_PLUGIN_FACTORY_WITH_JSON(SolidUiServerFactory,
+                           "soliduiserver.json",
+                           registerPlugin<SolidUiServer>();
+                          )
 
 SolidUiServer::SolidUiServer(QObject* parent, const QList<QVariant>&)
     : KDEDModule(parent)
@@ -116,7 +107,7 @@ void SolidUiServer::showActionsDialog(const QString &udi,
     // in the background due to focus stealing prevention. Entering a new media can
     // be seen as a kind of user activity after all. It'd be better to update the timestamp
     // as soon as the media is entered, but it apparently takes some time to get here.
-    kapp->updateUserTimestamp();
+    KUserTimestamp::updateUserTimestamp();
 
     dialog->show();
 }
@@ -205,7 +196,7 @@ void SolidUiServer::onPassphraseDialogCompleted(const QString &pass, bool keep)
         m_idToPassphraseDialog.remove(returnService+':'+udi);
 
         if (!reply.isValid()) {
-            kWarning() << "Impossible to send the passphrase to the application, D-Bus said: "
+            qWarning() << "Impossible to send the passphrase to the application, D-Bus said: "
                        << reply.error().name() << ", " << reply.error().message() << endl;
             return;  // don't save into wallet if an error occurs
         }
@@ -248,7 +239,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI
 
     // allow dialog activation even if it interrupts, better than trying hacks
     // with keeping the dialog on top or on all desktops
-    kapp->updateUserTimestamp();
+    KUserTimestamp::updateUserTimestamp();
 }
 
 #include "soliduiserver.moc"