Commit af625797 authored by dt's avatar dt
Browse files

Refactoring: Renamed Qt4BuildConfigWidget to Qt4ProjectConfigWidget

parent 9689582e
......@@ -27,14 +27,14 @@
**
**************************************************************************/
#include "qt4buildconfigwidget.h"
#include "qt4projectconfigwidget.h"
#include "makestep.h"
#include "qmakestep.h"
#include "qt4project.h"
#include "qt4projectmanagerconstants.h"
#include "qt4projectmanager.h"
#include "ui_qt4buildconfigwidget.h"
#include "ui_qt4projectconfigwidget.h"
#include <coreplugin/icore.h>
#include <coreplugin/mainwindow.h>
......@@ -48,11 +48,11 @@ bool debug = false;
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
Qt4BuildConfigWidget::Qt4BuildConfigWidget(Qt4Project *project)
Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
: BuildStepConfigWidget(),
m_pro(project)
{
m_ui = new Ui::Qt4BuildConfigWidget();
m_ui = new Ui::Qt4ProjectConfigWidget();
m_ui->setupUi(this);
m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory"));
m_ui->shadowBuildDirEdit->setExpectedKind(Core::Utils::PathChooser::Directory);
......@@ -83,27 +83,27 @@ Qt4BuildConfigWidget::Qt4BuildConfigWidget(Qt4Project *project)
this, SLOT(setupQtVersionsComboBox()));
}
Qt4BuildConfigWidget::~Qt4BuildConfigWidget()
Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
{
delete m_ui;
}
void Qt4BuildConfigWidget::manageQtVersions()
void Qt4ProjectConfigWidget::manageQtVersions()
{
Core::ICore *core = Core::ICore::instance();
core->showOptionsDialog(Constants::QT_CATEGORY, Constants::QTVERSION_PAGE);
}
QString Qt4BuildConfigWidget::displayName() const
QString Qt4ProjectConfigWidget::displayName() const
{
return tr("General");
}
void Qt4BuildConfigWidget::init(const QString &buildConfiguration)
void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
{
if (debug)
qDebug() << "Qt4BuildConfigWidget::init()";
qDebug() << "Qt4ProjectConfigWidget::init()";
m_buildConfiguration = buildConfiguration;
......@@ -118,12 +118,12 @@ void Qt4BuildConfigWidget::init(const QString &buildConfiguration)
updateImportLabel();
}
void Qt4BuildConfigWidget::changeConfigName(const QString &newName)
void Qt4ProjectConfigWidget::changeConfigName(const QString &newName)
{
m_pro->setDisplayNameFor(m_buildConfiguration, newName);
}
void Qt4BuildConfigWidget::setupQtVersionsComboBox()
void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
{
if (m_buildConfiguration.isEmpty()) // not yet initialized
return;
......@@ -155,14 +155,14 @@ void Qt4BuildConfigWidget::setupQtVersionsComboBox()
this, SLOT(qtVersionComboBoxCurrentIndexChanged(QString)));
}
void Qt4BuildConfigWidget::onBeforeBeforeShadowBuildDirBrowsed()
void Qt4ProjectConfigWidget::onBeforeBeforeShadowBuildDirBrowsed()
{
QString initialDirectory = QFileInfo(m_pro->file()->fileName()).absolutePath();
if (!initialDirectory.isEmpty())
m_ui->shadowBuildDirEdit->setInitialBrowsePathBackup(initialDirectory);
}
void Qt4BuildConfigWidget::shadowBuildCheckBoxClicked(bool checked)
void Qt4ProjectConfigWidget::shadowBuildCheckBoxClicked(bool checked)
{
m_ui->shadowBuildDirEdit->setEnabled(checked);
bool b = m_ui->shadowBuildCheckBox->isChecked();
......@@ -173,7 +173,7 @@ void Qt4BuildConfigWidget::shadowBuildCheckBoxClicked(bool checked)
m_pro->setValue(m_buildConfiguration, "buildDirectory", QVariant(QString::null));
}
void Qt4BuildConfigWidget::updateImportLabel()
void Qt4ProjectConfigWidget::updateImportLabel()
{
m_ui->importLabel->setVisible(false);
if (m_ui->shadowBuildCheckBox->isChecked()) {
......@@ -184,7 +184,7 @@ void Qt4BuildConfigWidget::updateImportLabel()
}
}
void Qt4BuildConfigWidget::shadowBuildLineEditTextChanged()
void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
{
if (m_pro->value(m_buildConfiguration, "buildDirectory").toString() == m_ui->shadowBuildDirEdit->path())
return;
......@@ -206,7 +206,7 @@ void Qt4BuildConfigWidget::shadowBuildLineEditTextChanged()
// }
}
void Qt4BuildConfigWidget::importLabelClicked()
void Qt4ProjectConfigWidget::importLabelClicked()
{
if (m_ui->shadowBuildCheckBox->isChecked()) {
QString directory = m_ui->shadowBuildDirEdit->path();
......@@ -252,7 +252,7 @@ void Qt4BuildConfigWidget::importLabelClicked()
setupQtVersionsComboBox();
}
void Qt4BuildConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString &)
void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString &)
{
//Qt Version
int newQtVersion;
......
......@@ -27,8 +27,8 @@
**
**************************************************************************/
#ifndef QT4BUILDCONFIGWIDGET_H
#define QT4BUILDCONFIGWIDGET_H
#ifndef QT4PROJECTCONFIGWIDGET_H
#define QT4PROJECTCONFIGWIDGET_H
#include <projectexplorer/buildstep.h>
......@@ -39,15 +39,15 @@ class Qt4Project;
namespace Internal {
namespace Ui {
class Qt4BuildConfigWidget;
class Qt4ProjectConfigWidget;
}
class Qt4BuildConfigWidget : public ProjectExplorer::BuildStepConfigWidget
class Qt4ProjectConfigWidget : public ProjectExplorer::BuildStepConfigWidget
{
Q_OBJECT
public:
Qt4BuildConfigWidget(Qt4Project *project);
~Qt4BuildConfigWidget();
Qt4ProjectConfigWidget(Qt4Project *project);
~Qt4ProjectConfigWidget();
QString displayName() const;
void init(const QString &buildConfiguration);
......@@ -64,7 +64,7 @@ private slots:
private:
void updateImportLabel();
Ui::Qt4BuildConfigWidget *m_ui;
Ui::Qt4ProjectConfigWidget *m_ui;
Qt4Project *m_pro;
QString m_buildConfiguration;
};
......@@ -72,4 +72,4 @@ private:
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // QT4BUILDCONFIGWIDGET_H
#endif // QT4PROJECTCONFIGWIDGET_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Qt4ProjectManager::Internal::Qt4BuildConfigWidget</class>
<widget class="QWidget" name="Qt4ProjectManager::Internal::Qt4BuildConfigWidget">
<class>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</class>
<widget class="QWidget" name="Qt4ProjectManager::Internal::Qt4ProjectConfigWidget">
<property name="geometry">
<rect>
<x>0</x>
......
......@@ -31,7 +31,7 @@ HEADERS = qt4projectmanagerplugin.h \
embeddedpropertiespage.h \
qt4runconfiguration.h \
speinfo.h \
qt4buildconfigwidget.h \
qt4projectconfigwidget.h \
qt4buildenvironmentwidget.h \
projectloadwizard.h
SOURCES = qt4projectmanagerplugin.cpp \
......@@ -60,7 +60,7 @@ SOURCES = qt4projectmanagerplugin.cpp \
embeddedpropertiespage.cpp \
qt4runconfiguration.cpp \
speinfo.cpp \
qt4buildconfigwidget.cpp \
qt4projectconfigwidget.cpp \
qt4buildenvironmentwidget.cpp \
projectloadwizard.cpp
FORMS = qtversionmanager.ui \
......@@ -69,7 +69,7 @@ FORMS = qtversionmanager.ui \
proeditorcontainer.ui \
makestep.ui \
qmakestep.ui \
qt4buildconfigwidget.ui \
qt4projectconfigwidget.ui \
embeddedpropertiespage.ui \
qt4buildenvironmentwidget.ui \
showbuildlog.ui
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment