feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

NewDialog: Use nullptr

Browse Source 
Change-Id: Iae9bd28a39a7fa77f2819a62870b2ce55011ca1e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-11-07 14:44:07 +01:00
parent be1d9beece
commit f4c3e9d638
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -54,16 +54,16 @@ const char LAST_PLATFORM_KEY[] = "Core/NewDialog/LastPlatform";
class WizardFactoryContainer
{
public:
WizardFactoryContainer() : wizard(0), wizardOption(0) {}
WizardFactoryContainer() : wizard(nullptr), wizardOption(0) {}
WizardFactoryContainer(Core::IWizardFactory *w, int i): wizard(w), wizardOption(i) {}
Core::IWizardFactory *wizard;
int wizardOption;
};
inline Core::IWizardFactory *factoryOfItem(const QStandardItem *item = 0)
inline Core::IWizardFactory *factoryOfItem(const QStandardItem *item = nullptr)
{
if (!item)
return 0;
return nullptr;
return item->data(Qt::UserRole).value<WizardFactoryContainer>().wizard;
}
@@ -71,7 +71,7 @@ class PlatformFilterProxyModel : public QSortFilterProxyModel
{
// Q_OBJECT
public:
PlatformFilterProxyModel(QObject *parent = 0): QSortFilterProxyModel(parent) {}
PlatformFilterProxyModel(QObject *parent = nullptr): QSortFilterProxyModel(parent) {}
void setPlatform(Core::Id platform)
{
@@ -99,7 +99,7 @@ class TwoLevelProxyModel : public QAbstractProxyModel
{
// Q_OBJECT
public:
TwoLevelProxyModel(QObject *parent = 0): QAbstractProxyModel(parent) {}
TwoLevelProxyModel(QObject *parent = nullptr): QAbstractProxyModel(parent) {}
QModelIndex index(int row, int column, const QModelIndex &parent) const override
{
@@ -145,7 +145,7 @@ public:
class FancyTopLevelDelegate : public QItemDelegate
{
public:
FancyTopLevelDelegate(QObject *parent = 0)
FancyTopLevelDelegate(QObject *parent = nullptr)
: QItemDelegate(parent) {}
void drawDisplay(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, const QString &text) const override
@@ -394,7 +394,7 @@ static QIcon iconWithText(const QIcon &icon, const QString &text)
void NewDialog::addItem(QStandardItem *topLevelCategoryItem, IWizardFactory *factory)
{
const QString categoryName = factory->category();
QStandardItem *categoryItem = 0;
QStandardItem *categoryItem = nullptr;
for (int i = 0; i < topLevelCategoryItem->rowCount(); i++) {
if (topLevelCategoryItem->child(i, 0)->data(Qt::UserRole) == categoryName)
categoryItem = topLevelCategoryItem->child(i, 0);
@@ -417,7 +417,7 @@ void NewDialog::addItem(QStandardItem *topLevelCategoryItem, IWizardFactory *fac
else
wizardIcon = factory->icon();
wizardItem->setIcon(iconWithText(wizardIcon, factory->iconText()));
wizardItem->setData(QVariant::fromValue(WizardFactoryContainer(factory, 0)), Qt::UserRole);
wizardItem->setData(QVariant::fromValue(WizardFactoryContainer(factory, nullptr)), Qt::UserRole);
wizardItem->setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable);
categoryItem->appendRow(wizardItem);