[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/plugins/cryptography
From:       Charles Connell <charles () connells ! org>
Date:       2007-08-30 14:53:01
Message-ID: 1188485581.007537.11823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 706489 by cconnell:

Port to kpluginfactory


 M  +4 -6      cryptographyplugin.cpp  
 M  +3 -2      cryptographyplugin.h  
 M  +7 -4      cryptographypreferences.cpp  
 M  +3 -1      cryptographypreferences.h  


--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyplugin.cpp \
#706488:706489 @@ -46,13 +46,11 @@
 #include "gpginterface.h"
 #include <kactioncollection.h>
 
-typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory;
-static const KAboutData aboutdata ( "kopete_cryptography", 0, ki18n ( "Cryptography" \
                ) , "1.2" );
-K_EXPORT_COMPONENT_FACTORY ( kopete_cryptography, CryptographyPluginFactory ( \
&aboutdata ) ) +K_PLUGIN_FACTORY ( CryptographyPluginFactory, \
registerPlugin<CryptographyPlugin>(); ) +K_EXPORT_PLUGIN ( CryptographyPluginFactory \
( "kopete_cryptography" ) )  
-CryptographyPlugin::CryptographyPlugin ( QObject *parent, const QStringList & /* \
                args */ )
-		: Kopete::Plugin ( CryptographyPluginFactory::componentData(), parent ),
-		m_cachedPass()
+CryptographyPlugin::CryptographyPlugin ( QObject *parent, const QVariantList \
&/*args*/ ) +	: Kopete::Plugin ( CryptographyPluginFactory::componentData(), parent )
 {
 	if ( !pluginStatic_ )
 		pluginStatic_=this;
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographyplugin.h \
#706488:706489 @@ -23,7 +23,8 @@
 
 #include "cryptographyconfig.h"
 
-class QStringList;
+#include <QVariantList>
+
 class QString;
 class QTimer;
 
@@ -52,7 +53,7 @@
 	static QStringList supportedProtocols() { QStringList l; return l << "MSNProtocol" \
<< "MessengerProtocol" << "JabberProtocol" << "YahooProtocol"; }  static QStringList \
getKabcKeys (QString uid);  
-	CryptographyPlugin( QObject *parent, const QStringList &args );
+	CryptographyPlugin( QObject *parent, const QVariantList &args );
 	~CryptographyPlugin();
 
 public slots:
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographypreferences.cpp \
#706488:706489 @@ -29,11 +29,14 @@
 
 #include "cryptographyconfig.h"
 
-typedef KGenericFactory<CryptographyPreferences> CryptographyPreferencesFactory;
-K_EXPORT_COMPONENT_FACTORY ( kcm_kopete_cryptography, CryptographyPreferencesFactory \
( "kcm_kopete_cryptography" ) ) +K_PLUGIN_FACTORY(CryptographyPreferencesFactory,
+		 registerPlugin<CryptographyPreferences>();
+		)
+K_EXPORT_PLUGIN(CryptographyPreferencesFactory ( "kcm_kopete_cryptography" ))
 
-CryptographyPreferences::CryptographyPreferences ( QWidget *parent, const \
                QStringList &args )
-		: KCModule ( CryptographyPreferencesFactory::componentData(), parent, args )
+
+CryptographyPreferences::CryptographyPreferences ( QWidget *parent, const \
QVariantList &args ) +	: KCModule ( CryptographyPreferencesFactory::componentData(), \
parent, args )  {
 	mConfig = new CryptographyConfig;
 	
--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/cryptographypreferences.h \
#706488:706489 @@ -21,6 +21,8 @@
 
 #include "kcmodule.h"
 
+#include <QVariantList>
+
 /**
  * Preference widget for the Cryptography plugin
  * @author Olivier Goffart
@@ -38,7 +40,7 @@
 		Q_OBJECT
 
 	public:
-		explicit CryptographyPreferences ( QWidget *parent = 0, const QStringList &args = \
QStringList() ); +		explicit CryptographyPreferences ( QWidget *parent = 0, const \
QVariantList &args = QVariantList() );  virtual ~CryptographyPreferences();
 		virtual void save();
 		virtual void load();


[prev in list] [next in list] [prev in thread] [next in thread]