[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:52:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 51246c2bcc813cc300715e1db31d64019373ce68
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 12 22:05:04 2001 +0000
Some more small cleanups that should improve stability.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 8f51ddc..126f88f 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -216,7 +216,7 @@ bool KHTMLPart::openURL( const KURL &url )
cache = WCGetDefaultURICache();
nsurl = [NSString stringWithCString:url.url().latin1()];
- id jobID = [cache requestWithString:nsurl requestor:d->m_recv userData:nil];
+ [cache requestWithString:nsurl requestor:d->m_recv userData:nil];
return true;
}
@@ -286,6 +286,8 @@ QVariant KHTMLPart::executeScript( const QString &script )
// passed to the interpreter.
QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
{
+ return QVariant();
+#if 0
KJSProxy *proxy = jScript();
if (!proxy) {
@@ -307,6 +309,7 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
//kdDebug(6050) << "KHTMLPart::executeScript - done" << endl;
return ret;
+#endif
}
void KHTMLPart::setJavaEnabled( bool enable )
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 8f51ddc..126f88f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -216,7 +216,7 @@ bool KHTMLPart::openURL( const KURL &url )
cache = WCGetDefaultURICache();
nsurl = [NSString stringWithCString:url.url().latin1()];
- id jobID = [cache requestWithString:nsurl requestor:d->m_recv userData:nil];
+ [cache requestWithString:nsurl requestor:d->m_recv userData:nil];
return true;
}
@@ -286,6 +286,8 @@ QVariant KHTMLPart::executeScript( const QString &script )
// passed to the interpreter.
QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
{
+ return QVariant();
+#if 0
KJSProxy *proxy = jScript();
if (!proxy) {
@@ -307,6 +309,7 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
//kdDebug(6050) << "KHTMLPart::executeScript - done" << endl;
return ret;
+#endif
}
void KHTMLPart::setJavaEnabled( bool enable )
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index b0f1d01..87ad966 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -87,7 +87,7 @@ QString KHTMLSettings::fantasyFontName() const
QString KHTMLSettings::settingsToCSS() const
{
_logNotYetImplemented();
- return "";
+ return QString();
}
QFont::CharSet KHTMLSettings::charset() const
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 7dc6a5d..260cf71 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -458,7 +458,7 @@ QWidget *QWidget::focusWidget() const
}
-QPoint QWidget::mapFromGlobal(const QPoint &) const
+QPoint QWidget::mapFromGlobal(const QPoint &point) const
{
_logNeverImplemented();
return QPoint(0,0);
diff --git a/WebCore/kwq/KWQasyncimageio.mm b/WebCore/kwq/KWQasyncimageio.mm
index bd94f69..8f844da 100644
--- a/WebCore/kwq/KWQasyncimageio.mm
+++ b/WebCore/kwq/KWQasyncimageio.mm
@@ -26,12 +26,15 @@
#include <kwqdebug.h>
#include <qasyncimageio.h>
+// FIXME
+static const char *BOGUS_FORMAT_NAME = "";
+
// class QImageConsumer ========================================================
const char *QImageConsumer::formatName(const uchar* buffer, int length)
{
_logNotYetImplemented();
- return "";
+ return BOGUS_FORMAT_NAME;
}
@@ -40,7 +43,7 @@ const char *QImageConsumer::formatName(const uchar* buffer, int length)
const char *QImageDecoder::formatName(const uchar* buffer, int length)
{
_logNotYetImplemented();
- return "";
+ return BOGUS_FORMAT_NAME;
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 8f51ddc..126f88f 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -216,7 +216,7 @@ bool KHTMLPart::openURL( const KURL &url )
cache = WCGetDefaultURICache();
nsurl = [NSString stringWithCString:url.url().latin1()];
- id jobID = [cache requestWithString:nsurl requestor:d->m_recv userData:nil];
+ [cache requestWithString:nsurl requestor:d->m_recv userData:nil];
return true;
}
@@ -286,6 +286,8 @@ QVariant KHTMLPart::executeScript( const QString &script )
// passed to the interpreter.
QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
{
+ return QVariant();
+#if 0
KJSProxy *proxy = jScript();
if (!proxy) {
@@ -307,6 +309,7 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
//kdDebug(6050) << "KHTMLPart::executeScript - done" << endl;
return ret;
+#endif
}
void KHTMLPart::setJavaEnabled( bool enable )
diff --git a/WebCore/src/kwq/KWQKHTMLSettings.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
index b0f1d01..87ad966 100644
--- a/WebCore/src/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -87,7 +87,7 @@ QString KHTMLSettings::fantasyFontName() const
QString KHTMLSettings::settingsToCSS() const
{
_logNotYetImplemented();
- return "";
+ return QString();
}
QFont::CharSet KHTMLSettings::charset() const
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index 7dc6a5d..260cf71 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -458,7 +458,7 @@ QWidget *QWidget::focusWidget() const
}
-QPoint QWidget::mapFromGlobal(const QPoint &) const
+QPoint QWidget::mapFromGlobal(const QPoint &point) const
{
_logNeverImplemented();
return QPoint(0,0);
diff --git a/WebCore/src/kwq/KWQasyncimageio.mm b/WebCore/src/kwq/KWQasyncimageio.mm
index bd94f69..8f844da 100644
--- a/WebCore/src/kwq/KWQasyncimageio.mm
+++ b/WebCore/src/kwq/KWQasyncimageio.mm
@@ -26,12 +26,15 @@
#include <kwqdebug.h>
#include <qasyncimageio.h>
+// FIXME
+static const char *BOGUS_FORMAT_NAME = "";
+
// class QImageConsumer ========================================================
const char *QImageConsumer::formatName(const uchar* buffer, int length)
{
_logNotYetImplemented();
- return "";
+ return BOGUS_FORMAT_NAME;
}
@@ -40,7 +43,7 @@ const char *QImageConsumer::formatName(const uchar* buffer, int length)
const char *QImageDecoder::formatName(const uchar* buffer, int length)
{
_logNotYetImplemented();
- return "";
+ return BOGUS_FORMAT_NAME;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list