diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-02-23 13:36:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-02-23 13:36:22 +0100 |
| commit | 373000a95460f0c16062ef2c14bfa6c0a56d6434 (patch) | |
| tree | 45e9601bfb951a19b01784a21c6cab2f3d059e5d /src/plugins/projectexplorer/toolchainoptionspage.h | |
| parent | 0bbe3df6ed7054167c9c483d1b30e6f38da4b0d7 (diff) | |
Toolchains: Make options page more stable.
Avoid double deletions by using shared pointers. Reset the model
after discard as the structure may change. Use qtc_assert
(to catch cases of add/delete again).
Diffstat (limited to 'src/plugins/projectexplorer/toolchainoptionspage.h')
| -rw-r--r-- | src/plugins/projectexplorer/toolchainoptionspage.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.h b/src/plugins/projectexplorer/toolchainoptionspage.h index ad620addd7..729a87caec 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.h +++ b/src/plugins/projectexplorer/toolchainoptionspage.h @@ -39,6 +39,7 @@ #include <coreplugin/dialogs/ioptionspage.h> #include <QtCore/QAbstractItemModel> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE class QTreeWidgetItem; @@ -101,12 +102,11 @@ private slots: private: QModelIndex index(ToolChainNode *, int column = 0) const; - ToolChainNode * m_root; - ToolChainNode * m_autoRoot; - ToolChainNode * m_manualRoot; + QSharedPointer<ToolChainNode> m_autoRoot; + QSharedPointer<ToolChainNode> m_manualRoot; - QList<ToolChainNode *> m_toAddList; - QList<ToolChainNode *> m_toRemoveList; + QList<QSharedPointer<ToolChainNode> > m_toAddList; + QList<QSharedPointer<ToolChainNode> > m_toRemoveList; }; // -------------------------------------------------------------------------- |