diff options
Diffstat (limited to 'examples/activeqt/opengl/globjwin.cpp')
-rw-r--r-- | examples/activeqt/opengl/globjwin.cpp | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/examples/activeqt/opengl/globjwin.cpp b/examples/activeqt/opengl/globjwin.cpp index 367ede2..dbb7e82 100644 --- a/examples/activeqt/opengl/globjwin.cpp +++ b/examples/activeqt/opengl/globjwin.cpp @@ -6,7 +6,17 @@ ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are @@ -49,62 +59,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); } |