[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=59e2a6b

The following commit has been merged in the master branch:
commit 59e2a6bc4f8ad943c75573e435ed4d9187062d76
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jul 20 17:07:41 2015 +0200

    Port and enable the sunshine plugin
    
    I'm not too sure about its usefulness though, the Sunshine CM is 4 years
    inactive.
---
 plugins/CMakeLists.txt                               |  2 +-
 plugins/sunshine/CMakeLists.txt                      |  6 ++++--
 plugins/sunshine/sunshine-account-ui-plugin.cpp      |  1 -
 plugins/sunshine/sunshine-advanced-options-widget.ui | 16 ++--------------
 plugins/sunshine/sunshine-main-options-widget.ui     | 14 ++------------
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 140c829..db9bfc4 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory (idle)
 # macro_optional_add_subdirectory (butterfly)
 # macro_optional_add_subdirectory (rakia)
 # macro_optional_add_subdirectory (salut)
-# macro_optional_add_subdirectory (sunshine)
+add_subdirectory (sunshine)
 # macro_optional_add_subdirectory (pintxo)
 add_subdirectory (morse)
 add_subdirectory (sipe)
diff --git a/plugins/sunshine/CMakeLists.txt b/plugins/sunshine/CMakeLists.txt
index c517743..dfed230 100644
--- a/plugins/sunshine/CMakeLists.txt
+++ b/plugins/sunshine/CMakeLists.txt
@@ -4,6 +4,8 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+add_definitions(-DTRANSLATION_DOMAIN=\"ktpaccountskcm_plugin_sunshine\")
+
 set (ktpaccountskcm_plugin_sunshine_SRCS
      sunshine-account-ui-plugin.cpp
      sunshine-account-ui.cpp
@@ -11,12 +13,12 @@ set (ktpaccountskcm_plugin_sunshine_SRCS
      sunshine-advanced-options-widget.cpp
 )
 
-kde4_add_ui_files (ktpaccountskcm_plugin_sunshine_SRCS
+qt5_wrap_ui (ktpaccountskcm_plugin_sunshine_SRCS
                    sunshine-main-options-widget.ui
                    sunshine-advanced-options-widget.ui
 )
 
-kde4_add_plugin (ktpaccountskcm_plugin_sunshine
+add_library (ktpaccountskcm_plugin_sunshine MODULE
                  ${ktpaccountskcm_plugin_sunshine_SRCS}
 )
 
diff --git a/plugins/sunshine/sunshine-account-ui-plugin.cpp b/plugins/sunshine/sunshine-account-ui-plugin.cpp
index 46f170c..d4db25b 100644
--- a/plugins/sunshine/sunshine-account-ui-plugin.cpp
+++ b/plugins/sunshine/sunshine-account-ui-plugin.cpp
@@ -54,6 +54,5 @@ AbstractAccountUi* SunshineAccountUiPlugin::accountUi(const QString &connectionM
 }
 
 K_PLUGIN_FACTORY(factory, registerPlugin<SunshineAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_sunshine"))
 
 #include "sunshine-account-ui-plugin.moc"
diff --git a/plugins/sunshine/sunshine-advanced-options-widget.ui b/plugins/sunshine/sunshine-advanced-options-widget.ui
index 0985089..f9bb339 100644
--- a/plugins/sunshine/sunshine-advanced-options-widget.ui
+++ b/plugins/sunshine/sunshine-advanced-options-widget.ui
@@ -34,7 +34,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="KLineEdit" name="serverLineEdit">
+       <widget class="QLineEdit" name="serverLineEdit">
         <property name="toolTip">
          <string>STUN server address (FQDN or IP address)</string>
         </property>
@@ -48,7 +48,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="KIntSpinBox" name="portSpinBox">
+       <widget class="QSpinBox" name="portSpinBox">
         <property name="maximum">
          <number>65535</number>
         </property>
@@ -99,18 +99,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>knuminput.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>serverGroupBox</tabstop>
   <tabstop>serverLineEdit</tabstop>
diff --git a/plugins/sunshine/sunshine-main-options-widget.ui b/plugins/sunshine/sunshine-main-options-widget.ui
index c191b10..410ce33 100644
--- a/plugins/sunshine/sunshine-main-options-widget.ui
+++ b/plugins/sunshine/sunshine-main-options-widget.ui
@@ -30,7 +30,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="KLineEdit" name="accountLineEdit"/>
+      <widget class="QLineEdit" name="accountLineEdit"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="passwordLabel">
@@ -43,26 +43,16 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="KLineEdit" name="passwordLineEdit">
+      <widget class="QLineEdit" name="passwordLineEdit">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
        </property>
-       <property name="passwordMode">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

-- 
ktp-accounts-kcm packaging