diff options
Diffstat (limited to 'examples/widgets/graphicsview/boxes/scene.cpp')
-rw-r--r-- | examples/widgets/graphicsview/boxes/scene.cpp | 56 |
1 files changed, 21 insertions, 35 deletions
diff --git a/examples/widgets/graphicsview/boxes/scene.cpp b/examples/widgets/graphicsview/boxes/scene.cpp index 3c65206c02..7f62ac894b 100644 --- a/examples/widgets/graphicsview/boxes/scene.cpp +++ b/examples/widgets/graphicsview/boxes/scene.cpp @@ -311,15 +311,13 @@ RenderOptionsDialog::RenderOptionsDialog() layout->addWidget(check, 0, 0, 1, 2); ++row; - QPalette palette; - // Load all .par files // .par files have a simple syntax for specifying user adjustable uniform variables. - QSet<QByteArray> uniforms; - QList<QString> filter = QStringList("*.par"); - QList<QFileInfo> files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable); + const QList<QFileInfo> files = QDir(QStringLiteral(":/res/boxes/")) + .entryInfoList({ QStringLiteral("*.par") }, + QDir::Files | QDir::Readable); - foreach (QFileInfo fileInfo, files) { + for (const QFileInfo &fileInfo : files) { QFile file(fileInfo.absoluteFilePath()); if (file.open(QIODevice::ReadOnly)) { while (!file.atEnd()) { @@ -404,7 +402,7 @@ int RenderOptionsDialog::addShader(const QString &name) void RenderOptionsDialog::emitParameterChanged() { - foreach (ParameterEdit *edit, m_parameterEdits) + for (ParameterEdit *edit : qAsConst(m_parameterEdits)) edit->emitChange(); } @@ -541,24 +539,15 @@ Scene::Scene(int width, int height, int maxTextureSize) Scene::~Scene() { - if (m_box) - delete m_box; - foreach (GLTexture *texture, m_textures) - if (texture) delete texture; - if (m_mainCubemap) - delete m_mainCubemap; - foreach (QGLShaderProgram *program, m_programs) - if (program) delete program; - if (m_vertexShader) - delete m_vertexShader; - foreach (QGLShader *shader, m_fragmentShaders) - if (shader) delete shader; - foreach (GLRenderTargetCube *rt, m_cubemaps) - if (rt) delete rt; - if (m_environmentShader) - delete m_environmentShader; - if (m_environmentProgram) - delete m_environmentProgram; + delete m_box; + qDeleteAll(m_textures); + delete m_mainCubemap; + qDeleteAll(m_programs); + delete m_vertexShader; + qDeleteAll(m_fragmentShaders); + qDeleteAll(m_cubemaps); + delete m_environmentShader; + delete m_environmentProgram; } void Scene::initGL() @@ -603,15 +592,13 @@ void Scene::initGL() m_mainCubemap = new GLRenderTargetCube(512); - QStringList filter; QList<QFileInfo> files; // Load all .png files as textures m_currentTexture = 0; - filter = QStringList("*.png"); - files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable); + files = QDir(":/res/boxes/").entryInfoList({ QStringLiteral("*.png") }, QDir::Files | QDir::Readable); - foreach (QFileInfo file, files) { + for (const QFileInfo &file : qAsConst(files)) { GLTexture *texture = new GLTexture2D(file.absoluteFilePath(), qMin(256, m_maxTextureSize), qMin(256, m_maxTextureSize)); if (texture->failed()) { delete texture; @@ -626,9 +613,8 @@ void Scene::initGL() // Load all .fsh files as fragment shaders m_currentShader = 0; - filter = QStringList("*.fsh"); - files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable); - foreach (QFileInfo file, files) { + files = QDir(":/res/boxes/").entryInfoList({ QStringLiteral("*.fsh") }, QDir::Files | QDir::Readable); + for (const QFileInfo &file : qAsConst(files)) { QGLShaderProgram *program = new QGLShaderProgram; QGLShader* shader = new QGLShader(QGLShader::Fragment); shader->compileSourceFile(file.absoluteFilePath()); @@ -664,7 +650,7 @@ void Scene::initGL() m_renderOptions->emitParameterChanged(); } -static void loadMatrix(const QMatrix4x4& m) +static void loadMatrix(const QMatrix4x4 &m) { // static to prevent glLoadMatrixf to fail on certain drivers static GLfloat mat[16]; @@ -1053,7 +1039,7 @@ void Scene::toggleDynamicCubemap(int state) void Scene::setColorParameter(const QString &name, QRgb color) { // set the color in all programs - foreach (QGLShaderProgram *program, m_programs) { + for (QGLShaderProgram *program : qAsConst(m_programs)) { program->bind(); program->setUniformValue(program->uniformLocation(name), QColor(color)); program->release(); @@ -1063,7 +1049,7 @@ void Scene::setColorParameter(const QString &name, QRgb color) void Scene::setFloatParameter(const QString &name, float value) { // set the color in all programs - foreach (QGLShaderProgram *program, m_programs) { + for (QGLShaderProgram *program : qAsConst(m_programs)) { program->bind(); program->setUniformValue(program->uniformLocation(name), value); program->release(); |