From 82a6d37b9917f83cc06375980c3a239ce0035ea8 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 6 May 2014 10:31:50 +0200 Subject: Wiggly example: Modernize/compactify code Change-Id: Iacfb308baac8eea60d56bf559113b36acb79d82a Reviewed-by: Jerome Pasion Reviewed-by: Friedemann Kleint --- examples/widgets/widgets/wiggly/dialog.cpp | 22 ++++++++-------------- examples/widgets/widgets/wiggly/dialog.h | 4 ++-- examples/widgets/widgets/wiggly/main.cpp | 11 +++-------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/examples/widgets/widgets/wiggly/dialog.cpp b/examples/widgets/widgets/wiggly/dialog.cpp index 1279d9d05b..3bb4f60d76 100644 --- a/examples/widgets/widgets/wiggly/dialog.cpp +++ b/examples/widgets/widgets/wiggly/dialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -38,32 +38,26 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include "dialog.h" #include "wigglywidget.h" //! [0] -Dialog::Dialog(QWidget *parent, bool smallScreen) +Dialog::Dialog(QWidget *parent) : QDialog(parent) { WigglyWidget *wigglyWidget = new WigglyWidget; QLineEdit *lineEdit = new QLineEdit; - QVBoxLayout *layout = new QVBoxLayout; + QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(wigglyWidget); layout->addWidget(lineEdit); - setLayout(layout); - connect(lineEdit, SIGNAL(textChanged(QString)), - wigglyWidget, SLOT(setText(QString))); - if (!smallScreen){ - lineEdit->setText(tr("Hello world!")); - } - else{ - lineEdit->setText(tr("Hello!")); - } + connect(lineEdit, &QLineEdit::textChanged, wigglyWidget, &WigglyWidget::setText); + lineEdit->setText(tr("Hello world!")); + setWindowTitle(tr("Wiggly")); resize(360, 145); } diff --git a/examples/widgets/widgets/wiggly/dialog.h b/examples/widgets/widgets/wiggly/dialog.h index 7355a56887..885671c69e 100644 --- a/examples/widgets/widgets/wiggly/dialog.h +++ b/examples/widgets/widgets/wiggly/dialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -49,7 +49,7 @@ class Dialog : public QDialog Q_OBJECT public: - explicit Dialog(QWidget *parent = 0, bool smallScreen = false); + explicit Dialog(QWidget *parent = 0); }; //! [0] diff --git a/examples/widgets/widgets/wiggly/main.cpp b/examples/widgets/widgets/wiggly/main.cpp index df5d5487bc..caf00eb748 100644 --- a/examples/widgets/widgets/wiggly/main.cpp +++ b/examples/widgets/widgets/wiggly/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -45,14 +45,9 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - bool smallScreen = QApplication::arguments().contains("-small-screen"); + Dialog dialog; + dialog.show(); - Dialog dialog(0, smallScreen); - - if (!smallScreen) - dialog.show(); - else - dialog.showFullScreen(); return app.exec(); } -- cgit v1.2.3