diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/tools/customcompleter/mainwindow.cpp | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/tools/customcompleter/mainwindow.cpp')
-rw-r--r-- | examples/widgets/tools/customcompleter/mainwindow.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/examples/widgets/tools/customcompleter/mainwindow.cpp b/examples/widgets/tools/customcompleter/mainwindow.cpp index 39f5f39617..b8072b505c 100644 --- a/examples/widgets/tools/customcompleter/mainwindow.cpp +++ b/examples/widgets/tools/customcompleter/mainwindow.cpp @@ -48,13 +48,20 @@ ** ****************************************************************************/ -#include <QtWidgets> #include "mainwindow.h" #include "textedit.h" +#include <QAction> +#include <QApplication> +#include <QCompleter> +#include <QFile> +#include <QMenuBar> +#include <QMessageBox> +#include <QStringListModel> + //! [0] MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), completer(0) + : QMainWindow(parent) { createMenu(); @@ -83,10 +90,10 @@ void MainWindow::createMenu() connect(aboutAct, &QAction::triggered, this, &MainWindow::about); connect(aboutQtAct, &QAction::triggered, qApp, &QApplication::aboutQt); - QMenu* fileMenu = menuBar()->addMenu(tr("File")); + QMenu *fileMenu = menuBar()->addMenu(tr("File")); fileMenu->addAction(exitAction); - QMenu* helpMenu = menuBar()->addMenu(tr("About")); + QMenu *helpMenu = menuBar()->addMenu(tr("About")); helpMenu->addAction(aboutAct); helpMenu->addAction(aboutQtAct); } @@ -107,7 +114,7 @@ QAbstractItemModel *MainWindow::modelFromFile(const QString& fileName) while (!file.atEnd()) { QByteArray line = file.readLine(); if (!line.isEmpty()) - words << line.trimmed(); + words << QString::fromUtf8(line.trimmed()); } #ifndef QT_NO_CURSOR |