diff options
Diffstat (limited to 'src/plugins/cvs/cvsplugin.cpp')
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 31ab9af265..7b8ff0ad90 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -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(); } |