[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:11:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ad4bde3d03550ba4787c001378577645ab38b648
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 6 23:40:45 2002 +0000
i * Makefile.am: Generate the PFE precompiled headers to be used
by automake compiles. Currently these don't have any dependency
tracking, but I'm sure Maciej can fix that if he wants to.
* configure.in: Go from "xNDEBUG" to "NDEBUG" now that precompiled
headers aren't in the way. Pass in the --load-pch option to all the
various compiles so they get the precompiled headers.
* Tests/libiftest/Makefile.am: Generate a top_srcdir.h file rather
than passing it in on the command line. This works around a PFE bug
with -D, Radar 2921026.
* Tests/libiftest/IFTestDirectory.c: Use top_srcdir.h.
* Tests/libiftest/.cvsignore: Ignore top_srcdir.h.
* Tests/qt/qpoint-test.cpp: (main): Take out an unused variable and
all the USING_BORROWED_QPOINT code.
* Tools/Makefile.am: Don't built the HotSpots directory for now, since
it runs into a PFE bug and we usually use the application version now.
* Tools/Scripts/check-non-ASCII: Skip preprocessor directives.
* Tools/Scripts/cvs-abandon: Tweak.
JavaScriptCore:
* JavaScriptCorePrefix.h: Added.
* JavaScriptCore.pbproj/project.pbxproj: Use PFE precompiling.
Also switch from xNDEBUG to NDEBUG.
WebFoundation:
Reviewed by Ken Kocienda:
* WebFoundationPrefix.h: Added.
* WebFoundation.pbproj/project.pbxproj: Use PFE precompiling.
Also switch from xNDEBUG to NDEBUG.
* AuthenticationManager.subproj/IFAuthenticationManager.m:
* CookieManager.subproj/IFCookie.m:
* Misc.subproj/IFNSStringExtensions.m:
* Misc.subproj/WebFoundationDebug.m:
Add undefs to work around PFE problem with inline functions, Radar 2920554.
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
Fix include to work with normal Project Builder way of dealing with frameworks.
Switch from xNDEBUG to NDEBUG.
* CacheLoader.subproj/IFURLLoad.m:
* CookieManager.subproj/IFCookie.m:
* Database.subproj/IFURLFileDatabase.m:
* Misc.subproj/IFError.m:
* Misc.subproj/IFMonitor.h:
* Misc.subproj/IFMonitor.m:
* Misc.subproj/IFRecursiveReadWriteLock.h:
Use import instead of include.
* Misc.subproj/IFCFNetworkExtensions.m: Added.
* Misc.subproj/IFCFRunLoopExtensions.m: Added.
* Misc.subproj/IFCFNetworkExtensions.c: Removed.
* Misc.subproj/IFCFRunLoopExtensions.c: Removed.
Renamed so we could share the Objective-C precompile. No need to compile this code
as plain C, even though it doesn't use any Objective-C features.
* Misc.subproj/WebFoundationDebug.h: Get rid of format attribute because of bug
2920557. Switch from xNDEBUG to NDEBUG.
WebCore:
* WebCorePrefix.h: Added.
* .cvsignore: Ignore the .pfe files in this directory.
* khtml/dom/dom_doc.cpp:
* khtml/dom/dom_text.cpp:
Added namespace directives as a clean workaround for a conflict
with the struct named Comment in <Carbon/AIFF.h>
* kwq/KWQFont.mm:
* kwq/KWQFontMetrics.mm:
* kwq/KWQKGlobal.mm:
* kwq/KWQListImpl.mm:
* kwq/KWQPtrDictImpl.h:
* kwq/KWQVectorImpl.mm:
* kwq/kwqdebug.h:
* kwq/qt/qcolor.h:
* kwq/qt/qcombobox.h:
* kwq/qt/qregion.h:
* kwq/qt/qstring.h:
* kwq/qt/qwidget.h:
Remove old workaround for conflicts with Fixed, Rect, and Boolean.
It does not good with a precompiled header anyway, and there is a
more elegant small fix in the KDE code itself.
* kwq/qt/qpoint.h:
* kwq/KWQPointArray.mm: (QPointArray::setPoints):
Work around bug with va_arg and PFE by not using varargs here.
* kwq/KWQRect.mm: (QRect::unite): (QRect::operator&):
Use std::min and std::max instead of defining our own MIN and MAX, which
conflict with something in one of the headers we are precompiling (error
message did not make it clear which).
* kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
Switch from xNDEBUG to NDEBUG.
* kwq/Makefile.am: Remove stuff for getting at the header inside the
ApplicationServices and QD frameworks, since that code is now in WebKit.
* kwq/kwqdebug.h: Get rid of format attribute because of bug 2920557.
Switch from xNDEBUG to NDEBUG.
* kwq/kwqdebug.mm: Switch from xNDEBUG to NDEBUG.
* kwq/qt/qstring.h: Define QT_VERSION in here instead of on the command
line to work around a PFE bug with -D, Radar 2921026.
WebKit:
* WebKitPrefix.h: Added.
* WebKit.pbproj/project.pbxproj: Use PFE precompiling.
Also switch from xNDEBUG to NDEBUG.
* Misc.subproj/WebKitDebug.h: Get rid of format attribute because of bug
2920557. Switch from xNDEBUG to NDEBUG.
* Misc.subproj/WebKitDebug.m:
Add undef to work around PFE problem with inline functions, Radar 2920554.
* Plugins.subproj/IFPluginView.mm: Changed how we work around the bug in
the CGS defines.
* WebCoreSupport.subproj/IFCachedTextRenderer.h: Change include of the
private QD header to use the form that works with more-normal way of
getting at the private bits of frameworks.
* WebCoreSupport.subproj/IFCachedTextRenderer.m: Use the header
<CoreGraphics/CoreGraphicsPrivate.h> instead of <CoreGraphics/CGFontPrivate.h>.
* Misc.subproj/IFCache.mm:
* WebView.subproj/IFLoadProgress.mm:
* WebView.subproj/IFWebFrame.mm:
* WebView.subproj/IFWebFramePrivate.mm:
* WebView.subproj/IFWebView.mm:
Changed includes to imports.
WebBrowser:
* WebBrowserPrefix.h: Added.
* WebBrowser.pbproj/project.pbxproj: Use PFE precompiling.
Also switch from xNDEBUG to NDEBUG.
* Debug/CacheController.m: Renamed to make it Objective C rather
than Objective C++.
* Debug/CacheController.mm: Removed.
* main.m: Use the real __CFA2UC. Use import instead of include.
* ___CFA2UC.c: Remove our copy.
* Debug/DOMTree.mm:
* Debug/RenderTree.mm:
* Preferences.subproj/ActiveContentPreferences.h:
* Preferences.subproj/AppearancePreferences.h:
* Preferences.subproj/GeneralPreferences.h:
* Preferences.subproj/SecurityPreferences.h:
* Preferences.subproj/TextPreferences.h:
* Preferences.subproj/WBPreferences.h:
* Test/PageLoadTestLogger.m:
Use import instead of include.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1102 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index bfe4a0b..5c47c5a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * JavaScriptCorePrefix.h: Added.
+ * JavaScriptCore.pbproj/project.pbxproj: Use PFE precompiling.
+ Also switch from xNDEBUG to NDEBUG.
+
=== Alexander 0.3c2 (v1) ===
2002-04-18 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index bfe4a0b..5c47c5a 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * JavaScriptCorePrefix.h: Added.
+ * JavaScriptCore.pbproj/project.pbxproj: Use PFE precompiling.
+ Also switch from xNDEBUG to NDEBUG.
+
=== Alexander 0.3c2 (v1) ===
2002-04-18 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index bfe4a0b..5c47c5a 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * JavaScriptCorePrefix.h: Added.
+ * JavaScriptCore.pbproj/project.pbxproj: Use PFE precompiling.
+ Also switch from xNDEBUG to NDEBUG.
+
=== Alexander 0.3c2 (v1) ===
2002-04-18 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 63ed195..24dc1b5 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -79,6 +79,7 @@
0867D691FE84028FC02AAC07 = {
children = (
08FB77AEFE84172EC02AAC07,
+ F5C290E50284F960018635CA,
089C1665FE841158C02AAC07,
0867D69AFE84028FC02AAC07,
034768DFFF38A50411DB9C8B,
@@ -93,7 +94,7 @@
1058C7B2FEA5585E11CA2CBB,
);
isa = PBXGroup;
- name = "External Frameworks and Libraries";
+ name = Frameworks;
refType = 4;
};
0867D69BFE84028FC02AAC07 = {
@@ -114,7 +115,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- DEBUG_CFLAGS = "-DxNDEBUG";
+ DEBUG_CFLAGS = "-DNDEBUG";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = "";
@@ -124,9 +125,13 @@
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
+ PFE_FILE_C_DIALECTS = "c++";
+ PRECOMPILE_PREFIX_HEADER = YES;
+ PREFIX_HEADER = JavaScriptCorePrefix.h;
PRODUCT_NAME = JavaScriptCore;
SECTORDER_FLAGS = "";
USE_GCC3 = YES;
+ USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
};
@@ -138,8 +143,8 @@
productName = JavaScriptCore;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">
-<plist version=\"0.9\">
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
@@ -211,6 +216,7 @@
F692A8CC02555BA201FF60F7,
F692A8CD02555BA201FF60F7,
F68EBB8E0255D4C601FF60F7,
+ F5C290E70284F98E018635CA,
);
isa = PBXHeadersBuildPhase;
};
@@ -312,7 +318,6 @@
F692A8510255597D01FF60F7,
F692A8520255597D01FF60F7,
F692A8530255597D01FF60F7,
- F692A8540255597D01FF60F7,
F692A8550255597D01FF60F7,
F692A8560255597D01FF60F7,
F692A8570255597D01FF60F7,
@@ -366,7 +371,6 @@
F692A8860255597D01FF60F7,
F692A8870255597D01FF60F7,
F692A8880255597D01FF60F7,
- F68EBB8C0255D4C601FF60F7,
);
isa = PBXGroup;
name = Classes;
@@ -435,6 +439,28 @@
isa = PBXBuildStyle;
name = Unoptimized;
};
+ F5C290E50284F960018635CA = {
+ children = (
+ F692A8540255597D01FF60F7,
+ F68EBB8C0255D4C601FF60F7,
+ F5C290E60284F98E018635CA,
+ );
+ isa = PBXGroup;
+ name = "Other Sources";
+ path = "";
+ refType = 4;
+ };
+ F5C290E60284F98E018635CA = {
+ isa = PBXFileReference;
+ path = JavaScriptCorePrefix.h;
+ refType = 4;
+ };
+ F5C290E70284F98E018635CA = {
+ fileRef = F5C290E60284F98E018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5FFE656026B47A6018635CA = {
isa = PBXFileReference;
name = nodes2string.cpp;
diff --git a/JavaScriptCore/JavaScriptCorePrefix.h b/JavaScriptCore/JavaScriptCorePrefix.h
new file mode 100644
index 0000000..3255c6c
--- /dev/null
+++ b/JavaScriptCore/JavaScriptCorePrefix.h
@@ -0,0 +1,20 @@
+#include <config.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <float.h>
+#include <list>
+#include <locale.h>
+#include <math.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <time.h>
+#include <typeinfo>
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/timeb.h>
diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index 933fbbe..6eec7ea 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -5,3 +5,4 @@ libwebcorecombined.exp
libwebcorenmedited.dylib
libwebcoreunstripped.dylib
webcore-install-stamp
+*.pfe
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 20cca3f..4ab34bd 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,53 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * WebCorePrefix.h: Added.
+
+ * .cvsignore: Ignore the .pfe files in this directory.
+
+ * khtml/dom/dom_doc.cpp:
+ * khtml/dom/dom_text.cpp:
+ Added namespace directives as a clean workaround for a conflict
+ with the struct named Comment in <Carbon/AIFF.h>
+
+ * kwq/KWQFont.mm:
+ * kwq/KWQFontMetrics.mm:
+ * kwq/KWQKGlobal.mm:
+ * kwq/KWQListImpl.mm:
+ * kwq/KWQPtrDictImpl.h:
+ * kwq/KWQVectorImpl.mm:
+ * kwq/kwqdebug.h:
+ * kwq/qt/qcolor.h:
+ * kwq/qt/qcombobox.h:
+ * kwq/qt/qregion.h:
+ * kwq/qt/qstring.h:
+ * kwq/qt/qwidget.h:
+ Remove old workaround for conflicts with Fixed, Rect, and Boolean.
+ It does not good with a precompiled header anyway, and there is a
+ more elegant small fix in the KDE code itself.
+
+ * kwq/qt/qpoint.h:
+ * kwq/KWQPointArray.mm: (QPointArray::setPoints):
+ Work around bug with va_arg and PFE by not using varargs here.
+
+ * kwq/KWQRect.mm: (QRect::unite): (QRect::operator&):
+ Use std::min and std::max instead of defining our own MIN and MAX, which
+ conflict with something in one of the headers we are precompiling (error
+ message did not make it clear which).
+
+ * kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Switch from xNDEBUG to NDEBUG.
+
+ * kwq/Makefile.am: Remove stuff for getting at the header inside the
+ ApplicationServices and QD frameworks, since that code is now in WebKit.
+
+ * kwq/kwqdebug.h: Get rid of format attribute because of bug 2920557.
+ Switch from xNDEBUG to NDEBUG.
+
+ * kwq/kwqdebug.mm: Switch from xNDEBUG to NDEBUG.
+
+ * kwq/qt/qstring.h: Define QT_VERSION in here instead of on the command
+ line to work around a PFE bug with -D, Radar 2921026.
+
2002-05-06 Richard J. Williamson <rjw at apple.com>
Changes to support dhmtl.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 20cca3f..4ab34bd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,53 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * WebCorePrefix.h: Added.
+
+ * .cvsignore: Ignore the .pfe files in this directory.
+
+ * khtml/dom/dom_doc.cpp:
+ * khtml/dom/dom_text.cpp:
+ Added namespace directives as a clean workaround for a conflict
+ with the struct named Comment in <Carbon/AIFF.h>
+
+ * kwq/KWQFont.mm:
+ * kwq/KWQFontMetrics.mm:
+ * kwq/KWQKGlobal.mm:
+ * kwq/KWQListImpl.mm:
+ * kwq/KWQPtrDictImpl.h:
+ * kwq/KWQVectorImpl.mm:
+ * kwq/kwqdebug.h:
+ * kwq/qt/qcolor.h:
+ * kwq/qt/qcombobox.h:
+ * kwq/qt/qregion.h:
+ * kwq/qt/qstring.h:
+ * kwq/qt/qwidget.h:
+ Remove old workaround for conflicts with Fixed, Rect, and Boolean.
+ It does not good with a precompiled header anyway, and there is a
+ more elegant small fix in the KDE code itself.
+
+ * kwq/qt/qpoint.h:
+ * kwq/KWQPointArray.mm: (QPointArray::setPoints):
+ Work around bug with va_arg and PFE by not using varargs here.
+
+ * kwq/KWQRect.mm: (QRect::unite): (QRect::operator&):
+ Use std::min and std::max instead of defining our own MIN and MAX, which
+ conflict with something in one of the headers we are precompiling (error
+ message did not make it clear which).
+
+ * kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Switch from xNDEBUG to NDEBUG.
+
+ * kwq/Makefile.am: Remove stuff for getting at the header inside the
+ ApplicationServices and QD frameworks, since that code is now in WebKit.
+
+ * kwq/kwqdebug.h: Get rid of format attribute because of bug 2920557.
+ Switch from xNDEBUG to NDEBUG.
+
+ * kwq/kwqdebug.mm: Switch from xNDEBUG to NDEBUG.
+
+ * kwq/qt/qstring.h: Define QT_VERSION in here instead of on the command
+ line to work around a PFE bug with -D, Radar 2921026.
+
2002-05-06 Richard J. Williamson <rjw at apple.com>
Changes to support dhmtl.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 20cca3f..4ab34bd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,53 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * WebCorePrefix.h: Added.
+
+ * .cvsignore: Ignore the .pfe files in this directory.
+
+ * khtml/dom/dom_doc.cpp:
+ * khtml/dom/dom_text.cpp:
+ Added namespace directives as a clean workaround for a conflict
+ with the struct named Comment in <Carbon/AIFF.h>
+
+ * kwq/KWQFont.mm:
+ * kwq/KWQFontMetrics.mm:
+ * kwq/KWQKGlobal.mm:
+ * kwq/KWQListImpl.mm:
+ * kwq/KWQPtrDictImpl.h:
+ * kwq/KWQVectorImpl.mm:
+ * kwq/kwqdebug.h:
+ * kwq/qt/qcolor.h:
+ * kwq/qt/qcombobox.h:
+ * kwq/qt/qregion.h:
+ * kwq/qt/qstring.h:
+ * kwq/qt/qwidget.h:
+ Remove old workaround for conflicts with Fixed, Rect, and Boolean.
+ It does not good with a precompiled header anyway, and there is a
+ more elegant small fix in the KDE code itself.
+
+ * kwq/qt/qpoint.h:
+ * kwq/KWQPointArray.mm: (QPointArray::setPoints):
+ Work around bug with va_arg and PFE by not using varargs here.
+
+ * kwq/KWQRect.mm: (QRect::unite): (QRect::operator&):
+ Use std::min and std::max instead of defining our own MIN and MAX, which
+ conflict with something in one of the headers we are precompiling (error
+ message did not make it clear which).
+
+ * kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Switch from xNDEBUG to NDEBUG.
+
+ * kwq/Makefile.am: Remove stuff for getting at the header inside the
+ ApplicationServices and QD frameworks, since that code is now in WebKit.
+
+ * kwq/kwqdebug.h: Get rid of format attribute because of bug 2920557.
+ Switch from xNDEBUG to NDEBUG.
+
+ * kwq/kwqdebug.mm: Switch from xNDEBUG to NDEBUG.
+
+ * kwq/qt/qstring.h: Define QT_VERSION in here instead of on the command
+ line to work around a PFE bug with -D, Radar 2921026.
+
2002-05-06 Richard J. Williamson <rjw at apple.com>
Changes to support dhmtl.
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
new file mode 100644
index 0000000..5416b2f
--- /dev/null
+++ b/WebCore/WebCorePrefix.h
@@ -0,0 +1,39 @@
+#include <config.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <regex.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef __cplusplus
+
+#include <cstddef>
+// FIXME: We really need to precompile iostream, but we can't until Radar 2920556 is fixed.
+//#include <iostream>
+#include <new>
+
+#endif
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <time.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
+
+#ifdef __OBJC__
+
+#import <Foundation/NSURLPathUtilities.h>
+
+#import <Cocoa/Cocoa.h>
+
+#endif
diff --git a/WebCore/khtml/dom/dom_doc.cpp b/WebCore/khtml/dom/dom_doc.cpp
index 4376c28..25aebc9 100644
--- a/WebCore/khtml/dom/dom_doc.cpp
+++ b/WebCore/khtml/dom/dom_doc.cpp
@@ -35,6 +35,9 @@
#include <kdebug.h>
using namespace DOM;
+#ifdef APPLE_CHANGES
+namespace DOM {
+#endif
DOMImplementation::DOMImplementation()
{
@@ -539,3 +542,6 @@ DOMString DocumentType::internalSubset() const
return static_cast<DocumentTypeImpl*>(impl)->internalSubset();
}
+#ifdef APPLE_CHANGES
+} // namespace DOM
+#endif
diff --git a/WebCore/khtml/dom/dom_text.cpp b/WebCore/khtml/dom/dom_text.cpp
index dc2f153..d5354fc 100644
--- a/WebCore/khtml/dom/dom_text.cpp
+++ b/WebCore/khtml/dom/dom_text.cpp
@@ -25,6 +25,9 @@
#include "xml/dom_textimpl.h"
using namespace DOM;
+#ifdef APPLE_CHANGES
+namespace DOM {
+#endif
CharacterData::CharacterData() : Node()
{
@@ -226,3 +229,7 @@ Text Text::splitText( const unsigned long offset )
Text::Text(TextImpl *i) : CharacterData(i)
{
}
+
+#ifdef APPLE_CHANGES
+} // namespace DOM
+#endif
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 471a449..d3d5d37 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -33,14 +33,8 @@
#include <qnamespace.h>
#include <qstring.h>
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index a4014b8..6dcb390 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -33,14 +33,8 @@
#include <KWQListBox.h>
#include "qwidget.h"
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
// class QComboBox =============================================================
diff --git a/WebCore/kwq/KWQFont.mm b/WebCore/kwq/KWQFont.mm
index c0daf4a..02bec09 100644
--- a/WebCore/kwq/KWQFont.mm
+++ b/WebCore/kwq/KWQFont.mm
@@ -26,13 +26,7 @@
#import <qfont.h>
#import <qstring.h>
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
QFont::QFont()
: _family([@"" retain])
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 961c283..f663b09 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -25,13 +25,7 @@
#import <qfontmetrics.h>
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#import <qfont.h>
#import <IFTextRendererFactory.h>
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index 3dac533..a7cb127 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -31,13 +31,7 @@
#include <qdict.h>
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
KWQStaticStringDict *KGlobal::_stringDict = 0;
KInstance *KGlobal::_instance = 0;
diff --git a/WebCore/kwq/KWQListImpl.mm b/WebCore/kwq/KWQListImpl.mm
index 828a8d0..dae86c0 100644
--- a/WebCore/kwq/KWQListImpl.mm
+++ b/WebCore/kwq/KWQListImpl.mm
@@ -29,13 +29,7 @@
#include <cstddef>
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <CoreFoundation/CFArray.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
// KWQListNode
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index 861337f..5125be6 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -26,15 +26,7 @@
#ifndef QPOINT_H_
#define QPOINT_H_
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-#ifdef USING_BORROWED_QPOINT
-
-#include <_qpoint.h>
-
-#else /* !USING_BORROWED_QPOINT */
#ifdef _KWQ_IOSTREAM_
#include <iostream>
@@ -44,95 +36,48 @@
#include "qarray.h"
-// class QPoint ================================================================
-
class QPoint {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QPoint();
QPoint(int, int);
- // QPoint(const QPoint &);
- // default copy constructor is fine
-
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QPoint() {}
-#endif
-
- // member functions --------------------------------------------------------
-
int x() const;
int y() const;
int manhattanLength() const;
-
- // operators ---------------------------------------------------------------
-
- /* Note: Trolltech seems to want operator= to be a bitwise copy
- * QPoint &operator=(const QPoint &);
- */
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
-// protected -------------------------------------------------------------------
-
-// private ---------------------------------------------------------------------
private:
QCOORD xCoord;
QCOORD yCoord;
-}; // class QPoint =============================================================
-
-
-// class QPointArray ===========================================================
+};
class QPointArray : public QMemArray<QPoint> {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
- // constructors, copy constructors, and destructors ------------------------
-
QPointArray() {}
- ~QPointArray() {}
- QPointArray(int size) : QMemArray<QPoint> (size){};
+ QPointArray(int size) : QMemArray<QPoint>(size) {}
- QPointArray(const QPointArray &);
QPointArray(int, const QCOORD *);
- // member functions --------------------------------------------------------
-
void setPoint(uint, int, int);
+#if 0
+ // FIXME: Workaround for Radar 2921061
bool setPoints(int, int, int, ...);
+#else
+ bool setPoints(int, int, int, int, int, int, int, int, int);
+#endif
bool setPoints( int nPoints, const QCOORD *points );
- // operators ---------------------------------------------------------------
-
- //QPointArray &operator=(const QPointArray &);
- QPointArray &operator=( const QPointArray &a )
- { return (QPointArray&)assign( a ); }
-
#ifdef _KWQ_IOSTREAM_
friend std::ostream &operator<<(std::ostream &, const QPoint &);
#endif
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-}; // class QPointArray ========================================================
+};
#endif
-
-#endif /* USING_BORROWED_QPOINT */
diff --git a/WebCore/kwq/KWQPointArray.mm b/WebCore/kwq/KWQPointArray.mm
index 24866dc..00ff4e9 100644
--- a/WebCore/kwq/KWQPointArray.mm
+++ b/WebCore/kwq/KWQPointArray.mm
@@ -26,7 +26,6 @@
#include "qpoint.h"
#include <stdarg.h>
-
QPointArray::QPointArray(int nPoints, const QCOORD *points)
{
setPoints( nPoints, points );
@@ -52,6 +51,8 @@ bool QPointArray::setPoints( int nPoints, const QCOORD *points )
return TRUE;
}
+// FIXME: Workaround for Radar 2921061
+#if 0
bool QPointArray::setPoints( int nPoints, int firstx, int firsty, ... )
{
@@ -70,3 +71,18 @@ bool QPointArray::setPoints( int nPoints, int firstx, int firsty, ... )
va_end( ap );
return TRUE;
}
+
+#else
+
+bool QPointArray::setPoints( int nPoints, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3)
+{
+ if ( !resize(nPoints) )
+ return FALSE;
+ setPoint( 0, x0, y0 );
+ setPoint( 1, x1, y1 );
+ setPoint( 2, x2, y2 );
+ setPoint( 3, x3, y3 );
+ return TRUE;
+}
+
+#endif
diff --git a/WebCore/kwq/KWQPtrDictImpl.h b/WebCore/kwq/KWQPtrDictImpl.h
index 9937488..0c55f36 100644
--- a/WebCore/kwq/KWQPtrDictImpl.h
+++ b/WebCore/kwq/KWQPtrDictImpl.h
@@ -33,13 +33,7 @@
#include <stddef.h>
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <CoreFoundation/CFDictionary.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
class KWQPtrDictImpl
{
diff --git a/WebCore/kwq/KWQRect.mm b/WebCore/kwq/KWQRect.mm
index c23af19..395e518 100644
--- a/WebCore/kwq/KWQRect.mm
+++ b/WebCore/kwq/KWQRect.mm
@@ -25,11 +25,8 @@
#include <qrect.h>
-#ifndef USING_BORROWED_QRECT
-
-#define MAX(a,b) ((a) >= (b) ? (a) : (b))
-#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-
+using std::max;
+using std::min;
QRect::QRect() : xp(0), yp(0), w(1), h(1)
{
@@ -127,8 +124,8 @@ QRect QRect::unite(const QRect &r) const
{
int nx, ny, nw, nh;
- nx = MIN(xp, r.xp);
- ny = MIN(yp, r.yp);
+ nx = min(xp, r.xp);
+ ny = min(yp, r.yp);
if (xp + w >= r.xp + r.w) {
nw = xp + w - nx;
@@ -154,8 +151,8 @@ QRect QRect::operator&(const QRect &r) const
{
int nx, ny, nw, nh;
- nx = MAX(xp, r.xp);
- ny = MAX(yp, r.yp);
+ nx = max(xp, r.xp);
+ ny = max(yp, r.yp);
if (xp + w <= r.xp + r.w) {
nw = xp + w - nx;
@@ -188,5 +185,3 @@ std::ostream &operator<<(std::ostream &o, const QRect &r)
return o << "QRect: [left: " << r.left () << "; top: " << r.top() << "; right: " << r.right() << "; bottom: " << r.bottom() << "]";
}
#endif
-
-#endif
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index c248969..90d6c1f 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -43,16 +43,8 @@
#include "qimage.h"
#include "qrect.h"
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
-
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
// class QRegion ===============================================================
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 23f7c2e..6e78ead 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -26,16 +26,13 @@
#ifndef QSTRING_H_
#define QSTRING_H_
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <CoreFoundation/CoreFoundation.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#include "qcstring.h"
+// Make htmltokenizer.cpp happy
+#define QT_VERSION 300
+
#define _FAST_QSTRING_TO_NSSTRING(aString) (aString).getNSString()
#define QSTRING_TO_NSSTRING(aString) (aString).getNSString()
#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
diff --git a/WebCore/kwq/KWQVectorImpl.mm b/WebCore/kwq/KWQVectorImpl.mm
index d646996..4d01ff6 100644
--- a/WebCore/kwq/KWQVectorImpl.mm
+++ b/WebCore/kwq/KWQVectorImpl.mm
@@ -27,13 +27,7 @@
#ifndef USING_BORROWED_QVECTOR
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <CoreFoundation/CFArray.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#include <new>
#include <stdlib.h>
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index 5df249c..9234dd6 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -171,7 +171,7 @@
- (void)layout
{
if (needsLayout){
-#ifndef xNDEBUG
+#ifndef NDEBUG
double start = CFAbsoluteTimeGetCurrent();
#endif
((KHTMLView *)widget)->layout();
@@ -197,7 +197,7 @@
[self lockFocus];
-#ifndef xNDEBUG
+#ifndef NDEBUG
double start = CFAbsoluteTimeGetCurrent();
#endif
((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 9081766..a55e702 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -41,16 +41,8 @@
#include "qevent.h"
#include <KWQStyle.h>
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
-
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
class QWidgetPrivate;
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 8be53a5..e8b4658 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -140,9 +140,6 @@ INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(WEBCORE_INCLUDES) \
- -I/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \
- -I/System/Library/Frameworks/ApplicationServices.framework/Frameworks/QD.framework/PrivateHeaders \
-F$(SYMROOTS) \
$(NULL)
diff --git a/WebCore/kwq/kwqdebug.h b/WebCore/kwq/kwqdebug.h
index 359344f..a4afcb9 100644
--- a/WebCore/kwq/kwqdebug.h
+++ b/WebCore/kwq/kwqdebug.h
@@ -26,15 +26,9 @@
#ifndef KWQDEBUG_H_
#define KWQDEBUG_H_
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
-#include <Foundation/Foundation.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
+#import <Foundation/Foundation.h>
-#ifdef xNDEBUG
+#ifdef NDEBUG
#define KWQDEBUGLEVEL(level,format...) ((void)0)
@@ -76,8 +70,10 @@ long _GetMillisecondsSinceEpoch();
void KWQSetLogLevel(int mask);
unsigned int KWQGetLogLevel();
void KWQLog(unsigned int level, const char *file, int line, const char *function, const char *format, ...)
- __attribute__((__format__ (__printf__, 5, 6)));
-
+// FIXME: When Radar 2920557 is fixed, we can add this back and turn the -Wmissing-format-attribute
+// switch back on. PFE precompiled headers currently prevent this from working.
+// __attribute__((__format__ (__printf__, 5, 6)))
+;
#define DEBUG_OBJECT(object) [[object description] lossyCString]
@@ -117,12 +113,12 @@ void KWQLog(unsigned int level, const char *file, int line, const char *function
#define KWQDEBUG(format...) KWQDEBUGLEVEL(KWQ_LOG_DEBUG,format)
#define _logNeverImplemented() \
- KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
+ KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)")
#define _logPartiallyImplemented() \
- KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
+ KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)")
#define _logNotYetImplemented() \
- KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
+ KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)")
#endif /* KWQDEBUG_H_ */
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index df6d015..54f3fb6 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -25,7 +25,7 @@
#include <kwqdebug.h>
-#ifndef xNDEBUG
+#ifndef NDEBUG
static unsigned int KWQ_LOG_LEVEL = 0;
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index 471a449..d3d5d37 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -33,14 +33,8 @@
#include <qnamespace.h>
#include <qstring.h>
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
diff --git a/WebCore/kwq/qt/qcombobox.h b/WebCore/kwq/qt/qcombobox.h
index a4014b8..6dcb390 100644
--- a/WebCore/kwq/qt/qcombobox.h
+++ b/WebCore/kwq/qt/qcombobox.h
@@ -33,14 +33,8 @@
#include <KWQListBox.h>
#include "qwidget.h"
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
// class QComboBox =============================================================
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index 861337f..5125be6 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -26,15 +26,7 @@
#ifndef QPOINT_H_
#define QPOINT_H_
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
-
-#ifdef USING_BORROWED_QPOINT
-
-#include <_qpoint.h>
-
-#else /* !USING_BORROWED_QPOINT */
#ifdef _KWQ_IOSTREAM_
#include <iostream>
@@ -44,95 +36,48 @@
#include "qarray.h"
-// class QPoint ================================================================
-
class QPoint {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QPoint();
QPoint(int, int);
- // QPoint(const QPoint &);
- // default copy constructor is fine
-
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QPoint() {}
-#endif
-
- // member functions --------------------------------------------------------
-
int x() const;
int y() const;
int manhattanLength() const;
-
- // operators ---------------------------------------------------------------
-
- /* Note: Trolltech seems to want operator= to be a bitwise copy
- * QPoint &operator=(const QPoint &);
- */
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
-// protected -------------------------------------------------------------------
-
-// private ---------------------------------------------------------------------
private:
QCOORD xCoord;
QCOORD yCoord;
-}; // class QPoint =============================================================
-
-
-// class QPointArray ===========================================================
+};
class QPointArray : public QMemArray<QPoint> {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
- // constructors, copy constructors, and destructors ------------------------
-
QPointArray() {}
- ~QPointArray() {}
- QPointArray(int size) : QMemArray<QPoint> (size){};
+ QPointArray(int size) : QMemArray<QPoint>(size) {}
- QPointArray(const QPointArray &);
QPointArray(int, const QCOORD *);
- // member functions --------------------------------------------------------
-
void setPoint(uint, int, int);
+#if 0
+ // FIXME: Workaround for Radar 2921061
bool setPoints(int, int, int, ...);
+#else
+ bool setPoints(int, int, int, int, int, int, int, int, int);
+#endif
bool setPoints( int nPoints, const QCOORD *points );
- // operators ---------------------------------------------------------------
-
- //QPointArray &operator=(const QPointArray &);
- QPointArray &operator=( const QPointArray &a )
- { return (QPointArray&)assign( a ); }
-
#ifdef _KWQ_IOSTREAM_
friend std::ostream &operator<<(std::ostream &, const QPoint &);
#endif
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-}; // class QPointArray ========================================================
+};
#endif
-
-#endif /* USING_BORROWED_QPOINT */
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index c248969..90d6c1f 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -43,16 +43,8 @@
#include "qimage.h"
#include "qrect.h"
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
-
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
// class QRegion ===============================================================
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 23f7c2e..6e78ead 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -26,16 +26,13 @@
#ifndef QSTRING_H_
#define QSTRING_H_
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
#include <CoreFoundation/CoreFoundation.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
#include "qcstring.h"
+// Make htmltokenizer.cpp happy
+#define QT_VERSION 300
+
#define _FAST_QSTRING_TO_NSSTRING(aString) (aString).getNSString()
#define QSTRING_TO_NSSTRING(aString) (aString).getNSString()
#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 9081766..a55e702 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -41,16 +41,8 @@
#include "qevent.h"
#include <KWQStyle.h>
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
-
+#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
-
-#undef Fixed
-#undef Rect
-#undef Boolean
#endif
class QWidgetPrivate;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c669525..823fe27 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,32 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * WebKitPrefix.h: Added.
+ * WebKit.pbproj/project.pbxproj: Use PFE precompiling.
+ Also switch from xNDEBUG to NDEBUG.
+
+ * Misc.subproj/WebKitDebug.h: Get rid of format attribute because of bug
+ 2920557. Switch from xNDEBUG to NDEBUG.
+
+ * Misc.subproj/WebKitDebug.m:
+ Add undef to work around PFE problem with inline functions, Radar 2920554.
+
+ * Plugins.subproj/IFPluginView.mm: Changed how we work around the bug in
+ the CGS defines.
+
+ * WebCoreSupport.subproj/IFCachedTextRenderer.h: Change include of the
+ private QD header to use the form that works with more-normal way of
+ getting at the private bits of frameworks.
+
+ * WebCoreSupport.subproj/IFCachedTextRenderer.m: Use the header
+ <CoreGraphics/CoreGraphicsPrivate.h> instead of <CoreGraphics/CGFontPrivate.h>.
+
+ * Misc.subproj/IFCache.mm:
+ * WebView.subproj/IFLoadProgress.mm:
+ * WebView.subproj/IFWebFrame.mm:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ * WebView.subproj/IFWebView.mm:
+ Changed includes to imports.
+
2002-05-06 Chris Blumenberg <cblu at apple.com>
Made start and stop work cleaner.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c669525..823fe27 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,32 @@
+2002-05-06 Darin Adler <darin at apple.com>
+
+ * WebKitPrefix.h: Added.
+ * WebKit.pbproj/project.pbxproj: Use PFE precompiling.
+ Also switch from xNDEBUG to NDEBUG.
+
+ * Misc.subproj/WebKitDebug.h: Get rid of format attribute because of bug
+ 2920557. Switch from xNDEBUG to NDEBUG.
+
+ * Misc.subproj/WebKitDebug.m:
+ Add undef to work around PFE problem with inline functions, Radar 2920554.
+
+ * Plugins.subproj/IFPluginView.mm: Changed how we work around the bug in
+ the CGS defines.
+
+ * WebCoreSupport.subproj/IFCachedTextRenderer.h: Change include of the
+ private QD header to use the form that works with more-normal way of
+ getting at the private bits of frameworks.
+
+ * WebCoreSupport.subproj/IFCachedTextRenderer.m: Use the header
+ <CoreGraphics/CoreGraphicsPrivate.h> instead of <CoreGraphics/CGFontPrivate.h>.
+
+ * Misc.subproj/IFCache.mm:
+ * WebView.subproj/IFLoadProgress.mm:
+ * WebView.subproj/IFWebFrame.mm:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ * WebView.subproj/IFWebView.mm:
+ Changed includes to imports.
+
2002-05-06 Chris Blumenberg <cblu at apple.com>
Made start and stop work cleaner.
diff --git a/WebKit/Misc.subproj/IFCache.mm b/WebKit/Misc.subproj/IFCache.mm
index 3475478..45b3e12 100644
--- a/WebKit/Misc.subproj/IFCache.mm
+++ b/WebKit/Misc.subproj/IFCache.mm
@@ -8,8 +8,8 @@
#import "IFCache.h"
-#include "misc/loader.h"
-#include "kjs/collector.h"
+#import "misc/loader.h"
+#import "kjs/collector.h"
@implementation IFCache
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.m b/WebKit/Misc.subproj/WebCoreStatistics.m
index 3475478..45b3e12 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.m
+++ b/WebKit/Misc.subproj/WebCoreStatistics.m
@@ -8,8 +8,8 @@
#import "IFCache.h"
-#include "misc/loader.h"
-#include "kjs/collector.h"
+#import "misc/loader.h"
+#import "kjs/collector.h"
@implementation IFCache
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 82514c5..cd19a40 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -2,11 +2,11 @@
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <pthread.h>
+#import <fcntl.h>
+#import <sys/stat.h>
+#import <sys/types.h>
+#import <sys/mman.h>
+#import <pthread.h>
#import "IFURLFileDatabase.h"
#import "IFNSFileManagerExtensions.h"
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 8077f3c..54905cb 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -4,7 +4,7 @@
#import <Foundation/Foundation.h>
-#ifdef xNDEBUG
+#ifdef NDEBUG
#define WEBKITDEBUGLEVEL(level, format...) ((void)0)
#define WEBKIT_ASSERT(expr) ((void)0)
@@ -55,8 +55,11 @@ extern "C" {
void WebKitSetLogLevel(int mask);
unsigned int WebKitGetLogLevel(void);
void WebKitLog(unsigned int level, const char *file, int line, const char *function, const char *format, ...)
- __attribute__((__format__ (__printf__, 5, 6)));
-
+// FIXME: When Radar 2920557 is fixed, we can add this back and turn the -Wmissing-format-attribute
+// switch back on. PFE precompiled headers currently prevent this from working.
+// __attribute__((__format__ (__printf__, 5, 6)))
+;
+
#ifdef __cplusplus
}
#endif
@@ -97,13 +100,13 @@ void WebKitLog(unsigned int level, const char *file, int line, const char *funct
#endif
#define _logNeverImplemented() \
- WEBKITDEBUGLEVEL(WEBKIT_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)")
#define _logPartiallyImplemented() \
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)")
#define _logNotYetImplemented() \
- WEBKITDEBUGLEVEL (WEBKIT_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)")
#define WEBKITDEBUG(format...) WEBKITDEBUGLEVEL(WEBKIT_LOG_GENERIC_DEBUG, format)
diff --git a/WebKit/Misc.subproj/WebKitDebug.m b/WebKit/Misc.subproj/WebKitDebug.m
index 410b5f0..f4f4b95 100644
--- a/WebKit/Misc.subproj/WebKitDebug.m
+++ b/WebKit/Misc.subproj/WebKitDebug.m
@@ -4,26 +4,30 @@
#import "WebKitDebug.h"
-#ifndef xNDEBUG
+// FIXME: Workaround for Radar xxx.
+#undef putc
-unsigned int WEBKIT_LOG_LEVEL = 0;
+#ifndef NDEBUG
+static unsigned WEBKIT_LOG_LEVEL = 0;
-void WebKitSetLogLevel(int mask) {
+void WebKitSetLogLevel(int mask)
+{
WEBKIT_LOG_LEVEL = mask;
}
-bool __checkedDefault = 0;
+unsigned int WebKitGetLogLevel(void)
+{
+ static BOOL checkedDefault = NO;
-unsigned int WebKitGetLogLevel(){
- if (!__checkedDefault){
+ if (!checkedDefault) {
NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitLogLevel"];
if (logLevelString != nil){
- if (![[NSScanner scannerWithString: logLevelString] scanHexInt: &WEBKIT_LOG_LEVEL]){
+ if (![[NSScanner scannerWithString: logLevelString] scanHexInt: &WEBKIT_LOG_LEVEL]) {
NSLog (@"Unable to scan hex value for WebKitLogLevel, default to value of %d", WEBKIT_LOG_LEVEL);
}
}
- __checkedDefault = 1;
+ checkedDefault = YES;
}
return WEBKIT_LOG_LEVEL;
}
@@ -40,7 +44,7 @@ timestamp(void)
#endif
void WebKitLog(unsigned int level, const char *file, int line, const char *function, const char *format, ...)
-{
+{
if (WebKitGetLogLevel() & level) {
va_list args;
fprintf(stderr, "[WEBKIT] - %s:%d %s - ", file, line, function);
@@ -54,7 +58,6 @@ void WebKitLog(unsigned int level, const char *file, int line, const char *funct
#endif
-
#ifdef IF_MALLOC_TESTING
#include <objc/malloc.h>
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 4504c93..5c34323 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -30,10 +30,14 @@
#import <IFPluginNullEventSender.h>
#import "IFNullPluginView.h"
-extern "C" {
#import <CoreGraphics/CoreGraphics.h>
+
+// Work around bug in CGSDefines.h.
+#import <CoreGraphics/CGSDefines.h>
+#undef CGS_EXTERN
+#define CGS_EXTERN extern "C"
+
#import <CoreGraphics/CoreGraphicsPrivate.h>
-}
@implementation IFPluginView
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 4504c93..5c34323 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -30,10 +30,14 @@
#import <IFPluginNullEventSender.h>
#import "IFNullPluginView.h"
-extern "C" {
#import <CoreGraphics/CoreGraphics.h>
+
+// Work around bug in CGSDefines.h.
+#import <CoreGraphics/CGSDefines.h>
+#undef CGS_EXTERN
+#define CGS_EXTERN extern "C"
+
#import <CoreGraphics/CoreGraphicsPrivate.h>
-}
@implementation IFPluginView
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h b/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
index 5006785..3e57909 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
@@ -7,7 +7,7 @@
//
#import <IFTextRenderer.h>
-#import <ATSUnicodePriv.h>
+#import <QD/ATSUnicodePriv.h>
typedef float IFGlyphWidth;
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
index 0c092d9..d9efb6e 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
@@ -11,7 +11,7 @@
#import <Cocoa/Cocoa.h>
#import <ApplicationServices/ApplicationServices.h>
-#import <CoreGraphics/CGFontPrivate.h>
+#import <CoreGraphics/CoreGraphicsPrivate.h>
#import <WebKit/WebKitDebug.h>
#define NON_BREAKING_SPACE 0xA0
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 6916c05..3f43944 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -12,7 +12,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+ FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
SKIP_INSTALL = YES;
@@ -24,7 +24,7 @@
buildRules = (
);
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+ FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
SKIP_INSTALL = YES;
};
@@ -90,12 +90,12 @@
0867D691FE84028FC02AAC07 = {
children = (
9C7CABBB0190A37C0ECA16EA,
- 254DC334016E1D3F0ECA149E,
25A8176801B5474B0ECA149E,
F5065217027F555001C1A526,
F5F084B8024BBFFE01CA1520,
F5B36B400281DE87018635CB,
F5EBC45202134BB601CA1520,
+ 254DC334016E1D3F0ECA149E,
089C1665FE841158C02AAC07,
0867D69AFE84028FC02AAC07,
034768DFFF38A50411DB9C8B,
@@ -106,19 +106,14 @@
};
0867D69AFE84028FC02AAC07 = {
children = (
- 1058C7B0FEA5585E11CA2CBB,
- 1058C7B2FEA5585E11CA2CBB,
+ F5C2869302846DCD018635CA,
+ F5C2869402846DCD018635CA,
+ F5C2869502846DCD018635CA,
);
isa = PBXGroup;
- name = "External Frameworks and Libraries";
+ name = Frameworks;
refType = 4;
};
- 0867D69BFE84028FC02AAC07 = {
- isa = PBXFrameworkReference;
- name = Foundation.framework;
- path = /System/Library/Frameworks/Foundation.framework;
- refType = 0;
- };
0867D69CFE84028FC02AAC07 = {
buildPhases = (
0867D69DFE84028FC02AAC07,
@@ -131,20 +126,25 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
- DEBUG_CFLAGS = "-DxNDEBUG";
+ DEBUG_CFLAGS = "-DNDEBUG";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\"";
FRAMEWORK_VERSION = A;
- HEADER_SEARCH_PATHS = ".. ../JavaScriptCore ../WebCore/khtml ../WebCore/kwq ../WebCore/kwq/kdecore ../WebCore/kwq/khtml ../WebCore/kwq/kparts ../WebCore/kwq/qt /System/Library/Frameworks/ApplicationServices.framework/Frameworks/QD.framework/PrivateHeaders";
+ HEADER_SEARCH_PATHS = ".. ../JavaScriptCore ../WebCore/khtml ../WebCore/kwq ../WebCore/kwq/kdecore ../WebCore/kwq/khtml ../WebCore/kwq/kparts ../WebCore/kwq/qt";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
- OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/ -F/System/Library/Frameworks/Carbon.framework/Frameworks/";
- OTHER_LDFLAGS = "-lwebcore -framework JavaScriptCore -framework WebFoundation -seg1addr 0x4000000";
+ OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
+ OTHER_LDFLAGS = "-framework WebFoundation -framework JavaScriptCore -lwebcore -seg1addr 0x4000000";
+ PFE_FILE_C_DIALECTS = "objective-c objective-c++";
+ PRECOMPILE_PREFIX_HEADER = YES;
+ PREFIX_HEADER = WebKitPrefix.h;
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
USE_GCC3 = YES;
- WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
+ USE_GCC3_PFE_SUPPORT = YES;
+ WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
};
dependencies = (
@@ -155,8 +155,8 @@
productName = WebKit;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">
-<plist version=\"0.9\">
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
@@ -229,6 +229,7 @@
F5B36B430281DF55018635CB,
F5B36B470281DF9C018635CB,
F50AD3880282028B01C1A526,
+ F5C283740284676D018635CA,
);
isa = PBXHeadersBuildPhase;
};
@@ -289,8 +290,9 @@
0867D6A0FE84028FC02AAC07 = {
buildActionMask = 2147483647;
files = (
- 1058C7B3FEA5585E11CA2CBB,
- F5EBC45C02134C0C01CA1520,
+ F5C287BB02846DCD018635CA,
+ F5C287BC02846DCD018635CA,
+ F5C287BD02846DCD018635CA,
);
isa = PBXFrameworksBuildPhase;
};
@@ -300,12 +302,6 @@
);
isa = PBXRezBuildPhase;
};
- 0867D6A5FE840307C02AAC07 = {
- isa = PBXFrameworkReference;
- name = AppKit.framework;
- path = /System/Library/Frameworks/AppKit.framework;
- refType = 0;
- };
089C1665FE841158C02AAC07 = {
children = (
35F3577E0198AAB80ACA1520,
@@ -353,46 +349,6 @@
//082
//083
//084
-//100
-//101
-//102
-//103
-//104
- 1058C7B0FEA5585E11CA2CBB = {
- children = (
- 1058C7B1FEA5585E11CA2CBB,
- );
- isa = PBXGroup;
- name = "Linked Frameworks";
- refType = 4;
- };
- 1058C7B1FEA5585E11CA2CBB = {
- isa = PBXFrameworkReference;
- name = Cocoa.framework;
- path = /System/Library/Frameworks/Cocoa.framework;
- refType = 0;
- };
- 1058C7B2FEA5585E11CA2CBB = {
- children = (
- 0867D69BFE84028FC02AAC07,
- 0867D6A5FE840307C02AAC07,
- F5EBC45B02134C0C01CA1520,
- );
- isa = PBXGroup;
- name = "Other Frameworks";
- refType = 4;
- };
- 1058C7B3FEA5585E11CA2CBB = {
- fileRef = 1058C7B1FEA5585E11CA2CBB;
- isa = PBXBuildFile;
- settings = {
- };
- };
-//100
-//101
-//102
-//103
-//104
//250
//251
//252
@@ -404,13 +360,14 @@
3944607B020F50ED0ECA1767,
2568C72C0174912D0ECA149E,
25C29825016E29620ECA149E,
+ F5C283730284676D018635CA,
25A5593101A5996D0ECA149E,
25A5593201A5996D0ECA149E,
F59EAE410253C8DE018635CA,
F59EAE3E0253C7EE018635CA,
);
isa = PBXGroup;
- name = Misc;
+ name = "Other Sources";
refType = 4;
};
255AF6590250FC030ECA149E = {
@@ -1377,7 +1334,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+ FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
SKIP_INSTALL = YES;
@@ -1504,7 +1461,7 @@
F5B36B420281DF55018635CB,
);
isa = PBXGroup;
- name = WebCoreSupport;
+ name = "WebCore Support";
refType = 4;
};
F5B36B410281DF55018635CB = {
@@ -1589,6 +1546,53 @@
settings = {
};
};
+ F5C283730284676D018635CA = {
+ isa = PBXFileReference;
+ path = WebKitPrefix.h;
+ refType = 4;
+ };
+ F5C283740284676D018635CA = {
+ fileRef = F5C283730284676D018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5C2869302846DCD018635CA = {
+ isa = PBXFrameworkReference;
+ name = ApplicationServices.framework;
+ path = /System/Library/Frameworks/ApplicationServices.framework;
+ refType = 0;
+ };
+ F5C2869402846DCD018635CA = {
+ isa = PBXFrameworkReference;
+ name = Carbon.framework;
+ path = /System/Library/Frameworks/Carbon.framework;
+ refType = 0;
+ };
+ F5C2869502846DCD018635CA = {
+ isa = PBXFrameworkReference;
+ name = Cocoa.framework;
+ path = /System/Library/Frameworks/Cocoa.framework;
+ refType = 0;
+ };
+ F5C287BB02846DCD018635CA = {
+ fileRef = F5C2869302846DCD018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5C287BC02846DCD018635CA = {
+ fileRef = F5C2869402846DCD018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5C287BD02846DCD018635CA = {
+ fileRef = F5C2869502846DCD018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5D538E802441F2601A80181 = {
isa = PBXFileReference;
name = IFMainURLHandleClient.h;
@@ -1676,18 +1680,6 @@
settings = {
};
};
- F5EBC45B02134C0C01CA1520 = {
- isa = PBXFrameworkReference;
- name = Carbon.framework;
- path = /System/Library/Frameworks/Carbon.framework;
- refType = 0;
- };
- F5EBC45C02134C0C01CA1520 = {
- fileRef = F5EBC45B02134C0C01CA1520;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5F084B8024BBFFE01CA1520 = {
children = (
F5F084B9024BDC8E01CA1520,
diff --git a/WebKit/WebKitPrefix.h b/WebKit/WebKitPrefix.h
new file mode 100644
index 0000000..b917286
--- /dev/null
+++ b/WebKit/WebKitPrefix.h
@@ -0,0 +1,18 @@
+#import <config.h>
+
+#import <stddef.h>
+#import <stdio.h>
+#import <fcntl.h>
+#import <errno.h>
+#import <unistd.h>
+
+#import <pthread.h>
+
+#import <ApplicationServices/ApplicationServices.h>
+#import <QD/ATSUnicodePriv.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+#import <Cocoa/Cocoa.h>
+#import <Foundation/NSPrivateDecls.h>
+
+#import <Carbon/Carbon.h>
diff --git a/WebKit/WebView.subproj/IFLoadProgress.mm b/WebKit/WebView.subproj/IFLoadProgress.mm
index 701af82..31ebb9d 100644
--- a/WebKit/WebView.subproj/IFLoadProgress.mm
+++ b/WebKit/WebView.subproj/IFLoadProgress.mm
@@ -5,7 +5,7 @@
#import "IFLoadProgress.h"
-#include <WCLoadProgress.h>
+#import <WCLoadProgress.h>
@implementation IFLoadProgress
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index e75a8f2..f029bc3 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -17,8 +17,8 @@
#import <WebKit/WebKitDebug.h>
-#include <khtml_part.h>
-#include <rendering/render_frames.h>
+#import <khtml_part.h>
+#import <rendering/render_frames.h>
@implementation IFWebFrame
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index a9defc0..51cdc0e 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -16,8 +16,8 @@
#import <WebFoundation/IFError.h>
// includes from kde
-#include <khtmlview.h>
-#include <rendering/render_frames.h>
+#import <khtmlview.h>
+#import <rendering/render_frames.h>
static const char * const stateNames[6] = {
"zero state",
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 05a29e6..6cf0893 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -12,11 +12,11 @@
#import <WebKit/WebKitDebug.h>
// KDE related includes
-#include <khtmlview.h>
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <html/html_documentimpl.h>
+#import <khtmlview.h>
+#import <qwidget.h>
+#import <qpainter.h>
+#import <qevent.h>
+#import <html/html_documentimpl.h>
@implementation IFWebView
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index e75a8f2..f029bc3 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -17,8 +17,8 @@
#import <WebKit/WebKitDebug.h>
-#include <khtml_part.h>
-#include <rendering/render_frames.h>
+#import <khtml_part.h>
+#import <rendering/render_frames.h>
@implementation IFWebFrame
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index a9defc0..51cdc0e 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -16,8 +16,8 @@
#import <WebFoundation/IFError.h>
// includes from kde
-#include <khtmlview.h>
-#include <rendering/render_frames.h>
+#import <khtmlview.h>
+#import <rendering/render_frames.h>
static const char * const stateNames[6] = {
"zero state",
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 05a29e6..6cf0893 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -12,11 +12,11 @@
#import <WebKit/WebKitDebug.h>
// KDE related includes
-#include <khtmlview.h>
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <html/html_documentimpl.h>
+#import <khtmlview.h>
+#import <qwidget.h>
+#import <qpainter.h>
+#import <qevent.h>
+#import <html/html_documentimpl.h>
@implementation IFWebView
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
index 701af82..31ebb9d 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.m
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -5,7 +5,7 @@
#import "IFLoadProgress.h"
-#include <WCLoadProgress.h>
+#import <WCLoadProgress.h>
@implementation IFLoadProgress
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list