qt4-b-gone: Remove all code supporting Qt < 5.5 and KDE4

[quassel.git] / src / qtui / coreconfigwizard.cpp

diff --git a/src/qtui/coreconfigwizard.cpp b/src/qtui/coreconfigwizard.cpp
index 471837b..ebb23b8 100644 (file)
--- a/src/qtui/coreconfigwizard.cpp
+++ b/src/qtui/coreconfigwizard.cpp
@@ -54,10 +54,11 @@ QGroupBox *createFieldBox(const QString &title, const std::vector<FieldInfo> &fi
     // provide specialized config widgets for those (which may be a good idea anyway, e.g. if we
     // think about client-side translations...)
 
-    QGroupBox *fieldBox = new QGroupBox;
+    auto *fieldBox = new QGroupBox;
     fieldBox->setTitle(title);
+    auto *formLayout = new QFormLayout;
+    fieldBox->setLayout(formLayout);
 
-    QFormLayout *formLayout = new QFormLayout(fieldBox);
     for (auto &&fieldInfo : fieldInfos) {
         QWidget *widget {nullptr};
         switch (std::get<2>(fieldInfo).type()) {
@@ -317,11 +318,7 @@ AuthenticationSelectionPage::AuthenticationSelectionPage(const QVariantList &aut
     setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
 
     QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
-#if QT_VERSION >= 0x050200
     sp.setRetainSizeWhenHidden(true);
-#else
-    ui.authSettingsStack->setVisible(true);  // ugly hack that will show an empty box, but we'll deprecate Qt4 soon anyway
-#endif
     ui.descriptionStack->setSizePolicy(sp);
     ui.authSettingsStack->setSizePolicy(sp);
 
@@ -346,11 +343,7 @@ QString AuthenticationSelectionPage::displayName() const
 
 QString AuthenticationSelectionPage::authenticator() const
 {
-#if QT_VERSION >= 0x050200
     return ui.backendList->currentData().toString();
-#else
-    return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
-#endif
 }
 
 
@@ -423,11 +416,7 @@ StorageSelectionPage::StorageSelectionPage(const QVariantList &backendInfos, QWi
     setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
 
     QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
-#if QT_VERSION >= 0x050200
     sp.setRetainSizeWhenHidden(true);
-#else
-    ui.storageSettingsStack->setVisible(true);  // ugly hack that will show an empty box, but we'll deprecate Qt4 soon anyway
-#endif
     ui.descriptionStack->setSizePolicy(sp);
     ui.storageSettingsStack->setSizePolicy(sp);
 
@@ -452,11 +441,7 @@ QString StorageSelectionPage::displayName() const
 
 QString StorageSelectionPage::backend() const
 {
-#if QT_VERSION >= 0x050200
     return ui.backendList->currentData().toString();
-#else
-    return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
-#endif
 }