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

Renamed VCSBaseSettingsPage to CommonSettingsPage

Browse Source 
To free up the name for an upcoming VCSBaseOptionsPage class that forms
the base for all version control option pages.

Reviewed-by: Friedemann Kleint
This commit is contained in:
Thorbjørn Lindeijer
2010-04-12 16:34:21 +02:00
parent 9454fe5689
commit f9051e6f87
12 changed files with 163 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/vcsbase/vcsplugin.cpp
View File

@@ -29,7 +29,7 @@
#include "vcsplugin.h"
#include "diffhighlighter.h"
#include "vcsbasesettingspage.h"
#include "commonsettingspage.h"
#include "nicknamedialog.h"
#include "vcsbaseoutputwindow.h"
#include "corelistener.h"
@@ -72,12 +72,12 @@ bool VCSPlugin::initialize(const QStringList &arguments, QString *errorMessage)
m_coreListener = new CoreListener;
addAutoReleasedObject(m_coreListener);
m_settingsPage = new VCSBaseSettingsPage;
m_settingsPage = new CommonOptionsPage;
addAutoReleasedObject(m_settingsPage);
addAutoReleasedObject(VCSBaseOutputWindow::instance());
connect(m_settingsPage, SIGNAL(settingsChanged(VCSBase::Internal::VCSBaseSettings)),
this, SIGNAL(settingsChanged(VCSBase::Internal::VCSBaseSettings)));
connect(m_settingsPage, SIGNAL(settingsChanged(VCSBase::Internal::VCSBaseSettings)),
connect(m_settingsPage, SIGNAL(settingsChanged(VCSBase::Internal::CommonVcsSettings)),
this, SIGNAL(settingsChanged(VCSBase::Internal::CommonVcsSettings)));
connect(m_settingsPage, SIGNAL(settingsChanged(VCSBase::Internal::CommonVcsSettings)),
this, SLOT(slotSettingsChanged()));
slotSettingsChanged();
return true;
@@ -97,7 +97,7 @@ CoreListener *VCSPlugin::coreListener() const
return m_coreListener;
}
VCSBaseSettings VCSPlugin::settings() const
CommonVcsSettings VCSPlugin::settings() const
{
return m_settingsPage->settings();
}
@@ -118,8 +118,8 @@ void VCSPlugin::populateNickNameModel()
if (!NickNameDialog::populateModelFromMailCapFile(settings().nickNameMailMap,
m_nickNameModel,
&errorMessage)) {
qWarning("%s", qPrintable(errorMessage));
}
qWarning("%s", qPrintable(errorMessage));
}
}
void VCSPlugin::slotSettingsChanged()