diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-24 14:09:13 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-30 08:53:32 +0100 |
commit | 56712a395be47e338ed536d32792e4734eb3296f (patch) | |
tree | 943ffe266ff42fbc74b132c347000b4109745cc5 | |
parent | ea93dfc7c3626c503546c33c3e81e5beaea01771 (diff) |
Qt Designer: Remove "using namespace qdesigner_internal" from sources
It causes clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I86e44bc5f0d9509ebf903fbb67166e4ce7bb6f35
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
27 files changed, 77 insertions, 34 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp b/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp index 648959b38..5f3d55884 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp +++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { BuddyEditorPlugin::BuddyEditorPlugin() = default; @@ -87,4 +87,6 @@ void BuddyEditorPlugin::activeFormWindowChanged(QDesignerFormWindowInterface *fo m_action->setEnabled(formWindow != nullptr); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp b/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp index 37fb99989..0ed4e7e64 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp +++ b/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { BuddyEditorTool::BuddyEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent) : QDesignerFormWindowToolInterface(parent), @@ -69,4 +69,6 @@ QAction *BuddyEditorTool::action() const return m_action; } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.cpp b/src/designer/src/components/formeditor/formwindow_dnditem.cpp index 4388ffad8..928922e3b 100644 --- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp +++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp @@ -16,7 +16,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { static QWidget *decorationFromWidget(QWidget *w) { @@ -76,4 +76,6 @@ DomUI *FormWindowDnDItem::domUi() const return result; } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp index 0373e91ac..503f384ec 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp @@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) : QObject(parent), @@ -177,4 +177,6 @@ QLayout *FormWindowWidgetStack::layout() const return m_layout; } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.cpp b/src/designer/src/components/formeditor/itemview_propertysheet.cpp index 9331830e0..76bc9cc64 100644 --- a/src/designer/src/components/formeditor/itemview_propertysheet.cpp +++ b/src/designer/src/components/formeditor/itemview_propertysheet.cpp @@ -53,10 +53,6 @@ static const char *highlightSectionsProperty = "highlightSections"; static const char *minimumSectionSizeProperty = "minimumSectionSize"; static const char *showSortIndicatorProperty = "showSortIndicator"; static const char *stretchLastSectionProperty = "stretchLastSection"; -} // namespace qdesigner_internal - -using namespace qdesigner_internal; - /***************** ItemViewPropertySheetPrivate *********************/ @@ -229,4 +225,6 @@ bool ItemViewPropertySheet::reset(int index) return QDesignerPropertySheet::reset(index); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/line_propertysheet.cpp b/src/designer/src/components/formeditor/line_propertysheet.cpp index d6d89af93..ebf228f4b 100644 --- a/src/designer/src/components/formeditor/line_propertysheet.cpp +++ b/src/designer/src/components/formeditor/line_propertysheet.cpp @@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { LinePropertySheet::LinePropertySheet(Line *object, QObject *parent) : QDesignerPropertySheet(object, parent) @@ -42,4 +42,6 @@ QString LinePropertySheet::propertyGroup(int index) const return QDesignerPropertySheet::propertyGroup(index); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp index 46bd2e506..8d692fca8 100644 --- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp +++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { QLayoutWidgetPropertySheet::QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent) : QDesignerPropertySheet(object, parent) @@ -40,4 +40,6 @@ bool QLayoutWidgetPropertySheet::dynamicPropertiesAllowed() const return false; } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp index a1df46d50..e25dcb36c 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp @@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { QMainWindowContainer::QMainWindowContainer(QMainWindow *widget, QObject *parent) : QObject(parent), @@ -177,4 +177,6 @@ void QMainWindowContainer::remove(int index) m_widgets.removeAt(index); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp index 7814d828d..50e1b30d8 100644 --- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp +++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { WidgetEditorTool::WidgetEditorTool(FormWindow *formWindow) : QDesignerFormWindowToolInterface(formWindow), @@ -326,4 +326,6 @@ void WidgetEditorTool::deactivated() m_formWindow->clearSelection(); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/propertyeditor/paletteeditorbutton.cpp b/src/designer/src/components/propertyeditor/paletteeditorbutton.cpp index 8bbef7fc0..4f6661bdc 100644 --- a/src/designer/src/components/propertyeditor/paletteeditorbutton.cpp +++ b/src/designer/src/components/propertyeditor/paletteeditorbutton.cpp @@ -8,7 +8,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { PaletteEditorButton::PaletteEditorButton(QDesignerFormEditorInterface *core, const QPalette &palette, QWidget *parent) : QToolButton(parent), @@ -44,4 +44,6 @@ void PaletteEditorButton::showPaletteEditor() } } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp index 56e7146d3..722338dd9 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.cpp +++ b/src/designer/src/components/propertyeditor/previewwidget.cpp @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { PreviewWidget::PreviewWidget(QWidget *parent) : QWidget(parent) @@ -31,5 +31,6 @@ PreviewWidget::PreviewWidget(QWidget *parent) PreviewWidget::~PreviewWidget() = default; +} // namespace qdesigner_internal QT_END_NAMESPACE diff --git a/src/designer/src/components/propertyeditor/qlonglongvalidator.cpp b/src/designer/src/components/propertyeditor/qlonglongvalidator.cpp index 6b0c544b6..1a40530df 100644 --- a/src/designer/src/components/propertyeditor/qlonglongvalidator.cpp +++ b/src/designer/src/components/propertyeditor/qlonglongvalidator.cpp @@ -5,7 +5,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { // ---------------------------------------------------------------------------- QLongLongValidator::QLongLongValidator(QObject * parent) @@ -103,4 +103,6 @@ void QULongLongValidator::setTop(qulonglong top) setRange(bottom(), top); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.cpp b/src/designer/src/components/propertyeditor/stringlisteditor.cpp index e58496e62..46819a890 100644 --- a/src/designer/src/components/propertyeditor/stringlisteditor.cpp +++ b/src/designer/src/components/propertyeditor/stringlisteditor.cpp @@ -7,7 +7,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { StringListEditor::StringListEditor(QWidget *parent) : QDialog(parent), m_model(new QStringListModel(this)) @@ -169,4 +169,6 @@ void StringListEditor::editString(int index) listView->edit(m_model->index(index, 0)); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/propertyeditor/stringlisteditorbutton.cpp b/src/designer/src/components/propertyeditor/stringlisteditorbutton.cpp index da9a0c804..59323686c 100644 --- a/src/designer/src/components/propertyeditor/stringlisteditorbutton.cpp +++ b/src/designer/src/components/propertyeditor/stringlisteditorbutton.cpp @@ -8,7 +8,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { StringListEditorButton::StringListEditorButton( const QStringList &stringList, QWidget *parent) @@ -38,4 +38,6 @@ void StringListEditorButton::showStringListEditor() } } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp index 9a6ad1f64..90d373dcd 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { SignalSlotEditorPlugin::SignalSlotEditorPlugin() = default; @@ -87,6 +87,8 @@ void SignalSlotEditorPlugin::activeFormWindowChanged(QDesignerFormWindowInterfac m_action->setEnabled(formWindow != nullptr); } +} // namespace qdesigner_internal + QT_END_NAMESPACE #include "moc_signalsloteditor_plugin.cpp" diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp index 27e8acb74..9b5e72fbd 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp @@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { SignalSlotEditorTool::SignalSlotEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent) : QDesignerFormWindowToolInterface(parent), @@ -82,4 +82,6 @@ void SignalSlotEditorTool::loadFromDom(DomUI *ui, QWidget *mainContainer) m_editor->fromUi(ui->elementConnections(), mainContainer); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp b/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp index 2175e4d3f..84f9e4702 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp +++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { TabOrderEditorPlugin::TabOrderEditorPlugin() = default; @@ -87,6 +87,8 @@ QAction *TabOrderEditorPlugin::action() const return m_action; } +} // namespace qdesigner_internal + QT_END_NAMESPACE #include "moc_tabordereditor_plugin.cpp" diff --git a/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp b/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp index eefbd3d9f..46270b007 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp +++ b/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { TabOrderEditorTool::TabOrderEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent) : QDesignerFormWindowToolInterface(parent), @@ -70,4 +70,6 @@ QAction *TabOrderEditorTool::action() const return m_action; } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp index da7781a99..75c1959b5 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { ComboBoxTaskMenu::ComboBoxTaskMenu(QComboBox *button, QObject *parent) : QDesignerTaskMenu(button, parent), @@ -91,4 +91,6 @@ void ComboBoxTaskMenu::updateSelection() m_editor->deleteLater(); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp index 0e3aa94c3..4bb08c4c2 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { ListWidgetTaskMenu::ListWidgetTaskMenu(QListWidget *button, QObject *parent) : QDesignerTaskMenu(button, parent), @@ -75,4 +75,6 @@ void ListWidgetTaskMenu::updateSelection() m_editor->deleteLater(); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/listwidgeteditor.cpp b/src/designer/src/components/taskmenu/listwidgeteditor.cpp index 91b917c95..000b1e554 100644 --- a/src/designer/src/components/taskmenu/listwidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/listwidgeteditor.cpp @@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { ListWidgetEditor::ListWidgetEditor(QDesignerFormWindowInterface *form, QWidget *parent) @@ -97,4 +97,6 @@ ListContents ListWidgetEditor::contents() const return retVal; } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp index c902c3fc3..9ace1eacf 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp @@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { TableWidgetTaskMenu::TableWidgetTaskMenu(QTableWidget *button, QObject *parent) : QDesignerTaskMenu(button, parent), @@ -73,4 +73,6 @@ void TableWidgetTaskMenu::updateSelection() m_editor->deleteLater(); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/taskmenu_component.cpp b/src/designer/src/components/taskmenu/taskmenu_component.cpp index 4f761e5f1..ef82880b2 100644 --- a/src/designer/src/components/taskmenu/taskmenu_component.cpp +++ b/src/designer/src/components/taskmenu/taskmenu_component.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { TaskMenuComponent::TaskMenuComponent(QDesignerFormEditorInterface *core, QObject *parent) : QObject(parent), @@ -62,5 +62,8 @@ QDesignerFormEditorInterface *TaskMenuComponent::core() const return m_core; } + +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp index ff0e00503..6ce0b3969 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { TreeWidgetTaskMenu::TreeWidgetTaskMenu(QTreeWidget *button, QObject *parent) : QDesignerTaskMenu(button, parent), @@ -72,4 +72,6 @@ void TreeWidgetTaskMenu::updateSelection() m_editor->deleteLater(); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index caa0dad78..9a8b7f91c 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -80,7 +80,6 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; using namespace Qt::StringLiterals; const char *QDesignerActions::defaultToolbarPropertyName = "__qt_defaultToolBarAction"; @@ -311,7 +310,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench) m_editWidgetsAction->setProperty(QDesignerActions::defaultToolbarPropertyName, true); m_toolActions->addAction(m_editWidgetsAction); - connect(formWindowManager, &QDesignerFormWindowManager::activeFormWindowChanged, + connect(formWindowManager, &qdesigner_internal::QDesignerFormWindowManager::activeFormWindowChanged, this, &QDesignerActions::activeFormWindowChanged); const QObjectList builtinPlugins = QPluginLoader::staticInstances() @@ -1160,7 +1159,7 @@ bool QDesignerActions::ensureBackupDirectories() { if (m_backupPath.isEmpty()) { // create names - m_backupPath = dataDirectory() + u"/backup"_s; + m_backupPath = qdesigner_internal::dataDirectory() + u"/backup"_s; m_backupTmpPath = m_backupPath + u"/tmp"_s; } @@ -1219,7 +1218,7 @@ QPixmap QDesignerActions::createPreviewPixmap(QDesignerFormWindowInterface *fw) qdesigner_internal::PreviewConfiguration QDesignerActions::previewConfiguration() { qdesigner_internal::PreviewConfiguration pc; - QDesignerSharedSettings settings(core()); + qdesigner_internal::QDesignerSharedSettings settings(core()); if (settings.isCustomPreviewConfigurationEnabled()) pc = settings.customPreviewConfiguration(); return pc; diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp index 8da7ce8d0..449161993 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp +++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp @@ -8,7 +8,7 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +namespace qdesigner_internal { /*! \class qdesigner_internal::QDesignerFormWindowManager @@ -46,4 +46,6 @@ void QDesignerFormWindowManager::showPluginDialog() dlg.exec(); } +} // namespace qdesigner_internal + QT_END_NAMESPACE diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp index 70f6ee69f..c5d754f71 100644 --- a/src/designer/src/lib/shared/shared_settings.cpp +++ b/src/designer/src/lib/shared/shared_settings.cpp @@ -36,8 +36,6 @@ static inline QString namingModeKey() { return QStringLiteral("naming"); } static inline QString underScoreNamingMode() { return QStringLiteral("underscore"); } static inline QString camelCaseNamingMode() { return QStringLiteral("camelcase"); } -using namespace qdesigner_internal; - static bool checkTemplatePath(const QString &path, bool create) { QDir current(QDir::current()); |