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

Use Core::Id in ICore::showOptionsDialog

Browse Source 
Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-12-29 01:31:08 +01:00
parent 82f9de4af0
commit e833b794b3
27 changed files with 74 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gerrit/gerritoptionspage.cpp
View File

@@ -47,15 +47,10 @@ GerritOptionsPage::GerritOptionsPage(const QSharedPointer<GerritParameters> &p,
: VcsBase::VcsBaseOptionsPage(parent)
, m_parameters(p)
{
setId(optionsId());
setId(QLatin1String("Gerrit"));
setDisplayName(tr("Gerrit"));
}
QString GerritOptionsPage::optionsId()
{
return QLatin1String("Gerrit");
}
QWidget *GerritOptionsPage::createPage(QWidget *parent)
{
GerritOptionsWidget *gow = new GerritOptionsWidget(parent);

2
src/plugins/git/gerrit/gerritoptionspage.h
View File

@@ -75,8 +75,6 @@ public:
GerritOptionsPage(const QSharedPointer<GerritParameters> &p,
QObject *parent = 0);
static QString optionsId();
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }

4
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -360,8 +360,8 @@ void GerritPlugin::openView()
{
if (m_dialog.isNull()) {
while (!m_parameters->isValid()) {
const QString group = QLatin1String(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
if (!Core::ICore::instance()->showOptionsDialog(group, GerritOptionsPage::optionsId()))
const Core::Id group = VcsBase::Constants::VCS_SETTINGS_CATEGORY;
if (!Core::ICore::instance()->showOptionsDialog(group, Core::Id("Gerrit")))
return;
}
GerritDialog *gd = new GerritDialog(m_parameters, Core::ICore::mainWindow());