--- a/controlpanel/src/cpframework/src/cppluginloader.cpp Fri Apr 16 11:40:46 2010 +0800
+++ b/controlpanel/src/cpframework/src/cppluginloader.cpp Fri May 14 13:29:47 2010 +0800
@@ -20,7 +20,6 @@
#include <QFileInfo>
#include <QPluginLoader>
#include <cpplugininterface.h>
-#include <cppluginplatinterface.h>
#include <cplauncherinterface.h>
#include <cpbasepath.h>
#include "cputility.h"
@@ -73,7 +72,7 @@
}
/*!
- load a controlpanel plugin by plugin file.
+ load a CpPluginInterface by plugin file.
the plugin file can either absoulte file path or only file name.
acceptable format:
sampleplugin
@@ -82,28 +81,21 @@
C:/resource/qt/plugins/controlpanel/sampleplugin.qtplugin
C:/resource/qt/plugins/controlpanel/sampleplugin.dll
*/
-
-CpPluginInterface *CpPluginLoader::loadCpPlugin(const QString &pluginFile)
-{
- return ::loadPluginInterface<CpPluginInterface>(pluginFile);
-}
-
-
-/*!
- \deprecated CpPluginPlatInterface *CpPluginLoader::loadPlatCpPlugin(const QString &) is deprecated.
- please use CpPluginInterface to implement controlpanel plugin and use CpPluginLoader::loadCpPluginInterface(const QString &) to load the plugin.
- */
-
-CpPluginPlatInterface *CpPluginLoader::loadPlatCpPlugin(const QString &pluginFile)
-{
- return ::loadPluginInterface<CpPluginPlatInterface>(pluginFile);
-}
-
CpPluginInterface *CpPluginLoader::loadCpPluginInterface(const QString &pluginFile)
{
return ::loadPluginInterface<CpPluginInterface>(pluginFile);
}
+/*!
+ load a CpLauncherInterface by plugin file.
+ the plugin file can either absoulte file path or only file name.
+ acceptable format:
+ sampleplugin
+ sampleplugin.qtplugin
+ sampleplugin.dll
+ C:/resource/qt/plugins/controlpanel/sampleplugin.qtplugin
+ C:/resource/qt/plugins/controlpanel/sampleplugin.dll
+ */
CpLauncherInterface *CpPluginLoader::loadCpLauncherInterface(const QString &pluginFile)
{
return ::loadPluginInterface<CpLauncherInterface>(pluginFile);