i * Makefile.am: Generate the PFE precompiled headers to be used
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 May 2002 23:40:45 +0000 (23:40 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 May 2002 23:40:45 +0000 (23:40 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@1102 268f45cc-cd09-0410-ab3c-d52691b4dbfc

57 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/ChangeLog-2002-12-03
JavaScriptCore/ChangeLog-2003-10-25
JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
JavaScriptCore/JavaScriptCorePrefix.h [new file with mode: 0644]
WebCore/.cvsignore
WebCore/ChangeLog-2002-12-03
WebCore/ChangeLog-2003-10-25
WebCore/ChangeLog-2005-08-23
WebCore/WebCorePrefix.h [new file with mode: 0644]
WebCore/khtml/dom/dom_doc.cpp
WebCore/khtml/dom/dom_text.cpp
WebCore/kwq/KWQColor.h
WebCore/kwq/KWQComboBox.h
WebCore/kwq/KWQFont.mm
WebCore/kwq/KWQFontMetrics.mm
WebCore/kwq/KWQKGlobal.mm
WebCore/kwq/KWQListImpl.mm
WebCore/kwq/KWQPointArray.h
WebCore/kwq/KWQPointArray.mm
WebCore/kwq/KWQPtrDictImpl.h
WebCore/kwq/KWQRect.mm
WebCore/kwq/KWQRegion.h
WebCore/kwq/KWQString.h
WebCore/kwq/KWQVectorImpl.mm
WebCore/kwq/KWQView.mm
WebCore/kwq/KWQWidget.h
WebCore/kwq/Makefile.am
WebCore/kwq/kwqdebug.h
WebCore/kwq/kwqdebug.mm
WebCore/kwq/qt/qcolor.h
WebCore/kwq/qt/qcombobox.h
WebCore/kwq/qt/qpoint.h
WebCore/kwq/qt/qregion.h
WebCore/kwq/qt/qstring.h
WebCore/kwq/qt/qwidget.h
WebKit/ChangeLog
WebKit/ChangeLog-2002-12-03
WebKit/Misc.subproj/IFCache.mm
WebKit/Misc.subproj/WebCoreStatistics.m
WebKit/Misc.subproj/WebFileDatabase.m
WebKit/Misc.subproj/WebKitDebug.h
WebKit/Misc.subproj/WebKitDebug.m
WebKit/Plugins.subproj/IFPluginView.mm
WebKit/Plugins.subproj/WebPluginView.m
WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
WebKit/WebKit.pbproj/project.pbxproj
WebKit/WebKitPrefix.h [new file with mode: 0644]
WebKit/WebView.subproj/IFLoadProgress.mm
WebKit/WebView.subproj/IFWebFrame.mm
WebKit/WebView.subproj/IFWebFramePrivate.mm
WebKit/WebView.subproj/IFWebView.mm
WebKit/WebView.subproj/WebFrame.m
WebKit/WebView.subproj/WebFramePrivate.m
WebKit/WebView.subproj/WebFrameView.m
WebKit/WebView.subproj/WebLoadProgress.m

index bfe4a0b..5c47c5a 100644 (file)
@@ -1,3 +1,9 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
index bfe4a0b..5c47c5a 100644 (file)
@@ -1,3 +1,9 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
index bfe4a0b..5c47c5a 100644 (file)
@@ -1,3 +1,9 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
index 63ed195..24dc1b5 100644 (file)
@@ -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 = {
                        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 = "";
                                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;
                        };
                        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>
                                F692A8CC02555BA201FF60F7,
                                F692A8CD02555BA201FF60F7,
                                F68EBB8E0255D4C601FF60F7,
+                               F5C290E70284F98E018635CA,
                        );
                        isa = PBXHeadersBuildPhase;
                };
                                F692A8510255597D01FF60F7,
                                F692A8520255597D01FF60F7,
                                F692A8530255597D01FF60F7,
-                               F692A8540255597D01FF60F7,
                                F692A8550255597D01FF60F7,
                                F692A8560255597D01FF60F7,
                                F692A8570255597D01FF60F7,
                                F692A8860255597D01FF60F7,
                                F692A8870255597D01FF60F7,
                                F692A8880255597D01FF60F7,
-                               F68EBB8C0255D4C601FF60F7,
                        );
                        isa = PBXGroup;
                        name = Classes;
                        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 (file)
