diff options
author | David Schulz <david.schulz@digia.com> | 2012-11-23 09:31:03 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 17:04:00 +0100 |
commit | dae8d2505d6b6c591429768c10ae3ca190679d41 (patch) | |
tree | 8feab16aa3ae17e410c0ef222a5ec6b79962eb65 /examples/widgets/graphicsview/embeddeddialogs | |
parent | cbf3771e86272c10519394627784d6c1088f3a3b (diff) |
QtBase: examples/widgets/graphicsview/ codestyle
Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/widgets/graphicsview/embeddeddialogs')
6 files changed, 62 insertions, 48 deletions
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp index 5374e84c38..13c9395be3 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp @@ -41,7 +41,9 @@ #include "customproxy.h" -#include <QtWidgets> +#include <QStyleOptionGraphicsItem> +#include <QPainter> +#include <QGraphicsScene> CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(0) @@ -95,13 +97,16 @@ void CustomProxy::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void CustomProxy::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { QGraphicsProxyWidget::hoverLeaveEvent(event); - if (!popupShown && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0)) + if (!popupShown + && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0)) { zoomOut(); + } } bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event) { - if (watched->isWindow() && (event->type() == QEvent::UngrabMouse || event->type() == QEvent::GrabMouse)) { + if (watched->isWindow() + && (event->type() == QEvent::UngrabMouse || event->type() == QEvent::GrabMouse)) { popupShown = watched->isVisible(); if (!popupShown && !isUnderMouse()) zoomOut(); @@ -142,10 +147,10 @@ void CustomProxy::updateStep(qreal step) void CustomProxy::stateChanged(QTimeLine::State state) { if (state == QTimeLine::Running) { - if (timeLine->direction() == QTimeLine::Forward) + if (timeLine->direction() == QTimeLine::Forward) setCacheMode(ItemCoordinateCache); } else if (state == QTimeLine::NotRunning) { - if (timeLine->direction() == QTimeLine::Backward) + if (timeLine->direction() == QTimeLine::Backward) setCacheMode(DeviceCoordinateCache); } } diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h index 4e884779fc..b20c05ce5b 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h +++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h @@ -42,12 +42,13 @@ #ifndef CUSTOMPROXY_H #define CUSTOMPROXY_H -#include <QtCore/qtimeline.h> -#include <QtWidgets/qgraphicsproxywidget.h> +#include <QTimeLine> +#include <QGraphicsProxyWidget> class CustomProxy : public QGraphicsProxyWidget { Q_OBJECT + public: explicit CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); @@ -73,4 +74,4 @@ private: QGraphicsItem *currentPopup; }; -#endif +#endif // CUSTOMPROXY_H diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp index d18f537eb9..aa80f1e9c0 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp @@ -42,12 +42,12 @@ #include "embeddeddialog.h" #include "ui_embeddeddialog.h" -#include <QtWidgets> +#include <QStyleFactory> EmbeddedDialog::EmbeddedDialog(QWidget *parent) : QDialog(parent) + , ui(new Ui::EmbeddedDialog) { - ui = new Ui_embeddedDialog; ui->setupUi(this); ui->layoutDirection->setCurrentIndex(layoutDirection() != Qt::LeftToRight); diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h index 88f2ae5983..3217b9a619 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h @@ -42,13 +42,18 @@ #ifndef EMBEDDEDDIALOG_H #define EMBEDDEDDIALOG_H -#include <QtWidgets/qdialog.h> +#include <QDialog> -QT_FORWARD_DECLARE_CLASS(Ui_embeddedDialog); +QT_BEGIN_NAMESPACE +namespace Ui { +class EmbeddedDialog; +} +QT_END_NAMESPACE class EmbeddedDialog : public QDialog { Q_OBJECT + public: EmbeddedDialog(QWidget *parent = 0); ~EmbeddedDialog(); @@ -60,7 +65,7 @@ private slots: void styleChanged(const QString &styleName); private: - Ui_embeddedDialog *ui; + Ui::EmbeddedDialog *ui; }; -#endif +#endif // EMBEDDEDDIALOG_H diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui index f967b10085..82aa5d7be3 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui @@ -1,7 +1,8 @@ -<ui version="4.0" > - <class>embeddedDialog</class> - <widget class="QDialog" name="embeddedDialog" > - <property name="geometry" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>EmbeddedDialog</class> + <widget class="QDialog" name="EmbeddedDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,73 +10,73 @@ <height>134</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Embedded Dialog</string> </property> - <layout class="QFormLayout" name="formLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <layout class="QFormLayout" name="formLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Layout Direction:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>layoutDirection</cstring> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QComboBox" name="layoutDirection" > + <item row="0" column="1"> + <widget class="QComboBox" name="layoutDirection"> <item> - <property name="text" > + <property name="text"> <string>Left to Right</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Right to Left</string> </property> </item> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Select Font:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>fontComboBox</cstring> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QFontComboBox" name="fontComboBox" /> + <item row="1" column="1"> + <widget class="QFontComboBox" name="fontComboBox"/> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Style:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>style</cstring> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QComboBox" name="style" /> + <item row="2" column="1"> + <widget class="QComboBox" name="style"/> </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> <string>Layout spacing:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>spacing</cstring> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QSlider" name="spacing" > - <property name="orientation" > + <item row="3" column="1"> + <widget class="QSlider" name="spacing"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> diff --git a/examples/widgets/graphicsview/embeddeddialogs/main.cpp b/examples/widgets/graphicsview/embeddeddialogs/main.cpp index 90b470df54..2cc5c78baa 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/main.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/main.cpp @@ -42,7 +42,9 @@ #include "customproxy.h" #include "embeddeddialog.h" -#include <QtWidgets> +#include <QApplication> +#include <QGraphicsScene> +#include <QGraphicsView> int main(int argc, char *argv[]) { |