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

QtOptionsPage: Simpler code, remove shared pointer

Browse Source
This commit is contained in:
dt
2011-02-24 12:11:36 +01:00
parent 3c3ebd223a
commit 66aa9db794
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/qt4projectmanager/qtoptionspage.cpp
View File

@@ -120,11 +120,7 @@ void QtOptionsPage::apply()
m_widget->finish(); m_widget->finish();
QtVersionManager *vm = QtVersionManager::instance(); QtVersionManager *vm = QtVersionManager::instance();
// Turn into flat list vm->setNewQtVersions(m_widget->versions());
QList<QtVersion *> versions;
foreach(const QSharedPointerQtVersion &spv, m_widget->versions())
versions.push_back(new QtVersion(*spv));
vm->setNewQtVersions(versions);
} }
bool QtOptionsPage::matches(const QString &s) const bool QtOptionsPage::matches(const QString &s) const
@@ -145,7 +141,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
{ {
// Initialize m_versions // Initialize m_versions
foreach(QtVersion *version, versions) foreach(QtVersion *version, versions)
m_versions.push_back(QSharedPointerQtVersion(new QtVersion(*version))); m_versions.push_back(new QtVersion(*version));
QWidget *versionInfoWidget = new QWidget(); QWidget *versionInfoWidget = new QWidget();
m_versionUi->setupUi(versionInfoWidget); m_versionUi->setupUi(versionInfoWidget);
@@ -180,7 +176,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
manualItem->setFirstColumnSpanned(true); manualItem->setFirstColumnSpanned(true);
for (int i = 0; i < m_versions.count(); ++i) { for (int i = 0; i < m_versions.count(); ++i) {
const QtVersion * const version = m_versions.at(i).data(); const QtVersion * const version = m_versions.at(i);
QTreeWidgetItem *item = new QTreeWidgetItem(version->isAutodetected()? autoItem : manualItem); QTreeWidgetItem *item = new QTreeWidgetItem(version->isAutodetected()? autoItem : manualItem);
item->setText(0, version->displayName()); item->setText(0, version->displayName());
item->setText(1, QDir::toNativeSeparators(version->qmakeCommand())); item->setText(1, QDir::toNativeSeparators(version->qmakeCommand()));
@@ -258,11 +254,11 @@ QtVersion *QtOptionsPageWidget::currentVersion() const
{ {
const int currentItemIndex = currentIndex(); const int currentItemIndex = currentIndex();
if (currentItemIndex >= 0 && currentItemIndex < m_versions.size()) if (currentItemIndex >= 0 && currentItemIndex < m_versions.size())
return m_versions.at(currentItemIndex).data(); return m_versions.at(currentItemIndex);
return 0; return 0;
} }
static inline int findVersionById(const QList<QSharedPointerQtVersion> &l, int id) static inline int findVersionById(const QList<QtVersion *> &l, int id)
{ {
const int size = l.size(); const int size = l.size();
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
@@ -289,7 +285,7 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, Debuggin
item->setData(0, BuildRunningRole, QVariant::fromValue(buildFlags)); item->setData(0, BuildRunningRole, QVariant::fromValue(buildFlags));
item->setData(0, BuildLogRole, output); item->setData(0, BuildLogRole, output);
QSharedPointerQtVersion qtVersion = m_versions.at(index); QtVersion *qtVersion = m_versions.at(index);
bool success = true; bool success = true;
if (tools & DebuggingHelperBuildTask::GdbDebugging) if (tools & DebuggingHelperBuildTask::GdbDebugging)
@@ -323,7 +319,7 @@ void QtOptionsPageWidget::buildDebuggingHelper(DebuggingHelperBuildTask::Tools t
buildFlags |= tools; buildFlags |= tools;
item->setData(0, BuildRunningRole, QVariant::fromValue(buildFlags)); item->setData(0, BuildRunningRole, QVariant::fromValue(buildFlags));
QtVersion *version = m_versions.at(index).data(); QtVersion *version = m_versions.at(index);
if (!version) if (!version)
return; return;
@@ -406,11 +402,12 @@ void QtOptionsPageWidget::showDebuggingBuildLog(const QTreeWidgetItem *currentIt
QtOptionsPageWidget::~QtOptionsPageWidget() QtOptionsPageWidget::~QtOptionsPageWidget()
{ {
delete m_ui; delete m_ui;
qDeleteAll(m_versions);
} }
void QtOptionsPageWidget::addQtDir() void QtOptionsPageWidget::addQtDir()
{ {
QSharedPointerQtVersion newVersion(new QtVersion(m_specifyNameString, m_specifyPathString)); QtVersion *newVersion = new QtVersion(m_specifyNameString, m_specifyPathString);
m_versions.append(newVersion); m_versions.append(newVersion);
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui->qtdirList->topLevelItem(1)); QTreeWidgetItem *item = new QTreeWidgetItem(m_ui->qtdirList->topLevelItem(1));
@@ -435,7 +432,9 @@ void QtOptionsPageWidget::removeQtDir()
delete item; delete item;
QtVersion *version = m_versions.at(index);
m_versions.removeAt(index); m_versions.removeAt(index);
delete version;
updateState(); updateState();
} }
@@ -616,11 +615,11 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
return; return;
int index = indexForTreeItem(item); int index = indexForTreeItem(item);
QSharedPointerQtVersion qtVersion;
if (index < 0) if (index < 0)
return; return;
qtVersion = m_versions.at(index); QtVersion *qtVersion = m_versions.at(index);
if (!qtVersion->isValid()) { if (!qtVersion->isValid()) {
m_versionUi->errorLabel->setText(qtVersion->invalidReason()); m_versionUi->errorLabel->setText(qtVersion->invalidReason());
return; return;
@@ -753,7 +752,7 @@ void QtOptionsPageWidget::updateCurrentQMakeLocation()
int currentItemIndex = indexForTreeItem(currentItem); int currentItemIndex = indexForTreeItem(currentItem);
if (currentItemIndex < 0) if (currentItemIndex < 0)
return; return;
QtVersion *version = m_versions.at(currentItemIndex).data(); QtVersion *version = m_versions.at(currentItemIndex);
QFileInfo fi(m_versionUi->qmakePath->path()); QFileInfo fi(m_versionUi->qmakePath->path());
if (!fi.exists() || !fi.isFile() || version->qmakeCommand() == fi.absoluteFilePath()) if (!fi.exists() || !fi.isFile() || version->qmakeCommand() == fi.absoluteFilePath())
return; return;
@@ -793,13 +792,12 @@ void QtOptionsPageWidget::updateCurrentSbsV2Directory()
QDir::fromNativeSeparators(m_versionUi->sbsV2Path->path())); QDir::fromNativeSeparators(m_versionUi->sbsV2Path->path()));
} }
QList<QSharedPointerQtVersion> QtOptionsPageWidget::versions() const QList<QtVersion *> QtOptionsPageWidget::versions() const
{ {
QList<QSharedPointerQtVersion> result; QList<QtVersion *> result;
for (int i = 0; i < m_versions.count(); ++i) { for (int i = 0; i < m_versions.count(); ++i)
if (m_versions.at(i)->qmakeCommand() != m_specifyPathString) if (m_versions.at(i)->qmakeCommand() != m_specifyPathString)
result.append(m_versions.at(i)); result.append(new QtVersion(*(m_versions.at(i))));
}
return result; return result;
} }

7
src/plugins/qt4projectmanager/qtoptionspage.h
View File

@@ -50,7 +50,6 @@ QT_END_NAMESPACE
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
class QtVersion; class QtVersion;
typedef QSharedPointer<QtVersion> QSharedPointerQtVersion;
namespace Internal { namespace Internal {
namespace Ui { namespace Ui {
@@ -66,7 +65,7 @@ class QtOptionsPageWidget : public QWidget
public: public:
QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> versions); QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> versions);
~QtOptionsPageWidget(); ~QtOptionsPageWidget();
QList<QSharedPointerQtVersion> versions() const; QList<QtVersion *> versions() const;
void finish(); void finish();
QString searchKeywords() const; QString searchKeywords() const;
@@ -86,7 +85,7 @@ private:
Internal::Ui::QtVersionManager *m_ui; Internal::Ui::QtVersionManager *m_ui;
Internal::Ui::QtVersionInfo *m_versionUi; Internal::Ui::QtVersionInfo *m_versionUi;
Internal::Ui::DebuggingHelper *m_debuggingHelperUi; Internal::Ui::DebuggingHelper *m_debuggingHelperUi;
QList<QSharedPointerQtVersion> m_versions; // Passed on to the helper build task, so, use QSharedPointerQtVersion QList<QtVersion *> m_versions;
int m_defaultVersion; int m_defaultVersion;
private slots: private slots:
@@ -126,7 +125,7 @@ public:
QIcon categoryIcon() const; QIcon categoryIcon() const;
QWidget *createPage(QWidget *parent); QWidget *createPage(QWidget *parent);
void apply(); void apply();
void finish() { } void finish() {}
virtual bool matches(const QString &) const; virtual bool matches(const QString &) const;
private: private: