diff options
Diffstat (limited to 'examples/widgets/tools/settingseditor')
8 files changed, 65 insertions, 57 deletions
diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp index 5b6e2652bb..99c9834a63 100644 --- a/examples/widgets/tools/settingseditor/locationdialog.cpp +++ b/examples/widgets/tools/settingseditor/locationdialog.cpp @@ -48,10 +48,20 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "locationdialog.h" +#include <QBoxLayout> +#include <QComboBox> +#include <QDialogButtonBox> +#include <QDir> +#include <QPushButton> +#include <QGroupBox> +#include <QHeaderView> +#include <QLabel> +#include <QLineEdit> +#include <QTableWidget> +#include <QTableWidgetItem> + LocationDialog::LocationDialog(QWidget *parent) : QDialog(parent) { @@ -91,8 +101,7 @@ LocationDialog::LocationDialog(QWidget *parent) locationsGroupBox = new QGroupBox(tr("Setting Locations")); - QStringList labels; - labels << tr("Location") << tr("Access"); + const QStringList labels{tr("Location"), tr("Access")}; locationsTable = new QTableWidget; locationsTable->setSelectionMode(QAbstractItemView::SingleSelection); diff --git a/examples/widgets/tools/settingseditor/locationdialog.h b/examples/widgets/tools/settingseditor/locationdialog.h index c25b01effd..cd2efecb0b 100644 --- a/examples/widgets/tools/settingseditor/locationdialog.h +++ b/examples/widgets/tools/settingseditor/locationdialog.h @@ -68,7 +68,7 @@ class LocationDialog : public QDialog Q_OBJECT public: - LocationDialog(QWidget *parent = 0); + LocationDialog(QWidget *parent = nullptr); QSettings::Format format() const; QSettings::Scope scope() const; diff --git a/examples/widgets/tools/settingseditor/mainwindow.cpp b/examples/widgets/tools/settingseditor/mainwindow.cpp index a7a1e9b415..b9c2193ccb 100644 --- a/examples/widgets/tools/settingseditor/mainwindow.cpp +++ b/examples/widgets/tools/settingseditor/mainwindow.cpp @@ -48,15 +48,23 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "locationdialog.h" #include "mainwindow.h" #include "settingstree.h" -MainWindow::MainWindow() - : settingsTree(new SettingsTree) - , locationDialog(nullptr) +#include <QAction> +#include <QApplication> +#include <QDesktopWidget> +#include <QFileDialog> +#include <QInputDialog> +#include <QLineEdit> +#include <QMenuBar> +#include <QMessageBox> +#include <QStandardPaths> +#include <QStatusBar> + +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) + , settingsTree(new SettingsTree) { setCentralWidget(settingsTree); diff --git a/examples/widgets/tools/settingseditor/mainwindow.h b/examples/widgets/tools/settingseditor/mainwindow.h index 373c982afe..b1115005a9 100644 --- a/examples/widgets/tools/settingseditor/mainwindow.h +++ b/examples/widgets/tools/settingseditor/mainwindow.h @@ -68,7 +68,7 @@ class MainWindow : public QMainWindow public: typedef QSharedPointer<QSettings> SettingsPtr; - MainWindow(); + MainWindow(QWidget *parent = nullptr); private slots: void openSettings(); @@ -81,11 +81,11 @@ private: void createActions(); void setSettingsObject(const SettingsPtr &settings); - SettingsTree *settingsTree; - LocationDialog *locationDialog; - QAction *refreshAct; - QAction *autoRefreshAct; - QAction *fallbacksAct; + SettingsTree *settingsTree = nullptr; + LocationDialog *locationDialog = nullptr; + QAction *refreshAct = nullptr; + QAction *autoRefreshAct = nullptr; + QAction *fallbacksAct = nullptr; }; #endif diff --git a/examples/widgets/tools/settingseditor/settingstree.cpp b/examples/widgets/tools/settingseditor/settingstree.cpp index 8585792787..b263746847 100644 --- a/examples/widgets/tools/settingseditor/settingstree.cpp +++ b/examples/widgets/tools/settingseditor/settingstree.cpp @@ -48,20 +48,20 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "settingstree.h" #include "variantdelegate.h" +#include <QApplication> +#include <QDesktopWidget> +#include <QHeaderView> +#include <QSettings> + SettingsTree::SettingsTree(QWidget *parent) : QTreeWidget(parent) - , autoRefresh(false) { setItemDelegate(new VariantDelegate(this)); - QStringList labels; - labels << tr("Setting") << tr("Type") << tr("Value"); - setHeaderLabels(labels); + setHeaderLabels({tr("Setting"), tr("Type"), tr("Value")}); header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); header()->setSectionResizeMode(1, QHeaderView::ResizeToContents); header()->setSectionResizeMode(2, QHeaderView::Stretch); @@ -77,10 +77,6 @@ SettingsTree::SettingsTree(QWidget *parent) connect(&refreshTimer, &QTimer::timeout, this, &SettingsTree::maybeRefresh); } -SettingsTree::~SettingsTree() -{ -} - void SettingsTree::setSettingsObject(const SettingsPtr &newSettings) { settings = newSettings; @@ -137,7 +133,7 @@ void SettingsTree::refresh() this, &SettingsTree::updateSetting); settings->sync(); - updateChildItems(0); + updateChildItems(nullptr); connect(this, &QTreeWidget::itemChanged, this, &SettingsTree::updateSetting); @@ -228,7 +224,7 @@ void SettingsTree::updateChildItems(QTreeWidgetItem *parent) QTreeWidgetItem *SettingsTree::createItem(const QString &text, QTreeWidgetItem *parent, int index) { - QTreeWidgetItem *after = 0; + QTreeWidgetItem *after = nullptr; if (index != 0) after = childAt(parent, index - 1); @@ -243,24 +239,18 @@ QTreeWidgetItem *SettingsTree::createItem(const QString &text, return item; } -QTreeWidgetItem *SettingsTree::childAt(QTreeWidgetItem *parent, int index) +QTreeWidgetItem *SettingsTree::childAt(QTreeWidgetItem *parent, int index) const { - if (parent) - return parent->child(index); - else - return topLevelItem(index); + return (parent ? parent->child(index) : topLevelItem(index)); } -int SettingsTree::childCount(QTreeWidgetItem *parent) +int SettingsTree::childCount(QTreeWidgetItem *parent) const { - if (parent) - return parent->childCount(); - else - return topLevelItemCount(); + return (parent ? parent->childCount() : topLevelItemCount()); } int SettingsTree::findChild(QTreeWidgetItem *parent, const QString &text, - int startIndex) + int startIndex) const { for (int i = startIndex; i < childCount(parent); ++i) { if (childAt(parent, i)->text(0) == text) diff --git a/examples/widgets/tools/settingseditor/settingstree.h b/examples/widgets/tools/settingseditor/settingstree.h index 15efa0e6aa..3e9e9658ce 100644 --- a/examples/widgets/tools/settingseditor/settingstree.h +++ b/examples/widgets/tools/settingseditor/settingstree.h @@ -65,10 +65,9 @@ class SettingsTree : public QTreeWidget Q_OBJECT public: - typedef QSharedPointer<QSettings> SettingsPtr; + using SettingsPtr = QSharedPointer<QSettings>; - SettingsTree(QWidget *parent = 0); - ~SettingsTree(); + SettingsTree(QWidget *parent = nullptr); void setSettingsObject(const SettingsPtr &settings); QSize sizeHint() const override; @@ -89,16 +88,16 @@ private: void updateChildItems(QTreeWidgetItem *parent); QTreeWidgetItem *createItem(const QString &text, QTreeWidgetItem *parent, int index); - QTreeWidgetItem *childAt(QTreeWidgetItem *parent, int index); - int childCount(QTreeWidgetItem *parent); - int findChild(QTreeWidgetItem *parent, const QString &text, int startIndex); + QTreeWidgetItem *childAt(QTreeWidgetItem *parent, int index) const; + int childCount(QTreeWidgetItem *parent) const; + int findChild(QTreeWidgetItem *parent, const QString &text, int startIndex) const; void moveItemForward(QTreeWidgetItem *parent, int oldIndex, int newIndex); SettingsPtr settings; QTimer refreshTimer; - bool autoRefresh; QIcon groupIcon; QIcon keyIcon; + bool autoRefresh = false; }; #endif diff --git a/examples/widgets/tools/settingseditor/variantdelegate.cpp b/examples/widgets/tools/settingseditor/variantdelegate.cpp index 266754ca4d..9772fe8a41 100644 --- a/examples/widgets/tools/settingseditor/variantdelegate.cpp +++ b/examples/widgets/tools/settingseditor/variantdelegate.cpp @@ -48,12 +48,14 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "variantdelegate.h" +#include <QDateTime> +#include <QLineEdit> +#include <QRegularExpressionValidator> + VariantDelegate::VariantDelegate(QObject *parent) - : QItemDelegate(parent) + : QStyledItemDelegate(parent) { boolExp.setPattern("true|false"); boolExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption); @@ -82,12 +84,12 @@ void VariantDelegate::paint(QPainter *painter, if (!isSupportedType(value.type())) { QStyleOptionViewItem myOption = option; myOption.state &= ~QStyle::State_Enabled; - QItemDelegate::paint(painter, myOption, index); + QStyledItemDelegate::paint(painter, myOption, index); return; } } - QItemDelegate::paint(painter, option, index); + QStyledItemDelegate::paint(painter, option, index); } QWidget *VariantDelegate::createEditor(QWidget *parent, @@ -95,11 +97,11 @@ QWidget *VariantDelegate::createEditor(QWidget *parent, const QModelIndex &index) const { if (index.column() != 2) - return 0; + return nullptr; QVariant originalValue = index.model()->data(index, Qt::UserRole); if (!isSupportedType(originalValue.type())) - return 0; + return nullptr; QLineEdit *lineEdit = new QLineEdit(parent); lineEdit->setFrame(false); @@ -149,7 +151,7 @@ QWidget *VariantDelegate::createEditor(QWidget *parent, regExp = unsignedIntegerExp; break; default: - ; + break; } if (regExp.isValid()) { diff --git a/examples/widgets/tools/settingseditor/variantdelegate.h b/examples/widgets/tools/settingseditor/variantdelegate.h index 7cd9fa9ee8..68f21fa3f6 100644 --- a/examples/widgets/tools/settingseditor/variantdelegate.h +++ b/examples/widgets/tools/settingseditor/variantdelegate.h @@ -51,15 +51,15 @@ #ifndef VARIANTDELEGATE_H #define VARIANTDELEGATE_H -#include <QItemDelegate> +#include <QStyledItemDelegate> #include <QRegularExpression> -class VariantDelegate : public QItemDelegate +class VariantDelegate : public QStyledItemDelegate { Q_OBJECT public: - VariantDelegate(QObject *parent = 0); + VariantDelegate(QObject *parent = nullptr); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; |