diff --git a/src/shared/Components/FilterSelector/FilterSelector.cpp b/src/shared/Components/FilterSelector/FilterSelector.cpp index ef6b251167cd0d6bf6b4db4aa41a495309193404..1a261eb82b0038948f630a2865d03cbf023f900f 100644 --- a/src/shared/Components/FilterSelector/FilterSelector.cpp +++ b/src/shared/Components/FilterSelector/FilterSelector.cpp @@ -31,14 +31,14 @@ void FilterSelector::setupUi() QVBoxLayout *layout = new QVBoxLayout; - topic = new QComboBox; + topic = std::make_unique<QComboBox>(); topic->setSizeAdjustPolicy(QComboBox::AdjustToContents); topic->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); topic->addItems(messages.keys()); - layout->addWidget(topic); + layout->addWidget(topic.get()); - fieldsWidget = new QListWidget; - layout->addWidget(fieldsWidget); + fieldsWidget = std::make_unique<QListWidget>(); + layout->addWidget(fieldsWidget.get()); QHBoxLayout *buttons = new QHBoxLayout; QPushButton *cancel = new QPushButton("Cancel"); @@ -55,7 +55,7 @@ void FilterSelector::setupUi() topic->setCurrentText(currentMessage); setTopic(currentMessage); - connect(topic, &QComboBox::currentTextChanged, this, + connect(topic.get(), &QComboBox::currentTextChanged, this, [=](QString key) { if (messages.contains(key)) @@ -78,8 +78,8 @@ void FilterSelector::setupUi() void FilterSelector::selectFilter(FilterSelector::Handler handler) { - FilterSelector *selector = new FilterSelector(); - QObject::connect(selector, &FilterSelector::filterSelected, handler); + auto selector = std::make_unique<FilterSelector>(); + QObject::connect(selector.get(), &FilterSelector::filterSelected, handler); selector->show(); } diff --git a/src/shared/Components/FilterSelector/FilterSelector.h b/src/shared/Components/FilterSelector/FilterSelector.h index 63a656e602beb569623b81ebe1cb0be3909a92cb..32fe9c9e3cd53c926e639fa7299eda0d6e8f7ce3 100644 --- a/src/shared/Components/FilterSelector/FilterSelector.h +++ b/src/shared/Components/FilterSelector/FilterSelector.h @@ -50,8 +50,8 @@ private: Filter filter; QString currentMessage; - QListWidget* fieldsWidget; - QComboBox* topic; + std::unique_ptr<QListWidget> fieldsWidget; + std::unique_ptr<QComboBox> topic; QMap<QString, QList<QString>> messages;