From a58297a57720787c742dde3566dfe1bc3c106397 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Apr 2019 00:41:26 +0200 Subject: [PATCH] (UI/QT) Create create_widget --- ui/drivers/qt/options/audio.cpp | 22 +--------------------- ui/drivers/qt/options/configuration.cpp | 22 +--------------------- ui/drivers/qt/options/core.cpp | 22 +--------------------- ui/drivers/qt/options/directory.cpp | 22 +--------------------- ui/drivers/qt/options/drivers.cpp | 22 +--------------------- ui/drivers/qt/options/logging.cpp | 22 +--------------------- ui/drivers/qt/options/network.cpp | 22 +--------------------- ui/drivers/qt/options/options.h | 24 ++++++++++++++++++++++++ ui/drivers/qt/options/throttle.cpp | 22 +--------------------- 9 files changed, 32 insertions(+), 168 deletions(-) diff --git a/ui/drivers/qt/options/audio.cpp b/ui/drivers/qt/options/audio.cpp index 67530bf6cf..69c301e7ef 100644 --- a/ui/drivers/qt/options/audio.cpp +++ b/ui/drivers/qt/options/audio.cpp @@ -76,25 +76,5 @@ MenuSoundsPage::MenuSoundsPage(QObject *parent) : QWidget *MenuSoundsPage::widget() { - unsigned i; - QWidget *widget = new QWidget(); - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_MENU_SOUNDS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_MENU_SOUNDS_LIST); } diff --git a/ui/drivers/qt/options/configuration.cpp b/ui/drivers/qt/options/configuration.cpp index 54c94726ed..4af468a7a4 100644 --- a/ui/drivers/qt/options/configuration.cpp +++ b/ui/drivers/qt/options/configuration.cpp @@ -23,25 +23,5 @@ ConfigurationPage::ConfigurationPage(QObject *parent) : QWidget *ConfigurationPage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_CONFIGURATION_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_CONFIGURATION_SETTINGS_LIST); } diff --git a/ui/drivers/qt/options/core.cpp b/ui/drivers/qt/options/core.cpp index 18f56e5d55..0252f353f8 100644 --- a/ui/drivers/qt/options/core.cpp +++ b/ui/drivers/qt/options/core.cpp @@ -23,25 +23,5 @@ CorePage::CorePage(QObject *parent) : QWidget *CorePage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_CORE_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_CORE_SETTINGS_LIST); } diff --git a/ui/drivers/qt/options/directory.cpp b/ui/drivers/qt/options/directory.cpp index ffd16851cc..a2b268aab4 100644 --- a/ui/drivers/qt/options/directory.cpp +++ b/ui/drivers/qt/options/directory.cpp @@ -23,25 +23,5 @@ DirectoryPage::DirectoryPage(QObject *parent) : QWidget *DirectoryPage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_DIRECTORY_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_DIRECTORY_SETTINGS_LIST); } diff --git a/ui/drivers/qt/options/drivers.cpp b/ui/drivers/qt/options/drivers.cpp index d88dc21a3b..3c2f52c420 100644 --- a/ui/drivers/qt/options/drivers.cpp +++ b/ui/drivers/qt/options/drivers.cpp @@ -24,25 +24,5 @@ DriversPage::DriversPage(QObject *parent) : QWidget *DriversPage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_DRIVER_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_DRIVER_SETTINGS_LIST); } diff --git a/ui/drivers/qt/options/logging.cpp b/ui/drivers/qt/options/logging.cpp index a71577fc01..f34c18c695 100644 --- a/ui/drivers/qt/options/logging.cpp +++ b/ui/drivers/qt/options/logging.cpp @@ -23,25 +23,5 @@ LoggingPage::LoggingPage(QObject *parent) : QWidget *LoggingPage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_LOGGING_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_LOGGING_SETTINGS_LIST); } diff --git a/ui/drivers/qt/options/network.cpp b/ui/drivers/qt/options/network.cpp index 88f2d837fe..b12e4177da 100644 --- a/ui/drivers/qt/options/network.cpp +++ b/ui/drivers/qt/options/network.cpp @@ -164,25 +164,5 @@ UpdaterPage::UpdaterPage(QObject *parent) : QWidget *UpdaterPage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_UPDATER_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_UPDATER_SETTINGS_LIST); } diff --git a/ui/drivers/qt/options/options.h b/ui/drivers/qt/options/options.h index b2549f1964..ec6c301eb4 100644 --- a/ui/drivers/qt/options/options.h +++ b/ui/drivers/qt/options/options.h @@ -534,4 +534,28 @@ public: QWidget *widget(); }; +static inline QWidget *create_widget(enum menu_displaylist_ctl_state name) +{ + unsigned i; + QWidget *widget = new QWidget; + FormLayout *layout = new FormLayout; + file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); + + menu_displaylist_build_list(list, name); + + for (i = 0; i < list->size; i++) + { + menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) + file_list_get_actiondata_at_offset(list, i); + + layout->add(cbs->enum_idx); + } + + file_list_free(list); + + widget->setLayout(layout); + + return widget; +} + #endif diff --git a/ui/drivers/qt/options/throttle.cpp b/ui/drivers/qt/options/throttle.cpp index b389dfc3e7..f4d1deda07 100644 --- a/ui/drivers/qt/options/throttle.cpp +++ b/ui/drivers/qt/options/throttle.cpp @@ -56,25 +56,5 @@ RewindPage::RewindPage(QObject *parent) : QWidget *RewindPage::widget() { - unsigned i; - QWidget *widget = new QWidget; - FormLayout *layout = new FormLayout; - file_list_t *list = (file_list_t*)calloc(1, sizeof(*list)); - - menu_displaylist_build_list( - list, DISPLAYLIST_REWIND_SETTINGS_LIST); - - for (i = 0; i < list->size; i++) - { - menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) - file_list_get_actiondata_at_offset(list, i); - - layout->add(cbs->enum_idx); - } - - file_list_free(list); - - widget->setLayout(layout); - - return widget; + return create_widget(DISPLAYLIST_REWIND_SETTINGS_LIST); }