Active Qt Examples: Brush up to C++ 11

Use nullptr, member initialization, new connect syntax, QStringLiteral, etc.

Change-Id: Ia79473ca302216f91eec6a32f670cf606761ed0d
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 28 insertions, 29 deletions

diff --git a/examples/activeqt/opengl/globjwin.cpp b/examples/activeqt/opengl/globjwin.cpp
index 367ede2..56b0902 100644
--- a/examples/activeqt/opengl/globjwin.cpp
+++ b/examples/activeqt/opengl/globjwin.cpp
@@ -49,62 +49,61 @@
 #include <QApplication>
 
 
-GLObjectWindow::GLObjectWindow(QWidget* parent)
+GLObjectWindow::GLObjectWindow(QWidget *parent)
     : QWidget(parent)
 {
-
     // Create a menu
-    QMenu *file = new QMenu( this );
-    file->addAction( "Exit",  qApp, SLOT(quit())/*, CTRL+Key_Q*/);
+    QMenu *file = new QMenu(this);
+    file->addAction(tr("Exit"), qApp, &QApplication::quit);
 
     // Create a menu bar
-    QMenuBar *m = new QMenuBar( this );
-    m->addMenu(file)->setText("&File");
+    QMenuBar *m = new QMenuBar(this);
+    m->addMenu(file)->setText(tr("&File"));
 
     // Create a nice frame to put around the OpenGL widget
-    QFrame* f = new QFrame(this);
-    f->setFrameStyle( QFrame::Sunken | QFrame::Panel );
-    f->setLineWidth( 2 );
+    QFrame *f = new QFrame(this);
+    f->setFrameStyle(QFrame::Sunken | QFrame::Panel);
+    f->setLineWidth(2);
 
     // Create our OpenGL widget
-    GLBox* c = new GLBox( f, "glbox");
+    GLBox *c = new GLBox(f, "glbox");
 
     // Create the three sliders; one for each rotation axis
-    QSlider* x = new QSlider(Qt::Vertical, this);
+    QSlider *x = new QSlider(Qt::Vertical, this);
     x->setMaximum(360);
     x->setPageStep(60);
-    x->setTickPosition( QSlider::TicksLeft );
-    QObject::connect( x, SIGNAL(valueChanged(int)),c,SLOT(setXRotation(int)) );
+    x->setTickPosition(QSlider::TicksLeft);
+    connect(x, &QSlider::valueChanged, c, &GLBox::setXRotation);
 
-    QSlider* y = new QSlider(Qt::Vertical, this);
+    QSlider *y = new QSlider(Qt::Vertical, this);
     y->setMaximum(360);
     y->setPageStep(60);
-    y->setTickPosition( QSlider::TicksLeft );
-    QObject::connect( y, SIGNAL(valueChanged(int)),c,SLOT(setYRotation(int)) );
+    y->setTickPosition(QSlider::TicksLeft);
+    connect(y, &QSlider::valueChanged, c, &GLBox::setYRotation);
 
-    QSlider* z = new QSlider(Qt::Vertical, this);
+    QSlider *z = new QSlider(Qt::Vertical, this);
     z->setMaximum(360);
     z->setPageStep(60);
-    z->setTickPosition( QSlider::TicksLeft );
-    QObject::connect( z, SIGNAL(valueChanged(int)),c,SLOT(setZRotation(int)) );
+    z->setTickPosition(QSlider::TicksLeft);
+    connect(z, &QSlider::valueChanged, c, &GLBox::setZRotation);
 
     // Now that we have all the widgets, put them into a nice layout
 
     // Top level layout, puts the sliders to the left of the frame/GL widget
-    QHBoxLayout* hlayout = new QHBoxLayout(this);
+    QHBoxLayout *hlayout = new QHBoxLayout(this);
 
     // Put the sliders on top of each other
-    QVBoxLayout* vlayout = new QVBoxLayout();
-    vlayout->addWidget( x );
-    vlayout->addWidget( y );
-    vlayout->addWidget( z );
+    QVBoxLayout *vlayout = new QVBoxLayout();
+    vlayout->addWidget(x);
+    vlayout->addWidget(y);
+    vlayout->addWidget(z);
 
     // Put the GL widget inside the frame
-    QHBoxLayout* flayout = new QHBoxLayout(f);
+    QHBoxLayout *flayout = new QHBoxLayout(f);
     flayout->setMargin(0);
-    flayout->addWidget( c, 1 );
+    flayout->addWidget(c, 1);
 
-    hlayout->setMenuBar( m );
-    hlayout->addLayout( vlayout );
-    hlayout->addWidget( f, 1 );
+    hlayout->setMenuBar(m);
+    hlayout->addLayout(vlayout);
+    hlayout->addWidget(f, 1);
 }