[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:17:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit acfacb20e9e0a1203a4b61505e5765e5652d5442
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jun 7 22:42:58 2002 +0000
* Makefile.am: I was running into failures in the embed rule, so I made it
always remove the framework before copying the new one in. This is better
for cases where a header was removed, too, so maybe we should do this in
the other directories.
* kwq/KWQDrawUtil.mm:
* kwq/KWQKComboBox.mm:
* kwq/KWQKConfigBase.mm:
* kwq/KWQKDebug.mm:
* kwq/KWQKMessageBox.mm:
* kwq/KWQKMimeType.mm:
* kwq/KWQKPrinter.mm:
* kwq/KWQKURL.mm:
* kwq/KWQMapImpl.mm:
* kwq/KWQObject.mm:
* kwq/KWQRegExp.mm:
* kwq/KWQRegion.mm:
* kwq/KWQScrollView.mm:
* kwq/KWQStringList.mm:
Remove repeated default values for parameters -- the new compiler
won't allow these and they are illegal C++.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1299 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c75cf9d..11edddd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,29 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: I was running into failures in the embed rule, so I made it
+ always remove the framework before copying the new one in. This is better
+ for cases where a header was removed, too, so maybe we should do this in
+ the other directories.
+
+ * kwq/KWQDrawUtil.mm:
+ * kwq/KWQKComboBox.mm:
+ * kwq/KWQKConfigBase.mm:
+ * kwq/KWQKDebug.mm:
+ * kwq/KWQKMessageBox.mm:
+ * kwq/KWQKMimeType.mm:
+ * kwq/KWQKPrinter.mm:
+ * kwq/KWQKURL.mm:
+ * kwq/KWQMapImpl.mm:
+ * kwq/KWQObject.mm:
+ * kwq/KWQRegExp.mm:
+ * kwq/KWQRegion.mm:
+ * kwq/KWQScrollView.mm:
+ * kwq/KWQStringList.mm:
+ Remove repeated default values for parameters -- the new compiler
+ won't allow these and they are illegal C++.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
is picky about the difference between struct and typedef.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c75cf9d..11edddd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,29 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: I was running into failures in the embed rule, so I made it
+ always remove the framework before copying the new one in. This is better
+ for cases where a header was removed, too, so maybe we should do this in
+ the other directories.
+
+ * kwq/KWQDrawUtil.mm:
+ * kwq/KWQKComboBox.mm:
+ * kwq/KWQKConfigBase.mm:
+ * kwq/KWQKDebug.mm:
+ * kwq/KWQKMessageBox.mm:
+ * kwq/KWQKMimeType.mm:
+ * kwq/KWQKPrinter.mm:
+ * kwq/KWQKURL.mm:
+ * kwq/KWQMapImpl.mm:
+ * kwq/KWQObject.mm:
+ * kwq/KWQRegExp.mm:
+ * kwq/KWQRegion.mm:
+ * kwq/KWQScrollView.mm:
+ * kwq/KWQStringList.mm:
+ Remove repeated default values for parameters -- the new compiler
+ won't allow these and they are illegal C++.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
is picky about the difference between struct and typedef.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c75cf9d..11edddd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,29 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: I was running into failures in the embed rule, so I made it
+ always remove the framework before copying the new one in. This is better
+ for cases where a header was removed, too, so maybe we should do this in
+ the other directories.
+
+ * kwq/KWQDrawUtil.mm:
+ * kwq/KWQKComboBox.mm:
+ * kwq/KWQKConfigBase.mm:
+ * kwq/KWQKDebug.mm:
+ * kwq/KWQKMessageBox.mm:
+ * kwq/KWQKMimeType.mm:
+ * kwq/KWQKPrinter.mm:
+ * kwq/KWQKURL.mm:
+ * kwq/KWQMapImpl.mm:
+ * kwq/KWQObject.mm:
+ * kwq/KWQRegExp.mm:
+ * kwq/KWQRegion.mm:
+ * kwq/KWQScrollView.mm:
+ * kwq/KWQStringList.mm:
+ Remove repeated default values for parameters -- the new compiler
+ won't allow these and they are illegal C++.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* kwq/KWQPtrDictImpl.h: Use CoreFoundation.h -- new compiler
is picky about the difference between struct and typedef.
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index 5728356..e68ba2d 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -45,10 +45,10 @@ FRAMEWORK_VERSION = A
FRAMEWORK_RESOURCES = Resources/Info.plist Resources/linkCursor.tiff
FRAMEWORK_LOCALIZED_RESOURCES = English.lproj/InfoPlist.strings
-
-FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_NAME).framework
+FRAMEWORK_DIR_NAME = $(FRAMEWORK_NAME).framework
+FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_DIR_NAME)
FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
-FRAMEWORK_LINKFLAGS = $(libwebcore_dylib_LIBADD) -install_name @executable_path/../Frameworks/$(FRAMEWORK_NAME).framework/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
+FRAMEWORK_LINKFLAGS = $(libwebcore_dylib_LIBADD) -install_name @executable_path/../Frameworks/$(FRAMEWORK_DIR_NAME)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
FRAMEWORK_RESOURCE_DIR = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/Resources
FRAMEWORK_LOCALIZED_RESOURCE_DIR = $(FRAMEWORK_RESOURCE_DIR)/English.lproj
@@ -107,8 +107,9 @@ embed:
if [ ! -d "$(EMBED_DIR)" ]; then \
mkdir -p "$(EMBED_DIR)"; \
fi; \
- echo "embedding $(FRAMEWORK_NAME) into $(EMBED_HOST)..."; \
- cp -rf $(FRAMEWORK_DIR) $(EMBED_DIR); \
+ echo "embedding $(FRAMEWORK_NAME) into $(EMBED_HOST)..." && \
+ rm -Rf $(EMBED_DIR)/$(FRAMEWORK_DIR_NAME) && \
+ cp -R $(FRAMEWORK_DIR) $(EMBED_DIR); \
else \
echo "$(EMBED_HOST) not found. Not embedding framework"; \
fi; \
diff --git a/WebCore/kwq/KWQDrawUtil.mm b/WebCore/kwq/KWQDrawUtil.mm
index 47d8c59..57d458c 100644
--- a/WebCore/kwq/KWQDrawUtil.mm
+++ b/WebCore/kwq/KWQDrawUtil.mm
@@ -27,7 +27,7 @@
#include <qdrawutil.h>
void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, const QColorGroup &g, bool
- sunken = FALSE, int lineWidth, const QBrush *fill)
+ sunken, int lineWidth, const QBrush *fill)
{
if ( w == 0 || h == 0 ) {
return;
diff --git a/WebCore/kwq/KWQKComboBox.mm b/WebCore/kwq/KWQKComboBox.mm
index 49608d9..f4d1082 100644
--- a/WebCore/kwq/KWQKComboBox.mm
+++ b/WebCore/kwq/KWQKComboBox.mm
@@ -27,13 +27,13 @@
#include <KWQView.h>
-KComboBox::KComboBox(QWidget *parent=0, const char *name=0)
+KComboBox::KComboBox(QWidget *parent, const char *name)
{
_logNotYetImplemented();
}
-KComboBox::KComboBox(bool rw, QWidget *parent=0, const char *name=0)
+KComboBox::KComboBox(bool rw, QWidget *parent, const char *name)
{
_logNotYetImplemented();
}
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 0e9339f..2b86fa2 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -59,13 +59,12 @@ void KConfig::setGroup(const QString &pGroup)
}
void KConfig::writeEntry(const QString &pKey, const QStringList &rValue,
- char sep=',', bool bPersistent=true, bool bGlobal=false,
- bool bNLS=false)
+ char sep, bool bPersistent, bool bGlobal, bool bNLS)
{
_logNotYetImplemented();
}
-QString KConfig::readEntry(const char *pKey, const QString& aDefault=QString::null) const
+QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
{
if (impl->isPluginInfo) {
id <WebCorePluginInfo> plugin;
diff --git a/WebCore/kwq/KWQKDebug.mm b/WebCore/kwq/KWQKDebug.mm
index fedb378..c2017f5 100644
--- a/WebCore/kwq/KWQKDebug.mm
+++ b/WebCore/kwq/KWQKDebug.mm
@@ -26,7 +26,7 @@
#include <kdebug.h>
-kdbgstream::kdbgstream(unsigned int area, unsigned int level, bool print=true)
+kdbgstream::kdbgstream(unsigned int area, unsigned int level, bool print)
{
}
@@ -69,43 +69,43 @@ kdbgstream &kdbgstream::operator<<(KDBGFUNC)
-kdbgstream kdDebug(int area = 0)
+kdbgstream kdDebug(int area)
{
return kdbgstream(0,0);
}
-kdbgstream kdWarning(int area = 0)
+kdbgstream kdWarning(int area)
{
return kdbgstream(0,0);
}
-kdbgstream kdWarning(bool cond, int area = 0)
+kdbgstream kdWarning(bool cond, int area)
{
return kdbgstream(0,0);
}
-kdbgstream kdError(int area = 0)
+kdbgstream kdError(int area)
{
return kdbgstream(0,0);
}
-kdbgstream kdError(bool cond, int area = 0)
+kdbgstream kdError(bool cond, int area)
{
return kdbgstream(0,0);
}
-kdbgstream kdFatal(int area = 0)
+kdbgstream kdFatal(int area)
{
return kdbgstream(0,0);
}
-kdbgstream kdFatal(bool cond, int area = 0)
+kdbgstream kdFatal(bool cond, int area)
{
return kdbgstream(0,0);
}
diff --git a/WebCore/kwq/KWQKMessageBox.mm b/WebCore/kwq/KWQKMessageBox.mm
index b18f258..d802381 100644
--- a/WebCore/kwq/KWQKMessageBox.mm
+++ b/WebCore/kwq/KWQKMessageBox.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -22,12 +22,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Cocoa/Cocoa.h>
-#include <kmessagebox.h>
+#import <kmessagebox.h>
+#import <Cocoa/Cocoa.h>
void KMessageBox::error(QWidget *, const QString &message,
- const QString &caption=QString::null, bool notify=true)
+ const QString &caption, bool notify)
{
if (caption.isNull())
NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), nil, nil, nil);
@@ -37,10 +37,10 @@ void KMessageBox::error(QWidget *, const QString &message,
int KMessageBox::warningYesNo(QWidget *, const QString &message,
- const QString &caption=QString::null,
- const QString &buttonYes=QString::null,
- const QString &buttonNo=QString::null,
- bool notify=true)
+ const QString &caption,
+ const QString &buttonYes,
+ const QString &buttonNo,
+ bool notify)
{
NSString *yes = buttonYes.isNull() ? nil : @"OK";
NSString *no = buttonNo.isNull() ? nil : @"Cancel";
@@ -58,9 +58,9 @@ int KMessageBox::warningYesNo(QWidget *, const QString &message,
int KMessageBox::questionYesNo(QWidget *, const QString &message,
- const QString &caption=QString::null,
- const QString &buttonYes=QString::null,
- const QString &buttonNo=QString::null, bool notify=true)
+ const QString &caption,
+ const QString &buttonYes,
+ const QString &buttonNo, bool notify)
{
NSString *yes = buttonYes.isNull() ? nil : @"OK";
NSString *no = buttonNo.isNull() ? nil : @"Cancel";
@@ -78,7 +78,7 @@ int KMessageBox::questionYesNo(QWidget *, const QString &message,
void KMessageBox::sorry(QWidget *, const QString &message,
- const QString &caption=QString::null, bool notify=true)
+ const QString &caption, bool notify)
{
if (caption.isNull())
NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), nil, nil, nil);
diff --git a/WebCore/kwq/KWQKMimeType.mm b/WebCore/kwq/KWQKMimeType.mm
index 1345dc9..1ace780 100644
--- a/WebCore/kwq/KWQKMimeType.mm
+++ b/WebCore/kwq/KWQKMimeType.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,20 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
#include <kmimetype.h>
+#include <kwqdebug.h>
-//FIX ME:
-static QString *tempQString = NULL;
-static KMimeType::Ptr *tempPtr = NULL;
-
-KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t=0, bool=false, bool)
+KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t, bool, bool)
{
_logNotYetImplemented();
- if (tempPtr == NULL) {
- tempPtr = new KMimeType::Ptr();
- }
- return *tempPtr;
+ return KMimeType::Ptr();
}
@@ -49,19 +42,13 @@ KMimeType::~KMimeType()
QString KMimeType::name() const
{
_logNotYetImplemented();
- if (tempQString == NULL) {
- tempQString = new QString();
- }
- return *tempQString;
+ return QString();
}
QString KMimeType::comment() const
{
_logNotYetImplemented();
- if (tempQString == NULL) {
- tempQString = new QString();
- }
- return *tempQString;
+ return QString();
}
@@ -75,9 +62,6 @@ KMimeType::Ptr KMimeType::mimeType(QString serviceType)
QString KMimeType::defaultMimeType()
{
_logNotYetImplemented();
- if (tempQString == NULL) {
- tempQString = new QString();
- }
- return *tempQString;
+ return QString();
}
diff --git a/WebCore/kwq/KWQKPrinter.mm b/WebCore/kwq/KWQKPrinter.mm
index f29f11a..b5f54fd 100644
--- a/WebCore/kwq/KWQKPrinter.mm
+++ b/WebCore/kwq/KWQKPrinter.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,18 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
#include <kprinter.h>
-
-//FIX ME:
-static QSize *tempQSize = NULL;
+#include <kwqdebug.h>
KPrinter::KPrinter(QPrinter::PrinterMode)
{
_logNeverImplemented();
}
-bool KPrinter::setup(QWidget *parent=0)
+bool KPrinter::setup(QWidget *parent)
{
_logNeverImplemented();
return FALSE;
@@ -69,11 +66,7 @@ void KPrinter::setFullPage(bool)
QSize KPrinter::margins() const
{
_logNeverImplemented();
- if (tempQSize == NULL) {
- tempQSize = new QSize(0,0);
- }
-
- return *tempQSize;
+ return QSize(0,0);
}
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index e78150a..4e60439 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -497,13 +497,13 @@ KURL::KURL() :
{
}
-KURL::KURL(const char *url, int encoding_hint=0) :
+KURL::KURL(const char *url, int encoding_hint) :
d(NULL),
urlString(normalizeURLString(url))
{
}
-KURL::KURL(const QString &url, int encoding_hint=0) :
+KURL::KURL(const QString &url, int encoding_hint) :
d(NULL),
urlString(normalizeURLString(url))
{
@@ -624,7 +624,7 @@ void KURL::setRef(const QString &s)
assemble();
}
-void KURL::setQuery(const QString &query, int encoding_hint=0)
+void KURL::setQuery(const QString &query, int encoding_hint)
{
copyOnWrite();
if (query.isEmpty() || query[0] == '?') {
@@ -643,7 +643,7 @@ void KURL::setPath(const QString &s)
assemble();
}
-QString KURL::prettyURL(int trailing=0) const
+QString KURL::prettyURL(int trailing) const
{
parse();
if (d->urlRef == NULL) {
diff --git a/WebCore/kwq/KWQMapImpl.mm b/WebCore/kwq/KWQMapImpl.mm
index 6be3f7b..8f8a2f1 100644
--- a/WebCore/kwq/KWQMapImpl.mm
+++ b/WebCore/kwq/KWQMapImpl.mm
@@ -476,7 +476,7 @@ KWQMapNodeImpl *KWQMapImpl::insertInternal(KWQMapNodeImpl *nodeToInsert, bool re
return node;
}
-void KWQMapImpl::removeEqualInternal(KWQMapNodeImpl *nodeToDelete, bool samePointer = false)
+void KWQMapImpl::removeEqualInternal(KWQMapNodeImpl *nodeToDelete, bool samePointer)
{
KWQMapNodeImpl *nodeStack[MAX_STACK];
bool wentLeftStack[MAX_STACK];
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 9d0ab80..5c78c7b 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -68,7 +68,7 @@ void QObject::setTarget (QObject *t)
target = t;
}
-QObject::QObject(QObject *parent=0, const char *name=0)
+QObject::QObject(QObject *parent, const char *name)
{
guardedPtrDummyList.append(this);
}
diff --git a/WebCore/kwq/KWQRegExp.mm b/WebCore/kwq/KWQRegExp.mm
index 5ab1701..d7f0f3b 100644
--- a/WebCore/kwq/KWQRegExp.mm
+++ b/WebCore/kwq/KWQRegExp.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,8 +26,6 @@
#include <qregexp.h>
-#ifndef USING_BORROWED_QREGEXP
-
#include <sys/types.h>
#include <regex.h>
@@ -47,7 +45,7 @@ public:
uint refCount;
};
-QRegExp::KWQRegExpPrivate::KWQRegExpPrivate() : pattern(QString("")), refCount(0)
+QRegExp::KWQRegExpPrivate::KWQRegExpPrivate() : pattern(""), refCount(0)
{
compile(true, false);
}
@@ -138,7 +136,7 @@ QString QRegExp::pattern() const
return d->pattern;
}
-int QRegExp::match(const QString &str, int startFrom = 0, int *matchLength = 0, bool treatStartAsStartOfInput = TRUE) const
+int QRegExp::match(const QString &str, int startFrom, int *matchLength, bool treatStartAsStartOfInput) const
{
const char *cstring = str.latin1() + startFrom;
@@ -160,6 +158,3 @@ int QRegExp::match(const QString &str, int startFrom = 0, int *matchLength = 0,
return startFrom + match[0].rm_so;
}
}
-
-
-#endif
diff --git a/WebCore/kwq/KWQRegion.mm b/WebCore/kwq/KWQRegion.mm
index 8be5109..2c68920 100644
--- a/WebCore/kwq/KWQRegion.mm
+++ b/WebCore/kwq/KWQRegion.mm
@@ -37,7 +37,7 @@ QRegion::QRegion(const QRect &rect)
{
}
-QRegion::QRegion(int x, int y, int w, int h, RegionType t=Rectangle)
+QRegion::QRegion(int x, int y, int w, int h, RegionType t)
{
NSRect rect;
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index bcf0f42..2a30fa7 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -200,7 +200,7 @@ void QScrollView::updateContents(const QRect &rect)
}
-void QScrollView::repaintContents(int x, int y, int w, int h, bool erase=TRUE)
+void QScrollView::repaintContents(int x, int y, int w, int h, bool erase)
{
KWQDEBUGLEVEL (KWQ_LOG_FRAMES, "%p %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
diff --git a/WebCore/kwq/KWQStringList.mm b/WebCore/kwq/KWQStringList.mm
index 2d0115c..6e395a3 100644
--- a/WebCore/kwq/KWQStringList.mm
+++ b/WebCore/kwq/KWQStringList.mm
@@ -37,8 +37,7 @@ static CFStringRef GetCFString(const QString &s)
return cfs;
}
-QStringList QStringList::split(const QString &separator, const QString &s,
- bool allowEmptyEntries = FALSE )
+QStringList QStringList::split(const QString &separator, const QString &s, bool allowEmptyEntries)
{
CFArrayRef cfresult;
QStringList result;
@@ -59,8 +58,7 @@ QStringList QStringList::split(const QString &separator, const QString &s,
return result;
}
-QStringList QStringList::split(const QChar &separator, const QString &s,
- bool allowEmptyEntries = FALSE )
+QStringList QStringList::split(const QChar &separator, const QString &s, bool allowEmptyEntries)
{
return QStringList::split(QString(separator), s, allowEmptyEntries);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list