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

Do not use QWeakPointer to track QObjects.

Browse Source 
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Christian Kandeler
2012-09-24 13:48:18 +02:00
parent f21a408b51
commit aef4280bc1
23 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/coreplugin/sidebar.cpp
View File

@@ -42,6 +42,7 @@
#include <QLayout>
#include <QToolBar>
#include <QAction>
#include <QPointer>
#include <QToolButton>
namespace Core {
@@ -80,7 +81,7 @@ struct SideBarPrivate {
SideBarPrivate() :m_closeWhenEmpty(false) {}
QList<Internal::SideBarWidget*> m_widgets;
QMap<QString, QWeakPointer<SideBarItem> > m_itemMap;
QMap<QString, QPointer<SideBarItem> > m_itemMap;
QStringList m_availableItemIds;
QStringList m_availableItemTitles;
QStringList m_unavailableItemIds;
@@ -109,7 +110,7 @@ SideBar::SideBar(QList<SideBarItem*> itemList,
SideBar::~SideBar()
{
foreach (const QWeakPointer<SideBarItem> &i, d->m_itemMap)
foreach (const QPointer<SideBarItem> &i, d->m_itemMap)
if (!i.isNull())
delete i.data();
delete d;
@@ -117,7 +118,7 @@ SideBar::~SideBar()
QString SideBar::idForTitle(const QString &title) const
{
QMapIterator<QString, QWeakPointer<SideBarItem> > iter(d->m_itemMap);
QMapIterator<QString, QPointer<SideBarItem> > iter(d->m_itemMap);
while(iter.hasNext()) {
iter.next();
if (iter.value().data()->title() == title)
@@ -152,7 +153,7 @@ void SideBar::setCloseWhenEmpty(bool value)
void SideBar::makeItemAvailable(SideBarItem *item)
{
typedef QMap<QString, QWeakPointer<SideBarItem> >::const_iterator Iterator;
typedef QMap<QString, QPointer<SideBarItem> >::const_iterator Iterator;
const Iterator cend = d->m_itemMap.constEnd();
for (Iterator it = d->m_itemMap.constBegin(); it != cend ; ++it) {
@@ -266,7 +267,7 @@ void SideBar::saveSettings(QSettings *settings, const QString &name)
views.append(currentItemId);
}
if (views.isEmpty() && d->m_itemMap.size()) {
QMapIterator<QString, QWeakPointer<SideBarItem> > iter(d->m_itemMap);
QMapIterator<QString, QPointer<SideBarItem> > iter(d->m_itemMap);
iter.next();
views.append(iter.key());
}
@@ -322,7 +323,7 @@ void SideBar::readSettings(QSettings *settings, const QString &name)
void SideBar::activateItem(SideBarItem *item)
{
typedef QMap<QString, QWeakPointer<SideBarItem> >::const_iterator Iterator;
typedef QMap<QString, QPointer<SideBarItem> >::const_iterator Iterator;
QString id;
const Iterator cend = d->m_itemMap.constEnd();