whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtGui documentation: cleanup 

Cleanup the QtGui documentation:
 - use new signal/slot syntax
 - use range-based for loop instead foreach

Change-Id: Id49ff2cbe78f28a06ca0fb63e6ca6f7dc2736f7b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
bb10
Christian Ehrlicher 2019-02-03 20:29:34 +01:00
parent 3514aedbf3
commit 0059de2d1b
15 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/doc/snippets/clipboard/clipwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "clipwindow.h"
@ -67,10 +67,11 @@ ClipWindow::ClipWindow(QWidget *parent)
previousItems = new QListWidget(centralWidget);
//! [0]
connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updateClipboard()));
connect(clipboard, &QClipboard::dataChanged,
this, &ClipWindow::updateClipboard);
//! [0]
connect(mimeTypeCombo, SIGNAL(activated(QString)),
this, SLOT(updateData(QString)));
connect(mimeTypeCombo, QOverload<QString>::of(&QComboBox::activated),
this, &ClipWindow::updateData);
QVBoxLayout *currentLayout = new QVBoxLayout(currentItem);
currentLayout->addWidget(mimeTypeLabel);

4
src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
View File

@ -73,8 +73,8 @@ for (int i = 0; i < 4; ++i) {
//! [2]
QTreeView *treeView = new QTreeView(this);
treeView->setModel(myStandardItemModel);
connect(treeView, SIGNAL(clicked(QModelIndex)),
this, SLOT(clicked(QModelIndex)));
connect(treeView, &QTreeView::clicked,
this, &MyWidget::clicked);
//! [2]

9
src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp
View File

@ -64,7 +64,8 @@ MyMainWidget::MyMainWidget(QWidget *parent)
:QWidget(parent)
{
QGuiApplication::setFallbackSessionManagementEnabled(false);
connect(qApp, SIGNAL(commitDataRequest(QSessionManager)), SLOT(commitData(QSessionManager)));
connect(qApp, &QGuiApplication::commitDataRequest,
this, &MyMainWidget::commitData);
}
void MyMainWidget::commitData(QSessionManager& manager)
@ -102,12 +103,14 @@ appname -session id
//! [3]
foreach (const QString &command, mySession.restartCommand())
const QStringList commands = mySession.restartCommand();
for (const QString &command : commands)
do_something(command);
//! [3]
//! [4]
foreach (const QString &command, mySession.discardCommand())
const QStringList commands = mySession.discardCommand();
for (const QString &command : mySession.discardCommand())
do_something(command);
//! [4]

10
src/gui/doc/snippets/draganddrop/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "dragwidget.h"
#include "mainwindow.h"
@ -64,10 +64,10 @@ MainWindow::MainWindow(QWidget *parent)
QLabel *dataLabel = new QLabel(tr("Amount of data (bytes):"), centralWidget);
dragWidget = new DragWidget(centralWidget);
connect(dragWidget, SIGNAL(mimeTypes(QStringList)),
this, SLOT(setMimeTypes(QStringList)));
connect(dragWidget, SIGNAL(dragResult(QString)),
this, SLOT(setDragResult(QString)));
connect(dragWidget, &DragWidget::mimeTypes,
this, &MainWindow::setMimeTypes);
connect(dragWidget, &DragWidget:dragResult,
this, &MainWindow::setDragResult);
QVBoxLayout *mainLayout = new QVBoxLayout(centralWidget);
mainLayout->addWidget(mimeTypeLabel);

10
src/gui/doc/snippets/picture/picture.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
void myProcessing(const QString &)
{
@ -85,8 +85,8 @@ int main()
{
// FORMATS
//! [2]
QStringList list = QPicture::inputFormatList();
foreach (const QString &string, list)
const QStringList list = QPicture::inputFormatList();
for (const QString &string : list)
myProcessing(string);
//! [2]
}
@ -94,8 +94,8 @@ int main()
{
// OUTPUT
//! [3]
QStringList list = QPicture::outputFormatList();
foreach (const QString &string, list)
const QStringList list = QPicture::outputFormatList();
for (const QString &string : list)
myProcessing(string);
//! [3]
}

11
src/gui/doc/snippets/qfontdatabase/main.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
int main(int argc, char **argv)
{
@ -60,16 +60,19 @@ int main(int argc, char **argv)
fontTree.setColumnCount(2);
fontTree.setHeaderLabels(QStringList() << "Font" << "Smooth Sizes");
foreach (const QString &family, database.families()) {
const QStringList fontFamilies = database.families();
for (const QString &family : fontFamilies) {
QTreeWidgetItem *familyItem = new QTreeWidgetItem(&fontTree);
familyItem->setText(0, family);
foreach (const QString &style, database.styles(family)) {
const QStringList fontStyles = database.styles(family);
for (const QString &style : fontStyles) {
QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem);
styleItem->setText(0, style);
QString sizes;
foreach (int points, database.smoothSizes(family, style))
const QList<int> smoothSizes = database.smoothSizes(family, style)
for (int points : smoothSizes)
sizes += QString::number(points) + ' ';
styleItem->setText(1, sizes.trimmed());

4
src/gui/doc/snippets/separations/screenwidget.cpp
View File

@ -105,8 +105,8 @@ ScreenWidget::ScreenWidget(QWidget *parent, QColor initialColor,
//invertButton->setOn(inverted);
invertButton->setEnabled(false);
connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
connect(invertButton, SIGNAL(clicked()), this, SLOT(invertImage()));
connect(colorButton, &QPushButton::clicked, this, &ScreenWidget::setColor);
connect(invertButton, &QPushButton::clicked, this, &ScreenWidget::invertImage);
QGridLayout *gridLayout = new QGridLayout;
gridLayout->addWidget(imageLabel, 0, 0, 1, 2);

18
src/gui/doc/snippets/separations/viewer.cpp
View File

@ -58,7 +58,7 @@ A main menu provides entries for selecting files, and adjusting the
brightness of the separations.
*/
#include <QtGui>
#include <QtWidgets>
#include "finalwidget.h"
#include "screenwidget.h"
@ -126,11 +126,11 @@ void Viewer::createMenus()
menuBar()->addMenu(fileMenu);
menuBar()->addMenu(brightnessMenu);
connect(openAction, SIGNAL(triggered()), this, SLOT(chooseFile()));
connect(saveAction, SIGNAL(triggered()), this, SLOT(saveImage()));
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(brightnessMenu, SIGNAL(triggered(QAction*)), this,
SLOT(setBrightness(QAction*)));
connect(openAction, &QAction::triggered, this, &Viewer::chooseFile);
connect(saveAction, &QAction::triggered, this, &Viewer::saveImage);
connect(quitAction, &QAction::triggered, qApp, QApplication::quit);
connect(brightnessMenu, &QMenu::triggered,
this, &Viewer::setBrightness);
}
/*
@ -160,9 +160,9 @@ QFrame* Viewer::createCentralWidget()
yellowWidget = new ScreenWidget(frame, Qt::yellow, tr("Yellow"),
ScreenWidget::Yellow, labelSize);
connect(cyanWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
connect(magentaWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
connect(yellowWidget, SIGNAL(imageChanged()), this, SLOT(createImage()));
connect(cyanWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage);
connect(magentaWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage);
connect(yellowWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage);
grid->addWidget(finalWidget, 0, 0, Qt::AlignTop | Qt::AlignHCenter);
grid->addWidget(cyanWidget, 0, 1, Qt::AlignTop | Qt::AlignHCenter);

8
src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mainwindow.h"
#include "xmlwriter.h"
@ -73,9 +73,9 @@ MainWindow::MainWindow()
editor = new QTextEdit(this);
connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar()));
connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile);
connect(quitAction, &QAction::triggered, this, &MainWindow::close);
connect(calendarAction, &QAction::triggered, this, &MainWindow::insertCalendar);
setCentralWidget(editor);
setWindowTitle(tr("Text Document Writer"));

8
src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mainwindow.h"
#include "xmlwriter.h"
@ -75,9 +75,9 @@ MainWindow::MainWindow()
editor = new QTextEdit(this);
//! [0]
connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar()));
connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile);
connect(quitAction, &QAction::triggered, this, &MainWindow::close);
connect(calendarAction, &QAction::triggered, this, &MainWindow::insertCalendar);
setCentralWidget(editor);
setWindowTitle(tr("Text Document Writer"));

8
src/gui/doc/snippets/textdocument-frames/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mainwindow.h"
#include "xmlwriter.h"
@ -64,7 +64,7 @@ MainWindow::MainWindow()
quitAction->setShortcut(tr("Ctrl+Q"));
menuBar()->addMenu(fileMenu);
editor = new QTextEdit();
editor = new QTextEdit;
QTextCursor cursor(editor->textCursor());
cursor.movePosition(QTextCursor::Start);
@ -130,8 +130,8 @@ MainWindow::MainWindow()
plainCharFormat);
connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile);
connect(quitAction, &QAction::triggered, this, &MainWindow::close);
setCentralWidget(editor);
setWindowTitle(tr("Text Document Frames"));

5
src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mainwindow.h"
@ -88,7 +88,8 @@ MainWindow::MainWindow()
document = new QTextDocument(this);
editor->setDocument(document);
connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus()));
connect(editor, &QTextEdit::selectionChanged,
this, &MainWindow::updateMenus);
updateMenus();

2
src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
View File

@ -74,7 +74,7 @@ MainWindow::MainWindow()
document = new QTextDocument(this);
editor->setDocument(document);
connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus()));
connect(editor, &QTextEdit::selectionChanged, this, &MainWindow::updateMenus);
setCentralWidget(editor);
setWindowTitle(tr("Text Document Writer"));

5
src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mainwindow.h"
@ -90,7 +90,8 @@ MainWindow::MainWindow()
document = new QTextDocument(this);
editor->setDocument(document);
connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus()));
connect(editor, &QTextEdit::selectionChanged,
this, &MainWindow::updateMenus);
setCentralWidget(editor);
setWindowTitle(tr("Text Document Writer"));

8
src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
View File

@ -48,7 +48,7 @@
**
****************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mainwindow.h"
#include "xmlwriter.h"
@ -132,9 +132,9 @@ MainWindow::MainWindow()
}
//! [8]
connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
connect(showTableAction, SIGNAL(triggered()), this, SLOT(showTable()));
connect(saveAction, &QAction:triggered, this, &MainWindow::saveFile);
connect(quitAction, &QAction:triggered, this, &MainWindow::close);
connect(showTableAction, &QAction:triggered, this, &MainWindow::showTable);
setCentralWidget(editor);
setWindowTitle(tr("Text Document Tables"));