summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2015-08-02 20:50:40 +0200
committerVolker Krause <[email protected]>2015-08-02 20:50:40 +0200
commit5a87343e612921d5fccdc1d8338725b2c3558a88 (patch)
tree7e7d9a7624aff69f253cab104d9dadfdf1e8a633
parent6a9d7bc07eb4ea5ade8d4958c8f1ca8df7b1b11a (diff)
KComboBox -> QComboBox, we don't need the KComboBox features here.
This removes the dependency on KF5::Completion.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/smtpconfigwidget.cpp2
-rw-r--r--src/transportcombobox.cpp2
-rw-r--r--src/transportcombobox.h4
-rw-r--r--src/ui/smtpsettings.ui9
5 files changed, 5 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7cb0c5..8023e95 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,7 +72,6 @@ PRIVATE
KF5::WidgetsAddons
KF5::CoreAddons
KF5::Wallet
- KF5::Completion
KF5::ConfigWidgets
Qt5::DBus
Qt5::Network
diff --git a/src/smtpconfigwidget.cpp b/src/smtpconfigwidget.cpp
index 2945378..662c15f 100644
--- a/src/smtpconfigwidget.cpp
+++ b/src/smtpconfigwidget.cpp
@@ -55,7 +55,7 @@ public:
bool serverTestFailed;
- static void addAuthenticationItem(KComboBox *combo,
+ static void addAuthenticationItem(QComboBox *combo,
int authenticationType)
{
combo->addItem(Transport::authenticationTypeString(authenticationType),
diff --git a/src/transportcombobox.cpp b/src/transportcombobox.cpp
index 013dd4d..3fbd9f1 100644
--- a/src/transportcombobox.cpp
+++ b/src/transportcombobox.cpp
@@ -34,7 +34,7 @@ public:
};
TransportComboBox::TransportComboBox(QWidget *parent)
- : KComboBox(parent), d(new TransportComboBoxPrivate)
+ : QComboBox(parent), d(new TransportComboBoxPrivate)
{
QMetaObject::invokeMethod(this, "updateComboboxList");
connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList);
diff --git a/src/transportcombobox.h b/src/transportcombobox.h
index 3e5ed03..73b4d48 100644
--- a/src/transportcombobox.h
+++ b/src/transportcombobox.h
@@ -23,7 +23,7 @@
#include <mailtransport_export.h>
#include <transportbase.h>
-#include <KComboBox>
+#include <QComboBox>
class TransportComboBoxPrivate;
@@ -34,7 +34,7 @@ namespace MailTransport
A combo-box for selecting a mail transport.
It is updated automatically when transports are added, changed, or removed.
*/
-class MAILTRANSPORT_EXPORT TransportComboBox : public KComboBox
+class MAILTRANSPORT_EXPORT TransportComboBox : public QComboBox
{
Q_OBJECT
diff --git a/src/ui/smtpsettings.ui b/src/ui/smtpsettings.ui
index b092d76..064582d 100644
--- a/src/ui/smtpsettings.ui
+++ b/src/ui/smtpsettings.ui
@@ -267,7 +267,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KComboBox" name="authCombo"/>
+ <widget class="QComboBox" name="authCombo"/>
</item>
</layout>
</item>
@@ -371,13 +371,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- </customwidgets>
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>kcfg_host</tabstop>