summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-12-28 19:17:41 +1100
committerOlivier Goffart <ogoffart@woboq.com>2012-12-28 13:25:39 +0100
commit77f471828c070a9fb10a1fa97d2cbab81e951502 (patch)
treea739cf8cc2841200b4c85ceefadd07e99f825f76
parentbae9ef96b7e4396adead35a5e540fe4963326368 (diff)
Replace Q_TYPENAME by typename
Q_TYPENAME is being removed. Based on qttools/f9aa0fb422ebc6a5a5b1416269eda471887a2c90. Change-Id: I26ffaf41d21d6fed12457e57e33dc830137255c1 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--qtpropertybrowser/src/qteditorfactory.cpp8
-rw-r--r--qtpropertybrowser/src/qtpropertymanager.cpp14
2 files changed, 11 insertions, 11 deletions
diff --git a/qtpropertybrowser/src/qteditorfactory.cpp b/qtpropertybrowser/src/qteditorfactory.cpp
index 5961e6f..9470d47 100644
--- a/qtpropertybrowser/src/qteditorfactory.cpp
+++ b/qtpropertybrowser/src/qteditorfactory.cpp
@@ -111,7 +111,7 @@ Editor *EditorFactoryPrivate<Editor>::createEditor(QtProperty *property, QWidget
template <class Editor>
void EditorFactoryPrivate<Editor>::initializeEditor(QtProperty *property, Editor *editor)
{
- Q_TYPENAME PropertyToEditorListMap::iterator it = m_createdEditors.find(property);
+ typename PropertyToEditorListMap::iterator it = m_createdEditors.find(property);
if (it == m_createdEditors.end())
it = m_createdEditors.insert(property, EditorList());
it.value().append(editor);
@@ -121,12 +121,12 @@ void EditorFactoryPrivate<Editor>::initializeEditor(QtProperty *property, Editor
template <class Editor>
void EditorFactoryPrivate<Editor>::slotEditorDestroyed(QObject *object)
{
- const Q_TYPENAME EditorToPropertyMap::iterator ecend = m_editorToProperty.end();
- for (Q_TYPENAME EditorToPropertyMap::iterator itEditor = m_editorToProperty.begin(); itEditor != ecend; ++itEditor) {
+ const typename EditorToPropertyMap::iterator ecend = m_editorToProperty.end();
+ for (typename EditorToPropertyMap::iterator itEditor = m_editorToProperty.begin(); itEditor != ecend; ++itEditor) {
if (itEditor.key() == object) {
Editor *editor = itEditor.key();
QtProperty *property = itEditor.value();
- const Q_TYPENAME PropertyToEditorListMap::iterator pit = m_createdEditors.find(property);
+ const typename PropertyToEditorListMap::iterator pit = m_createdEditors.find(property);
if (pit != m_createdEditors.end()) {
pit.value().removeAll(editor);
if (pit.value().empty())
diff --git a/qtpropertybrowser/src/qtpropertymanager.cpp b/qtpropertybrowser/src/qtpropertymanager.cpp
index 076bfd1..5ac6563 100644
--- a/qtpropertybrowser/src/qtpropertymanager.cpp
+++ b/qtpropertybrowser/src/qtpropertymanager.cpp
@@ -194,7 +194,7 @@ static Value getData(const QMap<const QtProperty *, PrivateData> &propertyMap,
const QtProperty *property, const Value &defaultValue = Value())
{
typedef QMap<const QtProperty *, PrivateData> PropertyToData;
- typedef Q_TYPENAME PropertyToData::const_iterator PropertyToDataConstIterator;
+ typedef typename PropertyToData::const_iterator PropertyToDataConstIterator;
const PropertyToDataConstIterator it = propertyMap.constFind(property);
if (it == propertyMap.constEnd())
return defaultValue;
@@ -230,7 +230,7 @@ static void setSimpleValue(QMap<const QtProperty *, Value> &propertyMap,
QtProperty *property, const Value &val)
{
typedef QMap<const QtProperty *, Value> PropertyToData;
- typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+ typedef typename PropertyToData::iterator PropertyToDataIterator;
const PropertyToDataIterator it = propertyMap.find(property);
if (it == propertyMap.end())
return;
@@ -251,9 +251,9 @@ static void setValueInRange(PropertyManager *manager, PropertyManagerPrivate *ma
QtProperty *property, const Value &val,
void (PropertyManagerPrivate::*setSubPropertyValue)(QtProperty *, ValueChangeParameter))
{
- typedef Q_TYPENAME PropertyManagerPrivate::Data PrivateData;
+ typedef typename PropertyManagerPrivate::Data PrivateData;
typedef QMap<const QtProperty *, PrivateData> PropertyToData;
- typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+ typedef typename PropertyToData::iterator PropertyToDataIterator;
const PropertyToDataIterator it = managerPrivate->m_values.find(property);
if (it == managerPrivate->m_values.end())
return;
@@ -286,9 +286,9 @@ static void setBorderValues(PropertyManager *manager, PropertyManagerPrivate *ma
void (PropertyManagerPrivate::*setSubPropertyRange)(QtProperty *,
ValueChangeParameter, ValueChangeParameter, ValueChangeParameter))
{
- typedef Q_TYPENAME PropertyManagerPrivate::Data PrivateData;
+ typedef typename PropertyManagerPrivate::Data PrivateData;
typedef QMap<const QtProperty *, PrivateData> PropertyToData;
- typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+ typedef typename PropertyToData::iterator PropertyToDataIterator;
const PropertyToDataIterator it = managerPrivate->m_values.find(property);
if (it == managerPrivate->m_values.end())
return;
@@ -331,7 +331,7 @@ static void setBorderValue(PropertyManager *manager, PropertyManagerPrivate *man
ValueChangeParameter, ValueChangeParameter, ValueChangeParameter))
{
typedef QMap<const QtProperty *, PrivateData> PropertyToData;
- typedef Q_TYPENAME PropertyToData::iterator PropertyToDataIterator;
+ typedef typename PropertyToData::iterator PropertyToDataIterator;
const PropertyToDataIterator it = managerPrivate->m_values.find(property);
if (it == managerPrivate->m_values.end())
return;