diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-12-09 17:10:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-12-09 17:11:20 +0100 |
| commit | 4714f86c54eb358ec431fb94d6b135b4cad2a7c7 (patch) | |
| tree | ead864148546b91c076f0852136680b816c7831a /src/corelib/tools | |
| parent | d5d073f87434fbe0f80269e9948b644f5ced1faf (diff) | |
| parent | b986131c6d1243725134285dfc94581f80c00746 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Change-Id: I01f94564c17d68872839be5396c24b661e53d571
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/tools/qmap.h | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index bd7c76c37a..f605a82dfe 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -56,11 +56,6 @@ const QMapData QMapData::shared_null = { Q_REFCOUNT_INITIALIZER(-1), 0, 0, 0, false, true, false, 0 }; -QMapData *QMapData::createData() -{ - return createData(0); -} - QMapData *QMapData::createData(int alignment) { QMapData *d = new QMapData; @@ -95,11 +90,6 @@ void QMapData::continueFreeData(int offset) delete this; } -QMapData::Node *QMapData::node_create(Node *update[], int offset) -{ - return node_create(update, offset, 0); -} - /*! Creates a new node inside the data structure. diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 8beae03a6e..362b723b0a 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -77,10 +77,8 @@ struct Q_CORE_EXPORT QMapData uint strictAlignment : 1; uint reserved : 29; - static QMapData *createData(); // ### Qt5 remove me static QMapData *createData(int alignment); void continueFreeData(int offset); - Node *node_create(Node *update[], int offset); // ### Qt5 remove me Node *node_create(Node *update[], int offset, int alignment); void node_delete(Node *update[], int offset, Node *node); #ifdef QT_QMAP_DEBUG |