summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/akregator
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-06 15:17:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-06 15:17:15 -0600
commit6e9f8cb7044774da171b2a0f6ffdda579eb9ddab (patch)
tree8078dd1ba3a4b5ec1d651c09156cf18e2cba9d51 /kontact/plugins/akregator
parent96cf12b16ab69bcb2df0773091ba9751e9219446 (diff)
downloadtdepim-6e9f8cb7044774da171b2a0f6ffdda579eb9ddab.tar.gz
tdepim-6e9f8cb7044774da171b2a0f6ffdda579eb9ddab.zip
Fix Kontact crash in Akregator part due to identical destructor signatures being generated for two unrelated classesr14.0.0
This relates to Bug 2235 Fix a slew of non-virtual destructor problems
Diffstat (limited to 'kontact/plugins/akregator')
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp25
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h7
2 files changed, 15 insertions, 17 deletions
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 01997690c..a7a7fa7af 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -44,14 +44,13 @@
#include "akregator_plugin.h"
namespace Akregator {
-typedef KGenericFactory<Akregator::Plugin, Kontact::Core > PluginFactory;
+typedef KGenericFactory<Akregator::AkregatorPlugin, Kontact::Core > PluginFactory;
K_EXPORT_COMPONENT_FACTORY( libkontact_akregator,
PluginFactory( "kontact_akregator" ) )
-Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& )
+AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0)
{
-
setInstance( PluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
@@ -60,22 +59,22 @@ Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& )
new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this );
}
-Plugin::~Plugin()
+AkregatorPlugin::~AkregatorPlugin()
{
}
-bool Plugin::isRunningStandalone()
+bool AkregatorPlugin::isRunningStandalone()
{
return m_uniqueAppWatcher->isRunningStandalone();
}
-TQStringList Plugin::invisibleToolbarActions() const
+TQStringList AkregatorPlugin::invisibleToolbarActions() const
{
return TQStringList( "file_new_contact" );
}
-Akregator::AkregatorPartIface_stub *Plugin::interface()
+Akregator::AkregatorPartIface_stub *AkregatorPlugin::interface()
{
if ( !m_stub ) {
part();
@@ -86,7 +85,7 @@ Akregator::AkregatorPartIface_stub *Plugin::interface()
}
-MyBasePart* Plugin::createPart()
+MyBasePart* AkregatorPlugin::createPart()
{
MyBasePart* p = loadPart();
@@ -98,24 +97,24 @@ MyBasePart* Plugin::createPart()
}
-void Plugin::showPart()
+void AkregatorPlugin::showPart()
{
core()->selectPlugin(this);
}
-void Plugin::addFeed()
+void AkregatorPlugin::addFeed()
{
interface()->addFeed();
}
-TQStringList Plugin::configModules() const
+TQStringList AkregatorPlugin::configModules() const
{
TQStringList modules;
modules << "PIM/akregator.desktop";
return modules;
}
-void Plugin::readProperties( TDEConfig *config )
+void AkregatorPlugin::readProperties( TDEConfig *config )
{
if ( part() ) {
Akregator::Part *myPart = static_cast<Akregator::Part*>( part() );
@@ -123,7 +122,7 @@ void Plugin::readProperties( TDEConfig *config )
}
}
-void Plugin::saveProperties( TDEConfig *config )
+void AkregatorPlugin::saveProperties( TDEConfig *config )
{
if ( part() ) {
Akregator::Part *myPart = static_cast<Akregator::Part*>( part() );
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 479ca8967..041d7a973 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -48,15 +48,14 @@ class UniqueAppHandler : public Kontact::UniqueAppHandler
};
-class Plugin : public Kontact::Plugin
+class AkregatorPlugin : public Kontact::Plugin
{
Q_OBJECT
-
public:
- Plugin( Kontact::Core *core, const char *name,
+ AkregatorPlugin( Kontact::Core *core, const char *name,
const TQStringList & );
- ~Plugin();
+ virtual ~AkregatorPlugin();
int weight() const { return 475; }