diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/corelib/ipc/sharedmemory | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/corelib/ipc/sharedmemory')
| -rw-r--r-- | examples/corelib/ipc/sharedmemory/dialog.cpp | 9 | ||||
| -rw-r--r-- | examples/corelib/ipc/sharedmemory/dialog.h | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/examples/corelib/ipc/sharedmemory/dialog.cpp b/examples/corelib/ipc/sharedmemory/dialog.cpp index ce5a4547bb..4e999d1bcf 100644 --- a/examples/corelib/ipc/sharedmemory/dialog.cpp +++ b/examples/corelib/ipc/sharedmemory/dialog.cpp @@ -51,7 +51,6 @@ #include "dialog.h" #include <QFileDialog> #include <QBuffer> -#include <QtCore/QDebug> /*! \class Dialog @@ -81,10 +80,10 @@ Dialog::Dialog(QWidget *parent) : QDialog(parent), sharedMemory("QSharedMemoryExample") { ui.setupUi(this); - connect(ui.loadFromFileButton, SIGNAL(clicked()), SLOT(loadFromFile())); - connect(ui.loadFromSharedMemoryButton, - SIGNAL(clicked()), - SLOT(loadFromMemory())); + connect(ui.loadFromFileButton, &QPushButton::clicked, + this, &Dialog::loadFromFile); + connect(ui.loadFromSharedMemoryButton, &QPushButton::clicked, + this, &Dialog::loadFromMemory); setWindowTitle(tr("SharedMemory Example")); } //! [0] diff --git a/examples/corelib/ipc/sharedmemory/dialog.h b/examples/corelib/ipc/sharedmemory/dialog.h index 1662654441..693333256c 100644 --- a/examples/corelib/ipc/sharedmemory/dialog.h +++ b/examples/corelib/ipc/sharedmemory/dialog.h @@ -51,8 +51,8 @@ #ifndef DIALOG_H #define DIALOG_H -#include <qdialog.h> -#include <qsharedmemory.h> +#include <QDialog> +#include <QSharedMemory> #include "ui_dialog.h" //! [0] @@ -61,7 +61,7 @@ class Dialog : public QDialog Q_OBJECT public: - Dialog(QWidget *parent = 0); + Dialog(QWidget *parent = nullptr); public slots: void loadFromFile(); |