[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:05:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=df8751c
The following commit has been merged in the master branch:
commit df8751cc931aaf792a7b90218d1306205efc7df6
Author: Martin Klapetek <mklapetek at kde.org>
Date: Wed Aug 6 13:15:53 2014 +0200
Port KLineEdit to QLineEdit in Gabble UI plugin
---
plugins/gabble/main-options-widget-facebook.ui | 12 ++----------
plugins/gabble/main-options-widget-googletalk.ui | 12 ++----------
plugins/gabble/main-options-widget-kde-talk.ui | 12 ++----------
plugins/gabble/main-options-widget.ui | 12 ++----------
plugins/gabble/proxy-settings-widget.ui | 13 ++++---------
plugins/gabble/server-settings-widget.ui | 9 ++-------
6 files changed, 14 insertions(+), 56 deletions(-)
diff --git a/plugins/gabble/main-options-widget-facebook.ui b/plugins/gabble/main-options-widget-facebook.ui
index 3ce8908..85360c1 100644
--- a/plugins/gabble/main-options-widget-facebook.ui
+++ b/plugins/gabble/main-options-widget-facebook.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="2" column="0">
<widget class="QLabel" name="passwordLabel">
@@ -43,13 +43,10 @@
</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="passwordMode">
- <bool>true</bool>
- </property>
</widget>
</item>
<item row="1" column="1">
@@ -81,11 +78,6 @@ Use <a href="http://www.facebook.com/username/">this page</a&
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<tabstops>
<tabstop>accountLineEdit</tabstop>
diff --git a/plugins/gabble/main-options-widget-googletalk.ui b/plugins/gabble/main-options-widget-googletalk.ui
index 3651bdc..df0305a 100644
--- a/plugins/gabble/main-options-widget-googletalk.ui
+++ b/plugins/gabble/main-options-widget-googletalk.ui
@@ -17,16 +17,13 @@
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit"/>
+ <widget class="QLineEdit" name="accountLineEdit"/>
</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>
<item row="0" column="0">
@@ -54,11 +51,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/plugins/gabble/main-options-widget-kde-talk.ui b/plugins/gabble/main-options-widget-kde-talk.ui
index 1e648d4..86e4584 100644
--- a/plugins/gabble/main-options-widget-kde-talk.ui
+++ b/plugins/gabble/main-options-widget-kde-talk.ui
@@ -29,7 +29,7 @@
<item row="0" column="1">
<layout class="QHBoxLayout" name="hLayout">
<item>
- <widget class="KLineEdit" name="accountLineEdit"/>
+ <widget class="QLineEdit" name="accountLineEdit"/>
</item>
<item>
<widget class="QLabel" name="label">
@@ -51,13 +51,10 @@
</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>
<item row="2" column="1">
@@ -72,11 +69,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/plugins/gabble/main-options-widget.ui b/plugins/gabble/main-options-widget.ui
index 9698d1c..758b0e3 100644
--- a/plugins/gabble/main-options-widget.ui
+++ b/plugins/gabble/main-options-widget.ui
@@ -17,16 +17,13 @@
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit"/>
+ <widget class="QLineEdit" name="accountLineEdit"/>
</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="passwordMode">
- <bool>true</bool>
- </property>
</widget>
</item>
<item row="0" column="0">
@@ -61,11 +58,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/plugins/gabble/proxy-settings-widget.ui b/plugins/gabble/proxy-settings-widget.ui
index 1dadfb3..5e78a72 100644
--- a/plugins/gabble/proxy-settings-widget.ui
+++ b/plugins/gabble/proxy-settings-widget.ui
@@ -30,7 +30,7 @@
</widget>
</item>
<item>
- <widget class="KLineEdit" name="stunServerLineEdit"/>
+ <widget class="QLineEdit" name="stunServerLineEdit"/>
</item>
<item>
<widget class="QLabel" name="stunPortLabel">
@@ -58,7 +58,7 @@
</widget>
</item>
<item>
- <widget class="KLineEdit" name="fallbackStunServerLineEdit"/>
+ <widget class="QLineEdit" name="fallbackStunServerLineEdit"/>
</item>
<item>
<widget class="QLabel" name="fallbackStunPortLabel">
@@ -95,7 +95,7 @@
</widget>
</item>
<item>
- <widget class="KLineEdit" name="httpsProxyServerLineEdit"/>
+ <widget class="QLineEdit" name="httpsProxyServerLineEdit"/>
</item>
<item>
<widget class="QLabel" name="httpsProxyPortLabel">
@@ -153,7 +153,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
- <widget class="KLineEdit" name="fallbackConferenceServerLineEdit"/>
+ <widget class="QLineEdit" name="fallbackConferenceServerLineEdit"/>
</item>
</layout>
</item>
@@ -164,11 +164,6 @@ p, li { white-space: pre-wrap; }
</widget>
<customwidgets>
<customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
<class>KTextEdit</class>
<extends>QTextEdit</extends>
<header>ktextedit.h</header>
diff --git a/plugins/gabble/server-settings-widget.ui b/plugins/gabble/server-settings-widget.ui
index df28cac..3217769 100644
--- a/plugins/gabble/server-settings-widget.ui
+++ b/plugins/gabble/server-settings-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="0">
<widget class="QLabel" name="portLabel">
@@ -93,7 +93,7 @@
<widget class="QSpinBox" name="prioritySpinBox"/>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="resourceLineEdit"/>
+ <widget class="QLineEdit" name="resourceLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="resourceLabel">
@@ -145,11 +145,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<tabstops>
<tabstop>serverLineEdit</tabstop>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list