[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=82288c9

The following commit has been merged in the master branch:
commit 82288c9336feb1bc640a421d4bea6eeab9d32d43
Author: Andrius Štikonas <andrius at stikonas.eu>
Date:   Sun Nov 2 17:19:06 2014 +0000

    Port idle plugin to KF5
---
 plugins/CMakeLists.txt                  |  4 ++--
 plugins/idle/CMakeLists.txt             | 11 ++++++-----
 plugins/idle/advanced-options-widget.ui | 24 ++++++------------------
 plugins/idle/idle-account-ui-plugin.cpp |  1 -
 plugins/idle/main-options-widget.ui     | 13 +++----------
 5 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 4a24516..2c8ca35 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_subdirectory (gabble)
 add_subdirectory (haze)
+add_subdirectory (idle)
 # macro_optional_add_subdirectory (butterfly)
-# macro_optional_add_subdirectory (idle)
 # macro_optional_add_subdirectory (rakia)
 # macro_optional_add_subdirectory (salut)
 # macro_optional_add_subdirectory (sunshine)
 # macro_optional_add_subdirectory (pintxo)
-# macro_optional_add_subdirectory (sipe)
\ No newline at end of file
+# macro_optional_add_subdirectory (sipe)
diff --git a/plugins/idle/CMakeLists.txt b/plugins/idle/CMakeLists.txt
index 77b5db3..a2bd271 100644
--- a/plugins/idle/CMakeLists.txt
+++ b/plugins/idle/CMakeLists.txt
@@ -11,20 +11,21 @@ set (ktpaccountskcm_plugin_idle_SRCS
      advanced-options-widget.cpp
 )
 
-kde4_add_ui_files (ktpaccountskcm_plugin_idle_SRCS
+ki18n_wrap_ui (ktpaccountskcm_plugin_idle_SRCS
                    main-options-widget.ui
                    advanced-options-widget.ui
 )
 
-kde4_add_plugin (ktpaccountskcm_plugin_idle
+add_library (ktpaccountskcm_plugin_idle MODULE
                  ${ktpaccountskcm_plugin_idle_SRCS}
 )
 
 target_link_libraries (ktpaccountskcm_plugin_idle
                        ktpaccountskcminternal
-                       ${QT_LIBRARIES}
-                       ${KDE4_KDEUI_LIBS}
-                       ${TELEPATHY_QT4_LIBRARIES}
+                       Qt5::Core
+                       Qt5::Widgets
+                       KF5::Codecs
+                       ${TELEPATHY_QT5_LIBRARIES}
 )
 
 # Install:
diff --git a/plugins/idle/advanced-options-widget.ui b/plugins/idle/advanced-options-widget.ui
index 5d741a9..a5e1a3c 100644
--- a/plugins/idle/advanced-options-widget.ui
+++ b/plugins/idle/advanced-options-widget.ui
@@ -28,7 +28,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="KLineEdit" name="usernameLineEdit">
+    <widget class="QLineEdit" name="usernameLineEdit">
      <property name="toolTip">
       <string/>
      </property>
@@ -51,15 +51,15 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="KLineEdit" name="passwordLineEdit">
+    <widget class="QLineEdit" name="passwordLineEdit">
      <property name="echoMode">
       <enum>QLineEdit::Password</enum>
      </property>
      <property name="showClearButton" stdset="0">
       <bool>true</bool>
      </property>
-     <property name="passwordMode">
-      <bool>true</bool>
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
      </property>
     </widget>
    </item>
@@ -74,7 +74,7 @@
     </widget>
    </item>
    <item row="5" column="1">
-    <widget class="KLineEdit" name="charsetLineEdit"/>
+    <widget class="QLineEdit" name="charsetLineEdit"/>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="portLabel">
@@ -87,7 +87,7 @@
     </widget>
    </item>
    <item row="6" column="1">
-    <widget class="KIntSpinBox" name="portSpinBox">
+    <widget class="QSpinBox" name="portSpinBox">
      <property name="maximum">
       <number>65535</number>
      </property>
@@ -112,18 +112,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>usernameLineEdit</tabstop>
   <tabstop>passwordLineEdit</tabstop>
diff --git a/plugins/idle/idle-account-ui-plugin.cpp b/plugins/idle/idle-account-ui-plugin.cpp
index 7cbad3c..19ba2ae 100644
--- a/plugins/idle/idle-account-ui-plugin.cpp
+++ b/plugins/idle/idle-account-ui-plugin.cpp
@@ -49,6 +49,5 @@ AbstractAccountUi* IdleAccountUiPlugin::accountUi(const QString &connectionManag
 }
 
 K_PLUGIN_FACTORY(factory, registerPlugin<IdleAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_idle"))
 
 #include "idle-account-ui-plugin.moc"
diff --git a/plugins/idle/main-options-widget.ui b/plugins/idle/main-options-widget.ui
index aae76d6..2cf0f03 100644
--- a/plugins/idle/main-options-widget.ui
+++ b/plugins/idle/main-options-widget.ui
@@ -28,7 +28,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="KLineEdit" name="serverLineEdit"/>
+    <widget class="QLineEdit" name="serverLineEdit"/>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="label">
@@ -48,7 +48,7 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="KLineEdit" name="accountLineEdit"/>
+    <widget class="QLineEdit" name="accountLineEdit"/>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="fullnameLabel">
@@ -61,7 +61,7 @@
     </widget>
    </item>
    <item row="5" column="1">
-    <widget class="KLineEdit" name="fullnameLineEdit"/>
+    <widget class="QLineEdit" name="fullnameLineEdit"/>
    </item>
    <item row="6" column="1">
     <widget class="QLabel" name="label_2">
@@ -72,13 +72,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>serverLineEdit</tabstop>
   <tabstop>accountLineEdit</tabstop>

-- 
ktp-accounts-kcm packaging