diff options
Diffstat (limited to 'src/designer/src')
30 files changed, 56 insertions, 56 deletions
diff --git a/src/designer/src/components/formeditor/formwindowcursor.cpp b/src/designer/src/components/formeditor/formwindowcursor.cpp index 294373fe3..85665a9a1 100644 --- a/src/designer/src/components/formeditor/formwindowcursor.cpp +++ b/src/designer/src/components/formeditor/formwindowcursor.cpp @@ -169,12 +169,12 @@ void FormWindowCursor::setProperty(const QString &name, const QVariant &value) // build selection const int N = selectedWidgetCount(); Q_ASSERT(N); - + SetPropertyCommand::ObjectList selection; - for (int i=0; i<N; ++i) + for (int i=0; i<N; ++i) selection.push_back(selectedWidget(i)); - + SetPropertyCommand* setPropertyCommand = new SetPropertyCommand(m_formWindow); if (setPropertyCommand->init(selection, name, value, current())) { m_formWindow->commandHistory()->push(setPropertyCommand); diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp index 457d15638..8761849d6 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -816,7 +816,7 @@ static inline bool hasManagedLayoutItems(const QDesignerFormEditorInterface *cor { if (const QLayout *ml = LayoutInfo::managedLayout(core, w)) { // Try to find managed items, ignore dummy grid spacers - const int count = ml->count(); + const int count = ml->count(); for (int i = 0; i < count; i++) if (!LayoutInfo::isEmptyItem(ml->itemAt(i))) return true; diff --git a/src/designer/src/components/formeditor/formwindowsettings.h b/src/designer/src/components/formeditor/formwindowsettings.h index b6543e2b1..9bf2be7a3 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.h +++ b/src/designer/src/components/formeditor/formwindowsettings.h @@ -45,7 +45,7 @@ #include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE - + namespace Ui { class FormWindowSettings; } diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp index 67ccaae59..cfaee7f71 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp @@ -88,7 +88,7 @@ void QMainWindowContainer::setCurrentIndex(int index) namespace { // Pair of <area,break_before> typedef QPair<Qt::ToolBarArea,bool> ToolBarData; - + ToolBarData toolBarData(QToolBar *me) { const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget()); if (!mw || !mw->layout() || mw->layout()->indexOf(me) == -1) @@ -96,7 +96,7 @@ namespace { return ToolBarData(mw->toolBarArea(me), mw->toolBarBreak(me)); } -Qt::DockWidgetArea dockWidgetArea(QDockWidget *me) +Qt::DockWidgetArea dockWidgetArea(QDockWidget *me) { if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget())) { // Make sure that me is actually managed by mw, otherwise diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp index bfd867658..dfa6cfdf7 100644 --- a/src/designer/src/components/objectinspector/objectinspector.cpp +++ b/src/designer/src/components/objectinspector/objectinspector.cpp @@ -262,7 +262,7 @@ ObjectInspector::ObjectInspectorPrivate::ObjectInspectorPrivate(QDesignerFormEdi m_treeView->setContextMenuPolicy(Qt::CustomContextMenu); } - + ObjectInspector::ObjectInspectorPrivate::~ObjectInspectorPrivate() { delete m_treeView->itemDelegate(); diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp index cf4ba20e7..9924c4bd7 100644 --- a/src/designer/src/components/propertyeditor/paletteeditor.cpp +++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp @@ -59,7 +59,7 @@ namespace qdesigner_internal { enum { BrushRole = 33 }; -PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) : +PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) : QDialog(parent), m_currentColorGroup(QPalette::Active), m_paletteModel(new PaletteModel(this)), @@ -238,7 +238,7 @@ QPalette PaletteEditor::getPalette(QDesignerFormEditorInterface *core, QWidget* ////////////////////// -PaletteModel::PaletteModel(QObject *parent) : +PaletteModel::PaletteModel(QObject *parent) : QAbstractTableModel(parent), m_compute(true) { @@ -419,7 +419,7 @@ BrushEditor::BrushEditor(QDesignerFormEditorInterface *core, QWidget *parent) : QWidget(parent), m_button(new QtColorButton(this)), m_changed(false), - m_core(core) + m_core(core) { QLayout *layout = new QHBoxLayout(this); layout->setMargin(0); @@ -500,12 +500,12 @@ void RoleEditor::emitResetProperty() setEdited(false); emit changed(this); } - + ////////////////////////// ColorDelegate::ColorDelegate(QDesignerFormEditorInterface *core, QObject *parent) : QItemDelegate(parent), m_core(core) -{ +{ } QWidget *ColorDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &, @@ -593,8 +593,8 @@ void ColorDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt, painter->restore(); } QItemDelegate::paint(painter, option, index); - - + + const QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &option)); const QPen oldPen = painter->pen(); painter->setPen(QPen(color)); diff --git a/src/designer/src/components/propertyeditor/previewframe.h b/src/designer/src/components/propertyeditor/previewframe.h index b494321d5..933c7b1fd 100644 --- a/src/designer/src/components/propertyeditor/previewframe.h +++ b/src/designer/src/components/propertyeditor/previewframe.h @@ -60,7 +60,7 @@ public: void setPreviewPalette(const QPalette &palette); void setSubWindowActive(bool active); - + private: // The user can on some platforms close the mdi child by invoking the system menu. // Ensure a child is present. diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h index 186a364e3..301c32bcd 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.h +++ b/src/designer/src/components/taskmenu/menutaskmenu.h @@ -57,7 +57,7 @@ namespace qdesigner_internal { class PromotionTaskMenu; // The QMenu task menu provides promotion and a remove option. The actual -// menu context options are not forwarded since they make only sense +// menu context options are not forwarded since they make only sense // when a menu is being edited/visible. class MenuTaskMenu : public QObject, public QDesignerTaskMenuExtension diff --git a/src/designer/src/designer/appfontdialog.h b/src/designer/src/designer/appfontdialog.h index 9d01266e5..9fa57a430 100644 --- a/src/designer/src/designer/appfontdialog.h +++ b/src/designer/src/designer/appfontdialog.h @@ -54,7 +54,7 @@ class QToolButton; class QItemSelection; class QDesignerSettingsInterface; -// AppFontWidget: Manages application fonts which the user can load and +// AppFontWidget: Manages application fonts which the user can load and // provides API for saving/restoring them. class AppFontWidget : public QGroupBox diff --git a/src/designer/src/designer/newform.cpp b/src/designer/src/designer/newform.cpp index 76b426901..a256d8074 100644 --- a/src/designer/src/designer/newform.cpp +++ b/src/designer/src/designer/newform.cpp @@ -96,7 +96,7 @@ NewForm::NewForm(QDesignerWorkbench *workbench, QWidget *parentWidget, const QSt m_buttonBox = createButtonBox(); vBoxLayout->addWidget(m_buttonBox); setLayout(vBoxLayout); - + resize(500, 400); slotCurrentTemplateChanged(m_newFormWidget->hasCurrentTemplate()); } diff --git a/src/designer/src/designer/qdesigner_server.cpp b/src/designer/src/designer/qdesigner_server.cpp index 4508b4a4e..00f3722d4 100644 --- a/src/designer/src/designer/qdesigner_server.cpp +++ b/src/designer/src/designer/qdesigner_server.cpp @@ -131,7 +131,7 @@ QDesignerClient::QDesignerClient(quint16 port, QObject *parent) m_socket->connectToHost(QHostAddress::LocalHost, port); connect(m_socket, SIGNAL(readyRead()), this, SLOT(readFromSocket())); - + } QDesignerClient::~QDesignerClient() diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.cpp b/src/designer/src/lib/sdk/abstractmetadatabase.cpp index a2af2b334..753de8840 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.cpp +++ b/src/designer/src/lib/sdk/abstractmetadatabase.cpp @@ -150,7 +150,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() \sa tabOrder() */ - + /*! \fn bool QDesignerMetaDataBaseItemInterface::enabled() const diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h index 80aae6bf3..0802e02d3 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.h +++ b/src/designer/src/lib/sdk/abstractmetadatabase.h @@ -62,12 +62,12 @@ public: virtual QString name() const = 0; virtual void setName(const QString &name) = 0; - + virtual QList<QWidget*> tabOrder() const = 0; virtual void setTabOrder(const QList<QWidget*> &tabOrder) = 0; - + virtual bool enabled() const = 0; - virtual void setEnabled(bool b) = 0; + virtual void setEnabled(bool b) = 0; }; @@ -85,7 +85,7 @@ public: virtual QList<QObject*> objects() const = 0; virtual QDesignerFormEditorInterface *core() const = 0; - + Q_SIGNALS: void changed(); }; diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp index 9cedb069a..ab2406eff 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -81,28 +81,28 @@ QDesignerPromotionInterface::~QDesignerPromotionInterface() Returns a set of promoted classed that are referenced by the currently opened forms. */ -/*! +/*! \fn virtual bool QDesignerPromotionInterface::addPromotedClass(const QString &baseClass, const QString &className, const QString &includeFile, QString *errorMessage) Add a promoted class named \a with the base class \a and include file \a includeFile. Returns \c true on success or \c false along with an error message in \a errorMessage on failure. */ -/*! +/*! \fn virtual bool QDesignerPromotionInterface::removePromotedClass(const QString &className, QString *errorMessage) Remove the promoted class named \a className unless it is referenced by a form. Returns \c true on success or \c false along with an error message in \a errorMessage on failure. */ -/*! +/*! \fn virtual bool QDesignerPromotionInterface::changePromotedClassName(const QString &oldClassName, const QString &newClassName, QString *errorMessage) Change the class name of a promoted class from \a oldClassName to \a newClassName. Returns \c true on success or \c false along with an error message in \a errorMessage on failure. */ -/*! +/*! \fn virtual bool QDesignerPromotionInterface::setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) Change the include file of a promoted class named \a className to be \a includeFile. Returns \c true on success or \c false along diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp index 84818bb81..31d4ec7b1 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp @@ -99,9 +99,9 @@ int QDesignerWidgetDataBaseInterface::indexOf(QDesignerWidgetDataBaseItemInterfa */ void QDesignerWidgetDataBaseInterface::insert(int index, QDesignerWidgetDataBaseItemInterface *item) { - if (debugWidgetDataBase) - qDebug() << "insert at " << index << ' ' << item->name() << " derived from " << item->extends(); - + if (debugWidgetDataBase) + qDebug() << "insert at " << index << ' ' << item->name() << " derived from " << item->extends(); + m_items.insert(index, item); } @@ -109,7 +109,7 @@ void QDesignerWidgetDataBaseInterface::insert(int index, QDesignerWidgetDataBase */ void QDesignerWidgetDataBaseInterface::append(QDesignerWidgetDataBaseItemInterface *item) { - if (debugWidgetDataBase) + if (debugWidgetDataBase) qDebug() << "append " << item->name() << " derived from " << item->extends(); m_items.append(item); } diff --git a/src/designer/src/lib/shared/csshighlighter_p.h b/src/designer/src/lib/shared/csshighlighter_p.h index 2f0745d83..cf99d9d75 100644 --- a/src/designer/src/lib/shared/csshighlighter_p.h +++ b/src/designer/src/lib/shared/csshighlighter_p.h @@ -71,7 +71,7 @@ protected: void highlight(const QString&, int, int, int/*State*/); private: - enum State { Selector, Property, Value, Pseudo, Pseudo1, Pseudo2, Quote, + enum State { Selector, Property, Value, Pseudo, Pseudo1, Pseudo2, Quote, MaybeComment, Comment, MaybeCommentEnd }; }; diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index 4feda3f1e..315f7de90 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -47,7 +47,7 @@ #include "qdesigner_menu_p.h" #include "qdesigner_menubar_p.h" #include "shared_settings_p.h" -#include "grid_p.h" +#include "grid_p.h" #include "deviceprofile_p.h" #include "qdesigner_utils_p.h" #include "spacer_widget_p.h" diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h index a75dca8c8..f42b6c775 100644 --- a/src/designer/src/lib/shared/formwindowbase_p.h +++ b/src/designer/src/lib/shared/formwindowbase_p.h @@ -185,7 +185,7 @@ private slots: private: void syncGridFeature(); - FormWindowBasePrivate *m_d; + FormWindowBasePrivate *m_d; }; } // namespace qdesigner_internal diff --git a/src/designer/src/lib/shared/metadatabase.cpp b/src/designer/src/lib/shared/metadatabase.cpp index 75e103fb2..a6b985163 100644 --- a/src/designer/src/lib/shared/metadatabase.cpp +++ b/src/designer/src/lib/shared/metadatabase.cpp @@ -227,7 +227,7 @@ QDESIGNER_SHARED_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QW qDebug() << "WARNING: Recursive promotion of " << oldCustomClassName << " to " << customClassName << ". A plugin is missing."; } - item->setCustomClassName(customClassName); + item->setCustomClassName(customClassName); if (debugMetaDatabase) { qDebug() << "Promoting " << widget->metaObject()->className() << " to " << customClassName; } @@ -267,7 +267,7 @@ QDESIGNER_SHARED_EXPORT QString promotedCustomClassName(QDesignerFormEditorInter return QString(); return item->customClassName(); } - + QDESIGNER_SHARED_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* widget) { const QString customClassName = promotedCustomClassName(core,widget); diff --git a/src/designer/src/lib/shared/metadatabase_p.h b/src/designer/src/lib/shared/metadatabase_p.h index f0361b501..5d1f1a14c 100644 --- a/src/designer/src/lib/shared/metadatabase_p.h +++ b/src/designer/src/lib/shared/metadatabase_p.h @@ -126,7 +126,7 @@ private: // promotion convenience QDESIGNER_SHARED_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QWidget *widget,const QString &customClassName); - QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget); + QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget); QDESIGNER_SHARED_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWidget* w); QDESIGNER_SHARED_EXPORT QString promotedCustomClassName(QDesignerFormEditorInterface *core, QWidget* w); QDESIGNER_SHARED_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* w); diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp index 8a4778418..25cbe6050 100644 --- a/src/designer/src/lib/shared/morphmenu.cpp +++ b/src/designer/src/lib/shared/morphmenu.cpp @@ -266,7 +266,7 @@ static void replaceWidgetListDynamicProperty(QWidget *parentWidget, } /* Morph a widget into another class. Use the static addMorphMacro() to - * add a respective command sequence to the undo stack as it emits signals + * add a respective command sequence to the undo stack as it emits signals * which cause other commands to be added. */ class MorphWidgetCommand : public QDesignerFormWindowCommand { diff --git a/src/designer/src/lib/shared/newactiondialog.cpp b/src/designer/src/lib/shared/newactiondialog.cpp index 1e77bfae1..27baddc0e 100644 --- a/src/designer/src/lib/shared/newactiondialog.cpp +++ b/src/designer/src/lib/shared/newactiondialog.cpp @@ -89,7 +89,7 @@ NewActionDialog::NewActionDialog(ActionEditor *parent) : m_actionEditor(parent) { m_ui->setupUi(this); - + m_ui->tooltipEditor->setTextPropertyValidationMode(ValidationRichText); connect(m_ui->toolTipToolButton, SIGNAL(clicked()), this, SLOT(slotEditToolTip())); diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index bb9349821..1cdad96e7 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -177,7 +177,7 @@ private slots: protected: // Fit the widget in case the orientation changes (transposing screensize) - virtual void fitWidget(const QSize &size); + virtual void fitWidget(const QSize &size); // Calculate the complete transformation for the skin // (base class implementation provides rotation). virtual QMatrix skinTransform() const; @@ -193,7 +193,7 @@ private: }; PreviewDeviceSkin::PreviewDeviceSkin(const DeviceSkinParameters ¶meters, QWidget *parent) : - DeviceSkin(parameters, parent), + DeviceSkin(parameters, parent), m_screenSize(parameters.screenSize()), m_direction(DirectionUp), m_directionUpAction(0), @@ -257,7 +257,7 @@ void PreviewDeviceSkin::slotPopupMenu() connect(directionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotDirection(QAction*))); directionGroup->setExclusive(true); m_directionUpAction = createCheckableActionIntData(tr("&Portrait"), DirectionUp, m_direction, directionGroup, this); - //: Rotate form preview counter-clockwise + //: Rotate form preview counter-clockwise m_directionLeftAction = createCheckableActionIntData(tr("Landscape (&CCW)"), DirectionLeft, m_direction, directionGroup, this); //: Rotate form preview clockwise m_directionRightAction = createCheckableActionIntData(tr("&Landscape (CW)"), DirectionRight, m_direction, directionGroup, this); @@ -299,7 +299,7 @@ void PreviewDeviceSkin::fitWidget(const QSize &size) QMatrix PreviewDeviceSkin::skinTransform() const { - QMatrix newTransform; + QMatrix newTransform; switch (m_direction) { case DirectionUp: break; @@ -352,7 +352,7 @@ signals: void zoomPercentChanged(int); protected: - virtual void populateContextMenu(QMenu *m); + virtual void populateContextMenu(QMenu *m); virtual QMatrix skinTransform() const; virtual void fitWidget(const QSize &size); @@ -389,7 +389,7 @@ static inline QSize scaleSize(int zoomPercent, const QSize &size) } void ZoomablePreviewDeviceSkin::setPreview(QWidget *formWidget) -{ +{ m_zoomWidget->setWidget(formWidget); m_zoomWidget->resize(scaleSize(zoomPercent(), screenSize())); } @@ -408,7 +408,7 @@ void ZoomablePreviewDeviceSkin::setZoomPercent(int zp) if (m_zoomMenu->zoom() != zp) m_zoomMenu->setZoom(zp); - QApplication::setOverrideCursor(Qt::WaitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); m_zoomWidget->setZoom(zp); setTransform(skinTransform()); QApplication::restoreOverrideCursor(); diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp index 363e9253f..2d897b906 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -1476,7 +1476,7 @@ enum DesignableState { PropertyIsDesignable, PropertyNotDesignable }; static inline DesignableState designableState(const QDesignerMetaPropertyInterface *p, const QObject *object) -{ +{ if (p->attributes(object) & QDesignerMetaPropertyInterface::DesignableAttribute) return PropertyIsDesignable; return (p->attributes() & QDesignerMetaPropertyInterface::DesignableAttribute) ? diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp index 2b576eab8..da10982b1 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp @@ -304,7 +304,7 @@ const QLayout *QDesignerWidgetItem::containingLayout() const return m_cachedContainingLayout; } -void QDesignerWidgetItem::layoutChanged() +void QDesignerWidgetItem::layoutChanged() { if (DebugWidgetItem) qDebug() << Q_FUNC_INFO; @@ -312,7 +312,7 @@ void QDesignerWidgetItem::layoutChanged() } bool QDesignerWidgetItem::eventFilter(QObject * /* watched */, QEvent *event) -{ +{ if (event->type() == QEvent::ParentChange) layoutChanged(); return false; diff --git a/src/designer/src/lib/shared/sheet_delegate.cpp b/src/designer/src/lib/shared/sheet_delegate.cpp index 8b71466d4..a9d0d1ca3 100644 --- a/src/designer/src/lib/shared/sheet_delegate.cpp +++ b/src/designer/src/lib/shared/sheet_delegate.cpp @@ -118,7 +118,7 @@ void SheetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, // draw text QRect textrect = QRect(r.left() + i*2, r.top(), r.width() - ((5*i)/2), r.height()); - QString text = elidedText(option.fontMetrics, textrect.width(), Qt::ElideMiddle, + QString text = elidedText(option.fontMetrics, textrect.width(), Qt::ElideMiddle, model->data(index, Qt::DisplayRole).toString()); m_view->style()->drawItemText(painter, textrect, Qt::AlignCenter, option.palette, m_view->isEnabled(), text); diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h index 8e3f8a9ed..3e6d0b01d 100644 --- a/src/designer/src/lib/shared/zoomwidget_p.h +++ b/src/designer/src/lib/shared/zoomwidget_p.h @@ -143,7 +143,7 @@ private: int m_zoom; qreal m_zoomFactor; - bool m_zoomContextMenuEnabled; + bool m_zoomContextMenuEnabled; bool m_resizeBlocked; ZoomMenu *m_zoomMenu; }; diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index 1849bd0d3..7dde47ca5 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -2455,7 +2455,7 @@ void QAbstractFormBuilder::loadListWidgetExtraInfo(DomWidget *ui_widget, QListWi loadItemPropsNFlags<QListWidgetItem>(this, item, properties); #else loadItemPropsNFlags(this, item, properties); -#endif +#endif } DomProperty *currentRow = propertyMap(ui_widget->elementProperty()).value(strings.currentRowProperty); diff --git a/src/designer/src/lib/uilib/customwidget.qdoc b/src/designer/src/lib/uilib/customwidget.qdoc index 2fab9868a..815a8ae00 100644 --- a/src/designer/src/lib/uilib/customwidget.qdoc +++ b/src/designer/src/lib/uilib/customwidget.qdoc @@ -64,7 +64,7 @@ \QD constructs instances of the custom widget by calling the plugin's createWidget() function with a suitable parent widget. Plugins must construct and return an instance of a custom widget with the specified - parent widget. + parent widget. Exporting your custom widget plugin to \QD using the Q_PLUGIN_METADATA() macro. For example, if a library called \c libcustomwidgetplugin.so diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp index f2c12eb2d..6b03b4796 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp @@ -181,7 +181,7 @@ void QAxWidgetPropertySheet::reloadPropertySheet(const struct SavedProperties &p foundGeometry = true; continue; } - if (name == QLatin1String(controlPropertyName)) { + if (name == QLatin1String(controlPropertyName)) { sheet->setChanged(index, !i.value().toString().isEmpty()); continue; } |