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

Use new static ICore interface.

Browse Source 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-01-24 15:36:40 +01:00
committed by hjk
parent c14a4756a9
commit 4a21f0c3c8
254 changed files with 848 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cvs/cvsplugin.cpp
View File

@@ -246,12 +246,11 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
initializeVcs(new CvsControl(this));
m_cvsPluginInstance = this;
ICore *core = ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"), errorMessage))
if (!ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"), errorMessage))
return false;
if (QSettings *settings = core->settings())
if (QSettings *settings = ICore::settings())
m_settings.fromSettings(settings);
addAutoReleasedObject(new SettingsPage);
@@ -270,7 +269,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(m_commandLocator);
// Register actions
ActionManager *ami = core->actionManager();
ActionManager *ami = ICore::actionManager();
ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS);
ActionContainer *cvsMenu = ami->createMenu(Id(CMD_ID_CVS_MENU));
@@ -505,7 +504,7 @@ bool CvsPlugin::submitEditorAboutToClose(VcsBaseSubmitEditor *submitEditor)
bool closeEditor = true;
if (!fileList.empty()) {
// get message & commit
closeEditor = ICore::instance()->fileManager()->saveFile(fileIFace);
closeEditor = ICore::fileManager()->saveFile(fileIFace);
if (closeEditor)
closeEditor = commit(m_commitMessageFileName, fileList);
}
@@ -1321,7 +1320,7 @@ void CvsPlugin::setSettings(const CvsSettings &s)
{
if (s != m_settings) {
m_settings = s;
if (QSettings *settings = ICore::instance()->settings())
if (QSettings *settings = ICore::settings())
m_settings.toSettings(settings);
cvsVersionControl()->emitConfigurationChanged();
}