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

DebuggingHelper: Rename 'qtVersionsChanged' to 'dumpUpdatedFor'

Browse Source 
Suggested by dt
This commit is contained in:
Kai Koehne
2011-05-13 13:17:24 +02:00
parent b470bdc6e2
commit fd1af2e620
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -463,8 +463,8 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
this, SLOT(qtVersionChanged())); this, SLOT(qtVersionChanged()));
connect(step->qt4BuildConfiguration(), SIGNAL(qmakeBuildConfigurationChanged()), connect(step->qt4BuildConfiguration(), SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(qmakeBuildConfigChanged())); this, SLOT(qmakeBuildConfigChanged()));
connect(QtVersionManager::instance(), SIGNAL(qtVersionsUpdated(QString)), connect(QtVersionManager::instance(), SIGNAL(dumpUpdatedFor(QString)),
this, SLOT(qtVersionsUpdated(QString))); this, SLOT(qtVersionsDumpUpdated(QString)));
} }
void QMakeStepConfigWidget::init() void QMakeStepConfigWidget::init()
@@ -496,7 +496,7 @@ void QMakeStepConfigWidget::qtVersionChanged()
updateQmlDebuggingOption(); updateQmlDebuggingOption();
} }
void QMakeStepConfigWidget::qtVersionsUpdated(const QString &qmakeCommand) void QMakeStepConfigWidget::qtVersionsDumpUpdated(const QString &qmakeCommand)
{ {
if (BaseQtVersion *version = m_step->qt4BuildConfiguration()->qtVersion()) { if (BaseQtVersion *version = m_step->qt4BuildConfiguration()->qtVersion()) {
if (version->qmakeCommand() == qmakeCommand) if (version->qmakeCommand() == qmakeCommand)

2
src/plugins/qt4projectmanager/qmakestep.h
View File

@@ -137,7 +137,7 @@ public:
private slots: private slots:
// slots for handling buildconfiguration/step signals // slots for handling buildconfiguration/step signals
void qtVersionChanged(); void qtVersionChanged();
void qtVersionsUpdated(const QString &qmakeCommand); void qtVersionsDumpUpdated(const QString &qmakeCommand);
void qmakeBuildConfigChanged(); void qmakeBuildConfigChanged();
void userArgumentsChanged(); void userArgumentsChanged();
void linkQmlDebuggingLibraryChanged(); void linkQmlDebuggingLibraryChanged();

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

@@ -198,8 +198,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<BaseQtVersion *>
userChangedCurrentVersion(); userChangedCurrentVersion();
updateCleanUpButton(); updateCleanUpButton();
connect(QtVersionManager::instance(), SIGNAL(qtVersionsUpdated(QString)), connect(QtVersionManager::instance(), SIGNAL(dumpUpdatedFor(QString)),
this, SLOT(qtVersionsUpdated(QString))); this, SLOT(qtVersionsDumpUpdated(QString)));
} }
bool QtOptionsPageWidget::eventFilter(QObject *o, QEvent *e) bool QtOptionsPageWidget::eventFilter(QObject *o, QEvent *e)
@@ -313,7 +313,7 @@ void QtOptionsPageWidget::cleanUpQtVersions()
updateCleanUpButton(); updateCleanUpButton();
} }
void QtOptionsPageWidget::qtVersionsUpdated(const QString &qmakeCommand) void QtOptionsPageWidget::qtVersionsDumpUpdated(const QString &qmakeCommand)
{ {
foreach (BaseQtVersion *version, m_versions) { foreach (BaseQtVersion *version, m_versions) {
if (version->qmakeCommand() == qmakeCommand) if (version->qmakeCommand() == qmakeCommand)

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

@@ -108,7 +108,7 @@ private slots:
void debuggingHelperBuildFinished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools); void debuggingHelperBuildFinished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools);
void cleanUpQtVersions(); void cleanUpQtVersions();
void qtVersionsUpdated(const QString &qmakeCommand); void qtVersionsDumpUpdated(const QString &qmakeCommand);
}; };
class QtOptionsPage : public Core::IOptionsPage class QtOptionsPage : public Core::IOptionsPage

2
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -381,7 +381,7 @@ void QtVersionManager::updateQtVersion(int id)
if (v->qmakeCommand() == qmakeCommand) if (v->qmakeCommand() == qmakeCommand)
v->recheckDumper(); v->recheckDumper();
} }
emit qtVersionsUpdated(qmakeCommand); emit dumpUpdatedFor(qmakeCommand);
} }
void QtVersionManager::updateSettings() void QtVersionManager::updateSettings()

4
src/plugins/qt4projectmanager/qtversionmanager.h
View File

@@ -118,8 +118,8 @@ public:
QString popPendingMwcUpdate(); QString popPendingMwcUpdate();
QString popPendingGcceUpdate(); QString popPendingGcceUpdate();
signals: signals:
// qt version information cache has been invalidated // content of BaseQtVersion objects with qmake path might have changed
void qtVersionsUpdated(const QString &qmakeCommand); void dumpUpdatedFor(const QString &qmakeCommand);
void qtVersionsChanged(const QList<int> &uniqueIds); void qtVersionsChanged(const QList<int> &uniqueIds);
void updateExamples(QString, QString, QString); void updateExamples(QString, QString, QString);