Reviewed, tweaked, and landed by Darin.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Jan 2006 15:47:47 +0000 (15:47 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Jan 2006 15:47:47 +0000 (15:47 +0000)
        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6497
          Use #include, not #import, in KWQ C++ files

        * bridge/mac/KWQKHTMLView.cpp:
        * kcanvas/RenderSVGText.cpp:
        * khtml/css/css_computedstyle.cpp:
        * kwq/KWQArrayImpl.cpp:
        * kwq/KWQBuffer.cpp:
        * kwq/KWQCString.cpp:
        * kwq/KWQCharsets.cpp:
        * kwq/KWQDateTime.cpp:
        * kwq/KWQDictImpl.cpp:
        * kwq/KWQGuardedPtr.cpp:
        * kwq/KWQKHTMLFactory.cpp:
        * kwq/KWQKPartsEvent.cpp:
        * kwq/KWQListImpl.cpp:
        * kwq/KWQMapImpl.cpp:
        * kwq/KWQObject.cpp:
        * kwq/KWQPen.cpp:
        * kwq/KWQPointArray.cpp:
        * kwq/KWQPtrDictImpl.cpp:
        * kwq/KWQRegion.cpp:
        * kwq/KWQStyle.cpp:
        * kwq/KWQTextCodec.cpp:
        * kwq/KWQTextStream.cpp:
        * kwq/KWQTimer.cpp:
        * kwq/KWQValueListImpl.cpp:
        * kwq/KWQVariant.cpp:
        * kwq/KWQVectorImpl.cpp:
        * kwq/KWQWMatrix.cpp:
        Replaced #import with #include.

        * kwq/KWQRegExp.cpp: Replaced #import with #include.
        Also changed <JavaScriptCore/pcre.h> to <pcre/pcre.h>.
        * ForwardingHeaders/pcre: Added.
        * ForwardingHeaders/pcre/pcre.h: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

30 files changed:
WebCore/ChangeLog
WebCore/ForwardingHeaders/pcre/pcre.h [new file with mode: 0644]
WebCore/bridge/mac/KWQKHTMLView.cpp
WebCore/kcanvas/RenderSVGText.cpp
WebCore/khtml/css/css_computedstyle.cpp
WebCore/kwq/KWQArrayImpl.cpp
WebCore/kwq/KWQBuffer.cpp
WebCore/kwq/KWQCString.cpp
WebCore/kwq/KWQCharsets.cpp
WebCore/kwq/KWQDateTime.cpp
WebCore/kwq/KWQDictImpl.cpp
WebCore/kwq/KWQGuardedPtr.cpp
WebCore/kwq/KWQKHTMLFactory.cpp
WebCore/kwq/KWQKPartsEvent.cpp
WebCore/kwq/KWQListImpl.cpp
WebCore/kwq/KWQMapImpl.cpp
WebCore/kwq/KWQObject.cpp
WebCore/kwq/KWQPen.cpp
WebCore/kwq/KWQPointArray.cpp
WebCore/kwq/KWQPtrDictImpl.cpp
WebCore/kwq/KWQRegExp.cpp
WebCore/kwq/KWQRegion.cpp
WebCore/kwq/KWQStyle.cpp
WebCore/kwq/KWQTextCodec.cpp
WebCore/kwq/KWQTextStream.cpp
WebCore/kwq/KWQTimer.cpp
WebCore/kwq/KWQValueListImpl.cpp
WebCore/kwq/KWQVariant.cpp
WebCore/kwq/KWQVectorImpl.cpp
WebCore/kwq/KWQWMatrix.cpp

index 9007e22..9320c9a 100644 (file)
@@ -1,3 +1,44 @@
+2006-01-12  Justin Haygood  <justin@xiondigital.net>
+
+        Reviewed, tweaked, and landed by Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6497
+          Use #include, not #import, in KWQ C++ files
+
+        * bridge/mac/KWQKHTMLView.cpp:
+        * kcanvas/RenderSVGText.cpp:
+        * khtml/css/css_computedstyle.cpp:
+        * kwq/KWQArrayImpl.cpp:
+        * kwq/KWQBuffer.cpp:
+        * kwq/KWQCString.cpp:
+        * kwq/KWQCharsets.cpp:
+        * kwq/KWQDateTime.cpp:
+        * kwq/KWQDictImpl.cpp:
+        * kwq/KWQGuardedPtr.cpp:
+        * kwq/KWQKHTMLFactory.cpp:
+        * kwq/KWQKPartsEvent.cpp:
+        * kwq/KWQListImpl.cpp:
+        * kwq/KWQMapImpl.cpp:
+        * kwq/KWQObject.cpp:
+        * kwq/KWQPen.cpp:
+        * kwq/KWQPointArray.cpp:
+        * kwq/KWQPtrDictImpl.cpp:
+        * kwq/KWQRegion.cpp:
+        * kwq/KWQStyle.cpp:
+        * kwq/KWQTextCodec.cpp:
+        * kwq/KWQTextStream.cpp:
+        * kwq/KWQTimer.cpp:
+        * kwq/KWQValueListImpl.cpp:
+        * kwq/KWQVariant.cpp:
+        * kwq/KWQVectorImpl.cpp:
+        * kwq/KWQWMatrix.cpp:
+        Replaced #import with #include.
+
+        * kwq/KWQRegExp.cpp: Replaced #import with #include.
+        Also changed <JavaScriptCore/pcre.h> to <pcre/pcre.h>.
+        * ForwardingHeaders/pcre: Added.
+        * ForwardingHeaders/pcre/pcre.h: Added.
+
 2006-01-12  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by anders & mjs.
diff --git a/WebCore/ForwardingHeaders/pcre/pcre.h b/WebCore/ForwardingHeaders/pcre/pcre.h
new file mode 100644 (file)
index 0000000..47c0d3d
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/pcre.h>
index 51c977c..81bc3ef 100644 (file)
  */
 
 #include "config.h"
-#import "FrameView.h"
+#include "FrameView.h"
 
-#import "MacFrame.h"
-#import "KWQWindowWidget.h"
+#include "MacFrame.h"
+#include "KWQWindowWidget.h"
 
 /*
     Currently this file just extends the KDE implementation.
index c7a448d..a06423b 100644 (file)
  *
  */
 
-
 #include "config.h"
 #include "RenderSVGText.h"
+
 #include "SVGTextElementImpl.h"
 #include "SVGAnimatedLengthListImpl.h"
-
-#import "KRenderingDevice.h"
-#import "KCanvasMatrix.h"
+#include "KRenderingDevice.h"
+#include "KCanvasMatrix.h"
 
 RenderSVGText::RenderSVGText(KSVG::SVGTextElementImpl *node) 
     : RenderBlock(node)
index e83ae20..0e9c066 100644 (file)
@@ -35,7 +35,7 @@
 #include "rendering/render_style.h"
 #include "rendering/render_object.h"
 
-#import <kxmlcore/Assertions.h>
+#include <kxmlcore/Assertions.h>
 
 using namespace khtml;
 
index 3907ddf..2679f40 100644 (file)
  */
 
 #include "config.h"
-#import "KWQArrayImpl.h"
+#include "KWQArrayImpl.h"
 
-#import <new>
-#import <string.h>
+#include <new>
+#include <string.h>
 
 #define        MIN(a,b) (((a)<(b))?(a):(b))
 
index faccab2..724a4b7 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#import "KWQBuffer.h"
+#include "KWQBuffer.h"
 
 void QBuffer::open(int)
 {
index 80701ea..c43d6be 100644 (file)
  */
 
 #include "config.h"
-#import "KWQCString.h"
+#include "KWQCString.h"
 
-#import <kxmlcore/Assertions.h>
-#import <ctype.h>
+#include <kxmlcore/Assertions.h>
+#include <ctype.h>
 
 using std::ostream;
 
index d071dee..b86db33 100644 (file)
  */
 
 #include "config.h"
-#import "KWQCharsets.h"
+#include "KWQCharsets.h"
 
-#import <unicode/ucnv.h>
-#import <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/utypes.h>
 
 struct CharsetEntry {
     const char *name;
index 4bf601f..d2c0e3f 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQDateTime.h"
+#include "KWQDateTime.h"
 
-#import <time.h>
+#include <time.h>
 
 static CFTimeZoneRef systemTimeZone()
 {
index a0bc3f0..7ea1275 100644 (file)
@@ -24,8 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQDictImpl.h"
-#import <CoreFoundation/CoreFoundation.h>
+#include "KWQDictImpl.h"
+
+#include <CoreFoundation/CoreFoundation.h>
 
 KWQDictImpl::KWQDictImpl(int size, bool caseSensitive, void (*deleteFunc)(void *)) :
     KWQPtrDictImpl(size, deleteFunc, &kCFCopyStringDictionaryKeyCallBacks), m_caseSensitive(caseSensitive)
index 345a1a0..371c365 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQGuardedPtr.h"
+#include "KWQGuardedPtr.h"
 
-#import "KWQObject.h"
+#include "KWQObject.h"
 
 KWQGuardedPtrBase::KWQGuardedPtrBase(QObject *o)
 {
index 7794aa0..bf5114c 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQKHTMLFactory.h"
+#include "KWQKHTMLFactory.h"
 
-#import "KWQKHTMLSettings.h"
+#include "KWQKHTMLSettings.h"
 
 KHTMLSettings *KHTMLFactory::defaultHTMLSettings()
 {
index fdb2763..a681231 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#import "KWQKPartsEvent.h"
+#include "KWQKPartsEvent.h"
 
 namespace KParts {
 
index f2bbc2f..0ab3196 100644 (file)
  */
 
 #include "config.h"
-#import "KWQListImpl.h"
+#include "KWQListImpl.h"
 
-#import <cstddef>
-#import <algorithm>
-#import <CoreFoundation/CFArray.h>
-#import <kxmlcore/Assertions.h>
-#import "kxmlcore/FastMalloc.h"
+#include <cstddef>
+#include <algorithm>
+#include <CoreFoundation/CFArray.h>
+#include <kxmlcore/Assertions.h>
 
 class KWQListNode
 {
index 470e296..6d4b8df 100644 (file)
@@ -24,8 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQMapImpl.h"
-#import "misc/shared.h"
+#include "KWQMapImpl.h"
+
+#include "misc/shared.h"
 
 KWQMapNodeImpl::KWQMapNodeImpl() :
     prev(NULL),
index 72bc323..cd5946a 100644 (file)
  */
 
 #include "config.h"
-#import "KWQObject.h"
+#include "KWQObject.h"
 
-#import <kxmlcore/Assertions.h>
-#import <kxmlcore/FastMalloc.h>
+#include <kxmlcore/Assertions.h>
 
 struct KWQObjectTimer {
     QObject *target;
index 33e64d8..4fb1e5b 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#import "KWQPen.h"
+#include "KWQPen.h"
 
 QPen::QPen(const QColor &color, uint width, PenStyle style) : penStyle(style), penWidth(width), penColor(color)
 {
@@ -71,5 +71,3 @@ bool QPen::operator!=(const QPen &compareTo) const
 {
     return !(*this == compareTo);
 }
-
-
index 4332083..ee5af69 100644 (file)
  */
 
 #include "config.h"
-#import "KWQPointArray.h"
-#import <stdarg.h>
+#include "KWQPointArray.h"
 
-#import "KWQRect.h"
+#include <stdarg.h>
+#include "KWQRect.h"
 
 QPointArray::QPointArray(int nPoints, const int *points)
 {
index 1b61cfd..2ed4211 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQPtrDictImpl.h"
+#include "KWQPtrDictImpl.h"
 
-#import <new>
+#include <new>
 
 typedef void (* DeleteFunction) (void *);
 
index b04a2a3..92f719e 100644 (file)
  */
 
 #include "config.h"
-#import "KWQRegExp.h"
-#import "KWQLogging.h"
+#include "KWQRegExp.h"
+#include "KWQLogging.h"
 
-#import <sys/types.h>
-#import <JavaScriptCore/pcre.h>
-#import "misc/shared.h"
+#include <sys/types.h>
+#include <pcre/pcre.h>
+#include "misc/shared.h"
 
 #define MAX_SUBSTRINGS  10
 #define MAX_OFFSETS     (3 *MAX_SUBSTRINGS)
@@ -223,7 +223,7 @@ QString QRegExp::cap(int n) const
 {
     Q_ASSERT(!d->lastSearchString.isNull());
     const pcre_char *substring = NULL;
-    int substringLength =  pcre_get_substring(reinterpret_cast<const uint16_t *>(d->lastMatchString.unicode()), d->lastMatchOffsets, d->lastMatchCount, n, &substring);
+    int substringLength = pcre_get_substring(reinterpret_cast<const uint16_t *>(d->lastMatchString.unicode()), d->lastMatchOffsets, d->lastMatchCount, n, &substring);
     if (substringLength > 0) {
        QString capture(reinterpret_cast<const QChar *>(substring), substringLength);
        pcre_free_substring(substring);
@@ -231,4 +231,3 @@ QString QRegExp::cap(int n) const
     }
     return QString();
 }
-
index 86820d9..ce599c1 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#import "KWQRegion.h"
+#include "KWQRegion.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 
index 1f44aed..0654afa 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQStyle.h"
+#include "KWQStyle.h"
 
-#import "KWQWidget.h"
+class QWidget;
 
 QSize QStyle::sizeFromContents(ContentType, QWidget *, const QSize &s) const
 {
index 02e28dc..2366af1 100644 (file)
  */
 
 #include "config.h"
-#import "KWQTextCodec.h"
+#include "KWQTextCodec.h"
 
-#import <kxmlcore/Assertions.h>
-#import "KWQCharsets.h"
-#import "KWQLogging.h"
-
-#import <unicode/ucnv.h>
-#import <unicode/utypes.h>
+#include <kxmlcore/Assertions.h>
+#include "KWQCharsets.h"
+#include "KWQLogging.h"
+#include <unicode/ucnv.h>
+#include <unicode/utypes.h>
 
 const UniChar replacementCharacter = 0xFFFD;
 const UniChar BOM = 0xFEFF;
index 0d4af0d..e6fc9dc 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQLogging.h"
+#include "KWQLogging.h"
 
-#import "KWQTextStream.h"
+#include "KWQTextStream.h"
 
 const size_t integerOrPointerAsStringBufferSize = 100; // large enough for any integer or pointer in string format, including trailing null character
 const char *precisionFormats[] = { "%.0f", "%.1f", "%.2f", "%.3f", "%.4f", "%.5f" "%.6f"}; 
index f5c6652..b2d1e9b 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQTimer.h"
+#include "KWQTimer.h"
 
-#import <kxmlcore/Assertions.h>
+#include <kxmlcore/Assertions.h>
 
 static void timerFired(CFRunLoopTimerRef, void *info)
 {
index 4c1355b..38ab682 100644 (file)
  */
 
 #include "config.h"
-#import "KWQValueListImpl.h"
-#import "misc/shared.h"
+#include "KWQValueListImpl.h"
 
-#import <stdlib.h>
+#include "misc/shared.h"
+#include <stdlib.h>
 
 class KWQValueListImpl::KWQValueListPrivate : public khtml::Shared<KWQValueListImpl::KWQValueListPrivate>
 {
index e0fa59d..5df1f62 100644 (file)
  */
 
 #include "config.h"
-#import "KWQVariant.h"
-#import "KWQString.h"
-#import "misc/shared.h"
+#include "KWQVariant.h"
+
+#include "KWQString.h"
+#include "misc/shared.h"
 
 class QVariant::QVariantPrivate : public khtml::Shared<QVariant::QVariantPrivate>
 {
index f72045a..b884e64 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#import "KWQVectorImpl.h"
+#include "KWQVectorImpl.h"
 
 KWQVectorImpl::KWQVectorImpl(void (*f)(void *))
     : m_data(0), m_size(0), m_count(0), m_deleteItemFunction(f)
index 4685bfb..9a633c1 100644 (file)
@@ -24,8 +24,9 @@
  */
 
 #include "config.h"
-#import "KWQWMatrix.h"
-#import "KWQRect.h"
+#include "KWQWMatrix.h"
+
+#include "KWQRect.h"
 
 static const double deg2rad = 0.017453292519943295769; // pi/180