index 0000000..3255c6c
--- /dev/null
@@ -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>
index 933fbbe..6eec7ea 100644 (file)
@@ -5,3 +5,4 @@ libwebcorecombined.exp
 libwebcorenmedited.dylib
 libwebcoreunstripped.dylib
 webcore-install-stamp
+*.pfe
index 20cca3f..4ab34bd 100644 (file)
@@ -1,3 +1,53 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
         
         Changes to support dhmtl.
index 20cca3f..4ab34bd 100644 (file)
@@ -1,3 +1,53 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
         
         Changes to support dhmtl.
index 20cca3f..4ab34bd 100644 (file)
@@ -1,3 +1,53 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
         
         Changes to support dhmtl.
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
new file mode 100644 (file)
index 0000000..5416b2f
--- /dev/null
@@ -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
index 4376c28..25aebc9 100644 (file)
@@ -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
index dc2f153..d5354fc 100644 (file)
@@ -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
index 471a449..d3d5d37 100644 (file)
 #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
 
 
index a4014b8..6dcb390 100644 (file)
 #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 =============================================================
index c0daf4a..02bec09 100644 (file)
 #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])
index 961c283..f663b09 100644 (file)
 
 #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>
index 3dac533..a7cb127 100644 (file)
 
 #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;
index 828a8d0..dae86c0 100644 (file)
 
 #include <cstddef>
 
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
 #include <CoreFoundation/CFArray.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
 
 // KWQListNode
 
index 861337f..5125be6 100644 (file)
 #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>
 
 #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 */
index 24866dc..00ff4e9 100644 (file)
@@ -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
index 9937488..0c55f36 100644 (file)
 
 #include <stddef.h>
 
-#define Fixed MacFixed
-#define Rect MacRect
-#define Boolean MacBoolean
 #include <CoreFoundation/CFDictionary.h>
-#undef Fixed
-#undef Rect
-#undef Boolean
 
 class KWQPtrDictImpl
 {
index c23af19..395e518 100644 (file)
 
 #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
index c248969..90d6c1f 100644 (file)
 #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 ===============================================================
index 23f7c2e..6e78ead 100644 (file)
 #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) \
index d646996..4d01ff6 100644 (file)
 
 #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>
index 5df249c..9234dd6 100644 (file)
 - (void)layout
 {
     if (needsLayout){
-#ifndef xNDEBUG
+#ifndef NDEBUG
         double start = CFAbsoluteTimeGetCurrent();
 #endif
         ((KHTMLView *)widget)->layout();
         
         [self lockFocus];
 
-#ifndef xNDEBUG
+#ifndef NDEBUG
         double start = CFAbsoluteTimeGetCurrent();
 #endif
         ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x, 
index 9081766..a55e702 100644 (file)
 #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;
index 8be53a5..e8b4658 100644 (file)
@@ -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)
 
index 359344f..a4afcb9 100644 (file)
 #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_ */
index df6d015..54f3fb6 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <kwqdebug.h>
 
-#ifndef xNDEBUG
+#ifndef NDEBUG
 
 static unsigned int KWQ_LOG_LEVEL = 0;
 
index 471a449..d3d5d37 100644 (file)
 #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
 
 
index a4014b8..6dcb390 100644 (file)
 #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 =============================================================
index 861337f..5125be6 100644 (file)
 #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>
 
 #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 */
index c248969..90d6c1f 100644 (file)
 #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 ===============================================================
index 23f7c2e..6e78ead 100644 (file)
 #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) \
index 9081766..a55e702 100644 (file)
 #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;
index c669525..823fe27 100644 (file)
@@ -1,3 +1,32 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
 
        Made start and stop work cleaner. 
index c669525..823fe27 100644 (file)
@@ -1,3 +1,32 @@
+2002-05-06  Darin Adler  <darin@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@apple.com>
 
        Made start and stop work cleaner. 
index 3475478..45b3e12 100644 (file)
@@ -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
 
index 3475478..45b3e12 100644 (file)
@@ -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
 
index 82514c5..cd19a40 100644 (file)
@@ -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"
index 8077f3c..54905cb 100644 (file)
@@ -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)
 
index 410b5f0..f4f4b95 100644 (file)
@@ -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>
 
index 4504c93..5c34323 100644 (file)
 #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
 
index 4504c93..5c34323 100644 (file)
 #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
 
index 5006785..3e57909 100644 (file)
@@ -7,7 +7,7 @@
 //
 
 #import <IFTextRenderer.h>
-#import <ATSUnicodePriv.h>
+#import <QD/ATSUnicodePriv.h>
 
 typedef float IFGlyphWidth;
 
index 0c092d9..d9efb6e 100644 (file)
@@ -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
index 6916c05..3f43944 100644 (file)
@@ -12,7 +12,7 @@
                                COPY_PHASE_STRIP = NO;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_CFLAGS = "";
-                               FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+                               FRAMEWORK_SEARCH_PATHS = "\U0001@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@executable_path/../Frameworks";
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                SKIP_INSTALL = YES;
                        };
                0867D691FE84028FC02AAC07 = {
                        children = (
                                9C7CABBB0190A37C0ECA16EA,
-                               254DC334016E1D3F0ECA149E,
                                25A8176801B5474B0ECA149E,
                                F5065217027F555001C1A526,
                                F5F084B8024BBFFE01CA1520,
                                F5B36B400281DE87018635CB,
                                F5EBC45202134BB601CA1520,
+                               254DC334016E1D3F0ECA149E,
                                089C1665FE841158C02AAC07,
                                0867D69AFE84028FC02AAC07,
                                034768DFFF38A50411DB9C8B,
                };
                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,
                        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 = (
                        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>
                                F5B36B430281DF55018635CB,
                                F5B36B470281DF9C018635CB,
                                F50AD3880282028B01C1A526,
+                               F5C283740284676D018635CA,
                        );
                        isa = PBXHeadersBuildPhase;
                };
                0867D6A0FE84028FC02AAC07 = {
                        buildActionMask = 2147483647;
                        files = (
-                               1058C7B3FEA5585E11CA2CBB,
-                               F5EBC45C02134C0C01CA1520,
+                               F5C287BB02846DCD018635CA,
+                               F5C287BC02846DCD018635CA,
+                               F5C287BD02846DCD018635CA,
                        );
                        isa = PBXFrameworksBuildPhase;
                };
                        );
                        isa = PBXRezBuildPhase;
                };
