ModelEditor: Replace 0 with nullptr in plugin

Change-Id: I38b34213790dd165637d0d5096a4640eb43e8e0c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Jochen Becher
2017-07-30 22:12:58 +02:00
parent 16b2b16238
commit 40acf8c191
34 changed files with 114 additions and 114 deletions

View File

@@ -46,20 +46,20 @@ namespace Internal {
class ActionHandler::ActionHandlerPrivate { class ActionHandler::ActionHandlerPrivate {
public: public:
Core::Context context; Core::Context context;
QAction *undoAction = 0; QAction *undoAction = nullptr;
QAction *redoAction = 0; QAction *redoAction = nullptr;
QAction *cutAction = 0; QAction *cutAction = nullptr;
QAction *copyAction = 0; QAction *copyAction = nullptr;
QAction *pasteAction = 0; QAction *pasteAction = nullptr;
QAction *removeAction = 0; QAction *removeAction = nullptr;
QAction *deleteAction = 0; QAction *deleteAction = nullptr;
QAction *selectAllAction = 0; QAction *selectAllAction = nullptr;
QAction *openParentDiagramAction = 0; QAction *openParentDiagramAction = nullptr;
QAction *synchronizeBrowserAction = 0; QAction *synchronizeBrowserAction = nullptr;
QAction *exportDiagramAction = 0; QAction *exportDiagramAction = nullptr;
QAction *zoomInAction = 0; QAction *zoomInAction = nullptr;
QAction *zoomOutAction = 0; QAction *zoomOutAction = nullptr;
QAction *resetZoomAction = 0; QAction *resetZoomAction = nullptr;
}; };
ActionHandler::ActionHandler(const Core::Context &context, QObject *parent) ActionHandler::ActionHandler(const Core::Context &context, QObject *parent)

View File

@@ -50,7 +50,7 @@ class ActionHandler :
class ActionHandlerPrivate; class ActionHandlerPrivate;
public: public:
ActionHandler(const Core::Context &context, QObject *parent = 0); ActionHandler(const Core::Context &context, QObject *parent = nullptr);
~ActionHandler(); ~ActionHandler();
public: public:

View File

@@ -38,7 +38,7 @@ class ClassViewController :
Q_OBJECT Q_OBJECT
public: public:
explicit ClassViewController(QObject *parent = 0); explicit ClassViewController(QObject *parent = nullptr);
~ClassViewController() = default; ~ClassViewController() = default;
QSet<QString> findClassDeclarations(const QString &fileName); QSet<QString> findClassDeclarations(const QString &fileName);

View File

@@ -64,7 +64,7 @@ private:
QString m_elementName; QString m_elementName;
QStringList m_elementsPath; QStringList m_elementsPath;
int m_maxPathLength = 0; int m_maxPathLength = 0;
qmt::MComponent *m_bestComponent = 0; qmt::MComponent *m_bestComponent = nullptr;
}; };
void FindComponentFromFilePath::setFilePath(const QString &filePath) void FindComponentFromFilePath::setFilePath(const QString &filePath)
@@ -131,7 +131,7 @@ private:
bool haveDependency(const qmt::MObject *source, const QList<qmt::MPackage *> &targets); bool haveDependency(const qmt::MObject *source, const QList<qmt::MPackage *> &targets);
private: private:
qmt::ModelController *m_modelController = 0; qmt::ModelController *m_modelController = nullptr;
QMultiHash<QString, Node> m_filePaths; QMultiHash<QString, Node> m_filePaths;
}; };
@@ -360,8 +360,8 @@ bool UpdateIncludeDependenciesVisitor::haveDependency(const qmt::MObject *source
class ComponentViewController::ComponentViewControllerPrivate { class ComponentViewController::ComponentViewControllerPrivate {
public: public:
PxNodeUtilities *pxnodeUtilities = 0; PxNodeUtilities *pxnodeUtilities = nullptr;
qmt::DiagramSceneController *diagramSceneController = 0; qmt::DiagramSceneController *diagramSceneController = nullptr;
}; };
ComponentViewController::ComponentViewController(QObject *parent) ComponentViewController::ComponentViewController(QObject *parent)
@@ -408,7 +408,7 @@ void ComponentViewController::doCreateComponentModel(const ProjectExplorer::Fold
{ {
foreach (const ProjectExplorer::FileNode *fileNode, folderNode->fileNodes()) { foreach (const ProjectExplorer::FileNode *fileNode, folderNode->fileNodes()) {
QString componentName = qmt::NameController::convertFileNameToElementName(fileNode->filePath().toString()); QString componentName = qmt::NameController::convertFileNameToElementName(fileNode->filePath().toString());
qmt::MComponent *component = 0; qmt::MComponent *component = nullptr;
bool isSource = false; bool isSource = false;
CppTools::ProjectFile::Kind kind = CppTools::ProjectFile::classify(fileNode->filePath().toString()); CppTools::ProjectFile::Kind kind = CppTools::ProjectFile::classify(fileNode->filePath().toString());
switch (kind) { switch (kind) {
@@ -441,7 +441,7 @@ void ComponentViewController::doCreateComponentModel(const ProjectExplorer::Fold
if (d->pxnodeUtilities->findSameObject(relativeElements, component)) { if (d->pxnodeUtilities->findSameObject(relativeElements, component)) {
delete component; delete component;
} else { } else {
qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(0, diagram); qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(nullptr, diagram);
qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements); qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements);
d->diagramSceneController->modelController()->addObject(bestParentPackage, component); d->diagramSceneController->modelController()->addObject(bestParentPackage, component);
} }

View File

@@ -47,7 +47,7 @@ class ComponentViewController :
class ComponentViewControllerPrivate; class ComponentViewControllerPrivate;
public: public:
explicit ComponentViewController(QObject *parent = 0); explicit ComponentViewController(QObject *parent = nullptr);
~ComponentViewController(); ~ComponentViewController();
void setPxNodeUtilties(PxNodeUtilities *pxnodeUtilities); void setPxNodeUtilties(PxNodeUtilities *pxnodeUtilities);

View File

@@ -46,7 +46,7 @@ class DiagramsViewManager :
Q_OBJECT Q_OBJECT
public: public:
explicit DiagramsViewManager(QObject *parent = 0); explicit DiagramsViewManager(QObject *parent = nullptr);
~DiagramsViewManager() = default; ~DiagramsViewManager() = default;
signals: signals:

View File

@@ -39,7 +39,7 @@ class DragTool :
public: public:
DragTool(const QIcon &icon, const QString &title, const QString &newElementId, DragTool(const QIcon &icon, const QString &title, const QString &newElementId,
const QString &stereotype, QWidget *parent = 0); const QString &stereotype, QWidget *parent = nullptr);
~DragTool(); ~DragTool();
QSize sizeHint() const override; QSize sizeHint() const override;

View File

@@ -40,7 +40,7 @@ namespace Internal {
class EditorDiagramView::EditorDiagramViewPrivate { class EditorDiagramView::EditorDiagramViewPrivate {
public: public:
PxNodeController *pxNodeController = 0; PxNodeController *pxNodeController = nullptr;
}; };
EditorDiagramView::EditorDiagramView(QWidget *parent) EditorDiagramView::EditorDiagramView(QWidget *parent)

View File

@@ -39,7 +39,7 @@ class EditorDiagramView :
class EditorDiagramViewPrivate; class EditorDiagramViewPrivate;
public: public:
explicit EditorDiagramView(QWidget *parent = 0); explicit EditorDiagramView(QWidget *parent = nullptr);
~EditorDiagramView() override; ~EditorDiagramView() override;
signals: signals:

View File

@@ -59,8 +59,8 @@ namespace Internal {
class ElementTasks::ElementTasksPrivate { class ElementTasks::ElementTasksPrivate {
public: public:
qmt::DocumentController *documentController = 0; qmt::DocumentController *documentController = nullptr;
ComponentViewController *componentViewController = 0; ComponentViewController *componentViewController = nullptr;
}; };
ElementTasks::ElementTasks(QObject *parent) ElementTasks::ElementTasks(QObject *parent)
@@ -274,7 +274,7 @@ bool ElementTasks::hasDiagram(const qmt::MElement *element) const
qmt::FindDiagramVisitor visitor; qmt::FindDiagramVisitor visitor;
element->accept(&visitor); element->accept(&visitor);
const qmt::MDiagram *diagram = visitor.diagram(); const qmt::MDiagram *diagram = visitor.diagram();
return diagram != 0; return diagram != nullptr;
} }
bool ElementTasks::hasDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const bool ElementTasks::hasDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const
@@ -373,7 +373,7 @@ void ElementTasks::openParentDiagram(const qmt::DElement *element, const qmt::ME
bool ElementTasks::mayCreateDiagram(const qmt::MElement *element) const bool ElementTasks::mayCreateDiagram(const qmt::MElement *element) const
{ {
return dynamic_cast<const qmt::MPackage *>(element) != 0; return dynamic_cast<const qmt::MPackage *>(element) != nullptr;
} }
bool ElementTasks::mayCreateDiagram(const qmt::DElement *element, bool ElementTasks::mayCreateDiagram(const qmt::DElement *element,

View File

@@ -43,7 +43,7 @@ class ElementTasks :
class ElementTasksPrivate; class ElementTasksPrivate;
public: public:
ElementTasks(QObject *parent = 0); ElementTasks(QObject *parent = nullptr);
~ElementTasks(); ~ElementTasks();
void setDocumentController(qmt::DocumentController *documentController); void setDocumentController(qmt::DocumentController *documentController);

View File

@@ -38,8 +38,8 @@ namespace Internal {
class ExtDocumentController::ExtDocumentControllerPrivate { class ExtDocumentController::ExtDocumentControllerPrivate {
public: public:
ElementTasks *elementTasks = 0; ElementTasks *elementTasks = nullptr;
PxNodeController *pxNodeController = 0; PxNodeController *pxNodeController = nullptr;
}; };
ExtDocumentController::ExtDocumentController(QObject *parent) ExtDocumentController::ExtDocumentController(QObject *parent)

View File

@@ -40,7 +40,7 @@ class ExtDocumentController :
class ExtDocumentControllerPrivate; class ExtDocumentControllerPrivate;
public: public:
explicit ExtDocumentController(QObject *parent = 0); explicit ExtDocumentController(QObject *parent = nullptr);
~ExtDocumentController(); ~ExtDocumentController();
ElementTasks *elementTasks() const; ElementTasks *elementTasks() const;

View File

@@ -57,7 +57,7 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
qmt::PropertiesView::MView::visitMPackage(package); qmt::PropertiesView::MView::visitMPackage(package);
if (m_modelElements.size() == 1 && !package->owner()) { if (m_modelElements.size() == 1 && !package->owner()) {
qmt::Project *project = m_projectController->project(); qmt::Project *project = m_projectController->project();
if (m_configPath == 0) { if (!m_configPath) {
m_configPath = new Utils::PathChooser(m_topWidget); m_configPath = new Utils::PathChooser(m_topWidget);
m_configPath->setPromptDialogTitle(tr("Select Custom Configuration Folder")); m_configPath->setPromptDialogTitle(tr("Select Custom Configuration Folder"));
m_configPath->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_configPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
@@ -78,7 +78,7 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
m_configPath->setPath(QFileInfo(projectDir, project->configPath()).canonicalFilePath()); m_configPath->setPath(QFileInfo(projectDir, project->configPath()).canonicalFilePath());
} }
} }
if (m_configPathInfo == 0) { if (!m_configPathInfo) {
m_configPathInfo = new QLabel(m_topWidget); m_configPathInfo = new QLabel(m_topWidget);
addRow(QString(), m_configPathInfo, "configpathinfo"); addRow(QString(), m_configPathInfo, "configpathinfo");
} }

View File

@@ -49,9 +49,9 @@ private:
void onConfigPathChanged(const QString &path); void onConfigPathChanged(const QString &path);
private: private:
qmt::ProjectController *m_projectController = 0; qmt::ProjectController *m_projectController = nullptr;
Utils::PathChooser *m_configPath = 0; Utils::PathChooser *m_configPath = nullptr;
QLabel *m_configPathInfo = 0; QLabel *m_configPathInfo = nullptr;
}; };
} // namespace Interal } // namespace Interal

View File

@@ -35,7 +35,7 @@ class JsExtension : public QObject
Q_OBJECT Q_OBJECT
public: public:
JsExtension(QObject *parent = 0) : QObject(parent) { } JsExtension(QObject *parent = nullptr) : QObject(parent) { }
Q_INVOKABLE QString fileNameToElementName(const QString &file); Q_INVOKABLE QString fileNameToElementName(const QString &file);
Q_INVOKABLE QString elementNameToFileName(const QString &element); Q_INVOKABLE QString elementNameToFileName(const QString &element);

View File

@@ -48,7 +48,7 @@ namespace Internal {
class ModelDocument::ModelDocumentPrivate { class ModelDocument::ModelDocumentPrivate {
public: public:
ExtDocumentController *documentController = 0; ExtDocumentController *documentController = nullptr;
}; };
ModelDocument::ModelDocument(QObject *parent) ModelDocument::ModelDocument(QObject *parent)

View File

@@ -41,7 +41,7 @@ class ModelDocument :
class ModelDocumentPrivate; class ModelDocumentPrivate;
public: public:
explicit ModelDocument(QObject *parent = 0); explicit ModelDocument(QObject *parent = nullptr);
~ModelDocument(); ~ModelDocument();
signals: signals:

View File

@@ -107,30 +107,30 @@ static const double ZOOM_FACTOR = 1.05;
class ModelEditor::ModelEditorPrivate class ModelEditor::ModelEditorPrivate
{ {
public: public:
UiController *uiController = 0; UiController *uiController = nullptr;
ActionHandler *actionHandler = 0; ActionHandler *actionHandler = nullptr;
ModelDocument *document = 0; ModelDocument *document = nullptr;
qmt::PropertiesView *propertiesView = 0; qmt::PropertiesView *propertiesView = nullptr;
Core::MiniSplitter *rightSplitter = 0; Core::MiniSplitter *rightSplitter = nullptr;
QWidget *leftGroup = 0; QWidget *leftGroup = nullptr;
QHBoxLayout *leftGroupLayout = 0; QHBoxLayout *leftGroupLayout = nullptr;
QToolBox *leftToolBox = 0; QToolBox *leftToolBox = nullptr;
QStackedWidget *diagramStack = 0; QStackedWidget *diagramStack = nullptr;
EditorDiagramView *diagramView = 0; EditorDiagramView *diagramView = nullptr;
QLabel *noDiagramLabel = 0; QLabel *noDiagramLabel = nullptr;
DiagramsViewManager *diagramsViewManager = 0; DiagramsViewManager *diagramsViewManager = nullptr;
Core::MiniSplitter *rightHorizSplitter = 0; Core::MiniSplitter *rightHorizSplitter = nullptr;
qmt::ModelTreeView *modelTreeView = 0; qmt::ModelTreeView *modelTreeView = nullptr;
qmt::TreeModelManager *modelTreeViewServant = 0; qmt::TreeModelManager *modelTreeViewServant = nullptr;
QScrollArea *propertiesScrollArea = 0; QScrollArea *propertiesScrollArea = nullptr;
QWidget *propertiesGroupWidget = 0; QWidget *propertiesGroupWidget = nullptr;
QWidget *toolbar = 0; QWidget *toolbar = nullptr;
QComboBox *diagramSelector = 0; QComboBox *diagramSelector = nullptr;
SelectedArea selectedArea = SelectedArea::Nothing; SelectedArea selectedArea = SelectedArea::Nothing;
QString lastExportDirPath; QString lastExportDirPath;
QAction *syncBrowserWithDiagramAction = 0; QAction *syncBrowserWithDiagramAction = nullptr;
QAction *syncDiagramWithBrowserAction = 0; QAction *syncDiagramWithBrowserAction = nullptr;
QAction *syncEachOtherAction = 0; QAction *syncEachOtherAction = nullptr;
}; };
ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler, QWidget *parent) ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler, QWidget *parent)
@@ -622,7 +622,7 @@ void ModelEditor::resetZoom()
qmt::MPackage *ModelEditor::guessSelectedPackage() const qmt::MPackage *ModelEditor::guessSelectedPackage() const
{ {
qmt::MPackage *package = 0; qmt::MPackage *package = nullptr;
switch (d->selectedArea) { switch (d->selectedArea) {
case SelectedArea::Nothing: case SelectedArea::Nothing:
package = d->modelTreeViewServant->selectedPackage(); package = d->modelTreeViewServant->selectedPackage();
@@ -661,13 +661,13 @@ void ModelEditor::updateSelectedArea(SelectedArea selectedArea)
bool canExportDiagram = false; bool canExportDiagram = false;
QList<qmt::MElement *> propertiesModelElements; QList<qmt::MElement *> propertiesModelElements;
QList<qmt::DElement *> propertiesDiagramElements; QList<qmt::DElement *> propertiesDiagramElements;
qmt::MDiagram *propertiesDiagram = 0; qmt::MDiagram *propertiesDiagram = nullptr;
qmt::MDiagram *activeDiagram = currentDiagram(); qmt::MDiagram *activeDiagram = currentDiagram();
switch (d->selectedArea) { switch (d->selectedArea) {
case SelectedArea::Nothing: case SelectedArea::Nothing:
canSelectAll = activeDiagram && !activeDiagram->diagramElements().isEmpty(); canSelectAll = activeDiagram && !activeDiagram->diagramElements().isEmpty();
canExportDiagram = activeDiagram != 0; canExportDiagram = activeDiagram != nullptr;
break; break;
case SelectedArea::Diagram: case SelectedArea::Diagram:
{ {
@@ -696,7 +696,7 @@ void ModelEditor::updateSelectedArea(SelectedArea selectedArea)
} }
case SelectedArea::TreeView: case SelectedArea::TreeView:
{ {
canExportDiagram = activeDiagram != 0; canExportDiagram = activeDiagram != nullptr;
bool hasSelection = !d->modelTreeViewServant->selectedObjects().isEmpty(); bool hasSelection = !d->modelTreeViewServant->selectedObjects().isEmpty();
bool hasSingleSelection = d->modelTreeViewServant->selectedObjects().indices().size() == 1; bool hasSingleSelection = d->modelTreeViewServant->selectedObjects().indices().size() == 1;
canCutCopyDelete = hasSelection && !d->modelTreeViewServant->isRootPackageSelected(); canCutCopyDelete = hasSelection && !d->modelTreeViewServant->isRootPackageSelected();
@@ -769,7 +769,7 @@ void ModelEditor::clearProperties()
Q_UNUSED(scrollWidget); // avoid warning in release mode Q_UNUSED(scrollWidget); // avoid warning in release mode
QMT_CHECK(scrollWidget == d->propertiesGroupWidget); QMT_CHECK(scrollWidget == d->propertiesGroupWidget);
d->propertiesGroupWidget->deleteLater(); d->propertiesGroupWidget->deleteLater();
d->propertiesGroupWidget = 0; d->propertiesGroupWidget = nullptr;
} }
} }
@@ -1003,7 +1003,7 @@ void ModelEditor::initToolbars()
[=](const qmt::Toolbar &lhs, const qmt::Toolbar &rhs) { return lhs.priority() > rhs.priority(); }); [=](const qmt::Toolbar &lhs, const qmt::Toolbar &rhs) { return lhs.priority() > rhs.priority(); });
foreach (const qmt::Toolbar &toolbar, toolbars) { foreach (const qmt::Toolbar &toolbar, toolbars) {
QWidget *toolBar = toolBars.value(toolbar.id()); QWidget *toolBar = toolBars.value(toolbar.id());
QLayout *toolBarLayout = 0; QLayout *toolBarLayout = nullptr;
if (!toolBar) { if (!toolBar) {
toolBar = new QWidget(d->leftToolBox); toolBar = new QWidget(d->leftToolBox);
toolBar->setProperty(PROPERTYNAME_TOOLBARID, toolbar.id()); toolBar->setProperty(PROPERTYNAME_TOOLBARID, toolbar.id());

View File

@@ -65,7 +65,7 @@ class ModelEditor :
public: public:
explicit ModelEditor(UiController *uiController, ActionHandler *actionHandler, explicit ModelEditor(UiController *uiController, ActionHandler *actionHandler,
QWidget *parent = 0); QWidget *parent = nullptr);
~ModelEditor(); ~ModelEditor();
Core::IDocument *document() override; Core::IDocument *document() override;

View File

@@ -57,15 +57,15 @@
namespace ModelEditor { namespace ModelEditor {
namespace Internal { namespace Internal {
ModelEditorPlugin *pluginInstance = 0; ModelEditorPlugin *pluginInstance = nullptr;
class ModelEditorPlugin::ModelEditorPluginPrivate class ModelEditorPlugin::ModelEditorPluginPrivate
{ {
public: public:
ModelsManager *modelsManager = 0; ModelsManager *modelsManager = nullptr;
UiController *uiController = 0; UiController *uiController = nullptr;
ModelEditorFactory *modelFactory = 0; ModelEditorFactory *modelFactory = nullptr;
SettingsController *settingsController = 0; SettingsController *settingsController = nullptr;
}; };
ModelEditorPlugin::ModelEditorPlugin() ModelEditorPlugin::ModelEditorPlugin()

View File

@@ -37,8 +37,8 @@ namespace Internal {
class ModelEditorFactory::ModelEditorFactoryPrivate class ModelEditorFactory::ModelEditorFactoryPrivate
{ {
public: public:
UiController *uiController = 0; UiController *uiController = nullptr;
ActionHandler *actionHandler = 0; ActionHandler *actionHandler = nullptr;
}; };
ModelEditorFactory::ModelEditorFactory(UiController *uiController, QObject *parent) ModelEditorFactory::ModelEditorFactory(UiController *uiController, QObject *parent)

View File

@@ -40,7 +40,7 @@ class ModelEditorFactory :
class ModelEditorFactoryPrivate; class ModelEditorFactoryPrivate;
public: public:
explicit ModelEditorFactory(UiController *uiController, QObject *parent = 0); explicit ModelEditorFactory(UiController *uiController, QObject *parent = nullptr);
~ModelEditorFactory(); ~ModelEditorFactory();
Core::IEditor *createEditor() override; Core::IEditor *createEditor() override;

View File

@@ -89,7 +89,7 @@ public:
private: private:
QString m_file; QString m_file;
ProjectExplorer::Project *m_project = 0; ProjectExplorer::Project *m_project = nullptr;
QDateTime m_lastModified; QDateTime m_lastModified;
}; };
@@ -255,7 +255,7 @@ public:
QHash<QString, ModelIndexer::IndexedDiagramReference *> indexedDiagramReferences; QHash<QString, ModelIndexer::IndexedDiagramReference *> indexedDiagramReferences;
QHash<qmt::Uid, QSet<ModelIndexer::IndexedDiagramReference *> > indexedDiagramReferencesByDiagramUid; QHash<qmt::Uid, QSet<ModelIndexer::IndexedDiagramReference *> > indexedDiagramReferencesByDiagramUid;
ModelIndexer::IndexerThread *indexerThread = 0; ModelIndexer::IndexerThread *indexerThread = nullptr;
}; };
void ModelIndexer::IndexerThread::onQuitIndexerThread() void ModelIndexer::IndexerThread::onQuitIndexerThread()
@@ -377,7 +377,7 @@ void ModelIndexer::onProjectAdded(ProjectExplorer::Project *project)
void ModelIndexer::onAboutToRemoveProject(ProjectExplorer::Project *project) void ModelIndexer::onAboutToRemoveProject(ProjectExplorer::Project *project)
{ {
disconnect(project, &ProjectExplorer::Project::fileListChanged, this, 0); disconnect(project, &ProjectExplorer::Project::fileListChanged, this, nullptr);
forgetProject(project); forgetProject(project);
} }

View File

@@ -53,7 +53,7 @@ class ModelIndexer :
const ModelIndexer::QueuedFile &rhs); const ModelIndexer::QueuedFile &rhs);
public: public:
ModelIndexer(QObject *parent = 0); ModelIndexer(QObject *parent = nullptr);
~ModelIndexer(); ~ModelIndexer();
signals: signals:

View File

@@ -69,8 +69,8 @@ public:
ManagedModel() = default; ManagedModel() = default;
ManagedModel(ExtDocumentController *m_documentController,ModelDocument *m_modelDocument); ManagedModel(ExtDocumentController *m_documentController,ModelDocument *m_modelDocument);
ExtDocumentController *m_documentController = 0; ExtDocumentController *m_documentController = nullptr;
ModelDocument *m_modelDocument = 0; ModelDocument *m_modelDocument = nullptr;
}; };
ModelsManager::ManagedModel::ManagedModel(ExtDocumentController *documentController, ModelsManager::ManagedModel::ManagedModel(ExtDocumentController *documentController,
@@ -88,11 +88,11 @@ public:
} }
QList<ModelsManager::ManagedModel> managedModels; QList<ModelsManager::ManagedModel> managedModels;
ModelIndexer *modelIndexer = 0; ModelIndexer *modelIndexer = nullptr;
QList<Core::IDocument *> documentsToBeClosed; QList<Core::IDocument *> documentsToBeClosed;
QAction *openDiagramContextMenuItem = 0; QAction *openDiagramContextMenuItem = nullptr;
ProjectExplorer::Node *contextMenuOwnerNode = 0; ProjectExplorer::Node *contextMenuOwnerNode = nullptr;
}; };
ModelsManager::ModelsManager(QObject *parent) ModelsManager::ModelsManager(QObject *parent)
@@ -182,14 +182,14 @@ void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Project *project,
if (canOpenDiagram) if (canOpenDiagram)
d->contextMenuOwnerNode = node; d->contextMenuOwnerNode = node;
else else
d->contextMenuOwnerNode = 0; d->contextMenuOwnerNode = nullptr;
d->openDiagramContextMenuItem->setVisible(canOpenDiagram); d->openDiagramContextMenuItem->setVisible(canOpenDiagram);
} }
void ModelsManager::onOpenDiagramFromProjectExplorer() void ModelsManager::onOpenDiagramFromProjectExplorer()
{ {
if (ProjectExplorer::ProjectTree::findCurrentNode() == d->contextMenuOwnerNode) { if (ProjectExplorer::ProjectTree::findCurrentNode() == d->contextMenuOwnerNode) {
qmt::MDiagram *diagram = 0; qmt::MDiagram *diagram = nullptr;
foreach (const ManagedModel &managedModel, d->managedModels) { foreach (const ManagedModel &managedModel, d->managedModels) {
if ((diagram = managedModel.m_documentController->pxNodeController()->findDiagramForExplorerNode(d->contextMenuOwnerNode))) { if ((diagram = managedModel.m_documentController->pxNodeController()->findDiagramForExplorerNode(d->contextMenuOwnerNode))) {
openDiagram(managedModel.m_documentController, diagram); openDiagram(managedModel.m_documentController, diagram);

View File

@@ -53,7 +53,7 @@ class ModelsManager :
class ModelsManagerPrivate; class ModelsManagerPrivate;
public: public:
explicit ModelsManager(QObject *parent = 0); explicit ModelsManager(QObject *parent = nullptr);
~ModelsManager(); ~ModelsManager();
ExtDocumentController *createModel(ModelDocument *modelDocument); ExtDocumentController *createModel(ModelDocument *modelDocument);

View File

@@ -59,8 +59,8 @@ public:
void visitDSwimlane(const qmt::DSwimlane *swimlane) override; void visitDSwimlane(const qmt::DSwimlane *swimlane) override;
private: private:
qmt::ModelController *m_modelController = 0; qmt::ModelController *m_modelController = nullptr;
ElementTasks *m_elementTasks = 0; ElementTasks *m_elementTasks = nullptr;
}; };
class OpenModelElementVisitor : class OpenModelElementVisitor :
@@ -84,7 +84,7 @@ public:
void visitMConnection(const qmt::MConnection *connection) override; void visitMConnection(const qmt::MConnection *connection) override;
private: private:
ElementTasks *m_elementTasks = 0; ElementTasks *m_elementTasks = nullptr;
}; };
} // namespace Internal } // namespace Internal

View File

@@ -91,10 +91,10 @@ public:
class PxNodeController::PxNodeControllerPrivate class PxNodeController::PxNodeControllerPrivate
{ {
public: public:
PxNodeUtilities *pxnodeUtilities = 0; PxNodeUtilities *pxnodeUtilities = nullptr;
ComponentViewController *componentViewController = 0; ComponentViewController *componentViewController = nullptr;
ClassViewController *classViewController = 0; ClassViewController *classViewController = nullptr;
qmt::DiagramSceneController *diagramSceneController = 0; qmt::DiagramSceneController *diagramSceneController = nullptr;
QString anchorFolder; QString anchorFolder;
}; };
@@ -208,7 +208,7 @@ void PxNodeController::addExplorerNode(const ProjectExplorer::Node *node,
bool PxNodeController::hasDiagramForExplorerNode(const ProjectExplorer::Node *node) bool PxNodeController::hasDiagramForExplorerNode(const ProjectExplorer::Node *node)
{ {
return findDiagramForExplorerNode(node) != 0; return findDiagramForExplorerNode(node) != nullptr;
} }
qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplorer::Node *node) qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplorer::Node *node)
@@ -252,7 +252,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore
} }
if (found) { if (found) {
QMT_ASSERT(relativeIndex >= relativeElements.size(), return 0); QMT_ASSERT(relativeIndex >= relativeElements.size(), return nullptr);
// complete package chain found so check for appropriate diagram within deepest package // complete package chain found so check for appropriate diagram within deepest package
qmt::MDiagram *diagram = d->diagramSceneController->findDiagramBySearchId( qmt::MDiagram *diagram = d->diagramSceneController->findDiagramBySearchId(
package, package->name()); package, package->name());
@@ -269,7 +269,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore
} }
// complete sub-package structure scanned but did not found the desired object // complete sub-package structure scanned but did not found the desired object
return 0; return nullptr;
} }
void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *action, void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *action,
@@ -277,8 +277,8 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
qmt::DElement *topMostElementAtPos, qmt::DElement *topMostElementAtPos,
const QPointF &pos, qmt::MDiagram *diagram) const QPointF &pos, qmt::MDiagram *diagram)
{ {
qmt::MObject *newObject = 0; qmt::MObject *newObject = nullptr;
qmt::MDiagram *newDiagramInObject = 0; qmt::MDiagram *newDiagramInObject = nullptr;
switch (action->type) { switch (action->type) {
case MenuAction::TYPE_ADD_COMPONENT: case MenuAction::TYPE_ADD_COMPONENT:
@@ -348,13 +348,13 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
if (newObject) { if (newObject) {
d->diagramSceneController->modelController()->undoController()->beginMergeSequence(tr("Drop Node")); d->diagramSceneController->modelController()->undoController()->beginMergeSequence(tr("Drop Node"));
qmt::MObject *parentForDiagram = 0; qmt::MObject *parentForDiagram = nullptr;
QStringList relativeElements = qmt::NameController::buildElementsPath( QStringList relativeElements = qmt::NameController::buildElementsPath(
d->pxnodeUtilities->calcRelativePath(node, d->anchorFolder), d->pxnodeUtilities->calcRelativePath(node, d->anchorFolder),
dynamic_cast<qmt::MPackage *>(newObject) != 0); dynamic_cast<qmt::MPackage *>(newObject) != nullptr);
if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) { if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) {
delete newObject; delete newObject;
newObject = 0; newObject = nullptr;
d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram); d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram);
parentForDiagram = existingObject; parentForDiagram = existingObject;
} else { } else {

View File

@@ -49,7 +49,7 @@ class PxNodeController :
class MenuAction; class MenuAction;
public: public:
explicit PxNodeController(QObject *parent = 0); explicit PxNodeController(QObject *parent = nullptr);
~PxNodeController(); ~PxNodeController();
ComponentViewController *componentViewController() const; ComponentViewController *componentViewController() const;

View File

@@ -44,7 +44,7 @@ namespace Internal {
class PxNodeUtilities::PxNodeUtilitiesPrivate { class PxNodeUtilities::PxNodeUtilitiesPrivate {
public: public:
qmt::DiagramSceneController *diagramSceneController = 0; qmt::DiagramSceneController *diagramSceneController = nullptr;
}; };
PxNodeUtilities::PxNodeUtilities(QObject *parent) PxNodeUtilities::PxNodeUtilities(QObject *parent)
@@ -100,7 +100,7 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath(
int maxChainLength = -1; int maxChainLength = -1;
int minChainDepth = -1; int minChainDepth = -1;
qmt::MPackage *bestParentPackage = 0; qmt::MPackage *bestParentPackage = nullptr;
while (!roots.isEmpty()) { while (!roots.isEmpty()) {
qmt::MPackage *package = roots.first().first; qmt::MPackage *package = roots.first().first;
@@ -231,7 +231,7 @@ qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElement
} }
// complete sub-package structure scanned but did not found the desired object // complete sub-package structure scanned but did not found the desired object
return 0; return nullptr;
} }
} // namespace Internal } // namespace Internal

View File

@@ -45,7 +45,7 @@ class PxNodeUtilities :
class PxNodeUtilitiesPrivate; class PxNodeUtilitiesPrivate;
public: public:
explicit PxNodeUtilities(QObject *parent = 0); explicit PxNodeUtilities(QObject *parent = nullptr);
~PxNodeUtilities(); ~PxNodeUtilities();
void setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController); void setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController);

View File

@@ -40,7 +40,7 @@ class SettingsController :
Q_OBJECT Q_OBJECT
public: public:
explicit SettingsController(QObject *parent = 0); explicit SettingsController(QObject *parent = nullptr);
signals: signals:
void resetSettings(); void resetSettings();

View File

@@ -41,7 +41,7 @@ class UiController :
class UiControllerPrivate; class UiControllerPrivate;
public: public:
explicit UiController(QObject *parent = 0); explicit UiController(QObject *parent = nullptr);
~UiController(); ~UiController();
signals: signals: