summaryrefslogtreecommitdiffstats
path: root/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-21 11:20:06 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-26 08:52:54 +0000
commit9da07cc30fdf2facaa9d4639ce6ca97509742fc4 (patch)
treeebcb356d4c970be389cf567b83ef28dfe5f596ae /examples/designer/taskmenuextension/tictactoetaskmenu.cpp
parent984efb1e87c94ef193035f6b980e57acb78dca7e (diff)
Qt Designer Examples: Brush up to C++ 11
Use nullptr, member initialization, QOverload, etc. Task-number: QTBUG-61184 Change-Id: I45061c506dad72d5f495f480b3e61f4d1c0599d4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'examples/designer/taskmenuextension/tictactoetaskmenu.cpp')
-rw-r--r--examples/designer/taskmenuextension/tictactoetaskmenu.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
index df13ed60b..75d1f625c 100644
--- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
@@ -83,9 +83,7 @@ QAction *TicTacToeTaskMenu::preferredEditAction() const
//! [3]
QList<QAction *> TicTacToeTaskMenu::taskActions() const
{
- QList<QAction *> list;
- list.append(editStateAction);
- return list;
+ return QList<QAction *>{editStateAction};
}
//! [3]
@@ -102,11 +100,11 @@ QObject *TicTacToeTaskMenuFactory::createExtension(QObject *object,
QObject *parent) const
{
if (iid != Q_TYPEID(QDesignerTaskMenuExtension))
- return 0;
+ return nullptr;
if (TicTacToe *tic = qobject_cast<TicTacToe*>(object))
return new TicTacToeTaskMenu(tic, parent);
- return 0;
+ return nullptr;
}
//! [5]