diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/multistreamclient/client.cpp | 3 | ||||
-rw-r--r-- | examples/network/securesocketclient/sslclient.cpp | 2 | ||||
-rw-r--r-- | examples/network/torrent/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/doc/src/cube.qdoc | 2 | ||||
-rw-r--r-- | examples/widgets/desktop/systray/window.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/mainwindows/mainwindow/mainwindow.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/tools/settingseditor/mainwindow.cpp | 4 |
8 files changed, 10 insertions, 11 deletions
diff --git a/examples/network/multistreamclient/client.cpp b/examples/network/multistreamclient/client.cpp index db6e3ba304..ce84f3df9a 100644 --- a/examples/network/multistreamclient/client.cpp +++ b/examples/network/multistreamclient/client.cpp @@ -126,8 +126,7 @@ Client::Client(QWidget *parent) connect(sctpSocket, &QSctpSocket::connected, this, &Client::connected); connect(sctpSocket, &QSctpSocket::disconnected, this, &Client::disconnected); connect(sctpSocket, &QSctpSocket::channelReadyRead, this, &Client::readDatagram); - connect(sctpSocket, QOverload<QAbstractSocket::SocketError>::of(&QSctpSocket::error), - this, &Client::displayError); + connect(sctpSocket, &QSctpSocket::errorOccurred, this, &Client::displayError); connect(consumers[SctpChannels::Time], &Consumer::writeDatagram, this, &Client::writeDatagram); connect(consumers[SctpChannels::Chat], &Consumer::writeDatagram, this, &Client::writeDatagram); diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp index 6eb1075996..d6c52a1c66 100644 --- a/examples/network/securesocketclient/sslclient.cpp +++ b/examples/network/securesocketclient/sslclient.cpp @@ -226,7 +226,7 @@ void SslClient::setupSecureSocket() this, &SslClient::socketStateChanged); connect(socket, &QSslSocket::encrypted, this, &SslClient::socketEncrypted); - connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QSslSocket::error), + connect(socket, &QSslSocket::errorOccurred, this, &SslClient::socketError); connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &SslClient::sslErrors); diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp index 331fa12944..c343ee81b9 100644 --- a/examples/network/torrent/mainwindow.cpp +++ b/examples/network/torrent/mainwindow.cpp @@ -183,7 +183,7 @@ MainWindow::MainWindow(QWidget *parent) bottomBar->addWidget((uploadLimitLabel = new QLabel(tr("0 KB/s")))); uploadLimitLabel->setFixedSize(QSize(fm.horizontalAdvance(tr("99999 KB/s")), fm.lineSpacing())); -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS setUnifiedTitleAndToolBarOnMac(true); #endif diff --git a/examples/opengl/doc/src/cube.qdoc b/examples/opengl/doc/src/cube.qdoc index 4f5b6bda90..05014173c5 100644 --- a/examples/opengl/doc/src/cube.qdoc +++ b/examples/opengl/doc/src/cube.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp index 3238e3bf31..e62b5fc0d0 100644 --- a/examples/widgets/desktop/systray/window.cpp +++ b/examples/widgets/desktop/systray/window.cpp @@ -111,7 +111,7 @@ void Window::setVisible(bool visible) //! [2] void Window::closeEvent(QCloseEvent *event) { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS if (!event->spontaneous() || !isVisible()) { return; } diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp index a43adfceac..d5a7d6ae07 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp @@ -120,7 +120,7 @@ void MainWindow::actionTriggered(QAction *action) void MainWindow::setupToolBar() { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS setUnifiedTitleAndToolBarOnMac(true); #endif @@ -178,7 +178,7 @@ void MainWindow::setupMenuBar() for (int i = 0; i < toolBars.count(); ++i) toolBarMenu->addMenu(toolBars.at(i)->toolbarMenu()); -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS toolBarMenu->addSeparator(); action = toolBarMenu->addAction(tr("Unified")); diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index eccc29d26d..9b5425240d 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -96,7 +96,7 @@ const QString rsrcPath = ":/images/win"; TextEdit::TextEdit(QWidget *parent) : QMainWindow(parent) { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS setUnifiedTitleAndToolBarOnMac(true); #endif setWindowTitle(QCoreApplication::applicationName()); diff --git a/examples/widgets/tools/settingseditor/mainwindow.cpp b/examples/widgets/tools/settingseditor/mainwindow.cpp index ccca16ffcd..225a396f91 100644 --- a/examples/widgets/tools/settingseditor/mainwindow.cpp +++ b/examples/widgets/tools/settingseditor/mainwindow.cpp @@ -157,10 +157,10 @@ void MainWindow::createActions() QAction *openIniFileAct = fileMenu->addAction(tr("Open I&NI File..."), this, &MainWindow::openIniFile); openIniFileAct->setShortcut(tr("Ctrl+N")); -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS QAction *openPropertyListAct = fileMenu->addAction(tr("Open Apple &Property List..."), this, &MainWindow::openPropertyList); openPropertyListAct->setShortcut(tr("Ctrl+P")); -#endif // Q_OS_OSX +#endif // Q_OS_MACOS #ifdef Q_OS_WIN QAction *openRegistryPathAct = fileMenu->addAction(tr("Open Windows &Registry Path..."), this, &MainWindow::openRegistryPath); |