forked from qt-creator/qt-creator
Remove a the necessity of a few weak vtables
For background, see QTBUG-45582. Change-Id: I6c4758ce62149437c26971056b465d5dbd2b13b0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -2442,6 +2442,10 @@ void AspectContainerData::append(const BaseAspect::Data::Ptr &data)
|
|||||||
m_data.append(data);
|
m_data.append(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BaseAspect::Data
|
||||||
|
|
||||||
|
BaseAspect::Data::~Data() = default;
|
||||||
|
|
||||||
void BaseAspect::Data::Ptr::operator=(const Ptr &other)
|
void BaseAspect::Data::Ptr::operator=(const Ptr &other)
|
||||||
{
|
{
|
||||||
if (this == &other)
|
if (this == &other)
|
||||||
|
@@ -145,7 +145,7 @@ public:
|
|||||||
// The (unique) address of the "owning" aspect's meta object is used as identifier.
|
// The (unique) address of the "owning" aspect's meta object is used as identifier.
|
||||||
using ClassId = const void *;
|
using ClassId = const void *;
|
||||||
|
|
||||||
virtual ~Data() = default;
|
virtual ~Data();
|
||||||
|
|
||||||
Id id() const { return m_id; }
|
Id id() const { return m_id; }
|
||||||
ClassId classId() const { return m_classId; }
|
ClassId classId() const { return m_classId; }
|
||||||
|
@@ -36,4 +36,6 @@ TemporaryFile::TemporaryFile(const QString &pattern) :
|
|||||||
QTC_CHECK(!QFileInfo(pattern).isAbsolute());
|
QTC_CHECK(!QFileInfo(pattern).isAbsolute());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TemporaryFile::~TemporaryFile() = default;
|
||||||
|
|
||||||
} // namespace Utils
|
} // namespace Utils
|
||||||
|
@@ -35,6 +35,7 @@ class QTCREATOR_UTILS_EXPORT TemporaryFile : public QTemporaryFile
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit TemporaryFile(const QString &pattern);
|
explicit TemporaryFile(const QString &pattern);
|
||||||
|
~TemporaryFile();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Utils
|
} // namespace Utils
|
||||||
|
@@ -82,4 +82,6 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters,
|
|||||||
setMarksVisible(false);
|
setMarksVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VcsEditorFactory::~VcsEditorFactory() = default;
|
||||||
|
|
||||||
} // namespace VcsBase
|
} // namespace VcsBase
|
||||||
|
@@ -41,6 +41,8 @@ public:
|
|||||||
VcsEditorFactory(const VcsBaseEditorParameters *parameters,
|
VcsEditorFactory(const VcsBaseEditorParameters *parameters,
|
||||||
const EditorWidgetCreator editorWidgetCreator,
|
const EditorWidgetCreator editorWidgetCreator,
|
||||||
std::function<void(const Utils::FilePath &, const QString &)> describeFunc);
|
std::function<void(const Utils::FilePath &, const QString &)> describeFunc);
|
||||||
|
|
||||||
|
~VcsEditorFactory();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace VcsBase
|
} // namespace VcsBase
|
||||||
|
@@ -74,4 +74,6 @@ VcsSubmitEditorFactory::VcsSubmitEditorFactory
|
|||||||
ActionManager::registerAction(&m_diffAction, DIFF_SELECTED, context);
|
ActionManager::registerAction(&m_diffAction, DIFF_SELECTED, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VcsSubmitEditorFactory::~VcsSubmitEditorFactory() = default;
|
||||||
|
|
||||||
} // namespace VcsBase
|
} // namespace VcsBase
|
||||||
|
@@ -53,6 +53,8 @@ public:
|
|||||||
const EditorCreator &editorCreator,
|
const EditorCreator &editorCreator,
|
||||||
VcsBasePluginPrivate *plugin);
|
VcsBasePluginPrivate *plugin);
|
||||||
|
|
||||||
|
~VcsSubmitEditorFactory();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QAction m_submitAction;
|
QAction m_submitAction;
|
||||||
QAction m_diffAction;
|
QAction m_diffAction;
|
||||||
|
@@ -75,6 +75,8 @@ VcsBaseSettings::VcsBaseSettings()
|
|||||||
timeout.setSuffix(tr("s"));
|
timeout.setSuffix(tr("s"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VcsBaseSettings::~VcsBaseSettings() = default;
|
||||||
|
|
||||||
FilePaths VcsBaseSettings::searchPathList() const
|
FilePaths VcsBaseSettings::searchPathList() const
|
||||||
{
|
{
|
||||||
return Utils::transform(path.value().split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts),
|
return Utils::transform(path.value().split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts),
|
||||||
|
@@ -37,6 +37,7 @@ class VCSBASE_EXPORT VcsBaseSettings : public Utils::AspectContainer
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
VcsBaseSettings();
|
VcsBaseSettings();
|
||||||
|
~VcsBaseSettings();
|
||||||
|
|
||||||
Utils::StringAspect binaryPath;
|
Utils::StringAspect binaryPath;
|
||||||
Utils::StringAspect userName;
|
Utils::StringAspect userName;
|
||||||
|
Reference in New Issue
Block a user