summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/qdesigner_membersheet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/designer/src/lib/shared/qdesigner_membersheet.cpp')
-rw-r--r--src/designer/src/lib/shared/qdesigner_membersheet.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp
index 47451f5a3..93371ac06 100644
--- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp
@@ -56,7 +56,7 @@ static QDesignerFormEditorInterface *formEditorForObject(QObject *o) {
o = o->parent();
} while(o);
Q_ASSERT(o);
- return 0;
+ return nullptr;
}
// ------------ QDesignerMemberSheetPrivate
@@ -73,7 +73,7 @@ public:
bool visible{true};
};
- typedef QHash<int, Info> InfoHash;
+ using InfoHash = QHash<int, Info>;
Info &ensureInfo(int index);
@@ -132,7 +132,7 @@ QString QDesignerMemberSheet::declaredInClass(int index) const
for (;;) {
const QDesignerMetaObjectInterface *tmp = meta_obj->superClass();
- if (tmp == 0)
+ if (tmp == nullptr)
break;
if (tmp->indexOfMethod(member) == -1)
break;
@@ -158,8 +158,7 @@ QString QDesignerMemberSheet::signature(int index) const
bool QDesignerMemberSheet::isVisible(int index) const
{
- typedef QDesignerMemberSheetPrivate::InfoHash InfoHash;
- const InfoHash::const_iterator it = d->m_info.constFind(index);
+ const auto it = d->m_info.constFind(index);
if (it != d->m_info.constEnd())
return it.value().visible;
@@ -248,7 +247,7 @@ QObject *QDesignerMemberSheetFactory::createExtension(QObject *object, const QSt
return new QDesignerMemberSheet(object, parent);
}
- return 0;
+ return nullptr;
}
QT_END_NAMESPACE