diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/widgets/itemviews/qitemeditorfactory.h | |
parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/widgets/itemviews/qitemeditorfactory.h')
-rw-r--r-- | src/widgets/itemviews/qitemeditorfactory.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h index 3d3359dc1a..aff8de3a4c 100644 --- a/src/widgets/itemviews/qitemeditorfactory.h +++ b/src/widgets/itemviews/qitemeditorfactory.h @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS @@ -103,16 +102,16 @@ public: inline QItemEditorFactory() {} virtual ~QItemEditorFactory(); - virtual QWidget *createEditor(QVariant::Type type, QWidget *parent) const; - virtual QByteArray valuePropertyName(QVariant::Type type) const; + virtual QWidget *createEditor(int userType, QWidget *parent) const; + virtual QByteArray valuePropertyName(int userType) const; - void registerEditor(QVariant::Type type, QItemEditorCreatorBase *creator); + void registerEditor(int userType, QItemEditorCreatorBase *creator); static const QItemEditorFactory *defaultFactory(); static void setDefaultFactory(QItemEditorFactory *factory); private: - QHash<QVariant::Type, QItemEditorCreatorBase *> creatorMap; + QHash<int, QItemEditorCreatorBase *> creatorMap; }; #endif // QT_NO_ITEMVIEWS |