-               0867D6A5FE840307C02AAC07 = {
-                       isa = PBXFrameworkReference;
-                       name = AppKit.framework;
-                       path = /System/Library/Frameworks/AppKit.framework;
-                       refType = 0;
-               };
                089C1665FE841158C02AAC07 = {
                        children = (
                                35F3577E0198AAB80ACA1520,
 //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
                                3944607B020F50ED0ECA1767,
                                2568C72C0174912D0ECA149E,
                                25C29825016E29620ECA149E,
+                               F5C283730284676D018635CA,
                                25A5593101A5996D0ECA149E,
                                25A5593201A5996D0ECA149E,
                                F59EAE410253C8DE018635CA,
                                F59EAE3E0253C7EE018635CA,
                        );
                        isa = PBXGroup;
-                       name = Misc;
+                       name = "Other Sources";
                        refType = 4;
                };
                255AF6590250FC030ECA149E = {
                                COPY_PHASE_STRIP = NO;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_CFLAGS = "";
-                               FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+                               FRAMEWORK_SEARCH_PATHS = "\U0001@executable_path/../Frameworks";
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                OPTIMIZATION_CFLAGS = "-O0";
                                SKIP_INSTALL = YES;
                                F5B36B420281DF55018635CB,
                        );
                        isa = PBXGroup;
-                       name = WebCoreSupport;
+                       name = "WebCore Support";
                        refType = 4;
                };
                F5B36B410281DF55018635CB = {
                        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;
                        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 (file)
index 0000000..b917286
--- /dev/null
@@ -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>
index 701af82..31ebb9d 100644 (file)
@@ -5,7 +5,7 @@
 
 #import "IFLoadProgress.h"
 
-#include <WCLoadProgress.h>
+#import <WCLoadProgress.h>
 
 @implementation IFLoadProgress
 
index e75a8f2..f029bc3 100644 (file)
@@ -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
 
index a9defc0..51cdc0e 100644 (file)
@@ -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",
index 05a29e6..6cf0893 100644 (file)
 #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
index e75a8f2..f029bc3 100644 (file)
@@ -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
 
index a9defc0..51cdc0e 100644 (file)
@@ -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",
index 05a29e6..6cf0893 100644 (file)
 #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
index 701af82..31ebb9d 100644 (file)
@@ -5,7 +5,7 @@
 
 #import "IFLoadProgress.h"
 
-#include <WCLoadProgress.h>
+#import <WCLoadProgress.h>
 
 @implementation IFLoadProgress