From 18b2693970662acc1cc6e12c2a4fcb898a863ff3 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 25 Mar 2009 15:41:15 +0100
Subject: [PATCH] qt4versionmanager: compile fix
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 13 +++++++------
src/plugins/qt4projectmanager/qtversionmanager.h | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index e1f9bc12a36..c1b45cbc506 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -491,7 +491,7 @@ QtDirWidget::QtDirWidget(QWidget *parent, QList<QtVersion *> versions, int defau
void QtDirWidget::buildDebuggingHelper()
{
// Find the qt version for this button..
- int index = indexForWidget(qobject_cast<QWidget *>(sender());
+ int index = indexForWidget(qobject_cast<QWidget *>(sender()));
if (index == -1)
return;
@@ -499,7 +499,8 @@ void QtDirWidget::buildDebuggingHelper()
QTreeWidgetItem *item = m_ui.qtdirList->topLevelItem(index);
item->setData(2, Qt::UserRole, result);
- DebuggingHelperWidget *dhw = qobject_cast<DebuggingHelperWidget *>(m_ui.qtdirList->itemWidget(item, 2));
+ DebuggingHelperWidget *dhw =
+ qobject_cast<DebuggingHelperWidget *>(m_ui.qtdirList->itemWidget(item, 2));
if (dhw) {
if (m_versions.at(index)->hasDebuggingHelper())
dhw->setState(DebuggingHelperWidget::State(DebuggingHelperWidget::Ok | DebuggingHelperWidget::ShowLog));
@@ -508,10 +509,10 @@ void QtDirWidget::buildDebuggingHelper()
}
}
-int QtDirWidget::indexFor(QWidget *debuggingHelperWidget) const
+int QtDirWidget::indexForWidget(QWidget *widget) const
{
int index = -1;
- for(int i=0; i < m_ui.qtdirList->topLevelItemCount(); ++i) {
+ for (int i = 0; i < m_ui.qtdirList->topLevelItemCount(); ++i) {
if (m_ui.qtdirList->itemWidget(m_ui.qtdirList->topLevelItem(i), 2) == widget) {
index = i;
break;
@@ -522,12 +523,12 @@ int QtDirWidget::indexFor(QWidget *debuggingHelperWidget) const
void QtDirWidget::showDebuggingBuildLog()
{
- int index = indexForWidget(qobject_cast<QWidget *>(sender());
+ int index = indexForWidget(qobject_cast<QWidget *>(sender()));
if (index == -1)
return;
QDialog dlg;
- ::Ui::ShowBuildLog ui;
+ Ui_ShowBuildLog ui;
ui.setupUi(&dlg);
ui.log->setPlainText(m_ui.qtdirList->topLevelItem(index)->data(2, Qt::UserRole).toString());
dlg.exec();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 7c9673ce38e..0d61ac22d19 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -136,10 +136,11 @@ public:
QList<QtVersion *> versions() const;
int defaultVersion() const;
void finish();
+
private:
void showEnvironmentPage(QTreeWidgetItem * item);
void fixQtVersionName(int index);
- int indexFor(QWidget *debuggingHelperWidget) const;
+ int indexForWidget(QWidget *debuggingHelperWidget) const;
Ui::QtVersionManager m_ui;
QList<QtVersion *> m_versions;
int m_defaultVersion;
--
GitLab