[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fb36ccfe8f2ce7aef52bc6c7548ffce16ac8c5bb
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 18 18:38:37 2002 +0000
Renamed KWQPlugin to WKPluginWidget
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@547 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0847c43..03b98f8 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -52,9 +52,7 @@
#import <WCURICache.h>
#import <WCURICacheData.h>
-#import <WKPluginDatabase.h>
-#include <npapi.h>
-#include <KWQPlugin.h>
+#include <WKPluginWidget.h>
#include <rendering/render_frames.h>
#import <KWQView.h>
@@ -1396,18 +1394,12 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, const QString &serviceType,
const QStringList &args)
{
- WKPlugin *plugin;
- KWQPlugin *pluginWidget;
+ WKPluginWidget *pluginWidget;
if(url.isEmpty() || serviceType.isEmpty()){
return FALSE;
}
- plugin = [[WKPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
- if(plugin == nil){
- return FALSE;
- }
- [plugin load];
- pluginWidget = new KWQPlugin(0, plugin, url, serviceType, args);
+ pluginWidget = new WKPluginWidget(0, url, serviceType, args);
frame->setWidget(pluginWidget);
return TRUE;
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 0847c43..03b98f8 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -52,9 +52,7 @@
#import <WCURICache.h>
#import <WCURICacheData.h>
-#import <WKPluginDatabase.h>
-#include <npapi.h>
-#include <KWQPlugin.h>
+#include <WKPluginWidget.h>
#include <rendering/render_frames.h>
#import <KWQView.h>
@@ -1396,18 +1394,12 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, const QString &serviceType,
const QStringList &args)
{
- WKPlugin *plugin;
- KWQPlugin *pluginWidget;
+ WKPluginWidget *pluginWidget;
if(url.isEmpty() || serviceType.isEmpty()){
return FALSE;
}
- plugin = [[WKPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
- if(plugin == nil){
- return FALSE;
- }
- [plugin load];
- pluginWidget = new KWQPlugin(0, plugin, url, serviceType, args);
+ pluginWidget = new WKPluginWidget(0, url, serviceType, args);
frame->setWidget(pluginWidget);
return TRUE;
}
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 7295e7e..45a1c88 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -123,7 +123,7 @@ libkwq_o_SOURCES = \
WKPlugin.mm \
WKPluginView.mm \
WKPluginDatabase.mm \
- KWQPlugin.mm \
+ WKPluginWidget.mm \
npapi.mm \
$(NULL)
diff --git a/WebCore/src/kwq/KWQPlugin.h b/WebCore/kwq/WKPluginWidget.h
similarity index 81%
rename from WebCore/src/kwq/KWQPlugin.h
rename to WebCore/kwq/WKPluginWidget.h
index 12112e0..84aad37 100644
--- a/WebCore/src/kwq/KWQPlugin.h
+++ b/WebCore/kwq/WKPluginWidget.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWQPlugin_H_
-#define KWQPlugin_H_
+#ifndef WKPluginWidget_H_
+#define WKPluginWidget_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -36,9 +36,9 @@
#import <WKPluginView.h>
#import <WKPlugin.h>
-// class KWQPlugin ===============================================================
+// class WKPluginWidget ===============================================================
-class KWQPlugin : public QWidget {
+class WKPluginWidget : public QWidget {
public:
// typedefs ----------------------------------------------------------------
@@ -48,8 +48,8 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KWQPlugin(QWidget *parent=0, WKPlugin *plugin=nil, const QString &url=0, const QString &serviceType=0, const QStringList &args=0);
- ~KWQPlugin();
+ WKPluginWidget(QWidget *parent=0, const QString &url=0, const QString &serviceType=0, const QStringList &args=0);
+ ~WKPluginWidget();
// member functions --------------------------------------------------------
@@ -59,10 +59,10 @@ public:
// private ---------------------------------------------------------------------
private:
- KWQPlugin(const KWQPlugin &);
- KWQPlugin &operator=(const KWQPlugin &);
+ WKPluginWidget(const WKPluginWidget &);
+ WKPluginWidget &operator=(const WKPluginWidget &);
-}; // class KWQPlugin ============================================================
+}; // class WKPluginWidget ============================================================
#endif
diff --git a/WebCore/src/kwq/KWQPlugin.mm b/WebCore/kwq/WKPluginWidget.mm
similarity index 76%
rename from WebCore/src/kwq/KWQPlugin.mm
rename to WebCore/kwq/WKPluginWidget.mm
index 7144b0f..9b423d2 100644
--- a/WebCore/src/kwq/KWQPlugin.mm
+++ b/WebCore/kwq/WKPluginWidget.mm
@@ -23,15 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQPlugin.h>
+#include <WKPluginWidget.h>
+#include <WKPluginDatabase.h>
#include <KWQView.h>
#include <kwqdebug.h>
-KWQPlugin::KWQPlugin(QWidget *parent, WKPlugin *plugin, const QString &url, const QString &serviceType, const QStringList &args)
+WKPluginWidget::WKPluginWidget(QWidget *parent, const QString &url, const QString &serviceType, const QStringList &args)
{
NSMutableDictionary *arguments;
NSString *arg;
NSRange r1, r2, r3;
+ WKPlugin *plugin;
uint i;
arguments = [NSMutableDictionary dictionaryWithCapacity:10];
@@ -43,11 +45,14 @@ KWQPlugin::KWQPlugin(QWidget *parent, WKPlugin *plugin, const QString &url, cons
r3.length = [arg length] - r2.location - 2; // don't include quotes
[arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
}
-
- setView([[[WKPluginView alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: this plugin: plugin url:QSTRING_TO_NSSTRING(url) mime:QSTRING_TO_NSSTRING(serviceType) arguments:arguments] autorelease]);
+ plugin = [[WKPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
+ if(plugin == nil)
+ return;
+ [plugin load];
+ setView([[[WKPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) widget:this plugin:plugin url:QSTRING_TO_NSSTRING(url) mime:QSTRING_TO_NSSTRING(serviceType) arguments:arguments] autorelease]);
}
-KWQPlugin::~KWQPlugin()
+WKPluginWidget::~WKPluginWidget()
{
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 0847c43..03b98f8 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -52,9 +52,7 @@
#import <WCURICache.h>
#import <WCURICacheData.h>
-#import <WKPluginDatabase.h>
-#include <npapi.h>
-#include <KWQPlugin.h>
+#include <WKPluginWidget.h>
#include <rendering/render_frames.h>
#import <KWQView.h>
@@ -1396,18 +1394,12 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, const QString &serviceType,
const QStringList &args)
{
- WKPlugin *plugin;
- KWQPlugin *pluginWidget;
+ WKPluginWidget *pluginWidget;
if(url.isEmpty() || serviceType.isEmpty()){
return FALSE;
}
- plugin = [[WKPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
- if(plugin == nil){
- return FALSE;
- }
- [plugin load];
- pluginWidget = new KWQPlugin(0, plugin, url, serviceType, args);
+ pluginWidget = new WKPluginWidget(0, url, serviceType, args);
frame->setWidget(pluginWidget);
return TRUE;
}
diff --git a/WebCore/src/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
index 7295e7e..45a1c88 100644
--- a/WebCore/src/kwq/Makefile.am
+++ b/WebCore/src/kwq/Makefile.am
@@ -123,7 +123,7 @@ libkwq_o_SOURCES = \
WKPlugin.mm \
WKPluginView.mm \
WKPluginDatabase.mm \
- KWQPlugin.mm \
+ WKPluginWidget.mm \
npapi.mm \
$(NULL)
diff --git a/WebCore/kwq/KWQPlugin.h b/WebCore/src/kwq/WKPluginWidget.h
similarity index 81%
rename from WebCore/kwq/KWQPlugin.h
rename to WebCore/src/kwq/WKPluginWidget.h
index 12112e0..84aad37 100644
--- a/WebCore/kwq/KWQPlugin.h
+++ b/WebCore/src/kwq/WKPluginWidget.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWQPlugin_H_
-#define KWQPlugin_H_
+#ifndef WKPluginWidget_H_
+#define WKPluginWidget_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -36,9 +36,9 @@
#import <WKPluginView.h>
#import <WKPlugin.h>
-// class KWQPlugin ===============================================================
+// class WKPluginWidget ===============================================================
-class KWQPlugin : public QWidget {
+class WKPluginWidget : public QWidget {
public:
// typedefs ----------------------------------------------------------------
@@ -48,8 +48,8 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KWQPlugin(QWidget *parent=0, WKPlugin *plugin=nil, const QString &url=0, const QString &serviceType=0, const QStringList &args=0);
- ~KWQPlugin();
+ WKPluginWidget(QWidget *parent=0, const QString &url=0, const QString &serviceType=0, const QStringList &args=0);
+ ~WKPluginWidget();
// member functions --------------------------------------------------------
@@ -59,10 +59,10 @@ public:
// private ---------------------------------------------------------------------
private:
- KWQPlugin(const KWQPlugin &);
- KWQPlugin &operator=(const KWQPlugin &);
+ WKPluginWidget(const WKPluginWidget &);
+ WKPluginWidget &operator=(const WKPluginWidget &);
-}; // class KWQPlugin ============================================================
+}; // class WKPluginWidget ============================================================
#endif
diff --git a/WebCore/kwq/KWQPlugin.mm b/WebCore/src/kwq/WKPluginWidget.mm
similarity index 76%
rename from WebCore/kwq/KWQPlugin.mm
rename to WebCore/src/kwq/WKPluginWidget.mm
index 7144b0f..9b423d2 100644
--- a/WebCore/kwq/KWQPlugin.mm
+++ b/WebCore/src/kwq/WKPluginWidget.mm
@@ -23,15 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQPlugin.h>
+#include <WKPluginWidget.h>
+#include <WKPluginDatabase.h>
#include <KWQView.h>
#include <kwqdebug.h>
-KWQPlugin::KWQPlugin(QWidget *parent, WKPlugin *plugin, const QString &url, const QString &serviceType, const QStringList &args)
+WKPluginWidget::WKPluginWidget(QWidget *parent, const QString &url, const QString &serviceType, const QStringList &args)
{
NSMutableDictionary *arguments;
NSString *arg;
NSRange r1, r2, r3;
+ WKPlugin *plugin;
uint i;
arguments = [NSMutableDictionary dictionaryWithCapacity:10];
@@ -43,11 +45,14 @@ KWQPlugin::KWQPlugin(QWidget *parent, WKPlugin *plugin, const QString &url, cons
r3.length = [arg length] - r2.location - 2; // don't include quotes
[arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
}
-
- setView([[[WKPluginView alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: this plugin: plugin url:QSTRING_TO_NSSTRING(url) mime:QSTRING_TO_NSSTRING(serviceType) arguments:arguments] autorelease]);
+ plugin = [[WKPluginDatabase installedPlugins] getPluginForMimeType:QSTRING_TO_NSSTRING(serviceType)];
+ if(plugin == nil)
+ return;
+ [plugin load];
+ setView([[[WKPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) widget:this plugin:plugin url:QSTRING_TO_NSSTRING(url) mime:QSTRING_TO_NSSTRING(serviceType) arguments:arguments] autorelease]);
}
-KWQPlugin::~KWQPlugin()
+WKPluginWidget::~WKPluginWidget()
{
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list