summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-06-07 14:05:42 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-06-07 14:05:42 (GMT)
commit1b17286845a62e6f30f7f8324ebe8d2802aa9f97 (patch)
tree646f63a89fbcda728660b956b77d3f52129cd04e
parent7889cdc8664e3d39fea7e779ad4b57d03f39f40a (diff)
Port remaining KHBoxes.
-rw-r--r--kgpgexternalactions.cpp7
-rw-r--r--kgpgkeygenerate.cpp10
2 files changed, 11 insertions, 6 deletions
diff --git a/kgpgexternalactions.cpp b/kgpgexternalactions.cpp
index da2d409..59b6add 100644
--- a/kgpgexternalactions.cpp
+++ b/kgpgexternalactions.cpp
@@ -37,9 +37,9 @@
#include <KActionCollection>
#include <KHelpClient>
#include <KMessageBox>
-#include <KHBox>
#include <QFont>
+#include <QHBoxLayout>
#include <QProcess>
#include <QStringListModel>
#include <QTemporaryFile>
@@ -147,11 +147,14 @@ void KGpgExternalActions::encryptFolders(KeysManager *parent, const QList<QUrl>
KgpgSelectPublicKeyDlg *dialog = new KgpgSelectPublicKeyDlg(parent, parent->getModel(), encActions->goDefaultKey(), false, urls);
encActions->m_kgpgfoldertmp = tmpfolder;
- KHBox *bGroup = new KHBox(dialog->optionsbox);
+ QWidget *bGroup = new QWidget(dialog->optionsbox);
+ QHBoxLayout *bGroupHBoxLayout = new QHBoxLayout(bGroup);
+ bGroupHBoxLayout->setMargin(0);
(void) new QLabel(i18n("Compression method for archive:"), bGroup);
KComboBox *optionbx = new KComboBox(bGroup);
+ bGroupHBoxLayout->addWidget(optionbx);
optionbx->setModel(new QStringListModel(FolderCompressJob::archiveNames(), bGroup));
connect(optionbx, SIGNAL(activated(int)), encActions, SLOT(slotSetCompression(int)));
diff --git a/kgpgkeygenerate.cpp b/kgpgkeygenerate.cpp
index 1cb2d1e..964cd4a 100644
--- a/kgpgkeygenerate.cpp
+++ b/kgpgkeygenerate.cpp
@@ -21,12 +21,12 @@
#include <KComboBox>
#include <KConfigGroup>
-#include <KHBox>
#include <KLocalizedString>
#include <KMessageBox>
-#include <QIntValidator>
#include <QDialogButtonBox>
+#include <QIntValidator>
+#include <QHBoxLayout>
#include <QPushButton>
#include <QStringList>
#include <QVBoxLayout>
@@ -60,8 +60,9 @@ KgpgKeyGenerate::KgpgKeyGenerate(QWidget *parent)
connect(m_kname, SIGNAL(textChanged(QString)), this, SLOT(slotEnableOk()));
- KHBox *hgroup = new KHBox(vgroup);
- hgroup->setFrameShape(QFrame::StyledPanel);
+ QWidget *hgroup = new QWidget(vgroup);
+ QHBoxLayout *hgroupHBoxLayout = new QHBoxLayout(hgroup);
+ hgroupHBoxLayout->setMargin(0);
m_days->setParent(hgroup);
QIntValidator *validator = new QIntValidator(m_days);
validator->setBottom(0);
@@ -70,6 +71,7 @@ KgpgKeyGenerate::KgpgKeyGenerate(QWidget *parent)
m_days->setDisabled(true);
m_keyexp = new KComboBox(hgroup);
+ hgroupHBoxLayout->addWidget(m_keyexp);
m_keyexp->addItem(i18nc("Key will not expire", "Never"), 0);
m_keyexp->addItem(i18n("Days"), 1);
m_keyexp->addItem(i18n("Weeks"), 2);