Commit a9627932 authored by darin's avatar darin

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.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12025 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6e70e6a5
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.
......
#include <JavaScriptCore/pcre.h>
......@@ -24,10 +24,10 @@
*/
#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.
......
......@@ -20,14 +20,13 @@
*
*/
#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)
......
......@@ -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;
......
......@@ -24,10 +24,10 @@
*/
#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))
......
......@@ -24,7 +24,7 @@
*/
#include "config.h"
#import "KWQBuffer.h"
#include "KWQBuffer.h"
void QBuffer::open(int)
{
......
......@@ -24,10 +24,10 @@
*/
#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;
......
......@@ -25,10 +25,10 @@
*/
#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;
......
......@@ -24,9 +24,9 @@
*/
#include "config.h"
#import "KWQDateTime.h"
#include "KWQDateTime.h"
#import <time.h>
#include <time.h>
static CFTimeZoneRef systemTimeZone()
{
......
......@@ -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)
......
......@@ -24,9 +24,9 @@
*/
#include "config.h"
#import "KWQGuardedPtr.h"
#include "KWQGuardedPtr.h"
#import "KWQObject.h"
#include "KWQObject.h"
KWQGuardedPtrBase::KWQGuardedPtrBase(QObject *o)
{
......
......@@ -24,9 +24,9 @@
*/
#include "config.h"
#import "KWQKHTMLFactory.h"
#include "KWQKHTMLFactory.h"
#import "KWQKHTMLSettings.h"
#include "KWQKHTMLSettings.h"
KHTMLSettings *KHTMLFactory::defaultHTMLSettings()
{
......
......@@ -24,7 +24,7 @@
*/
#include "config.h"
#import "KWQKPartsEvent.h"
#include "KWQKPartsEvent.h"
namespace KParts {
......
......@@ -24,13 +24,12 @@
*/
#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
{
......
......@@ -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),
......
......@@ -24,10 +24,9 @@
*/
#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;
......
......@@ -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);
}
......@@ -24,10 +24,10 @@
*/
#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)
{
......
......@@ -24,9 +24,9 @@
*/
#include "config.h"
#import "KWQPtrDictImpl.h"
#include "KWQPtrDictImpl.h"
#import <new>
#include <new>
typedef void (* DeleteFunction) (void *);
......
......@@ -24,12 +24,12 @@
*/
#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();
}
......@@ -24,7 +24,7 @@
*/
#include "config.h"
#import "KWQRegion.h"
#include "KWQRegion.h"
#include <ApplicationServices/ApplicationServices.h>
......
......@@ -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
{
......
......@@ -24,14 +24,13 @@
*/
#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;
......
......@@ -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"};
......
......@@ -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)
{
......
......@@ -24,10 +24,10 @@
*/
#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>
{
......
......@@ -24,9 +24,10 @@
*/
#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>
{
......
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment