diff options
Diffstat (limited to 'src/plugins/qmldesigner')
12 files changed, 28 insertions, 28 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h index 74d59c3d46..2db3eea4d0 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -58,7 +58,7 @@ public slots: private: DragTool *m_dragTool; }; -}; +} class DragTool : public AbstractFormEditorTool { diff --git a/src/plugins/qmldesigner/components/formeditor/scaleitem.h b/src/plugins/qmldesigner/components/formeditor/scaleitem.h index c6eb3bc727..0ead6c80b8 100644 --- a/src/plugins/qmldesigner/components/formeditor/scaleitem.h +++ b/src/plugins/qmldesigner/components/formeditor/scaleitem.h @@ -48,6 +48,6 @@ private: ScaleIndicator* m_indicator; }; -}; +} #endif // SCALEITEM_H diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index d24d6fb364..b851ae9daf 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -160,7 +160,7 @@ void ComponentView::variantPropertiesChanged(const QList<VariantProperty>& /*pro void ComponentView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, PropertyChangeFlags /*propertyChange*/) {} void ComponentView::rootNodeTypeChanged(const QString &/*type*/, int /*majorVersion*/, int /*minorVersion*/) {} void ComponentView::scriptFunctionsChanged(const ModelNode &/*node*/, const QStringList &/*scriptFunctionList*/) {} -void ComponentView::instancePropertyChange(const QList<QPair<ModelNode, QString> > &/*propertyList*/) {}; +void ComponentView::instancePropertyChange(const QList<QPair<ModelNode, QString> > &/*propertyList*/) {} void ComponentView::instancesCompleted(const QVector<ModelNode> &/*completedNodeList*/) {} diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp index a1e967a021..d6cead8fb5 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp @@ -40,22 +40,22 @@ namespace QmlDesigner { -void DesignDocumentControllerView::nodeCreated(const ModelNode & /*createdNode*/) {}; -void DesignDocumentControllerView::nodeAboutToBeRemoved(const ModelNode & /*removedNode*/) {}; -void DesignDocumentControllerView::nodeRemoved(const ModelNode & /*removedNode*/, const NodeAbstractProperty & /*parentProperty*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}; -void DesignDocumentControllerView::nodeAboutToBeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}; -void DesignDocumentControllerView::nodeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}; -void DesignDocumentControllerView::nodeIdChanged(const ModelNode& /*node*/, const QString& /*newId*/, const QString& /*oldId*/) {}; -void DesignDocumentControllerView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& /*propertyList*/) {}; -void DesignDocumentControllerView::propertiesRemoved(const QList<AbstractProperty>& /*propertyList*/) {}; -void DesignDocumentControllerView::variantPropertiesChanged(const QList<VariantProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}; -void DesignDocumentControllerView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}; -void DesignDocumentControllerView::rootNodeTypeChanged(const QString & /*type*/, int /*majorVersion*/, int /*minorVersion*/) {}; +void DesignDocumentControllerView::nodeCreated(const ModelNode & /*createdNode*/) {} +void DesignDocumentControllerView::nodeAboutToBeRemoved(const ModelNode & /*removedNode*/) {} +void DesignDocumentControllerView::nodeRemoved(const ModelNode & /*removedNode*/, const NodeAbstractProperty & /*parentProperty*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {} +void DesignDocumentControllerView::nodeAboutToBeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {} +void DesignDocumentControllerView::nodeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {} +void DesignDocumentControllerView::nodeIdChanged(const ModelNode& /*node*/, const QString& /*newId*/, const QString& /*oldId*/) {} +void DesignDocumentControllerView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& /*propertyList*/) {} +void DesignDocumentControllerView::propertiesRemoved(const QList<AbstractProperty>& /*propertyList*/) {} +void DesignDocumentControllerView::variantPropertiesChanged(const QList<VariantProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {} +void DesignDocumentControllerView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {} +void DesignDocumentControllerView::rootNodeTypeChanged(const QString & /*type*/, int /*majorVersion*/, int /*minorVersion*/) {} void DesignDocumentControllerView::selectedNodesChanged(const QList<ModelNode> & /*selectedNodeList*/, - const QList<ModelNode> & /*lastSelectedNodeList*/) {}; + const QList<ModelNode> & /*lastSelectedNodeList*/) {} -void DesignDocumentControllerView::nodeOrderChanged(const NodeListProperty & /*listProperty*/, const ModelNode & /*movedNode*/, int /*oldIndex*/) {}; +void DesignDocumentControllerView::nodeOrderChanged(const NodeListProperty & /*listProperty*/, const ModelNode & /*movedNode*/, int /*oldIndex*/) {} void DesignDocumentControllerView::scriptFunctionsChanged(const ModelNode &/*node*/, const QStringList &/*scriptFunctionList*/) { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index 5a5da139c7..5a405d1fd3 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -36,7 +36,7 @@ #include <QScriptEngine> #include <private/qdeclarativelistmodel_p.h> -QT_FORWARD_DECLARE_CLASS(QMimeData); +QT_FORWARD_DECLARE_CLASS(QMimeData) namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h index 75556abb19..cd5ee4cd7b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h @@ -49,7 +49,7 @@ class ItemLibraryWidget : public QFrame enum FilterChangeFlag { QtBasic = 0x0, Meego = 0x1, - Symbian = 0x2, + Symbian = 0x2 }; public: diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp index 49468353ac..fb740b51b4 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp @@ -174,7 +174,7 @@ NavigatorTreeView::NavigatorTreeView(QWidget *parent) TreeViewStyle *style = new TreeViewStyle; setStyle(style); style->setParent(this); -}; +} QSize IconCheckboxItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const @@ -224,7 +224,7 @@ void NameItemDelegate::paint(QPainter *painter, painter->save(); QFontMetrics fm(option.font); - int width; + int width = 0; if (index.data(Qt::UserRole).isValid()) { int pixmapSide = 16; diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h index 87986816fd..679d9eedec 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h @@ -101,8 +101,8 @@ public: Action(QObject *parent = 0) : QAction(parent) {} }; -QML_DECLARE_TYPE(QMenu); -QML_DECLARE_TYPE(Action); +QML_DECLARE_TYPE(QMenu) +QML_DECLARE_TYPE(Action) //QML_DECLARE_TYPE(QToolBox) diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp index 7245e59fae..21d13889aa 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp @@ -173,4 +173,4 @@ void BehaviorDialog::reject() QDialog::reject(); } -}; +} diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h index ccf93602b7..1947c94349 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h @@ -92,7 +92,7 @@ private: }; -}; +} QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget) diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h index cce822d585..1c85225e7f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h @@ -50,7 +50,7 @@ class QmlAnchorBindingProxy : public QObject Q_PROPERTY(bool bottomAnchored READ bottomAnchored WRITE setBottomAnchor NOTIFY bottomAnchorChanged) Q_PROPERTY(bool leftAnchored READ leftAnchored WRITE setLeftAnchor NOTIFY leftAnchorChanged) Q_PROPERTY(bool rightAnchored READ rightAnchored WRITE setRightAnchor NOTIFY rightAnchorChanged) - Q_PROPERTY(bool hasParent READ hasParent NOTIFY parentChanged); + Q_PROPERTY(bool hasParent READ hasParent NOTIFY parentChanged) Q_PROPERTY(QVariant topTarget READ topTarget WRITE setTopTarget NOTIFY topTargetChanged) Q_PROPERTY(QVariant bottomTarget READ bottomTarget WRITE setBottomTarget NOTIFY bottomTargetChanged) diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 70b8383b4d..eae232631e 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -61,15 +61,15 @@ class CORESHARED_EXPORT AbstractView : public QObject { Q_OBJECT public: - Q_FLAGS(PropertyChangeFlag PropertyChangeFlags); + Q_FLAGS(PropertyChangeFlag PropertyChangeFlags) typedef QWeakPointer<AbstractView> Pointer; enum PropertyChangeFlag { NoAdditionalChanges = 0x0, PropertiesAdded = 0x1, - EmptyPropertiesRemoved = 0x2, + EmptyPropertiesRemoved = 0x2 }; - Q_DECLARE_FLAGS(PropertyChangeFlags, PropertyChangeFlag); + Q_DECLARE_FLAGS(PropertyChangeFlags, PropertyChangeFlag) AbstractView(QObject *parent = 0) : QObject(parent) {} |