diff options
Diffstat (limited to 'examples/widgets/tools/codecs')
-rw-r--r-- | examples/widgets/tools/codecs/mainwindow.cpp | 20 | ||||
-rw-r--r-- | examples/widgets/tools/codecs/mainwindow.h | 6 | ||||
-rw-r--r-- | examples/widgets/tools/codecs/previewform.cpp | 22 | ||||
-rw-r--r-- | examples/widgets/tools/codecs/previewform.h | 4 |
4 files changed, 35 insertions, 17 deletions
diff --git a/examples/widgets/tools/codecs/mainwindow.cpp b/examples/widgets/tools/codecs/mainwindow.cpp index 53db9fe61f..6b601062b6 100644 --- a/examples/widgets/tools/codecs/mainwindow.cpp +++ b/examples/widgets/tools/codecs/mainwindow.cpp @@ -48,12 +48,21 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "mainwindow.h" #include "encodingdialog.h" #include "previewform.h" +#include <QAction> +#include <QApplication> +#include <QDesktopWidget> +#include <QFileDialog> +#include <QMenuBar> +#include <QMessageBox> +#include <QPlainTextEdit> +#include <QRegularExpression> +#include <QTextCodec> +#include <QTextStream> + MainWindow::MainWindow() { textEdit = new QPlainTextEdit; @@ -146,14 +155,14 @@ void MainWindow::findCodecs() QTextCodec *codec = QTextCodec::codecForMib(mib); QString sortKey = codec->name().toUpper(); - int rank; + char rank; if (sortKey.startsWith(QLatin1String("UTF-8"))) { rank = 1; } else if (sortKey.startsWith(QLatin1String("UTF-16"))) { rank = 2; } else if ((match = iso8859RegExp.match(sortKey)).hasMatch()) { - if (match.captured(1).size() == 1) + if (match.capturedRef(1).size() == 1) rank = 3; else rank = 4; @@ -164,7 +173,8 @@ void MainWindow::findCodecs() codecMap.insert(sortKey, codec); } - codecs = codecMap.values(); + for (const auto &codec : qAsConst(codecMap)) + codecs += codec; } void MainWindow::createMenus() diff --git a/examples/widgets/tools/codecs/mainwindow.h b/examples/widgets/tools/codecs/mainwindow.h index 64494d1960..cf18222520 100644 --- a/examples/widgets/tools/codecs/mainwindow.h +++ b/examples/widgets/tools/codecs/mainwindow.h @@ -51,7 +51,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QList> +#include <QVector> #include <QMainWindow> QT_BEGIN_NAMESPACE @@ -81,10 +81,10 @@ private: void findCodecs(); void createMenus(); - QList<QAction *> saveAsActs; + QVector<QAction *> saveAsActs; QPlainTextEdit *textEdit; PreviewForm *previewForm; - QList<QTextCodec *> codecs; + QVector<QTextCodec *> codecs; EncodingDialog *m_encodingDialog = nullptr; }; diff --git a/examples/widgets/tools/codecs/previewform.cpp b/examples/widgets/tools/codecs/previewform.cpp index 206b5757cd..ec75ebb9fa 100644 --- a/examples/widgets/tools/codecs/previewform.cpp +++ b/examples/widgets/tools/codecs/previewform.cpp @@ -48,10 +48,19 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "previewform.h" +#include <QApplication> +#include <QComboBox> +#include <QDesktopWidget> +#include <QDialogButtonBox> +#include <QGridLayout> +#include <QLabel> +#include <QPlainTextEdit> +#include <QPushButton> +#include <QTextCodec> +#include <QTextStream> + // Helpers for creating hex dumps static void indent(QTextStream &str, int indent) { @@ -83,8 +92,7 @@ static void formatHex(QTextStream &str, const QByteArray &data) static void formatPrintableCharacters(QTextStream &str, const QByteArray &data) { - for (int i = 0, size = data.size(); i < size; ++i) { - const char c = data.at(i); + for (const char c : data) { switch (c) { case '\0': str << "\\0"; @@ -179,7 +187,7 @@ PreviewForm::PreviewForm(QWidget *parent) resize(screenGeometry.width() * 2 / 5, screenGeometry.height() / 2); } -void PreviewForm::setCodecList(const QList<QTextCodec *> &list) +void PreviewForm::setCodecList(const QVector<QTextCodec *> &list) { encodingComboBox->clear(); for (const QTextCodec *codec : list) { @@ -226,10 +234,10 @@ void PreviewForm::updateTextEdit() statusLabel->setText(message); statusLabel->setStyleSheet(QStringLiteral("background-color: \"red\";")); } else if (state.invalidChars) { - statusLabel->setText(tr("%1: %n invalid characters", 0, state.invalidChars).arg(name)); + statusLabel->setText(tr("%1: %n invalid characters", nullptr, state.invalidChars).arg(name)); statusLabel->setStyleSheet(QStringLiteral("background-color: \"yellow\";")); } else { - statusLabel->setText(tr("%1: %n bytes converted", 0, encodedData.size()).arg(name)); + statusLabel->setText(tr("%1: %n bytes converted", nullptr, encodedData.size()).arg(name)); statusLabel->setStyleSheet(QString()); } if (success) diff --git a/examples/widgets/tools/codecs/previewform.h b/examples/widgets/tools/codecs/previewform.h index 6335b6539f..02eb3533f3 100644 --- a/examples/widgets/tools/codecs/previewform.h +++ b/examples/widgets/tools/codecs/previewform.h @@ -52,7 +52,7 @@ #define PREVIEWFORM_H #include <QDialog> -#include <QList> +#include <QVector> QT_BEGIN_NAMESPACE class QComboBox; @@ -71,7 +71,7 @@ class PreviewForm : public QDialog public: explicit PreviewForm(QWidget *parent = nullptr); - void setCodecList(const QList<QTextCodec *> &list); + void setCodecList(const QVector<QTextCodec *> &list); void setEncodedData(const QByteArray &data); QString decodedString() const { return decodedStr; } |