diff options
Diffstat (limited to 'src/designer/src/lib/shared')
-rw-r--r-- | src/designer/src/lib/shared/csshighlighter_p.h | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/formwindowbase.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/formwindowbase_p.h | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/metadatabase.cpp | 4 | ||||
-rw-r--r-- | src/designer/src/lib/shared/metadatabase_p.h | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/morphmenu.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/newactiondialog.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/previewmanager.cpp | 14 | ||||
-rw-r--r-- | src/designer/src/lib/shared/qdesigner_propertysheet.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/qdesigner_widgetitem.cpp | 4 | ||||
-rw-r--r-- | src/designer/src/lib/shared/sheet_delegate.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/zoomwidget_p.h | 2 |
12 files changed, 20 insertions, 20 deletions
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; }; |