[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/khtml
From: Kevin Ottens <ervin () kde ! org>
Date: 2010-11-04 8:41:44
Message-ID: 20101104084144.430DBAC89B () svn ! kde ! org
[Download RAW message or body]
SVN commit 1192892 by ervin:
Port away from deprecated API.
M +11 -6 java/kjavaappletviewer.cpp
M +4 -6 java/kjavaappletviewer.h
M +8 -6 khtml_factory.cpp
M +7 -3 khtml_factory.h
M +12 -5 khtmladaptorpart.cpp
M +6 -5 khtmladaptorpart.h
M +4 -4 kmultipart/kmultipart.cpp
M +1 -1 kmultipart/kmultipart.h
M +5 -6 rendering/break_lines.cpp
--- trunk/KDE/kdelibs/khtml/java/kjavaappletviewer.cpp #1192891:1192892
@@ -23,6 +23,7 @@
#include "kjavaappletwidget.h"
#include "kjavaappletserver.h"
+#include <algorithm>
#include <stdio.h>
#ifdef KDE_USE_FINAL
@@ -38,7 +39,6 @@
#include <kapplication.h>
#include <kauthorized.h>
-#include <klibloader.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <kstatusbar.h>
@@ -48,7 +48,7 @@
#include <kio/authinfo.h>
-K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)
+K_EXPORT_PLUGIN( KJavaAppletViewerFactory )
KComponentData *KJavaAppletViewerFactory::s_componentData = 0;
KIconLoader *KJavaAppletViewerFactory::s_iconLoader = 0;
@@ -63,12 +63,17 @@
delete s_componentData;
}
-KParts::Part *KJavaAppletViewerFactory::createPartObject
- (QWidget *wparent,
- QObject *parent, const char *, const QStringList & args) {
- return new KJavaAppletViewer (wparent, parent, args);
+QString variant2StringHelper(const QVariant &variant) {
+ return variant.toString();
}
+QObject *KJavaAppletViewerFactory::create(const char *, QWidget *wparent, QObject \
*parent, + const QVariantList & args, const \
QString &) { + QStringList argsStrings;
+ std::transform(args.begin(), args.end(), argsStrings.begin(), \
variant2StringHelper); + return new KJavaAppletViewer (wparent, parent, \
argsStrings); +}
+
//-----------------------------------------------------------------------------
class KJavaServerMaintainer;
--- trunk/KDE/kdelibs/khtml/java/kjavaappletviewer.h #1192891:1192892
@@ -26,7 +26,7 @@
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kparts/statusbarextension.h>
-#include <kparts/factory.h>
+#include <kpluginfactory.h>
#include <kdialog.h>
#include <kurl.h>
#include <QtCore/QObject>
@@ -116,15 +116,13 @@
bool m_closed;
};
-class KJavaAppletViewerFactory : public KParts::Factory {
+class KJavaAppletViewerFactory : public KPluginFactory {
Q_OBJECT
public:
KJavaAppletViewerFactory ();
virtual ~KJavaAppletViewerFactory ();
- virtual KParts::Part *createPartObject
- (QWidget *wparent,
- QObject *parent,
- const char *className, const QStringList &args);
+ virtual QObject *create(const char *, QWidget *wparent, QObject *parent,
+ const QVariantList & args, const QString &);
static const KComponentData &componentData() { return *s_componentData; }
static KIconLoader * iconLoader () { return s_iconLoader; }
private:
--- trunk/KDE/kdelibs/khtml/khtml_factory.cpp #1192891:1192892
@@ -35,10 +35,15 @@
KHTMLGlobal::finalCheck();
}
-KParts::Part * KHTMLFactory::createPartObject( QWidget *parentWidget, QObject \
*parent, const char *className, const QStringList &args ) +QObject * \
KHTMLFactory::create( const char *iface, + QWidget \
*parentWidget, + QObject *parent,
+ const QVariantList &args,
+ const QString &keyword )
{
+ Q_UNUSED( keyword );
KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI;
- if ( strcmp(className, "Browser/View") == 0 ) // old hack
+ if ( strcmp(iface, "Browser/View") == 0 ) // old hack
prof = KHTMLPart::BrowserViewGUI;
if (args.contains("Browser/View"))
prof = KHTMLPart::BrowserViewGUI;
@@ -46,9 +51,6 @@
return new KHTMLPart( parentWidget, parent, prof );
}
-extern "C" KDE_EXPORT void *init_libkhtmlpart()
-{
- return new KHTMLFactory;
-}
+K_EXPORT_PLUGIN( KHTMLFactory )
#include "khtml_factory.moc"
--- trunk/KDE/kdelibs/khtml/khtml_factory.h #1192891:1192892
@@ -23,16 +23,20 @@
#include <khtml_export.h>
-#include <kparts/factory.h>
+#include <kpluginfactory.h>
-class KHTMLFactory : public KParts::Factory
+class KHTML_EXPORT KHTMLFactory : public KPluginFactory
{
Q_OBJECT
public:
KHTMLFactory();
virtual ~KHTMLFactory();
- virtual KParts::Part *createPartObject( QWidget *parentWidget, QObject *parent, \
const char *className, const QStringList &args ); + virtual QObject *create(const \
char* iface, + QWidget *parentWidget,
+ QObject *parent,
+ const QVariantList &args,
+ const QString &keyword);
};
#endif
--- trunk/KDE/kdelibs/khtml/khtmladaptorpart.cpp #1192891:1192892
@@ -47,18 +47,25 @@
return new KJS::JSObject();
}
-K_EXPORT_COMPONENT_FACTORY (khtmladaptorpart, KHTMLAdaptorPartFactory)
+K_EXPORT_PLUGIN(KHTMLAdaptorPartFactory)
KHTMLAdaptorPartFactory::KHTMLAdaptorPartFactory()
{
}
-KParts::Part* KHTMLAdaptorPartFactory::createPartObject(QWidget* wparent,
+
+QString variant2StringHelper(const QVariant &variant)
+{
+ return variant.toString();
+}
+
+QObject* KHTMLAdaptorPartFactory::create(const char* /*iface*/,
+ QWidget* wparent,
QObject* parent,
- const char* /*className*/,
- const QStringList& args)
+ const QVariantList &/*args*/,
+ const QString& /*keyword*/)
{
- return new AdaptorView(wparent, parent, args);
+ return new AdaptorView(wparent, parent, QStringList());
}
#include "moc_khtmladaptorpart.cpp"
--- trunk/KDE/kdelibs/khtml/khtmladaptorpart.h #1192891:1192892
@@ -23,7 +23,7 @@
#include <khtml_export.h>
#include <kparts/part.h>
#include <kparts/browserextension.h>
-#include <kparts/factory.h>
+#include <kpluginfactory.h>
namespace KJS
{
@@ -44,14 +44,15 @@
Q_DECLARE_INTERFACE(ScriptingInterface, "org.kde.khtml.ScriptingInterface")
-class KHTMLAdaptorPartFactory : public KParts::Factory {
+class KHTMLAdaptorPartFactory : public KPluginFactory {
Q_OBJECT
public:
KHTMLAdaptorPartFactory ();
- virtual KParts::Part *createPartObject(QWidget *wparent,
+ virtual QObject *create(const char *iface,
+ QWidget *wparent,
QObject *parent,
- const char *className,
- const QStringList &args);
+ const QVariantList &args,
+ const QString &keyword);
};
class AdaptorView : public KParts::ReadOnlyPart,
--- trunk/KDE/kdelibs/khtml/kmultipart/kmultipart.cpp #1192891:1192892
@@ -29,15 +29,15 @@
#include <ktemporaryfile.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
#include <khtml_part.h>
#include <unistd.h>
#include <kxmlguifactory.h>
#include <QtCore/QTimer>
#include <kvbox.h>
-typedef KParts::GenericFactory<KMultiPart> KMultiPartFactory; // factory for the \
part
-K_EXPORT_COMPONENT_FACTORY( libkmultipart /*library name*/, KMultiPartFactory )
+K_PLUGIN_FACTORY(KMultiPartFactory, registerPlugin<KMultiPart>();)
+K_EXPORT_PLUGIN(KMultiPartFactory)
//#define DEBUG_PARSING
@@ -96,7 +96,7 @@
KMultiPart::KMultiPart( QWidget *parentWidget,
- QObject *parent, const QStringList& )
+ QObject *parent, const QVariantList& )
: KParts::ReadOnlyPart( parent )
{
m_filter = 0L;
--- trunk/KDE/kdelibs/khtml/kmultipart/kmultipart.h #1192891:1192892
@@ -39,7 +39,7 @@
Q_OBJECT
public:
KMultiPart( QWidget *parentWidget,
- QObject *parent, const QStringList& );
+ QObject *parent, const QVariantList& );
virtual ~KMultiPart();
virtual bool openFile() { return false; }
--- trunk/KDE/kdelibs/khtml/rendering/break_lines.cpp #1192891:1192892
@@ -1,5 +1,5 @@
#include <break_lines.h>
-#include <klibloader.h>
+#include <klibrary.h>
#include <QtCore/QTextCodec>
#include <stdio.h>
#include <stdlib.h>
@@ -37,6 +37,7 @@
free(wbrpos);
free(isbreakable);
if (library) library->unload();
+ delete library;
}
const QChar *string;
int *wbrpos;
@@ -63,20 +64,18 @@
#ifndef HAVE_LIBTHAI
- KLibrary *lib = 0;
+ KLibrary *lib = new KLibrary( QLatin1String("libthai") );
/* load libthai dynamically */
if (( !th_brk ) && thaiCodec ) {
printf("Try to load libthai dynamically...\n");
- KLibLoader *loader = KLibLoader::self();
- lib = loader->library(QLatin1String("libthai"));
- if ( lib )
+ if ( lib->load() )
th_brk = (th_brk_def) lib->resolveFunction("th_brk");
if ( !th_brk ) {
// indication that loading failed and we shouldn't try to load again
printf("Error, can't load libthai...\n");
thaiCodec = 0;
- if (lib)
+ if (lib->isLoaded())
lib->unload();
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic