summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-06-20 21:42:37 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-06-20 21:42:37 (GMT)
commitec44b760a7a548a3ea4e8e2c95ec9bb0bfd0d832 (patch)
tree95e7e201d8774d8640cb19f6ed8dfa8ab678f2b6
parent6abc51220ce7894afaf98bfafff788d5aaac7293 (diff)
Port away from KComboBox to QComboBox.
-rw-r--r--conf_encryption.ui16
-rw-r--r--conf_misc.ui17
-rw-r--r--conf_ui2.ui2
-rw-r--r--keyexport.ui10
-rw-r--r--keyserver.ui21
-rw-r--r--kgpgKeyInfo.ui11
-rw-r--r--kgpgexternalactions.cpp3
-rw-r--r--kgpgfirstassistant.cpp4
-rw-r--r--kgpgfirstassistant.h4
-rw-r--r--kgpgkeygenerate.cpp4
-rw-r--r--kgpgkeygenerate.h4
-rw-r--r--kgpgkeygenerate.ui11
-rw-r--r--kgpgrevokewidget.ui9
-rw-r--r--searchres.ui7
-rw-r--r--selectsecretkey.cpp4
-rw-r--r--selectsecretkey.h5
16 files changed, 32 insertions, 100 deletions
diff --git a/conf_encryption.ui b/conf_encryption.ui
index ed5a522..f5fae21 100644
--- a/conf_encryption.ui
+++ b/conf_encryption.ui
@@ -81,7 +81,7 @@
</widget>
</item>
<item row="8" column="1" colspan="2">
- <widget class="KComboBox" name="always_key">
+ <widget class="QComboBox" name="always_key">
<property name="enabled">
<bool>false</bool>
</property>
@@ -94,7 +94,7 @@
</widget>
</item>
<item row="9" column="1" colspan="2">
- <widget class="KComboBox" name="file_key">
+ <widget class="QComboBox" name="file_key">
<property name="enabled">
<bool>false</bool>
</property>
@@ -173,18 +173,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/conf_misc.ui b/conf_misc.ui
index 54721a6..2012228 100644
--- a/conf_misc.ui
+++ b/conf_misc.ui
@@ -127,7 +127,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="kcfg_SignMenu">
+ <widget class="QComboBox" name="kcfg_SignMenu">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -172,7 +172,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="kcfg_DecryptMenu">
+ <widget class="QComboBox" name="kcfg_DecryptMenu">
<item>
<property name="text">
<string>Disable</string>
@@ -228,7 +228,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="kcfg_LeftClick">
+ <widget class="QComboBox" name="kcfg_LeftClick">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -319,7 +319,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="kcfg_MailUats">
+ <widget class="QComboBox" name="kcfg_MailUats">
<item>
<property name="text">
<string>Send with every Email</string>
@@ -365,15 +365,6 @@ The placeholders surrounded by the percent signs (like %KEYID%) will be replaced
</widget>
<customwidgets>
<customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>QTabWidget</class>
- <container>1</container>
- </customwidget>
- <customwidget>
<class>KTextEdit</class>
<extends>QTextEdit</extends>
<header>ktextedit.h</header>
diff --git a/conf_ui2.ui b/conf_ui2.ui
index ed70500..908d728 100644
--- a/conf_ui2.ui
+++ b/conf_ui2.ui
@@ -247,7 +247,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KComboBox" name="kcfg_EmailSorting">
+ <widget class="QComboBox" name="kcfg_EmailSorting">
<item>
<property name="text">
<string>Left to right, account first</string>
diff --git a/keyexport.ui b/keyexport.ui
index bfc7d68..be2cdb23 100644
--- a/keyexport.ui
+++ b/keyexport.ui
@@ -63,7 +63,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="destServer">
+ <widget class="QComboBox" name="destServer">
<property name="enabled">
<bool>false</bool>
</property>
@@ -152,19 +152,11 @@
</widget>
<customwidgets>
<customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
<class>KUrlRequester</class>
<extends>QWidget</extends>
<header>kurlrequester.h</header>
</customwidget>
</customwidgets>
- <includes>
- <include location="local">kpushbutton.h</include>
- </includes>
<resources/>
<connections>
<connection>
diff --git a/keyserver.ui b/keyserver.ui
index 25eaf7d..33c57ad 100644
--- a/keyserver.ui
+++ b/keyserver.ui
@@ -46,7 +46,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="kCBimportks" >
+ <widget class="QComboBox" name="kCBimportks" >
<property name="whatsThis" >
<string>&lt;b>Key Server Drop Down Dialog:&lt;/b>
Allows the user to select the Key Server which will be used to import PGP/GnuPG keys into the local keyring.</string>
@@ -181,7 +181,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
</widget>
</item>
<item>
- <widget class="KComboBox" name="kCBexportks" />
+ <widget class="QComboBox" name="kCBexportks" />
</item>
<item>
<widget class="QLabel" name="textLabel4" >
@@ -198,7 +198,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
</widget>
</item>
<item>
- <widget class="KComboBox" name="kCBexportkey" />
+ <widget class="QComboBox" name="kCBexportkey" />
</item>
<item>
<widget class="QCheckBox" name="exportAttributes" >
@@ -293,21 +293,6 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>QTabWidget</class>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/kgpgKeyInfo.ui b/kgpgKeyInfo.ui
index ff28501..fce7bf2 100644
--- a/kgpgKeyInfo.ui
+++ b/kgpgKeyInfo.ui
@@ -165,7 +165,7 @@
</widget>
</item>
<item row="5" column="1">
- <widget class="KComboBox" name="m_owtrust">
+ <widget class="QComboBox" name="m_owtrust">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -345,7 +345,7 @@
</layout>
</item>
<item>
- <widget class="KComboBox" name="m_photoid"/>
+ <widget class="QComboBox" name="m_photoid"/>
</item>
</layout>
</widget>
@@ -444,12 +444,7 @@
<customwidget>
<class>KUrlLabel</class>
<extends>QLabel</extends>
- <header>kurllabel.h</header>
- </customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
+ <header>KUrlLabel</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/kgpgexternalactions.cpp b/kgpgexternalactions.cpp
index 59b6add..fbfd90e 100644
--- a/kgpgexternalactions.cpp
+++ b/kgpgexternalactions.cpp
@@ -38,6 +38,7 @@
#include <KHelpClient>
#include <KMessageBox>
+#include <QComboBox>
#include <QFont>
#include <QHBoxLayout>
#include <QProcess>
@@ -153,7 +154,7 @@ void KGpgExternalActions::encryptFolders(KeysManager *parent, const QList<QUrl>
(void) new QLabel(i18n("Compression method for archive:"), bGroup);
- KComboBox *optionbx = new KComboBox(bGroup);
+ QComboBox *optionbx = new QComboBox(bGroup);
bGroupHBoxLayout->addWidget(optionbx);
optionbx->setModel(new QStringListModel(FolderCompressJob::archiveNames(), bGroup));
diff --git a/kgpgfirstassistant.cpp b/kgpgfirstassistant.cpp
index 4d32fe6..32fc0f1 100644
--- a/kgpgfirstassistant.cpp
+++ b/kgpgfirstassistant.cpp
@@ -23,12 +23,12 @@
#include "kgpginterface.h"
#include "core/kgpgkey.h"
-#include <KComboBox>
#include <KLocalizedString>
#include <KMessageBox>
#include <KUrlRequester>
#include <QCheckBox>
+#include <QComboBox>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QLabel>
@@ -184,7 +184,7 @@ KGpgFirstAssistant::KGpgFirstAssistant(QWidget *parent)
hboxLayout->addWidget(label);
- CBdefault = new KComboBox(page);
+ CBdefault = new QComboBox(page);
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed);
sizePolicy1.setHorizontalStretch(0);
sizePolicy1.setVerticalStretch(0);
diff --git a/kgpgfirstassistant.h b/kgpgfirstassistant.h
index e4a22eb..39a45c4 100644
--- a/kgpgfirstassistant.h
+++ b/kgpgfirstassistant.h
@@ -24,10 +24,10 @@
#include <kgpgcompiler.h>
class QCheckBox;
+class QComboBox;
class QLabel;
class KPageWidgetItem;
class KUrlRequester;
-class KComboBox;
class KGpgFirstAssistant : public KAssistantDialog
{
@@ -49,7 +49,7 @@ private:
QCheckBox *generateCB;
QCheckBox *autostartCB;
- KComboBox *CBdefault;
+ QComboBox *CBdefault;
KUrlRequester *binURL;
KUrlRequester *pathURL;
diff --git a/kgpgkeygenerate.cpp b/kgpgkeygenerate.cpp
index 964cd4a..d7ed7d4 100644
--- a/kgpgkeygenerate.cpp
+++ b/kgpgkeygenerate.cpp
@@ -19,11 +19,11 @@
#include "gpgproc.h"
#include "kgpgsettings.h"
-#include <KComboBox>
#include <KConfigGroup>
#include <KLocalizedString>
#include <KMessageBox>
+#include <QComboBox>
#include <QDialogButtonBox>
#include <QIntValidator>
#include <QHBoxLayout>
@@ -70,7 +70,7 @@ KgpgKeyGenerate::KgpgKeyGenerate(QWidget *parent)
m_days->setMaxLength(4);
m_days->setDisabled(true);
- m_keyexp = new KComboBox(hgroup);
+ m_keyexp = new QComboBox(hgroup);
hgroupHBoxLayout->addWidget(m_keyexp);
m_keyexp->addItem(i18nc("Key will not expire", "Never"), 0);
m_keyexp->addItem(i18n("Days"), 1);
diff --git a/kgpgkeygenerate.h b/kgpgkeygenerate.h
index 393b640..7df71ce 100644
--- a/kgpgkeygenerate.h
+++ b/kgpgkeygenerate.h
@@ -22,7 +22,7 @@
#include <QDialog>
#include <QPushButton>
-class KComboBox;
+class QComboBox;
class KgpgKeyGenerate : public QDialog, public Ui::kgpgKeyGenerate
{
@@ -56,7 +56,7 @@ private slots:
private:
QPushButton *okButton;
- KComboBox *m_keyexp;
+ QComboBox *m_keyexp;
bool m_expert;
};
diff --git a/kgpgkeygenerate.ui b/kgpgkeygenerate.ui
index 54176cb..2e0cbd0 100644
--- a/kgpgkeygenerate.ui
+++ b/kgpgkeygenerate.ui
@@ -100,7 +100,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="m_keysize"/>
+ <widget class="QComboBox" name="m_keysize"/>
</item>
<item>
<widget class="QLabel" name="label_5">
@@ -113,7 +113,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="m_keykind"/>
+ <widget class="QComboBox" name="m_keykind"/>
</item>
<item>
<widget class="QGroupBox" name="capabilities">
@@ -182,13 +182,6 @@
</layout>
</widget>
</widget>
- <customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/kgpgrevokewidget.ui b/kgpgrevokewidget.ui
index 474eb46..e84dc9c 100644
--- a/kgpgrevokewidget.ui
+++ b/kgpgrevokewidget.ui
@@ -50,7 +50,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="comboBox1" >
+ <widget class="QComboBox" name="comboBox1" >
<item>
<property name="text" >
<string>No Reason</string>
@@ -128,12 +128,7 @@
<customwidget>
<class>KUrlRequester</class>
<extends>QFrame</extends>
- <header>kurlrequester.h</header>
- </customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
+ <header>KUrlRequester</header>
</customwidget>
<customwidget>
<class>KTextEdit</class>
diff --git a/searchres.ui b/searchres.ui
index 16af5d0..362a04e 100644
--- a/searchres.ui
+++ b/searchres.ui
@@ -82,13 +82,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
<tabstops>
<tabstop>kLVsearch</tabstop>
<tabstop>kLEID</tabstop>
diff --git a/selectsecretkey.cpp b/selectsecretkey.cpp
index 6f0afca..e93c659 100644
--- a/selectsecretkey.cpp
+++ b/selectsecretkey.cpp
@@ -15,11 +15,11 @@
#include "model/kgpgitemmodel.h"
#include "model/selectkeyproxymodel.h"
-#include <KComboBox>
#include <KConfigGroup>
#include <KLocalizedString>
#include <QCheckBox>
+#include <QComboBox>
#include <QDialogButtonBox>
#include <QLabel>
#include <QPushButton>
@@ -70,7 +70,7 @@ KgpgSelectSecretKey::KgpgSelectSecretKey(QWidget *parent, KGpgItemModel *model,
"belong to the people with whom you wish to communicate:", countkey), page);
signchecklabel->setWordWrap(true);
- m_signtrust = new KComboBox(page);
+ m_signtrust = new QComboBox(page);
m_signtrust->addItem(i18n("I Will Not Answer"));
m_signtrust->addItem(i18n("I Have Not Checked at All"));
m_signtrust->addItem(i18n("I Have Done Casual Checking"));
diff --git a/selectsecretkey.h b/selectsecretkey.h
index a46c11b..3e3217e 100644
--- a/selectsecretkey.h
+++ b/selectsecretkey.h
@@ -13,10 +13,9 @@
#include <QDialog>
class QCheckBox;
+class QComboBox;
class QTableView;
-class KComboBox;
-
class KGpgItemModel;
class SelectSecretKeyProxyModel;
@@ -65,7 +64,7 @@ private:
QPushButton *m_okButton;
- KComboBox *m_signtrust;
+ QComboBox *m_signtrust;
QTableView *m_keyslist;
SelectSecretKeyProxyModel *m_proxy;
};