diff options
Diffstat (limited to 'src/designer/src/components/formeditor')
39 files changed, 239 insertions, 240 deletions
diff --git a/src/designer/src/components/formeditor/default_actionprovider.cpp b/src/designer/src/components/formeditor/default_actionprovider.cpp index 53f1f9ec5..663ce8731 100644 --- a/src/designer/src/components/formeditor/default_actionprovider.cpp +++ b/src/designer/src/components/formeditor/default_actionprovider.cpp @@ -45,7 +45,7 @@ namespace qdesigner_internal { ActionProviderBase::ActionProviderBase(QWidget *widget) : m_indicator(new InvisibleWidget(widget)) { - Q_ASSERT(widget != 0); + Q_ASSERT(widget != nullptr); m_indicator->setAutoFillBackground(true); m_indicator->setBackgroundRole(QPalette::Window); diff --git a/src/designer/src/components/formeditor/default_actionprovider.h b/src/designer/src/components/formeditor/default_actionprovider.h index 05c436299..85619f33d 100644 --- a/src/designer/src/components/formeditor/default_actionprovider.h +++ b/src/designer/src/components/formeditor/default_actionprovider.h @@ -64,7 +64,7 @@ class QT_FORMEDITOR_EXPORT QToolBarActionProvider: public QObject, public Action Q_OBJECT Q_INTERFACES(QDesignerActionProviderExtension) public: - explicit QToolBarActionProvider(QToolBar *widget, QObject *parent = 0); + explicit QToolBarActionProvider(QToolBar *widget, QObject *parent = nullptr); QRect actionGeometry(QAction *action) const override; QAction *actionAt(const QPoint &pos) const override; @@ -82,7 +82,7 @@ class QT_FORMEDITOR_EXPORT QMenuBarActionProvider: public QObject, public Action Q_OBJECT Q_INTERFACES(QDesignerActionProviderExtension) public: - explicit QMenuBarActionProvider(QMenuBar *widget, QObject *parent = 0); + explicit QMenuBarActionProvider(QMenuBar *widget, QObject *parent = nullptr); QRect actionGeometry(QAction *action) const override; QAction *actionAt(const QPoint &pos) const override; @@ -97,7 +97,7 @@ class QT_FORMEDITOR_EXPORT QMenuActionProvider: public QObject, public ActionPro Q_OBJECT Q_INTERFACES(QDesignerActionProviderExtension) public: - explicit QMenuActionProvider(QMenu *widget, QObject *parent = 0); + explicit QMenuActionProvider(QMenu *widget, QObject *parent = nullptr); QRect actionGeometry(QAction *action) const override; QAction *actionAt(const QPoint &pos) const override; diff --git a/src/designer/src/components/formeditor/default_container.cpp b/src/designer/src/components/formeditor/default_container.cpp index 066c5b49c..747000aa6 100644 --- a/src/designer/src/components/formeditor/default_container.cpp +++ b/src/designer/src/components/formeditor/default_container.cpp @@ -43,7 +43,7 @@ static inline void setCurrentContainerIndex(int index, Container *container) static inline void ensureNoParent(QWidget *widget) { if (widget->parentWidget()) - widget->setParent(0); + widget->setParent(nullptr); } static const char *PageLabel = "Page"; @@ -145,7 +145,7 @@ void QToolBoxContainer::remove(int index) QScrollAreaContainer::QScrollAreaContainer(QScrollArea *widget, QObject *parent) : QObject(parent), - SingleChildContainer<QScrollArea>(widget, widget->widget() == 0) + SingleChildContainer<QScrollArea>(widget, widget->widget() == nullptr) { } // ------------------- QDockWidgetContainer diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h index 2f112aea8..337ddc445 100644 --- a/src/designer/src/components/formeditor/default_container.h +++ b/src/designer/src/components/formeditor/default_container.h @@ -49,7 +49,7 @@ class QStackedWidgetContainer: public QObject, public QDesignerContainerExtensio Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QStackedWidgetContainer(QStackedWidget *widget, QObject *parent = 0); + explicit QStackedWidgetContainer(QStackedWidget *widget, QObject *parent = nullptr); int count() const override { return m_widget->count(); } QWidget *widget(int index) const override { return m_widget->widget(index); } @@ -71,7 +71,7 @@ class QTabWidgetContainer: public QObject, public QDesignerContainerExtension Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QTabWidgetContainer(QTabWidget *widget, QObject *parent = 0); + explicit QTabWidgetContainer(QTabWidget *widget, QObject *parent = nullptr); int count() const override { return m_widget->count(); } QWidget *widget(int index) const override { return m_widget->widget(index); } @@ -93,7 +93,7 @@ class QToolBoxContainer: public QObject, public QDesignerContainerExtension Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QToolBoxContainer(QToolBox *widget, QObject *parent = 0); + explicit QToolBoxContainer(QToolBox *widget, QObject *parent = nullptr); int count() const override { return m_widget->count(); } QWidget *widget(int index) const override { return m_widget->widget(index); } @@ -162,7 +162,7 @@ int SingleChildContainer<Container>::currentIndex() const template <class Container> void SingleChildContainer<Container>::addWidget(QWidget *widget) { - Q_ASSERT(m_container->widget() == 0); + Q_ASSERT(m_container->widget() == nullptr); widget->setParent(m_container); m_container->setWidget(widget); } @@ -179,7 +179,7 @@ class QScrollAreaContainer: public QObject, public SingleChildContainer<QScrollA Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QScrollAreaContainer(QScrollArea *widget, QObject *parent = 0); + explicit QScrollAreaContainer(QScrollArea *widget, QObject *parent = nullptr); }; // --------------- QDockWidgetContainer @@ -188,7 +188,7 @@ class QDockWidgetContainer: public QObject, public SingleChildContainer<QDockWid Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QDockWidgetContainer(QDockWidget *widget, QObject *parent = 0); + explicit QDockWidgetContainer(QDockWidget *widget, QObject *parent = nullptr); }; typedef ExtensionFactory<QDesignerContainerExtension, QStackedWidget, QStackedWidgetContainer> QDesignerStackedWidgetContainerFactory; diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.cpp b/src/designer/src/components/formeditor/default_layoutdecoration.cpp index 0a5a5691a..9a45b01b6 100644 --- a/src/designer/src/components/formeditor/default_layoutdecoration.cpp +++ b/src/designer/src/components/formeditor/default_layoutdecoration.cpp @@ -48,7 +48,7 @@ QDesignerLayoutDecorationFactory::QDesignerLayoutDecorationFactory(QExtensionMan QObject *QDesignerLayoutDecorationFactory::createExtension(QObject *object, const QString &iid, QObject *parent) const { if (!object->isWidgetType() || iid != Q_TYPEID(QDesignerLayoutDecorationExtension)) - return 0; + return nullptr; QWidget *widget = qobject_cast<QWidget*>(object); @@ -59,7 +59,7 @@ QObject *QDesignerLayoutDecorationFactory::createExtension(QObject *object, cons if (LayoutInfo::managedLayout(fw->core(), widget)) return QLayoutSupport::createLayoutSupport(fw, widget, parent); - return 0; + return nullptr; } } diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.h b/src/designer/src/components/formeditor/default_layoutdecoration.h index 4ed70221f..412824ff5 100644 --- a/src/designer/src/components/formeditor/default_layoutdecoration.h +++ b/src/designer/src/components/formeditor/default_layoutdecoration.h @@ -43,7 +43,7 @@ class QDesignerLayoutDecorationFactory: public QExtensionFactory Q_OBJECT Q_INTERFACES(QAbstractExtensionFactory) public: - explicit QDesignerLayoutDecorationFactory(QExtensionManager *parent = 0); + explicit QDesignerLayoutDecorationFactory(QExtensionManager *parent = nullptr); protected: QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const override; diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.h b/src/designer/src/components/formeditor/deviceprofiledialog.h index 11c69f497..539827c78 100644 --- a/src/designer/src/components/formeditor/deviceprofiledialog.h +++ b/src/designer/src/components/formeditor/deviceprofiledialog.h @@ -64,7 +64,7 @@ class DeviceProfileDialog : public QDialog Q_DISABLE_COPY(DeviceProfileDialog) Q_OBJECT public: - explicit DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QWidget *parent = 0); + explicit DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QWidget *parent = nullptr); ~DeviceProfileDialog(); DeviceProfile deviceProfile() const; diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index 915623f40..d20f2ef05 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -82,7 +82,7 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : // Predefined settings: System DeviceProfile::systemResolution(&(m_systemEntry->dpiX), &(m_systemEntry->dpiY)); - m_systemEntry->description = 0; + m_systemEntry->description = nullptr; const struct DPI_Entry *systemEntry = m_systemEntry; //: System resolution m_predefinedCombo->addItem(tr("System (%1 x %2)").arg(m_systemEntry->dpiX).arg(m_systemEntry->dpiY), QVariant::fromValue(systemEntry)); diff --git a/src/designer/src/components/formeditor/dpi_chooser.h b/src/designer/src/components/formeditor/dpi_chooser.h index a04b2bdb0..2ff7f9b77 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.h +++ b/src/designer/src/components/formeditor/dpi_chooser.h @@ -57,7 +57,7 @@ class DPI_Chooser : public QWidget { Q_OBJECT public: - explicit DPI_Chooser(QWidget *parent = 0); + explicit DPI_Chooser(QWidget *parent = nullptr); ~DPI_Chooser(); void getDPI(int *dpiX, int *dpiY) const; diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.h b/src/designer/src/components/formeditor/embeddedoptionspage.h index f0d8b96ff..9522aa53f 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.h +++ b/src/designer/src/components/formeditor/embeddedoptionspage.h @@ -47,7 +47,7 @@ class EmbeddedOptionsControl : public QWidget { Q_DISABLE_COPY(EmbeddedOptionsControl) Q_OBJECT public: - explicit EmbeddedOptionsControl(QDesignerFormEditorInterface *core, QWidget *parent = 0); + explicit EmbeddedOptionsControl(QDesignerFormEditorInterface *core, QWidget *parent = nullptr); ~EmbeddedOptionsControl(); bool isDirty() const; diff --git a/src/designer/src/components/formeditor/formeditor.h b/src/designer/src/components/formeditor/formeditor.h index 1edbfe384..25698c23d 100644 --- a/src/designer/src/components/formeditor/formeditor.h +++ b/src/designer/src/components/formeditor/formeditor.h @@ -43,7 +43,7 @@ class QT_FORMEDITOR_EXPORT FormEditor: public QDesignerFormEditorInterface { Q_OBJECT public: - FormEditor(QObject *parent = 0); + FormEditor(QObject *parent = nullptr); ~FormEditor() override; public slots: void slotQrcFileChangedExternally(const QString &path); diff --git a/src/designer/src/components/formeditor/formeditor_optionspage.cpp b/src/designer/src/components/formeditor/formeditor_optionspage.cpp index 564b5964e..0ad956d7e 100644 --- a/src/designer/src/components/formeditor/formeditor_optionspage.cpp +++ b/src/designer/src/components/formeditor/formeditor_optionspage.cpp @@ -56,7 +56,7 @@ namespace qdesigner_internal { class ZoomSettingsWidget : public QGroupBox { Q_DISABLE_COPY(ZoomSettingsWidget) public: - explicit ZoomSettingsWidget(QWidget *parent = 0); + explicit ZoomSettingsWidget(QWidget *parent = nullptr); void fromSettings(const QDesignerSharedSettings &s); void toSettings(QDesignerSharedSettings &s) const; diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 9f988273a..6f58d0255 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -180,7 +180,7 @@ void FormWindow::Selection::clear() { if (!m_usedSelections.empty()) { for (auto it = m_usedSelections.begin(), mend = m_usedSelections.end(); it != mend; ++it) - it.value()->setWidget(0); + it.value()->setWidget(nullptr); m_usedSelections.clear(); } } @@ -195,7 +195,7 @@ void FormWindow::Selection::clearSelectionPool() WidgetSelection *FormWindow::Selection::addWidget(FormWindow* fw, QWidget *w) { WidgetSelection *rc = m_usedSelections.value(w); - if (rc != 0) { + if (rc != nullptr) { rc->show(); rc->updateActive(); return rc; @@ -208,7 +208,7 @@ WidgetSelection *FormWindow::Selection::addWidget(FormWindow* fw, QWidget *w) } } - if (rc == 0) { + if (rc == nullptr) { rc = new WidgetSelection(fw); m_selectionPool.push_back(rc); } @@ -224,11 +224,11 @@ QWidget* FormWindow::Selection::removeWidget(QWidget *w) if (!s) return w; - s->setWidget(0); + s->setWidget(nullptr); m_usedSelections.remove(w); if (m_usedSelections.isEmpty()) - return 0; + return nullptr; return (*m_usedSelections.begin())->widget(); } @@ -313,9 +313,9 @@ FormWindow::FormWindow(FormEditor *core, QWidget *parent, Qt::WindowFlags flags) FormWindow::~FormWindow() { - Q_ASSERT(core() != 0); - Q_ASSERT(core()->metaDataBase() != 0); - Q_ASSERT(core()->formWindowManager() != 0); + Q_ASSERT(core() != nullptr); + Q_ASSERT(core()->metaDataBase() != nullptr); + Q_ASSERT(core()->formWindowManager() != nullptr); core()->formWindowManager()->removeFormWindow(this); core()->metaDataBase()->remove(this); @@ -324,8 +324,8 @@ FormWindow::~FormWindow() for (QWidget *w : l) core()->metaDataBase()->remove(w); - m_widgetStack = 0; - m_rubberBand = 0; + m_widgetStack = nullptr; + m_rubberBand = nullptr; if (resourceSet()) core()->resourceModel()->removeResourceSet(resourceSet()); delete m_selection; @@ -414,12 +414,12 @@ void FormWindow::init() connect(m_geometryChangedTimer, &QTimer::timeout, this, &QDesignerFormWindowInterface::geometryChanged); - m_rubberBand = 0; + m_rubberBand = nullptr; setFocusPolicy(Qt::StrongFocus); - m_mainContainer = 0; - m_currentWidget = 0; + m_mainContainer = nullptr; + m_currentWidget = nullptr; connect(&m_undoStack, &QUndoStack::indexChanged, this, &QDesignerFormWindowInterface::changed); @@ -449,11 +449,11 @@ void FormWindow::clearMainContainer() { if (m_mainContainer) { setCurrentTool(0); - m_widgetStack->setMainContainer(0); + m_widgetStack->setMainContainer(nullptr); core()->metaDataBase()->remove(m_mainContainer); unmanageWidget(m_mainContainer); delete m_mainContainer; - m_mainContainer = 0; + m_mainContainer = nullptr; } } @@ -519,7 +519,7 @@ static QWidget *findSelectedParent(QDesignerFormWindowInterface *fw, const QWidg if (fw->isManaged(p)) if (cursor->isWidgetSelected(p) == selected) return p; - return 0; + return nullptr; } // Mouse modifiers. @@ -562,7 +562,7 @@ void FormWindow::handleClickSelection(QWidget *managedWidget, unsigned mouseMode return; } - QWidget *selectionCandidate = 0; + QWidget *selectionCandidate = nullptr; // Hierarchy cycling: If the same widget clicked again: Attempt to cycle // trough the hierarchy. Find the next currently selected parent if (sameWidget && (mouseMode & CycleParentModifier)) @@ -838,7 +838,7 @@ void FormWindow::endRectDraw() { if (m_rubberBand) { delete m_rubberBand; - m_rubberBand = 0; + m_rubberBand = nullptr; } } @@ -1236,17 +1236,17 @@ QWidget *FormWindow::createWidget(DomUI *ui, const QRect &rc, QWidget *target) { QWidget *container = findContainer(target, false); if (!container) - return 0; + return nullptr; if (isMainContainer(container)) { if (QMainWindow *mw = qobject_cast<QMainWindow*>(container)) { - Q_ASSERT(mw->centralWidget() != 0); + Q_ASSERT(mw->centralWidget() != nullptr); container = mw->centralWidget(); } } QDesignerResource resource(this); const FormBuilderClipboard clipboard = resource.paste(ui, container); if (clipboard.m_widgets.size() != 1) // multiple-paste from DomUI not supported yet - return 0; + return nullptr; QWidget *widget = clipboard.m_widgets.first(); insertWidget(widget, rc, container); return widget; @@ -1254,7 +1254,7 @@ QWidget *FormWindow::createWidget(DomUI *ui, const QRect &rc, QWidget *target) static bool isDescendant(const QWidget *parent, const QWidget *child) { - for (; child != 0; child = child->parentWidget()) { + for (; child != nullptr; child = child->parentWidget()) { if (child == parent) return true; } @@ -1282,7 +1282,7 @@ void FormWindow::raiseChildSelections(QWidget *w) QWidget *FormWindow::containerAt(const QPoint &pos, QWidget *notParentOf) { - QWidget *container = 0; + QWidget *container = nullptr; int depth = -1; const QWidgetList selected = selectedWidgets(); if (rect().contains(mapFromGlobal(pos))) { @@ -1308,7 +1308,7 @@ QWidget *FormWindow::containerAt(const QPoint &pos, QWidget *notParentOf) break; w = w->parentWidget(); } - if (!(w == 0 || w->isWindow())) + if (!(w == nullptr || w->isWindow())) continue; // we did not get through the full while loop int wd = widgetDepth(wit); @@ -1485,7 +1485,7 @@ PropertyHelper::Value ArrowKeyPropertyHelper::setValue(QDesignerFormWindowInterf class ArrowKeyPropertyCommand: public SetPropertyCommand { public: explicit ArrowKeyPropertyCommand(QDesignerFormWindowInterface *fw, - QUndoCommand *p = 0); + QUndoCommand *p = nullptr); void init(QWidgetList &l, const ArrowKeyOperation &op); @@ -1681,9 +1681,7 @@ QWidget *FormWindow::innerContainer(QWidget *outerContainer) const if (m_core->widgetDataBase()->isContainer(outerContainer)) if (const QDesignerContainerExtension *container = qt_extension<QDesignerContainerExtension*>(m_core->extensionManager(), outerContainer)) { const int currentIndex = container->currentIndex(); - return currentIndex >= 0 ? - container->widget(currentIndex) : - static_cast<QWidget *>(0); + return currentIndex >= 0 ? container->widget(currentIndex) : nullptr; } return outerContainer; } @@ -1692,7 +1690,7 @@ QWidget *FormWindow::containerForPaste() const { QWidget *w = mainContainer(); if (!w) - return 0; + return nullptr; do { // Try to find a close parent, for example a non-laid-out // QFrame/QGroupBox when a widget within it is selected. @@ -1717,13 +1715,13 @@ QWidget *FormWindow::containerForPaste() const w = innerContainer(w); if (!w) - return 0; + return nullptr; if (LayoutInfo::layoutType(m_core, w) != LayoutInfo::NoLayout) - return 0; + return nullptr; // Go up via container extension (also includes step from QMainWindow to its central widget) w = m_core->widgetFactory()->containerOfWidget(w); - if (w == 0 || LayoutInfo::layoutType(m_core, w) != LayoutInfo::NoLayout) - return 0; + if (w == nullptr || LayoutInfo::layoutType(m_core, w) != LayoutInfo::NoLayout) + return nullptr; if (debugFormWindow) qDebug() <<"containerForPaste() " << w; @@ -1737,10 +1735,10 @@ static inline DomUI *domUIFromClipboard(int *widgetCount, int *actionCount) *widgetCount = *actionCount = 0; const QString clipboardText = qApp->clipboard()->text(); if (clipboardText.isEmpty() || clipboardText.indexOf(QLatin1Char('<')) == -1) - return 0; + return nullptr; QXmlStreamReader reader(clipboardText); - DomUI *ui = 0; + DomUI *ui = nullptr; const QString uiElement = QStringLiteral("ui"); while (!reader.atEnd()) { if (reader.readNext() == QXmlStreamReader::StartElement) { @@ -1754,10 +1752,10 @@ static inline DomUI *domUIFromClipboard(int *widgetCount, int *actionCount) } if (reader.hasError()) { delete ui; - ui = 0; + ui = nullptr; designerWarning(QCoreApplication::translate("FormWindow", "Error while pasting clipboard contents at line %1, column %2: %3"). arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString())); - return 0; + return nullptr; } if (const DomWidget *topLevel = ui->elementWidget()) { @@ -1766,7 +1764,7 @@ static inline DomUI *domUIFromClipboard(int *widgetCount, int *actionCount) } if (*widgetCount == 0 && *actionCount == 0) { delete ui; - return 0; + return nullptr; } return ui; } @@ -1775,9 +1773,9 @@ static inline DomUI *domUIFromClipboard(int *widgetCount, int *actionCount) static inline QString pasteCommandDescription(int widgetCount, int actionCount) { if (widgetCount == 0) - return FormWindow::tr("Paste %n action(s)", 0, actionCount); + return FormWindow::tr("Paste %n action(s)", nullptr, actionCount); if (actionCount == 0) - return FormWindow::tr("Paste %n widget(s)", 0, widgetCount); + return FormWindow::tr("Paste %n widget(s)", nullptr, widgetCount); return FormWindow::tr("Paste (%1 widgets, %2 actions)").arg(widgetCount).arg(actionCount); } @@ -1803,7 +1801,7 @@ static void positionPastedWidgetsAtMousePosition(FormWindow *fw, const QPoint &c // get the stacked-offset effect of Designer 4.3, that is, offset by grid if Ctrl-V is pressed continuously do { const QPoint bottomRight = cursorPos + QPoint(pasteArea.width(), pasteArea.height()) - QPoint(1, 1); - if (bottomRight.y() > parentGeometry.bottom() || parent->childAt(bottomRight) == 0) + if (bottomRight.y() > parentGeometry.bottom() || parent->childAt(bottomRight) == nullptr) break; cursorPos += QPoint(grid.deltaX(), grid.deltaY()); } while (true); @@ -1818,7 +1816,7 @@ void FormWindow::paste(PasteMode pasteMode) { // Avoid QDesignerResource constructing widgets that are not used as // QDesignerResource manages the widgets it creates (creating havoc if one remains unused) - DomUI *ui = 0; + DomUI *ui = nullptr; do { int widgetCount; int actionCount; @@ -1832,8 +1830,8 @@ void FormWindow::paste(PasteMode pasteMode) break; // Check for widgets: need a container - QWidget *pasteContainer = widgetCount ? containerForPaste() : 0; - if (widgetCount && pasteContainer == 0) { + QWidget *pasteContainer = widgetCount ? containerForPaste() : nullptr; + if (widgetCount && pasteContainer == nullptr) { const QString message = tr("Cannot paste widgets. Designer could not find a container " "without a layout to paste into."); @@ -2069,7 +2067,7 @@ bool FormWindow::handleMouseButtonDblClickEvent(QWidget *w, QWidget *managedWidg QMenu *FormWindow::initializePopupMenu(QWidget *managedWidget) { if (!isManaged(managedWidget) || currentTool()) - return 0; + return nullptr; // Make sure the managedWidget is selected and current since // the SetPropertyCommands must use the right reference @@ -2091,7 +2089,7 @@ QMenu *FormWindow::initializePopupMenu(QWidget *managedWidget) QMetaObject::invokeMethod(core()->formWindowManager(), "slotUpdateActions"); } - QWidget *contextMenuWidget = 0; + QWidget *contextMenuWidget = nullptr; if (isMainContainer(managedWidget)) { // press on a child widget contextMenuWidget = mainContainer(); @@ -2108,11 +2106,11 @@ QMenu *FormWindow::initializePopupMenu(QWidget *managedWidget) } if (!contextMenuWidget) - return 0; + return nullptr; QMenu *contextMenu = createPopupMenu(contextMenuWidget); if (!contextMenu) - return 0; + return nullptr; emit contextMenuRequested(contextMenu, contextMenuWidget); return contextMenu; @@ -2160,7 +2158,7 @@ bool FormWindow::setContents(QIODevice *dev, QString *errorMessageIn /* = 0 */) } if (errorMessageIn) *errorMessageIn = r.errorString(); - return w != 0; + return w != nullptr; } bool FormWindow::setContents(const QString &contents) @@ -2255,7 +2253,7 @@ QAction *FormWindow::createSelectAncestorSubMenu(QWidget *w) if (isManaged(p) && !isWidgetSelected(p)) parents.push_back(p); if (parents.empty()) - return 0; + return nullptr; // Create a submenu listing the managed, unselected parents QMenu *menu = new QMenu; QActionGroup *ag = new QActionGroup(menu); @@ -2267,7 +2265,7 @@ QAction *FormWindow::createSelectAncestorSubMenu(QWidget *w) a->setData(QVariant::fromValue(w)); menu->addAction(a); } - QAction *ma = new QAction(tr("Select Ancestor"), 0); + QAction *ma = new QAction(tr("Select Ancestor"), nullptr); ma->setMenu(menu); return ma; } @@ -2372,7 +2370,7 @@ QWidget *FormWindow::findContainer(QWidget *w, bool excludeLayout) const { if (!isChildOf(w, this) || const_cast<const QWidget *>(w) == this) - return 0; + return nullptr; QDesignerWidgetFactoryInterface *widgetFactory = core()->widgetFactory(); QDesignerWidgetDataBaseInterface *widgetDataBase = core()->widgetDataBase(); @@ -2467,10 +2465,10 @@ QWidget *FormWindow::containerAt(const QPoint &pos) static QWidget *childAt_SkipDropLine(QWidget *w, QPoint pos) { - const QObjectList child_list = w->children(); + const QObjectList &child_list = w->children(); for (int i = child_list.size() - 1; i >= 0; --i) { QObject *child_obj = child_list[i]; - if (qobject_cast<WidgetHandle*>(child_obj) != 0) + if (qobject_cast<WidgetHandle*>(child_obj) != nullptr) continue; QWidget *child = qobject_cast<QWidget*>(child_obj); if (!child || child->isWindow() || !child->isVisible() || @@ -2484,7 +2482,7 @@ static QWidget *childAt_SkipDropLine(QWidget *w, QPoint pos) return child; } - return 0; + return nullptr; } QWidget *FormWindow::widgetAt(const QPoint &pos) @@ -2492,7 +2490,7 @@ QWidget *FormWindow::widgetAt(const QPoint &pos) QWidget *w = childAt(pos); if (qobject_cast<const WidgetHandle*>(w) != 0) w = childAt_SkipDropLine(this, pos); - return (w == 0 || w == formContainer()) ? this : w; + return (w == nullptr || w == formContainer()) ? this : w; } void FormWindow::highlightWidget(QWidget *widget, const QPoint &pos, HighlightMode mode) @@ -2505,7 +2503,7 @@ void FormWindow::highlightWidget(QWidget *widget, const QPoint &pos, HighlightMo QWidget *container = findContainer(widget, false); - if (container == 0 || core()->metaDataBase()->item(container) == 0) + if (container == nullptr || core()->metaDataBase()->item(container) == nullptr) return; if (QDesignerActionProviderExtension *g = qt_extension<QDesignerActionProviderExtension*>(core()->extensionManager(), container)) { @@ -2579,7 +2577,7 @@ QDesignerFormWindowToolInterface *FormWindow::tool(int index) const void FormWindow::registerTool(QDesignerFormWindowToolInterface *tool) { - Q_ASSERT(tool != 0); + Q_ASSERT(tool != nullptr); m_widgetStack->addTool(tool); @@ -2599,11 +2597,11 @@ int FormWindow::currentTool() const bool FormWindow::handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) { - if (m_widgetStack == 0) + if (m_widgetStack == nullptr) return false; QDesignerFormWindowToolInterface *tool = m_widgetStack->currentTool(); - if (tool == 0) + if (tool == nullptr) return false; return tool->handleEvent(widget, managedWidget, event); @@ -2702,7 +2700,7 @@ void FormWindow::dragWidgetWithinForm(QWidget *widget, const QRect &targetGeomet { const bool fromLayout = canDragWidgetInLayout(core(), widget); const QDesignerLayoutDecorationExtension *targetDeco = qt_extension<QDesignerLayoutDecorationExtension*>(core()->extensionManager(), targetContainer); - const bool toLayout = targetDeco != 0; + const bool toLayout = targetDeco != nullptr; if (fromLayout) { // Drag from Layout: We need to delete the widget properly to store the layout state @@ -2827,7 +2825,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, { QWidget *parent = target; - if (parent == 0) + if (parent == nullptr) parent = mainContainer(); // You can only drop stuff onto the central widget of a QMainWindow // ### generalize to use container extension @@ -2843,7 +2841,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, } QWidget *container = findContainer(parent, false); - if (container == 0) + if (container == nullptr) return false; beginCommand(tr("Drop widget")); @@ -2852,7 +2850,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, highlightWidget(target, target->mapFromGlobal(global_mouse_pos), FormWindow::Restore); QPoint offset; - QDesignerDnDItemInterface *current = 0; + QDesignerDnDItemInterface *current = nullptr; QDesignerFormWindowCursorInterface *c = cursor(); for (QDesignerDnDItemInterface *item : qAsConst(item_list)) { QWidget *w = item->widget(); @@ -2872,7 +2870,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, for (QDesignerDnDItemInterface *item : qAsConst(item_list)) { DomUI *dom_ui = item->domUi(); QRect geometry = item->decoration()->geometry(); - Q_ASSERT(dom_ui != 0); + Q_ASSERT(dom_ui != nullptr); geometry.moveTopLeft(container->mapFromGlobal(geometry.topLeft()) + offset); if (item->type() == QDesignerDnDItemInterface::CopyDrop) { // from widget box or CTRL + mouse move @@ -2885,13 +2883,13 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, mainContainer()->setFocus(Qt::MouseFocusReason); // in case focus was in e.g. object inspector } else { // same form move QWidget *widget = item->widget(); - Q_ASSERT(widget != 0); + Q_ASSERT(widget != nullptr); QDesignerFormWindowInterface *dest = findFormWindow(widget); if (dest == this) { dragWidgetWithinForm(widget, geometry, container); } else { // from other form FormWindow *source = qobject_cast<FormWindow*>(item->source()); - Q_ASSERT(source != 0); + Q_ASSERT(source != nullptr); source->deleteWidgetList(QWidgetList() << widget); QWidget *new_widget = createWidget(dom_ui, geometry, parent); diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h index e2fb78400..abecc8252 100644 --- a/src/designer/src/components/formeditor/formwindow.h +++ b/src/designer/src/components/formeditor/formwindow.h @@ -77,7 +77,7 @@ public: ChangeLayoutSpanHandleOperation }; - explicit FormWindow(FormEditor *core, QWidget *parent = 0, Qt::WindowFlags flags = 0); + explicit FormWindow(FormEditor *core, QWidget *parent = nullptr, Qt::WindowFlags flags = {}); ~FormWindow() override; QDesignerFormEditorInterface *core() const override; @@ -118,7 +118,7 @@ public: void setFileName(const QString &fileName) override; QString contents() const override; - bool setContents(QIODevice *dev, QString *errorMessage = 0) override; + bool setContents(QIODevice *dev, QString *errorMessage = nullptr) override; bool setContents(const QString &) override; QDir absoluteDir() const override; @@ -223,7 +223,7 @@ public slots: #endif void selectAll(); - void createLayout(int type, QWidget *container = 0); + void createLayout(int type, QWidget *container = nullptr); void morphLayout(QWidget *container, int newType); void breakLayout(QWidget *w); diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.cpp b/src/designer/src/components/formeditor/formwindow_dnditem.cpp index a5a9321a9..2df8c9aa6 100644 --- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp +++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp @@ -45,7 +45,7 @@ using namespace qdesigner_internal; static QWidget *decorationFromWidget(QWidget *w) { - QLabel *label = new QLabel(0, Qt::ToolTip); + QLabel *label = new QLabel(nullptr, Qt::ToolTip); QPixmap pm = w->grab(QRect(0, 0, -1, -1)); label->setPixmap(pm); label->resize((QSizeF(pm.size()) / pm.devicePixelRatio()).toSize()); @@ -68,17 +68,17 @@ FormWindowDnDItem::FormWindowDnDItem(QDesignerDnDItemInterface::DropType type, F QPoint pos = widget->mapToGlobal(QPoint(0, 0)); decoration->move(pos); - init(0, widget, decoration, global_mouse_pos); + init(nullptr, widget, decoration, global_mouse_pos); } DomUI *FormWindowDnDItem::domUi() const { DomUI *result = QDesignerDnDItem::domUi(); - if (result != 0) + if (result != nullptr) return result; FormWindow *form = qobject_cast<FormWindow*>(source()); - if (widget() == 0 || form == 0) - return 0; + if (widget() == nullptr || form == nullptr) + return nullptr; QtResourceModel *resourceModel = form->core()->resourceModel(); QtResourceSet *currentResourceSet = resourceModel->currentResourceSet(); diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp index c9fc88f04..18126c145 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp @@ -104,9 +104,9 @@ void FormWindowWidgetStack::setCurrentTool(int index) void FormWindowWidgetStack::setSenderAsCurrentTool() { - QDesignerFormWindowToolInterface *tool = 0; + QDesignerFormWindowToolInterface *tool = nullptr; QAction *action = qobject_cast<QAction*>(sender()); - if (action == 0) { + if (action == nullptr) { qDebug("FormWindowWidgetStack::setSenderAsCurrentTool(): sender is not a QAction"); return; } @@ -118,7 +118,7 @@ void FormWindowWidgetStack::setSenderAsCurrentTool() } } - if (tool == 0) { + if (tool == nullptr) { qDebug("FormWindowWidgetStack::setSenderAsCurrentTool(): unknown tool"); return; } @@ -147,7 +147,8 @@ void FormWindowWidgetStack::setMainContainer(QWidget *w) // This code is triggered once by the formwindow and // by integrations doing "revert to saved". Anything changing? const int previousCount = m_formContainerLayout->count(); - QWidget *previousMainContainer = previousCount ? m_formContainerLayout->itemAt(0)->widget() : static_cast<QWidget*>(0); + QWidget *previousMainContainer = previousCount + ? m_formContainerLayout->itemAt(0)->widget() : nullptr; if (previousMainContainer == w) return; // Swap @@ -177,7 +178,7 @@ void FormWindowWidgetStack::addTool(QDesignerFormWindowToolInterface *tool) QDesignerFormWindowToolInterface *FormWindowWidgetStack::tool(int index) const { if (index < 0 || index >= count()) - return 0; + return nullptr; return m_tools.at(index); } @@ -190,7 +191,7 @@ int FormWindowWidgetStack::currentIndex() const QWidget *FormWindowWidgetStack::defaultEditor() const { if (m_tools.isEmpty()) - return 0; + return nullptr; return m_tools.at(0)->editor(); } diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.h b/src/designer/src/components/formeditor/formwindow_widgetstack.h index de535e0ca..01ee921fd 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.h +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.h @@ -46,7 +46,7 @@ class QT_FORMEDITOR_EXPORT FormWindowWidgetStack: public QObject { Q_OBJECT public: - FormWindowWidgetStack(QObject *parent = 0); + FormWindowWidgetStack(QObject *parent = nullptr); ~FormWindowWidgetStack() override; QLayout *layout() const; @@ -57,7 +57,7 @@ public: int currentIndex() const; int indexOf(QDesignerFormWindowToolInterface *tool) const; - void setMainContainer(QWidget *w = 0); + void setMainContainer(QWidget *w = nullptr); // Return the widget containing the form which can be used to apply embedded design settings to. // These settings should not affect the other editing tools. diff --git a/src/designer/src/components/formeditor/formwindowcursor.h b/src/designer/src/components/formeditor/formwindowcursor.h index 4ac73798c..e8f699928 100644 --- a/src/designer/src/components/formeditor/formwindowcursor.h +++ b/src/designer/src/components/formeditor/formwindowcursor.h @@ -43,7 +43,7 @@ class QT_FORMEDITOR_EXPORT FormWindowCursor: public QObject, public QDesignerFor { Q_OBJECT public: - explicit FormWindowCursor(FormWindow *fw, QObject *parent = 0); + explicit FormWindowCursor(FormWindow *fw, QObject *parent = nullptr); ~FormWindowCursor() override; QDesignerFormWindowInterface *formWindow() const override; diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp index 914180fe6..d1edb231c 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -102,12 +102,12 @@ namespace qdesigner_internal { FormWindowManager::FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent) : QDesignerFormWindowManager(parent), m_core(core), - m_activeFormWindow(0), + m_activeFormWindow(nullptr), m_previewManager(new PreviewManager(PreviewManager::SingleFormNonModalPreview, this)), m_createLayoutContext(LayoutContainer), - m_morphLayoutContainer(0), - m_actionGroupPreviewInStyle(0), - m_actionShowFormWindowSettingsDialog(0) + m_morphLayoutContainer(nullptr), + m_actionGroupPreviewInStyle(nullptr), + m_actionShowFormWindowSettingsDialog(nullptr) { setupActions(); qApp->installEventFilter(this); @@ -145,7 +145,7 @@ bool FormWindowManager::eventFilter(QObject *o, QEvent *e) // If we don't have an active form, we only listen for WindowActivate to speed up integrations const QEvent::Type eventType = e->type(); - if (m_activeFormWindow == 0 && eventType != QEvent::WindowActivate) + if (m_activeFormWindow == nullptr && eventType != QEvent::WindowActivate) return false; switch (eventType) { // Uninteresting events @@ -198,7 +198,7 @@ bool FormWindowManager::eventFilter(QObject *o, QEvent *e) } FormWindow *fw = FormWindow::findFormWindow(widget); - if (fw == 0) { + if (fw == nullptr) { return false; } @@ -294,7 +294,7 @@ void FormWindowManager::removeFormWindow(QDesignerFormWindowInterface *w) emit formWindowRemoved(formWindow); if (formWindow == m_activeFormWindow) - setActiveFormWindow(0); + setActiveFormWindow(nullptr); // Make sure that widget box is enabled by default if (m_formWindows.isEmpty() && m_core->widgetBox()) @@ -313,7 +313,7 @@ void FormWindowManager::setActiveFormWindow(QDesignerFormWindowInterface *w) m_activeFormWindow = formWindow; - QtResourceSet *resourceSet = 0; + QtResourceSet *resourceSet = nullptr; if (formWindow) resourceSet = formWindow->resourceSet(); m_core->resourceModel()->setCurrentResourceSet(resourceSet); @@ -332,7 +332,7 @@ void FormWindowManager::setActiveFormWindow(QDesignerFormWindowInterface *w) m_activeFormWindow->emitSelectionChanged(); m_activeFormWindow->commandHistory()->setActive(); // Trigger setActiveSubWindow on mdi area unless we are in toplevel mode - QMdiSubWindow *mdiSubWindow = 0; + QMdiSubWindow *mdiSubWindow = nullptr; if (QWidget *formwindow = m_activeFormWindow->parentWidget()) { mdiSubWindow = qobject_cast<QMdiSubWindow *>(formwindow->parentWidget()); } @@ -611,7 +611,7 @@ void FormWindowManager::slotActionBreakLayoutActivated() void FormWindowManager::slotActionSimplifyLayoutActivated() { - Q_ASSERT(m_activeFormWindow != 0); + Q_ASSERT(m_activeFormWindow != nullptr); QWidgetList selectedWidgets = m_activeFormWindow->selectedWidgets(); m_activeFormWindow->simplifySelection(&selectedWidgets); if (selectedWidgets.size() != 1) @@ -626,7 +626,7 @@ void FormWindowManager::slotActionSimplifyLayoutActivated() void FormWindowManager::slotActionAdjustSizeActivated() { - Q_ASSERT(m_activeFormWindow != 0); + Q_ASSERT(m_activeFormWindow != nullptr); m_activeFormWindow->beginCommand(tr("Adjust Size")); @@ -634,7 +634,7 @@ void FormWindowManager::slotActionAdjustSizeActivated() m_activeFormWindow->simplifySelection(&selectedWidgets); if (selectedWidgets.isEmpty()) { - Q_ASSERT(m_activeFormWindow->mainContainer() != 0); + Q_ASSERT(m_activeFormWindow->mainContainer() != nullptr); selectedWidgets.append(m_activeFormWindow->mainContainer()); } @@ -688,7 +688,7 @@ QWidgetList FormWindowManager::layoutsToBeBroken(QWidget *w) const QWidget *parent = w->parentWidget(); if (m_activeFormWindow->isMainContainer(w)) - parent = 0; + parent = nullptr; QWidget *widget = core()->widgetFactory()->containerOfWidget(w); @@ -806,7 +806,7 @@ static inline bool hasManagedLayoutItems(const QDesignerFormEditorInterface *cor void FormWindowManager::slotUpdateActions() { m_createLayoutContext = LayoutSelection; - m_morphLayoutContainer = 0; + m_morphLayoutContainer = nullptr; bool canMorphIntoVBoxLayout = false; bool canMorphIntoHBoxLayout = false; bool canMorphIntoGridLayout = false; @@ -824,7 +824,7 @@ void FormWindowManager::slotUpdateActions() bool canChangeZOrder = true; do { - if (m_activeFormWindow == 0 || m_activeFormWindow->currentTool() != 0) + if (m_activeFormWindow == nullptr || m_activeFormWindow->currentTool() != 0) break; breakAvailable = hasLayoutsToBeBroken(); @@ -862,7 +862,7 @@ void FormWindowManager::slotUpdateActions() // Manipulate layout of a single widget m_createLayoutContext = LayoutSelection; QWidget *widget = core()->widgetFactory()->containerOfWidget(simplifiedSelection.first()); - if (widget == 0) // We are looking at a page-based container with 0 pages + if (widget == nullptr) // We are looking at a page-based container with 0 pages break; const QDesignerWidgetDataBaseInterface *db = m_core->widgetDataBase(); @@ -878,7 +878,7 @@ void FormWindowManager::slotUpdateActions() layoutContainer = (item->isContainer() || m_activeFormWindow->isMainContainer(widget)); - layoutAvailable = layoutContainer && m_activeFormWindow->hasInsertedChildren(widget) && managedLayout == 0; + layoutAvailable = layoutContainer && m_activeFormWindow->hasInsertedChildren(widget) && managedLayout == nullptr; simplifyAvailable = SimplifyLayoutCommand::canSimplify(m_core, widget); if (layoutAvailable) { m_createLayoutContext = LayoutContainer; @@ -912,7 +912,7 @@ void FormWindowManager::slotUpdateActions() m_actionRaise->setEnabled(canChangeZOrder && selectedWidgetCount > 0); - m_actionSelectAll->setEnabled(m_activeFormWindow != 0); + m_actionSelectAll->setEnabled(m_activeFormWindow != nullptr); m_actionAdjustSize->setEnabled(unlaidoutWidgetCount > 0); @@ -925,7 +925,7 @@ void FormWindowManager::slotUpdateActions() m_actionBreakLayout->setEnabled(breakAvailable); m_actionSimplifyLayout->setEnabled(simplifyAvailable); - m_actionShowFormWindowSettingsDialog->setEnabled(m_activeFormWindow != 0); + m_actionShowFormWindowSettingsDialog->setEnabled(m_activeFormWindow != nullptr); } QDesignerFormWindowInterface *FormWindowManager::createFormWindow(QWidget *parentWidget, Qt::WindowFlags flags) @@ -972,12 +972,12 @@ void FormWindowManager::slotActionShowFormWindowSettingsDialog() if (!fw) return; - QDialog *settingsDialog = 0; + QDialog *settingsDialog = nullptr; const bool wasDirty = fw->isDirty(); // Ask the language extension for a dialog. If not, create our own if (QDesignerLanguageExtension *lang = qt_extension<QDesignerLanguageExtension*>(m_core->extensionManager(), m_core)) - settingsDialog = lang->createFormWindowSettingsDialog(fw, /*parent=*/ 0); + settingsDialog = lang->createFormWindowSettingsDialog(fw, /*parent=*/ nullptr); if (!settingsDialog) settingsDialog = new FormWindowSettings(fw); @@ -1042,14 +1042,14 @@ QAction *FormWindowManager::action(Action action) const return m_actionShowFormWindowSettingsDialog; } qWarning("FormWindowManager::action: Unhanded enumeration value %d", action); - return 0; + return nullptr; } QActionGroup *FormWindowManager::actionGroup(ActionGroup actionGroup) const { switch (actionGroup) { case QDesignerFormWindowManagerInterface::StyledPreviewActionGroup: - if (m_actionGroupPreviewInStyle == 0) { + if (m_actionGroupPreviewInStyle == nullptr) { // Wish we could make the 'this' pointer mutable ;-) QObject *parent = const_cast<FormWindowManager*>(this); m_actionGroupPreviewInStyle = new PreviewActionGroup(m_core, parent); @@ -1059,7 +1059,7 @@ QActionGroup *FormWindowManager::actionGroup(ActionGroup actionGroup) const return m_actionGroupPreviewInStyle; } qWarning("FormWindowManager::actionGroup: Unhanded enumeration value %d", actionGroup); - return 0; + return nullptr; } } diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h index f2f007186..d9723cea6 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.h +++ b/src/designer/src/components/formeditor/formwindowmanager.h @@ -58,7 +58,7 @@ class QT_FORMEDITOR_EXPORT FormWindowManager { Q_OBJECT public: - explicit FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent = 0); + explicit FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent = nullptr); ~FormWindowManager() override; QDesignerFormEditorInterface *core() const override; @@ -71,7 +71,7 @@ public: int formWindowCount() const override; QDesignerFormWindowInterface *formWindow(int index) const override; - QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = 0, Qt::WindowFlags flags = 0) override; + QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = nullptr, Qt::WindowFlags flags = {}) override; QPixmap createPreviewPixmap() const override; diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp index 63fabf615..2ed718d88 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.cpp +++ b/src/designer/src/components/formeditor/formwindowsettings.cpp @@ -108,9 +108,9 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) QStyle *style = fw->formContainer()->style(); layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN; if (defaultMargin == INT_MIN) - defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, 0); + defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr); if (defaultSpacing == INT_MIN) - defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, 0); + defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr); marginFunction.clear(); diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.cpp b/src/designer/src/components/formeditor/itemview_propertysheet.cpp index 897110f1d..71adf7397 100644 --- a/src/designer/src/components/formeditor/itemview_propertysheet.cpp +++ b/src/designer/src/components/formeditor/itemview_propertysheet.cpp @@ -143,7 +143,7 @@ QString ItemViewPropertySheetPrivate::fakePropertyName(const QString &prefix, ItemViewPropertySheet::ItemViewPropertySheet(QTreeView *treeViewObject, QObject *parent) : QDesignerPropertySheet(treeViewObject, parent), - d(new ItemViewPropertySheetPrivate(core(), treeViewObject->header(), 0)) + d(new ItemViewPropertySheetPrivate(core(), treeViewObject->header(), nullptr)) { initHeaderProperties(treeViewObject->header(), QStringLiteral("header")); } diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.h b/src/designer/src/components/formeditor/itemview_propertysheet.h index ad010599e..c5cd1f410 100644 --- a/src/designer/src/components/formeditor/itemview_propertysheet.h +++ b/src/designer/src/components/formeditor/itemview_propertysheet.h @@ -46,8 +46,8 @@ class ItemViewPropertySheet: public QDesignerPropertySheet Q_OBJECT Q_INTERFACES(QDesignerPropertySheetExtension) public: - explicit ItemViewPropertySheet(QTreeView *treeViewObject, QObject *parent = 0); - explicit ItemViewPropertySheet(QTableView *tableViewObject, QObject *parent = 0); + explicit ItemViewPropertySheet(QTreeView *treeViewObject, QObject *parent = nullptr); + explicit ItemViewPropertySheet(QTableView *tableViewObject, QObject *parent = nullptr); ~ItemViewPropertySheet(); QHash<QString,QString> propertyNameMap() const; diff --git a/src/designer/src/components/formeditor/layout_propertysheet.h b/src/designer/src/components/formeditor/layout_propertysheet.h index 27682ad66..559f09d4a 100644 --- a/src/designer/src/components/formeditor/layout_propertysheet.h +++ b/src/designer/src/components/formeditor/layout_propertysheet.h @@ -46,7 +46,7 @@ class LayoutPropertySheet: public QDesignerPropertySheet Q_OBJECT Q_INTERFACES(QDesignerPropertySheetExtension) public: - explicit LayoutPropertySheet(QLayout *object, QObject *parent = 0); + explicit LayoutPropertySheet(QLayout *object, QObject *parent = nullptr); ~LayoutPropertySheet() override; void setProperty(int index, const QVariant &value) override; diff --git a/src/designer/src/components/formeditor/line_propertysheet.h b/src/designer/src/components/formeditor/line_propertysheet.h index 1268153ee..ebd3960d7 100644 --- a/src/designer/src/components/formeditor/line_propertysheet.h +++ b/src/designer/src/components/formeditor/line_propertysheet.h @@ -42,7 +42,7 @@ class LinePropertySheet: public QDesignerPropertySheet Q_OBJECT Q_INTERFACES(QDesignerPropertySheetExtension) public: - explicit LinePropertySheet(Line *object, QObject *parent = 0); + explicit LinePropertySheet(Line *object, QObject *parent = nullptr); ~LinePropertySheet() override; void setProperty(int index, const QVariant &value) override; diff --git a/src/designer/src/components/formeditor/previewactiongroup.h b/src/designer/src/components/formeditor/previewactiongroup.h index ed639319a..168c6c603 100644 --- a/src/designer/src/components/formeditor/previewactiongroup.h +++ b/src/designer/src/components/formeditor/previewactiongroup.h @@ -56,7 +56,7 @@ class PreviewActionGroup : public QActionGroup Q_DISABLE_COPY(PreviewActionGroup) Q_OBJECT public: - explicit PreviewActionGroup(QDesignerFormEditorInterface *core, QObject *parent = 0); + explicit PreviewActionGroup(QDesignerFormEditorInterface *core, QObject *parent = nullptr); signals: void preview(const QString &style, int deviceProfileIndex); diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index c2344dd76..72ad5ab2a 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -162,9 +162,9 @@ QDesignerResourceBuilder::QDesignerResourceBuilder(QDesignerFormEditorInterface static inline void setIconPixmap(QIcon::Mode m, QIcon::State s, const QDir &workingDirectory, QString path, PropertySheetIconValue &icon, - const QDesignerLanguageExtension *lang = 0) + const QDesignerLanguageExtension *lang = nullptr) { - if (lang == 0 || !lang->isLanguageResource(path)) + if (lang == nullptr || !lang->isLanguageResource(path)) path = QFileInfo(workingDirectory, path).absoluteFilePath(); icon.setPixmap(m, s, PropertySheetPixmapValue(path)); } @@ -176,7 +176,7 @@ QVariant QDesignerResourceBuilder::loadResource(const QDir &workingDirectory, co PropertySheetPixmapValue pixmap; DomResourcePixmap *dp = property->elementPixmap(); if (!dp->text().isEmpty()) { - if (m_lang != 0 && m_lang->isLanguageResource(dp->text())) { + if (m_lang != nullptr && m_lang->isLanguageResource(dp->text())) { pixmap.setPath(dp->text()); } else { pixmap.setPath(QFileInfo(workingDirectory, dp->text()).absoluteFilePath()); @@ -319,7 +319,7 @@ DomProperty *QDesignerResourceBuilder::saveResource(const QDir &workingDirectory } } delete p; - return 0; + return nullptr; } bool QDesignerResourceBuilder::isResourceType(const QVariant &value) const @@ -418,14 +418,14 @@ DomProperty *QDesignerTextBuilder::saveText(const QVariant &value) const } if (value.canConvert<QString>()) return stringToDomProperty(value.toString()); - return 0; + return nullptr; } QDesignerResource::QDesignerResource(FormWindow *formWindow) : QEditorFormBuilder(formWindow->core()), m_formWindow(formWindow), m_copyWidget(false), - m_selected(0), + m_selected(nullptr), m_resourceBuilder(new QDesignerResourceBuilder(m_formWindow->core(), m_formWindow->pixmapCache(), m_formWindow->iconCache())) { // Check language unless extension present (Jambi) @@ -479,7 +479,7 @@ void QDesignerResource::saveDom(DomUI *ui, QWidget *widget) QAbstractFormBuilder::saveDom(ui, widget); QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), widget); - Q_ASSERT(sheet != 0); + Q_ASSERT(sheet != nullptr); const QVariant classVar = sheet->property(sheet->indexOf(QStringLiteral("objectName"))); QString classStr; @@ -491,7 +491,7 @@ void QDesignerResource::saveDom(DomUI *ui, QWidget *widget) for (int index = 0; index < m_formWindow->toolCount(); ++index) { QDesignerFormWindowToolInterface *tool = m_formWindow->tool(index); - Q_ASSERT(tool != 0); + Q_ASSERT(tool != nullptr); tool->saveToDom(ui, widget); } @@ -633,12 +633,12 @@ QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget) const QString errorMessage = QApplication::translate("Designer", "This file cannot be read because the extra info extension failed to load."); core()->dialogGui()->message(parentWidget->window(), QDesignerDialogGuiInterface::FormLoadFailureMessage, QMessageBox::Warning, messageBoxTitle(), errorMessage, QMessageBox::Ok); - return 0; + return nullptr; } } qdesigner_internal::WidgetFactory *factory = qobject_cast<qdesigner_internal::WidgetFactory*>(core()->widgetFactory()); - Q_ASSERT(factory != 0); + Q_ASSERT(factory != nullptr); QDesignerFormWindowInterface *previousFormWindow = factory->currentFormWindow(m_formWindow); @@ -712,7 +712,7 @@ QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget) // Load tools for (int index = 0; index < m_formWindow->toolCount(); ++index) { QDesignerFormWindowToolInterface *tool = m_formWindow->tool(index); - Q_ASSERT(tool != 0); + Q_ASSERT(tool != nullptr); tool->loadFromDom(ui, mainWidget); } } @@ -786,7 +786,7 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget) QDesignerContainerExtension *container = qt_extension<QDesignerContainerExtension*>(core()->extensionManager(), parentWidget); - if (container == 0) { + if (container == nullptr) { // generate a QLayoutWidget iff the parent is not an QDesignerContainerExtension. ui_widget->setAttributeClass(QStringLiteral("QLayoutWidget")); } @@ -801,8 +801,8 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget) // restore the actions ui_widget->setElementAddAction(actionRefs); - if (w == 0) - return 0; + if (w == nullptr) + return nullptr; // ### generalize using the extension manager QDesignerMenu *menu = qobject_cast<QDesignerMenu*>(w); @@ -882,7 +882,7 @@ QLayoutItem *QDesignerResource::create(DomLayoutItem *ui_layoutItem, QLayout *la core()->metaDataBase()->add(layoutWidget); if (m_formWindow) m_formWindow->manageWidget(layoutWidget); - (void) create(ui_layout, 0, layoutWidget); + (void) create(ui_layout, nullptr, layoutWidget); return new QWidgetItem(layoutWidget); } return QAbstractFormBuilder::create(ui_layoutItem, layout, parentWidget); @@ -1025,7 +1025,7 @@ QWidget *QDesignerResource::createWidget(const QString &widgetName, QWidget *par QWidget *w = core()->widgetFactory()->createWidget(widgetName, parentWidget); if (!w) - return 0; + return nullptr; if (name.isEmpty()) { QDesignerWidgetDataBaseInterface *db = core()->widgetDataBase(); @@ -1059,13 +1059,13 @@ QWidget *QDesignerResource::createWidget(const QString &widgetName, QWidget *par QLayout *QDesignerResource::createLayout(const QString &layoutName, QObject *parent, const QString &name) { - QWidget *layoutBase = 0; + QWidget *layoutBase = nullptr; QLayout *layout = qobject_cast<QLayout*>(parent); if (parent->isWidgetType()) layoutBase = static_cast<QWidget*>(parent); else { - Q_ASSERT( layout != 0 ); + Q_ASSERT( layout != nullptr ); layoutBase = layout->parentWidget(); } @@ -1075,7 +1075,7 @@ QLayout *QDesignerResource::createLayout(const QString &layoutName, QObject *par layoutType = LayoutInfo::Grid; } QLayout *lay = core()->widgetFactory()->createLayout(layoutBase, layout, layoutType); - if (lay != 0) + if (lay != nullptr) changeObjectName(lay, name); return lay; @@ -1086,13 +1086,13 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid { QDesignerMetaDataBaseItemInterface *item = core()->metaDataBase()->item(widget); if (!item) - return 0; + return nullptr; if (qobject_cast<Spacer*>(widget) && !m_copyWidget) - return 0; + return nullptr; const QDesignerWidgetDataBaseInterface *wdb = core()->widgetDataBase(); - QDesignerWidgetDataBaseItemInterface *widgetInfo = 0; + QDesignerWidgetDataBaseItemInterface *widgetInfo = nullptr; const int widgetInfoIndex = wdb->indexOfObject(widget, false); if (widgetInfoIndex != -1) { widgetInfo = wdb->item(widgetInfoIndex); @@ -1105,12 +1105,12 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid break; // There are faulty files around that have name==extends } else { const int extendsIndex = wdb->indexOfClassName(customInfo->extends()); - customInfo = extendsIndex != -1 ? wdb->item(extendsIndex) : static_cast<QDesignerWidgetDataBaseItemInterface *>(0); + customInfo = extendsIndex != -1 ? wdb->item(extendsIndex) : nullptr; } } } - DomWidget *w = 0; + DomWidget *w = nullptr; if (QTabWidget *tabWidget = qobject_cast<QTabWidget*>(widget)) w = saveWidget(tabWidget, ui_parentWidget); @@ -1129,7 +1129,7 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid else w = QAbstractFormBuilder::createDom(widget, ui_parentWidget, recursive); - Q_ASSERT( w != 0 ); + Q_ASSERT( w != nullptr ); if (!qobject_cast<QLayoutWidget*>(widget) && w->attributeClass() == QStringLiteral("QWidget")) { w->setAttributeNative(true); @@ -1142,7 +1142,7 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid w->setAttributeName(widget->objectName()); if (isPromoted( core(), widget)) { // is promoted? - Q_ASSERT(widgetInfo != 0); + Q_ASSERT(widgetInfo != nullptr); w->setAttributeName(widget->objectName()); w->setAttributeClass(widgetInfo->name()); @@ -1157,7 +1157,7 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid break; } } - } else if (widgetInfo != 0 && m_usedCustomWidgets.contains(widgetInfo)) { + } else if (widgetInfo != nullptr && m_usedCustomWidgets.contains(widgetInfo)) { if (widgetInfo->name() != w->attributeClass()) w->setAttributeClass(widgetInfo->name()); } @@ -1169,26 +1169,26 @@ DomLayout *QDesignerResource::createDom(QLayout *layout, DomLayout *ui_parentLay { QDesignerMetaDataBaseItemInterface *item = core()->metaDataBase()->item(layout); - if (item == 0) { + if (item == nullptr) { layout = layout->findChild<QLayout*>(); // refresh the meta database item item = core()->metaDataBase()->item(layout); } - if (item == 0) { + if (item == nullptr) { // nothing to do. - return 0; + return nullptr; } if (qobject_cast<QSplitter*>(layout->parentWidget()) != 0) { // nothing to do. - return 0; + return nullptr; } m_chain.push(layout); DomLayout *l = QAbstractFormBuilder::createDom(layout, ui_parentLayout, ui_parentWidget); - Q_ASSERT(l != 0); + Q_ASSERT(l != nullptr); LayoutPropertySheet::stretchAttributesToDom(core(), layout, l); m_chain.pop(); @@ -1198,11 +1198,11 @@ DomLayout *QDesignerResource::createDom(QLayout *layout, DomLayout *ui_parentLay DomLayoutItem *QDesignerResource::createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget) { - DomLayoutItem *ui_item = 0; + DomLayoutItem *ui_item = nullptr; if (Spacer *s = qobject_cast<Spacer*>(item->widget())) { if (!core()->metaDataBase()->item(s)) - return 0; + return nullptr; DomSpacer *spacer = new DomSpacer(); const QString objectName = s->objectName(); @@ -1224,7 +1224,7 @@ DomLayoutItem *QDesignerResource::createDom(QLayoutItem *item, DomLayout *ui_lay } else if (!item->spacerItem()) { // we use spacer as fake item in the Designer ui_item = QAbstractFormBuilder::createDom(item, ui_layout, ui_parentWidget); } else { - return 0; + return nullptr; } return ui_item; } @@ -1252,7 +1252,7 @@ DomTabStops *QDesignerResource::saveTabStops() return dom; } - return 0; + return nullptr; } void QDesignerResource::applyTabStops(QWidget *widget, DomTabStops *tabStops) @@ -1536,7 +1536,7 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const if (prop == QStringLiteral("objectName") || prop == QStringLiteral("spacerName")) // ### don't store the property objectName return false; - QWidget *check_widget = 0; + QWidget *check_widget = nullptr; if (obj->isWidgetType()) check_widget = static_cast<QWidget*>(obj); @@ -1570,19 +1570,19 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const bool QDesignerResource::addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) { - if (item->widget() == 0) { + if (item->widget() == nullptr) { return false; } QGridLayout *grid = qobject_cast<QGridLayout*>(layout); QBoxLayout *box = qobject_cast<QBoxLayout*>(layout); - if (grid != 0) { + if (grid != nullptr) { const int rowSpan = ui_item->hasAttributeRowSpan() ? ui_item->attributeRowSpan() : 1; const int colSpan = ui_item->hasAttributeColSpan() ? ui_item->attributeColSpan() : 1; grid->addWidget(item->widget(), ui_item->attributeRow(), ui_item->attributeColumn(), rowSpan, colSpan, item->alignment()); return true; - } else if (box != 0) { + } else if (box != nullptr) { box->addItem(item); return true; } @@ -1679,7 +1679,7 @@ bool QDesignerResource::copy(QIODevice *dev, const FormBuilderClipboard &selecti DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection) { if (selection.empty()) - return 0; + return nullptr; m_copyWidget = true; @@ -1694,7 +1694,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection) QWidget *w = selection.m_widgets.at(i); m_selected = w; DomWidget *ui_child = createDom(w, ui_widget); - m_selected = 0; + m_selected = nullptr; if (ui_child) ui_widget_list.append(ui_child); } @@ -1721,7 +1721,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection) if (!hasItems) { delete ui_widget; - return 0; + return nullptr; } // UI DomUI *ui = new DomUI(); @@ -1816,7 +1816,7 @@ void QDesignerResource::layoutInfo(DomLayout *layout, QObject *parent, int *marg DomCustomWidgets *QDesignerResource::saveCustomWidgets() { if (m_usedCustomWidgets.isEmpty()) - return 0; + return nullptr; // We would like the list to be in order of the widget database indexes // to ensure that base classes come first (nice optics) @@ -1928,7 +1928,7 @@ QList<DomProperty*> QDesignerResource::computeProperties(QObject *object) DomProperty *QDesignerResource::applyProperStdSetAttribute(QObject *object, const QString &propertyName, DomProperty *property) { if (!property) - return 0; + return nullptr; QExtensionManager *mgr = core()->extensionManager(); if (const QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(mgr, object)) { @@ -1954,14 +1954,14 @@ static inline bool hasSetter(QDesignerFormEditorInterface *core, QObject *object DomProperty *QDesignerResource::createProperty(QObject *object, const QString &propertyName, const QVariant &value) { if (!checkProperty(object, propertyName)) { - return 0; + return nullptr; } if (value.canConvert<PropertySheetFlagValue>()) { const PropertySheetFlagValue f = qvariant_cast<PropertySheetFlagValue>(value); const QString flagString = f.metaFlags.toString(f.value, DesignerMetaFlags::FullyQualified); if (flagString.isEmpty()) - return 0; + return nullptr; DomProperty *p = new DomProperty; // check if we have a standard cpp set function @@ -1978,7 +1978,7 @@ DomProperty *QDesignerResource::createProperty(QObject *object, const QString &p if (!ok) designerWarning(e.metaEnum.messageToStringFailed(e.value)); if (id.isEmpty()) - return 0; + return nullptr; DomProperty *p = new DomProperty; // check if we have a standard cpp set function @@ -2040,7 +2040,7 @@ QStringList QDesignerResource::mergeWithLoadedPaths(const QStringList &paths) co void QDesignerResource::createResources(DomResources *resources) { QStringList paths; - if (resources != 0) { + if (resources != nullptr) { const auto &dom_include = resources->elementInclude(); for (DomResource *res : dom_include) { QString path = QDir::cleanPath(m_formWindow->absoluteDir().absoluteFilePath(res->attributeLocation())); @@ -2132,18 +2132,18 @@ DomResources *QDesignerResource::saveResources(const QStringList &qrcPaths) DomAction *QDesignerResource::createDom(QAction *action) { if (!core()->metaDataBase()->item(action) || action->menu()) - return 0; + return nullptr; return QAbstractFormBuilder::createDom(action); } DomActionGroup *QDesignerResource::createDom(QActionGroup *actionGroup) { - if (core()->metaDataBase()->item(actionGroup) != 0) { + if (core()->metaDataBase()->item(actionGroup) != nullptr) { return QAbstractFormBuilder::createDom(actionGroup); } - return 0; + return nullptr; } QAction *QDesignerResource::create(DomAction *ui_action, QObject *parent) @@ -2153,7 +2153,7 @@ QAction *QDesignerResource::create(DomAction *ui_action, QObject *parent) return action; } - return 0; + return nullptr; } QActionGroup *QDesignerResource::create(DomActionGroup *ui_action_group, QObject *parent) @@ -2163,14 +2163,14 @@ QActionGroup *QDesignerResource::create(DomActionGroup *ui_action_group, QObject return actionGroup; } - return 0; + return nullptr; } DomActionRef *QDesignerResource::createActionRefDom(QAction *action) { if (!core()->metaDataBase()->item(action) || (!action->isSeparator() && !action->menu() && action->objectName().isEmpty())) - return 0; + return nullptr; return QAbstractFormBuilder::createActionRefDom(action); } @@ -2187,7 +2187,7 @@ QAction *QDesignerResource::createAction(QObject *parent, const QString &name) return action; } - return 0; + return nullptr; } QActionGroup *QDesignerResource::createActionGroup(QObject *parent, const QString &name) @@ -2197,7 +2197,7 @@ QActionGroup *QDesignerResource::createActionGroup(QObject *parent, const QStrin return actionGroup; } - return 0; + return nullptr; } /* Apply the attributes to a widget via property sheet where appropriate, diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h index 0df515355..c0e925f87 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.h +++ b/src/designer/src/components/formeditor/qdesigner_resource.h @@ -70,8 +70,8 @@ public: bool copy(QIODevice *dev, const FormBuilderClipboard &selection) override; DomUI *copy(const FormBuilderClipboard &selection) override; - FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) override; - FormBuilderClipboard paste(QIODevice *dev, QWidget *widgetParent, QObject *actionParent = 0) override; + FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = nullptr) override; + FormBuilderClipboard paste(QIODevice *dev, QWidget *widgetParent, QObject *actionParent = nullptr) override; bool saveRelative() const; void setSaveRelative(bool relative); diff --git a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h index b57e6a7cd..e50df88f4 100644 --- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h +++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h @@ -42,7 +42,7 @@ class QLayoutWidgetPropertySheet: public QDesignerPropertySheet Q_OBJECT Q_INTERFACES(QDesignerPropertySheetExtension) public: - explicit QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent = 0); + explicit QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent = nullptr); ~QLayoutWidgetPropertySheet() override; void setProperty(int index, const QVariant &value) override; diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp index 71f608fa2..cf0cbdaa1 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp @@ -56,7 +56,7 @@ int QMainWindowContainer::count() const QWidget *QMainWindowContainer::widget(int index) const { if (index == -1) - return 0; + return nullptr; return m_widgets.at(index); } @@ -174,12 +174,12 @@ void QMainWindowContainer::remove(int index) m_mainWindow->removeToolBar(toolBar); } else if (QMenuBar *menuBar = qobject_cast<QMenuBar*>(widget)) { menuBar->hide(); - menuBar->setParent(0); - m_mainWindow->setMenuBar(0); + menuBar->setParent(nullptr); + m_mainWindow->setMenuBar(nullptr); } else if (QStatusBar *statusBar = qobject_cast<QStatusBar*>(widget)) { statusBar->hide(); - statusBar->setParent(0); - m_mainWindow->setStatusBar(0); + statusBar->setParent(nullptr); + m_mainWindow->setStatusBar(nullptr); } else if (QDockWidget *dockWidget = qobject_cast<QDockWidget*>(widget)) { m_mainWindow->removeDockWidget(dockWidget); } diff --git a/src/designer/src/components/formeditor/qmainwindow_container.h b/src/designer/src/components/formeditor/qmainwindow_container.h index 3673cb665..96991f411 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.h +++ b/src/designer/src/components/formeditor/qmainwindow_container.h @@ -45,7 +45,7 @@ class QMainWindowContainer: public QObject, public QDesignerContainerExtension Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QMainWindowContainer(QMainWindow *widget, QObject *parent = 0); + explicit QMainWindowContainer(QMainWindow *widget, QObject *parent = nullptr); int count() const override; QWidget *widget(int index) const override; diff --git a/src/designer/src/components/formeditor/qmdiarea_container.cpp b/src/designer/src/components/formeditor/qmdiarea_container.cpp index 01cf0d598..2726cfcee 100644 --- a/src/designer/src/components/formeditor/qmdiarea_container.cpp +++ b/src/designer/src/components/formeditor/qmdiarea_container.cpp @@ -55,7 +55,7 @@ int QMdiAreaContainer::count() const QWidget *QMdiAreaContainer::widget(int index) const { if (index < 0) - return 0; + return nullptr; return m_mdiArea->subWindowList(QMdiArea::CreationOrder).at(index)->widget(); } @@ -214,7 +214,7 @@ bool QMdiAreaPropertySheet::isEnabled(int index) const switch (mdiAreaProperty(propertyName(index))) { case MdiAreaSubWindowName: case MdiAreaSubWindowTitle: - return currentWindow() != 0; + return currentWindow() != nullptr; case MdiAreaNone: break; } @@ -226,7 +226,7 @@ bool QMdiAreaPropertySheet::isChanged(int index) const bool rc = false; switch (mdiAreaProperty(propertyName(index))) { case MdiAreaSubWindowName: - rc = currentWindow() != 0; + rc = currentWindow() != nullptr; break; case MdiAreaSubWindowTitle: if (QDesignerPropertySheetExtension *cws = currentWindowSheet()) { @@ -246,17 +246,17 @@ QWidget *QMdiAreaPropertySheet::currentWindow() const if (const QDesignerContainerExtension *c = qt_extension<QDesignerContainerExtension*>(core()->extensionManager(), object())) { const int ci = c->currentIndex(); if (ci < 0) - return 0; + return nullptr; return c->widget(ci); } - return 0; + return nullptr; } QDesignerPropertySheetExtension *QMdiAreaPropertySheet::currentWindowSheet() const { QWidget *cw = currentWindow(); - if (cw == 0) - return 0; + if (cw == nullptr) + return nullptr; return qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), cw); } diff --git a/src/designer/src/components/formeditor/qmdiarea_container.h b/src/designer/src/components/formeditor/qmdiarea_container.h index 9506e0de8..47669af3a 100644 --- a/src/designer/src/components/formeditor/qmdiarea_container.h +++ b/src/designer/src/components/formeditor/qmdiarea_container.h @@ -47,7 +47,7 @@ class QMdiAreaContainer: public QObject, public QDesignerContainerExtension Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QMdiAreaContainer(QMdiArea *widget, QObject *parent = 0); + explicit QMdiAreaContainer(QMdiArea *widget, QObject *parent = nullptr); int count() const override; QWidget *widget(int index) const override; @@ -71,7 +71,7 @@ class QMdiAreaPropertySheet: public QDesignerPropertySheet Q_OBJECT Q_INTERFACES(QDesignerPropertySheetExtension) public: - explicit QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent = 0); + explicit QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent = nullptr); void setProperty(int index, const QVariant &value) override; bool reset(int index) override; diff --git a/src/designer/src/components/formeditor/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp index 9339a1a90..36e73c6ea 100644 --- a/src/designer/src/components/formeditor/qwizard_container.cpp +++ b/src/designer/src/components/formeditor/qwizard_container.cpp @@ -54,7 +54,7 @@ int QWizardContainer::count() const QWidget *QWizardContainer::widget(int index) const { - QWidget *rc = 0; + QWidget *rc = nullptr; if (index >= 0) { const IdList idList = m_wizard->pageIds(); if (index < idList.size()) diff --git a/src/designer/src/components/formeditor/qwizard_container.h b/src/designer/src/components/formeditor/qwizard_container.h index 7a8c3624a..fe7cdbc2f 100644 --- a/src/designer/src/components/formeditor/qwizard_container.h +++ b/src/designer/src/components/formeditor/qwizard_container.h @@ -50,7 +50,7 @@ class QWizardContainer: public QObject, public QDesignerContainerExtension Q_OBJECT Q_INTERFACES(QDesignerContainerExtension) public: - explicit QWizardContainer(QWizard *widget, QObject *parent = 0); + explicit QWizardContainer(QWizard *widget, QObject *parent = nullptr); int count() const override; QWidget *widget(int index) const override; @@ -73,7 +73,7 @@ class QWizardPagePropertySheet: public QDesignerPropertySheet { Q_OBJECT public: - explicit QWizardPagePropertySheet(QWizardPage *object, QObject *parent = 0); + explicit QWizardPagePropertySheet(QWizardPage *object, QObject *parent = nullptr); bool reset(int index) override; @@ -91,7 +91,7 @@ class QWizardPropertySheet: public QDesignerPropertySheet { Q_OBJECT public: - explicit QWizardPropertySheet(QWizard *object, QObject *parent = 0); + explicit QWizardPropertySheet(QWizard *object, QObject *parent = nullptr); bool isVisible(int index) const override; private: diff --git a/src/designer/src/components/formeditor/spacer_propertysheet.h b/src/designer/src/components/formeditor/spacer_propertysheet.h index 8395df208..05dfb7d32 100644 --- a/src/designer/src/components/formeditor/spacer_propertysheet.h +++ b/src/designer/src/components/formeditor/spacer_propertysheet.h @@ -42,7 +42,7 @@ class SpacerPropertySheet: public QDesignerPropertySheet Q_OBJECT Q_INTERFACES(QDesignerPropertySheetExtension) public: - explicit SpacerPropertySheet(Spacer *object, QObject *parent = 0); + explicit SpacerPropertySheet(Spacer *object, QObject *parent = nullptr); ~SpacerPropertySheet() override; void setProperty(int index, const QVariant &value) override; diff --git a/src/designer/src/components/formeditor/templateoptionspage.h b/src/designer/src/components/formeditor/templateoptionspage.h index 204b805e9..660e41268 100644 --- a/src/designer/src/components/formeditor/templateoptionspage.h +++ b/src/designer/src/components/formeditor/templateoptionspage.h @@ -54,7 +54,7 @@ class TemplateOptionsWidget : public QWidget Q_DISABLE_COPY(TemplateOptionsWidget) public: explicit TemplateOptionsWidget(QDesignerFormEditorInterface *core, - QWidget *parent = 0); + QWidget *parent = nullptr); ~TemplateOptionsWidget(); diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp index 0f41f74bf..d3ecf8087 100644 --- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp +++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp @@ -76,7 +76,7 @@ QDesignerFormWindowInterface *WidgetEditorTool::formWindow() const bool WidgetEditorTool::mainWindowSeparatorEvent(QWidget *widget, QEvent *event) { QMainWindow *mw = qobject_cast<QMainWindow*>(widget); - if (mw == 0) + if (mw == nullptr) return false; if (event->type() != QEvent::MouseButtonPress @@ -100,7 +100,7 @@ bool WidgetEditorTool::mainWindowSeparatorEvent(QWidget *widget, QEvent *event) if (event->type() == QEvent::MouseButtonRelease) { if (m_separator_drag_mw != mw) return false; - m_separator_drag_mw = 0; + m_separator_drag_mw = nullptr; return true; } @@ -248,7 +248,7 @@ bool WidgetEditorTool::handleDragEnterMoveEvent(QWidget *widget, QWidget * /*man QPoint globalPos = QPoint(0, 0); if (m_specialDockDrag) { - m_lastDropTarget = 0; + m_lastDropTarget = nullptr; QMainWindow *mw = qobject_cast<QMainWindow*>(m_formWindow->mainContainer()); if (mw) m_lastDropTarget = mw->centralWidget(); @@ -306,7 +306,7 @@ bool WidgetEditorTool::restoreDropHighlighting() return false; m_formWindow->highlightWidget(m_lastDropTarget, m_lastDropTarget->mapFromGlobal(QCursor::pos()), FormWindow::Restore); - m_lastDropTarget = 0; + m_lastDropTarget = nullptr; return true; } @@ -321,7 +321,7 @@ bool WidgetEditorTool::handleDragLeaveEvent(QWidget *, QWidget *, QDragLeaveEven QWidget *WidgetEditorTool::editor() const { - Q_ASSERT(formWindow() != 0); + Q_ASSERT(formWindow() != nullptr); return formWindow()->mainContainer(); } @@ -330,7 +330,7 @@ void WidgetEditorTool::activated() if (core()->widgetBox()) core()->widgetBox()->setEnabled(true); - if (m_formWindow == 0) + if (m_formWindow == nullptr) return; const QWidgetList &sel = m_formWindow->selectedWidgets(); @@ -343,7 +343,7 @@ void WidgetEditorTool::deactivated() if (core()->widgetBox()) core()->widgetBox()->setEnabled(false); - if (m_formWindow == 0) + if (m_formWindow == nullptr) return; m_formWindow->clearSelection(); diff --git a/src/designer/src/components/formeditor/widgetselection.cpp b/src/designer/src/components/formeditor/widgetselection.cpp index 608428554..c871063b5 100644 --- a/src/designer/src/components/formeditor/widgetselection.cpp +++ b/src/designer/src/components/formeditor/widgetselection.cpp @@ -65,18 +65,18 @@ enum { debugWidgetSelection = 0 }; template <class Layout> static inline Layout *managedLayoutOf(const QDesignerFormEditorInterface *core, QWidget *w, - const Layout * /* vs6dummy */ = 0) + const Layout * /* vs6dummy */ = nullptr) { if (QWidget *p = w->parentWidget()) if (QLayout *l = LayoutInfo::managedLayout(core, p)) return qobject_cast<Layout*>(l); - return 0; + return nullptr; } // ----------- WidgetHandle WidgetHandle::WidgetHandle(FormWindow *parent, WidgetHandle::Type t, WidgetSelection *s) : InvisibleWidget(parent->formContainer()), - m_widget(0), + m_widget(nullptr), m_type(t), m_formWindow( parent), m_sel(s), @@ -135,7 +135,7 @@ QDesignerFormEditorInterface *WidgetHandle::core() const if (m_formWindow) return m_formWindow->core(); - return 0; + return nullptr; } void WidgetHandle::setActive(bool a) @@ -396,7 +396,7 @@ static inline int formLayoutRightHandleOperation(int dx, unsigned possibleOperat // Change form layout item horizontal span void WidgetHandle::changeFormLayoutItemSpan() { - QUndoCommand *cmd = 0; + QUndoCommand *cmd = nullptr; // Figure out command according to the movement const int dx = m_widget->geometry().center().x() - m_origGeom.center().x(); if (qAbs(dx) >= QApplication::startDragDistance()) { @@ -450,7 +450,7 @@ void WidgetHandle::changeGridLayoutItemSpan() const QPoint pt = m_origGeom.center() - m_widget->geometry().center(); - ChangeLayoutItemGeometry *cmd = 0; + ChangeLayoutItemGeometry *cmd = nullptr; switch (m_type) { default: @@ -501,7 +501,7 @@ void WidgetHandle::changeGridLayoutItemSpan() break; } - if (cmd != 0) { + if (cmd != nullptr) { m_formWindow->commandHistory()->push(cmd); } else { grid->invalidate(); @@ -568,7 +568,7 @@ WidgetSelection::WidgetState WidgetSelection::widgetState(const QDesignerFormEdi } WidgetSelection::WidgetSelection(FormWindow *parent) : - m_widget(0), + m_widget(nullptr), m_formWindow(parent) { for (int i = WidgetHandle::LeftTop; i < WidgetHandle::TypeCount; ++i) @@ -578,12 +578,12 @@ WidgetSelection::WidgetSelection(FormWindow *parent) : void WidgetSelection::setWidget(QWidget *w) { - if (m_widget != 0) + if (m_widget != nullptr) m_widget->removeEventFilter(this); - if (w == 0) { + if (w == nullptr) { hide(); - m_widget = 0; + m_widget = nullptr; return; } @@ -629,7 +629,7 @@ void WidgetSelection::updateActive() bool WidgetSelection::isUsed() const { - return m_widget != 0; + return m_widget != nullptr; } void WidgetSelection::updateGeometry() @@ -715,7 +715,7 @@ QDesignerFormEditorInterface *WidgetSelection::core() const if (m_formWindow) return m_formWindow->core(); - return 0; + return nullptr; } bool WidgetSelection::eventFilter(QObject *object, QEvent *event) |