[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:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 56787754158cfdf655c5ed3d22130bb4d1654367
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 14 23:51:38 2001 +0000
Making sure that functions return proper values
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@454 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKIONetAccess.mm b/WebCore/kwq/KWQKIONetAccess.mm
index d37bebb..dae2840 100644
--- a/WebCore/kwq/KWQKIONetAccess.mm
+++ b/WebCore/kwq/KWQKIONetAccess.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <netaccess.h>
+//FIX ME:
+static QString tempQString = QString();
+
namespace KIO {
bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
@@ -38,7 +41,7 @@ bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
QString NetAccess::lastErrorString()
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
diff --git a/WebCore/kwq/KWQKJavaEmbed.mm b/WebCore/kwq/KWQKJavaEmbed.mm
index a944955..d2febbd 100644
--- a/WebCore/kwq/KWQKJavaEmbed.mm
+++ b/WebCore/kwq/KWQKJavaEmbed.mm
@@ -27,6 +27,9 @@ to work better with java applets.
#include <kwqdebug.h>
#include <javaembed.h>
+//FIX ME:
+static QSize tempQSize = QSize(0,0);
+
KJavaEmbed::KJavaEmbed( QWidget *parent=0, const char *name=0, WFlags f = 0 )
{
_logNotYetImplemented();
@@ -48,14 +51,14 @@ void KJavaEmbed::embed( WId w )
QSize KJavaEmbed::sizeHint() const
{
_logNotYetImplemented();
- return QSize();
+ return tempQSize;
}
QSize KJavaEmbed::minimumSizeHint() const
{
_logNotYetImplemented();
- return QSize();
+ return tempQSize;
}
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index fc3ec6c..fa40785 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -26,6 +26,9 @@
#include <qstring.h>
#include <klocale.h>
+//FIX ME:
+static QString tempQString = QString("en_US");
+
QString i18n(const char* text)
{
NSBundle *wkBundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
@@ -37,6 +40,6 @@ QString i18n(const char* text)
QString KLocale::language() const
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
diff --git a/WebCore/kwq/KWQKMessageBox.mm b/WebCore/kwq/KWQKMessageBox.mm
index 854a73b..957610c 100644
--- a/WebCore/kwq/KWQKMessageBox.mm
+++ b/WebCore/kwq/KWQKMessageBox.mm
@@ -37,6 +37,7 @@ int KMessageBox::warningYesNo(QWidget *, const QString &,
const QString &buttonNo=QString::null,
bool notify=true)
{
+return 0;
}
@@ -45,6 +46,7 @@ int KMessageBox::questionYesNo(QWidget *, const QString &,
const QString &buttonYes=QString::null,
const QString &buttonNo=QString::null, bool notify=true)
{
+return 0;
}
diff --git a/WebCore/kwq/KWQKMimeType.mm b/WebCore/kwq/KWQKMimeType.mm
index 4410afc..4d33989 100644
--- a/WebCore/kwq/KWQKMimeType.mm
+++ b/WebCore/kwq/KWQKMimeType.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <kmimetype.h>
+//FIX ME:
+static QString tempQString = QString();
+
KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t=0, bool=false, bool)
{
_logNotYetImplemented();
@@ -41,5 +44,5 @@ KMimeType::~KMimeType()
QString KMimeType::name() const
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
diff --git a/WebCore/kwq/KWQKPrinter.mm b/WebCore/kwq/KWQKPrinter.mm
index b3ec1a6..b7d78fd 100644
--- a/WebCore/kwq/KWQKPrinter.mm
+++ b/WebCore/kwq/KWQKPrinter.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <kprinter.h>
+//FIX ME:
+static QSize tempQSize = QSize(0,0);
+
bool KPrinter::setup(QWidget *parent=0)
{
_logNeverImplemented();
@@ -61,7 +64,7 @@ void KPrinter::setFullPage(bool)
QSize KPrinter::margins() const
{
_logNeverImplemented();
- return QSize();
+ return tempQSize;
}
diff --git a/WebCore/kwq/KWQKProtocolManager.mm b/WebCore/kwq/KWQKProtocolManager.mm
index 278d99f..612b383 100644
--- a/WebCore/kwq/KWQKProtocolManager.mm
+++ b/WebCore/kwq/KWQKProtocolManager.mm
@@ -29,6 +29,8 @@
#include <kprotocolmanager.h>
+//FIX ME:
+static QString tempQString = QString();
bool KProtocolManager::useProxy()
{
@@ -39,7 +41,7 @@ bool KProtocolManager::useProxy()
QString KProtocolManager::httpProxy()
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
QString KProtocolManager::userAgentForHost( const QString& )
diff --git a/WebCore/kwq/KWQKWinModule.mm b/WebCore/kwq/KWQKWinModule.mm
index e1af293..968edd2 100644
--- a/WebCore/kwq/KWQKWinModule.mm
+++ b/WebCore/kwq/KWQKWinModule.mm
@@ -26,6 +26,8 @@
#include <kwqdebug.h>
#include <kwinmodule.h>
+//FIX ME:
+static QRect tempQRect = QRect(0,0,0,0);
KWinModule::KWinModule(QObject* parent=0)
{
@@ -42,7 +44,7 @@ KWinModule::~KWinModule()
QRect KWinModule::workArea(int desktop=-1) const
{
_logNotYetImplemented();
- return QRect();
+ return tempQRect;
}
diff --git a/WebCore/kwq/KWQKnetaccess.mm b/WebCore/kwq/KWQKnetaccess.mm
index d37bebb..dae2840 100644
--- a/WebCore/kwq/KWQKnetaccess.mm
+++ b/WebCore/kwq/KWQKnetaccess.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <netaccess.h>
+//FIX ME:
+static QString tempQString = QString();
+
namespace KIO {
bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
@@ -38,7 +41,7 @@ bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
QString NetAccess::lastErrorString()
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
diff --git a/WebCore/src/kwq/KWQKJavaEmbed.mm b/WebCore/src/kwq/KWQKJavaEmbed.mm
index a944955..d2febbd 100644
--- a/WebCore/src/kwq/KWQKJavaEmbed.mm
+++ b/WebCore/src/kwq/KWQKJavaEmbed.mm
@@ -27,6 +27,9 @@ to work better with java applets.
#include <kwqdebug.h>
#include <javaembed.h>
+//FIX ME:
+static QSize tempQSize = QSize(0,0);
+
KJavaEmbed::KJavaEmbed( QWidget *parent=0, const char *name=0, WFlags f = 0 )
{
_logNotYetImplemented();
@@ -48,14 +51,14 @@ void KJavaEmbed::embed( WId w )
QSize KJavaEmbed::sizeHint() const
{
_logNotYetImplemented();
- return QSize();
+ return tempQSize;
}
QSize KJavaEmbed::minimumSizeHint() const
{
_logNotYetImplemented();
- return QSize();
+ return tempQSize;
}
diff --git a/WebCore/src/kwq/KWQKLocale.mm b/WebCore/src/kwq/KWQKLocale.mm
index fc3ec6c..fa40785 100644
--- a/WebCore/src/kwq/KWQKLocale.mm
+++ b/WebCore/src/kwq/KWQKLocale.mm
@@ -26,6 +26,9 @@
#include <qstring.h>
#include <klocale.h>
+//FIX ME:
+static QString tempQString = QString("en_US");
+
QString i18n(const char* text)
{
NSBundle *wkBundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
@@ -37,6 +40,6 @@ QString i18n(const char* text)
QString KLocale::language() const
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
diff --git a/WebCore/src/kwq/KWQKMessageBox.mm b/WebCore/src/kwq/KWQKMessageBox.mm
index 854a73b..957610c 100644
--- a/WebCore/src/kwq/KWQKMessageBox.mm
+++ b/WebCore/src/kwq/KWQKMessageBox.mm
@@ -37,6 +37,7 @@ int KMessageBox::warningYesNo(QWidget *, const QString &,
const QString &buttonNo=QString::null,
bool notify=true)
{
+return 0;
}
@@ -45,6 +46,7 @@ int KMessageBox::questionYesNo(QWidget *, const QString &,
const QString &buttonYes=QString::null,
const QString &buttonNo=QString::null, bool notify=true)
{
+return 0;
}
diff --git a/WebCore/src/kwq/KWQKMimeType.mm b/WebCore/src/kwq/KWQKMimeType.mm
index 4410afc..4d33989 100644
--- a/WebCore/src/kwq/KWQKMimeType.mm
+++ b/WebCore/src/kwq/KWQKMimeType.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <kmimetype.h>
+//FIX ME:
+static QString tempQString = QString();
+
KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t=0, bool=false, bool)
{
_logNotYetImplemented();
@@ -41,5 +44,5 @@ KMimeType::~KMimeType()
QString KMimeType::name() const
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
diff --git a/WebCore/src/kwq/KWQKPrinter.mm b/WebCore/src/kwq/KWQKPrinter.mm
index b3ec1a6..b7d78fd 100644
--- a/WebCore/src/kwq/KWQKPrinter.mm
+++ b/WebCore/src/kwq/KWQKPrinter.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <kprinter.h>
+//FIX ME:
+static QSize tempQSize = QSize(0,0);
+
bool KPrinter::setup(QWidget *parent=0)
{
_logNeverImplemented();
@@ -61,7 +64,7 @@ void KPrinter::setFullPage(bool)
QSize KPrinter::margins() const
{
_logNeverImplemented();
- return QSize();
+ return tempQSize;
}
diff --git a/WebCore/src/kwq/KWQKProtocolManager.mm b/WebCore/src/kwq/KWQKProtocolManager.mm
index 278d99f..612b383 100644
--- a/WebCore/src/kwq/KWQKProtocolManager.mm
+++ b/WebCore/src/kwq/KWQKProtocolManager.mm
@@ -29,6 +29,8 @@
#include <kprotocolmanager.h>
+//FIX ME:
+static QString tempQString = QString();
bool KProtocolManager::useProxy()
{
@@ -39,7 +41,7 @@ bool KProtocolManager::useProxy()
QString KProtocolManager::httpProxy()
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
QString KProtocolManager::userAgentForHost( const QString& )
diff --git a/WebCore/src/kwq/KWQKWinModule.mm b/WebCore/src/kwq/KWQKWinModule.mm
index e1af293..968edd2 100644
--- a/WebCore/src/kwq/KWQKWinModule.mm
+++ b/WebCore/src/kwq/KWQKWinModule.mm
@@ -26,6 +26,8 @@
#include <kwqdebug.h>
#include <kwinmodule.h>
+//FIX ME:
+static QRect tempQRect = QRect(0,0,0,0);
KWinModule::KWinModule(QObject* parent=0)
{
@@ -42,7 +44,7 @@ KWinModule::~KWinModule()
QRect KWinModule::workArea(int desktop=-1) const
{
_logNotYetImplemented();
- return QRect();
+ return tempQRect;
}
diff --git a/WebCore/src/kwq/KWQKnetaccess.mm b/WebCore/src/kwq/KWQKnetaccess.mm
index d37bebb..dae2840 100644
--- a/WebCore/src/kwq/KWQKnetaccess.mm
+++ b/WebCore/src/kwq/KWQKnetaccess.mm
@@ -26,6 +26,9 @@
#include <kwqdebug.h>
#include <netaccess.h>
+//FIX ME:
+static QString tempQString = QString();
+
namespace KIO {
bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
@@ -38,7 +41,7 @@ bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
QString NetAccess::lastErrorString()
{
_logNotYetImplemented();
- return QString();
+ return tempQString;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list