[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:52:22 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit facb77e9eb4fa23b0791b8faa969f93aaa652c67
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 14 20:07:52 2001 +0000

    Making sure that functions are return proper values
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@453 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFrame.mm b/WebCore/kwq/KWQFrame.mm
index 473971d..004eb5a 100644
--- a/WebCore/kwq/KWQFrame.mm
+++ b/WebCore/kwq/KWQFrame.mm
@@ -47,6 +47,7 @@ void QFrame::setFrameStyle(int)
 int QFrame::frameWidth() const
 {
     _logNeverImplemented();
+    return 0;
 }
 
 
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 94129b9..eb41897 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -26,6 +26,11 @@
 #include <kwqdebug.h>
 #include <kconfig.h>
 
+//FIX ME:
+static QString tempQString = QString();
+static QColor tempQColor = QColor(0,0,0);
+static QStringList tempQStringList = QStringList();
+
 KConfigBase::KConfigBase()
 {
     _logNotYetImplemented();
@@ -57,7 +62,7 @@ QString KConfigBase::readEntry(const char *pKey,
     const QString& aDefault=QString::null) const
 {
     _logNotYetImplemented();
-    return QString();
+    return tempQString;
 }
 
 
@@ -88,14 +93,14 @@ bool KConfigBase::readBoolEntry(const char *pKey, bool nDefault=0) const
 QColor KConfigBase::readColorEntry(const char *pKey, const QColor *pDefault=0L) const
 {
     _logNotYetImplemented();
-    return QColor(0,0,0);
+    return tempQColor;
 }
 
 
 QStringList KConfigBase::readListEntry(const QString &pKey, char sep=',') const
 {
     _logNotYetImplemented();
-    return QStringList();
+    return tempQStringList;
 }
 
 
diff --git a/WebCore/kwq/KWQbrowserextension.mm b/WebCore/kwq/KWQbrowserextension.mm
index 8dbddb7..eef36f9 100644
--- a/WebCore/kwq/KWQbrowserextension.mm
+++ b/WebCore/kwq/KWQbrowserextension.mm
@@ -35,10 +35,12 @@ BrowserExtension::~BrowserExtension()
     _logNotYetImplemented();
 }
 
+static BrowserInterface *tempBrowserInterface = 0;
 
 BrowserInterface *BrowserExtension::browserInterface() const
 {
-    _logNotYetImplemented();
+	_logNotYetImplemented();
+    return tempBrowserInterface;
 }
 
 
diff --git a/WebCore/src/kwq/KWQFrame.mm b/WebCore/src/kwq/KWQFrame.mm
index 473971d..004eb5a 100644
--- a/WebCore/src/kwq/KWQFrame.mm
+++ b/WebCore/src/kwq/KWQFrame.mm
@@ -47,6 +47,7 @@ void QFrame::setFrameStyle(int)
 int QFrame::frameWidth() const
 {
     _logNeverImplemented();
+    return 0;
 }
 
 
diff --git a/WebCore/src/kwq/KWQKConfigBase.mm b/WebCore/src/kwq/KWQKConfigBase.mm
index 94129b9..eb41897 100644
--- a/WebCore/src/kwq/KWQKConfigBase.mm
+++ b/WebCore/src/kwq/KWQKConfigBase.mm
@@ -26,6 +26,11 @@
 #include <kwqdebug.h>
 #include <kconfig.h>
 
+//FIX ME:
+static QString tempQString = QString();
+static QColor tempQColor = QColor(0,0,0);
+static QStringList tempQStringList = QStringList();
+
 KConfigBase::KConfigBase()
 {
     _logNotYetImplemented();
@@ -57,7 +62,7 @@ QString KConfigBase::readEntry(const char *pKey,
     const QString& aDefault=QString::null) const
 {
     _logNotYetImplemented();
-    return QString();
+    return tempQString;
 }
 
 
@@ -88,14 +93,14 @@ bool KConfigBase::readBoolEntry(const char *pKey, bool nDefault=0) const
 QColor KConfigBase::readColorEntry(const char *pKey, const QColor *pDefault=0L) const
 {
     _logNotYetImplemented();
-    return QColor(0,0,0);
+    return tempQColor;
 }
 
 
 QStringList KConfigBase::readListEntry(const QString &pKey, char sep=',') const
 {
     _logNotYetImplemented();
-    return QStringList();
+    return tempQStringList;
 }
 
 
diff --git a/WebCore/src/kwq/KWQbrowserextension.mm b/WebCore/src/kwq/KWQbrowserextension.mm
index 8dbddb7..eef36f9 100644
--- a/WebCore/src/kwq/KWQbrowserextension.mm
+++ b/WebCore/src/kwq/KWQbrowserextension.mm
@@ -35,10 +35,12 @@ BrowserExtension::~BrowserExtension()
     _logNotYetImplemented();
 }
 
+static BrowserInterface *tempBrowserInterface = 0;
 
 BrowserInterface *BrowserExtension::browserInterface() const
 {
-    _logNotYetImplemented();
+	_logNotYetImplemented();
+    return tempBrowserInterface;
 }
 
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list