Changeset View
Changeset View
Standalone View
Standalone View
krusader/Filter/filterdialog.cpp
Show All 22 Lines | |||||
23 | #include "generalfilter.h" | 23 | #include "generalfilter.h" | ||
24 | 24 | | |||
25 | // QtWidgets | 25 | // QtWidgets | ||
26 | #include <QDialogButtonBox> | 26 | #include <QDialogButtonBox> | ||
27 | #include <QGridLayout> | 27 | #include <QGridLayout> | ||
28 | #include <QPushButton> | 28 | #include <QPushButton> | ||
29 | 29 | | |||
30 | #include <KI18n/KLocalizedString> | 30 | #include <KI18n/KLocalizedString> | ||
31 | #include <utility> | ||||
31 | 32 | | |||
32 | FilterDialog::FilterDialog(QWidget *parent, QString caption, QStringList extraOptions, bool modal) | 33 | FilterDialog::FilterDialog(QWidget *parent, const QString& caption, QStringList extraOptions, bool modal) | ||
33 | : QDialog(parent) | 34 | : QDialog(parent) | ||
34 | { | 35 | { | ||
35 | setWindowTitle(caption.isNull() ? i18n("Krusader::Choose Files") : caption); | 36 | setWindowTitle(caption.isNull() ? i18n("Krusader::Choose Files") : caption); | ||
36 | setModal(modal); | 37 | setModal(modal); | ||
37 | 38 | | |||
38 | QVBoxLayout *mainLayout = new QVBoxLayout; | 39 | auto *mainLayout = new QVBoxLayout; | ||
39 | setLayout(mainLayout); | 40 | setLayout(mainLayout); | ||
40 | 41 | | |||
41 | QTabWidget *filterWidget = new QTabWidget; | 42 | auto *filterWidget = new QTabWidget; | ||
42 | 43 | | |||
43 | filterTabs = FilterTabs::addTo(filterWidget, FilterTabs::HasProfileHandler, extraOptions); | 44 | filterTabs = FilterTabs::addTo(filterWidget, FilterTabs::HasProfileHandler, std::move(extraOptions)); | ||
44 | generalFilter = static_cast<GeneralFilter*> (filterTabs->get("GeneralFilter")); | 45 | generalFilter = dynamic_cast<GeneralFilter*> (filterTabs->get("GeneralFilter")); | ||
45 | 46 | | |||
46 | mainLayout->addWidget(filterWidget); | 47 | mainLayout->addWidget(filterWidget); | ||
47 | 48 | | |||
48 | QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Reset); | 49 | QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Reset); | ||
49 | mainLayout->addWidget(buttonBox); | 50 | mainLayout->addWidget(buttonBox); | ||
50 | 51 | | |||
51 | QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); | 52 | QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); | ||
52 | okButton->setDefault(true); | 53 | okButton->setDefault(true); | ||
Show All 16 Lines | |||||
69 | 70 | | |||
70 | KRQuery FilterDialog::getQuery() | 71 | KRQuery FilterDialog::getQuery() | ||
71 | { | 72 | { | ||
72 | return settings.toQuery(); | 73 | return settings.toQuery(); | ||
73 | } | 74 | } | ||
74 | 75 | | |||
75 | bool FilterDialog::isExtraOptionChecked(QString name) | 76 | bool FilterDialog::isExtraOptionChecked(QString name) | ||
76 | { | 77 | { | ||
77 | return filterTabs->isExtraOptionChecked(name); | 78 | return filterTabs->isExtraOptionChecked(std::move(name)); | ||
78 | } | 79 | } | ||
79 | 80 | | |||
80 | void FilterDialog::checkExtraOption(QString name, bool check) | 81 | void FilterDialog::checkExtraOption(QString name, bool check) | ||
81 | { | 82 | { | ||
82 | filterTabs->checkExtraOption(name, check); | 83 | filterTabs->checkExtraOption(std::move(name), check); | ||
83 | } | 84 | } | ||
84 | 85 | | |||
85 | void FilterDialog::slotCloseRequest(bool doAccept) | 86 | void FilterDialog::slotCloseRequest(bool doAccept) | ||
86 | { | 87 | { | ||
87 | if (doAccept) { | 88 | if (doAccept) { | ||
88 | slotOk(); | 89 | slotOk(); | ||
89 | accept(); | 90 | accept(); | ||
90 | } else | 91 | } else | ||
Show All 16 Lines |