From kde-commits Wed Jul 22 14:15:57 2009 From: Andreas Pakulat Date: Wed, 22 Jul 2009 14:15:57 +0000 To: kde-commits Subject: KDE/kdevplatform/plugins Message-Id: <1248272157.611951.28170.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124827216528666 SVN commit 1001036 by apaku: Properly unload toolviews when the plugin is unloaded CCBUG:178445 M +6 -0 cvs/cvsplugin.cpp M +2 -0 cvs/cvsplugin.h M +6 -0 git/gitplugin.cpp M +2 -0 git/gitplugin.h M +7 -0 mercurial/mercurialplugin.cpp M +2 -0 mercurial/mercurialplugin.h --- trunk/KDE/kdevplatform/plugins/cvs/cvsplugin.cpp #1001035:1001036 @@ -100,6 +100,12 @@ } +void CvsPlugin::unload() +{ + core()->uiController()->removeToolView( d->m_factory ); +} + + CvsProxy* CvsPlugin::proxy() { return d->m_proxy; --- trunk/KDE/kdevplatform/plugins/cvs/cvsplugin.h #1001035:1001036 @@ -43,6 +43,8 @@ public: explicit CvsPlugin(QObject *parent, const QVariantList & args = QVariantList()); virtual ~CvsPlugin(); + + virtual void unload(); virtual QString name() const; virtual KDevelop::VcsImportMetadataWidget* createImportMetadataWidget(QWidget* parent); --- trunk/KDE/kdevplatform/plugins/git/gitplugin.cpp #1001035:1001036 @@ -65,6 +65,12 @@ } +void GitPlugin::unload() +{ + core()->uiController()->removeToolView( dvcsViewFactory() ); +} + + QString GitPlugin::name() const { return QLatin1String("Git"); --- trunk/KDE/kdevplatform/plugins/git/gitplugin.h #1001035:1001036 @@ -49,6 +49,8 @@ public: GitPlugin(QObject *parent, const QVariantList & args = QVariantList() ); ~GitPlugin(); + + virtual void unload(); QString name() const; --- trunk/KDE/kdevplatform/plugins/mercurial/mercurialplugin.cpp #1001035:1001036 @@ -68,6 +68,13 @@ { } + +void MercurialPlugin::unload() +{ + core()->uiController()->removeToolView( dvcsViewFactory() ); +} + + QString MercurialPlugin::name() const { return QLatin1String("Mercurial"); --- trunk/KDE/kdevplatform/plugins/mercurial/mercurialplugin.h #1001035:1001036 @@ -57,6 +57,8 @@ explicit MercurialPlugin(QObject *parent, const QVariantList & args = QVariantList()); ~MercurialPlugin(); + virtual void unload(); + bool isValidDirectory(const KUrl &dirPath); bool isVersionControlled(const KUrl &path); QString name() const;