[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:54:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7fd4bd7d9d2161ff892eb85727642f18c0d01504
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 26 23:21:43 2002 +0000
- changed to use #if APPLE_CHANGES and #if !APPLE_CHANGES consistently
We no longer do #ifdef APPLE_CHANGES or #ifndef APPLE_CHANGES.
* lots of files
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3b466b8..18bdc10 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,7 +1,16 @@
2002-10-26 Darin Adler <darin at apple.com>
+ - changed to use #if APPLE_CHANGES and #if !APPLE_CHANGES consistently
+
+ We no longer do #ifdef APPLE_CHANGES or #ifndef APPLE_CHANGES.
+
+ * lots of files
+
+2002-10-26 Darin Adler <darin at apple.com>
+
- changed naming scheme in KWQ for files like qstring.h
- Now use names like KWQString.h and make a forwarding header called qstring.h.
+
+ Now use names like KWQString.h and a forwarding header called qstring.h.
* tons of files
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3b466b8..18bdc10 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,7 +1,16 @@
2002-10-26 Darin Adler <darin at apple.com>
+ - changed to use #if APPLE_CHANGES and #if !APPLE_CHANGES consistently
+
+ We no longer do #ifdef APPLE_CHANGES or #ifndef APPLE_CHANGES.
+
+ * lots of files
+
+2002-10-26 Darin Adler <darin at apple.com>
+
- changed naming scheme in KWQ for files like qstring.h
- Now use names like KWQString.h and make a forwarding header called qstring.h.
+
+ Now use names like KWQString.h and a forwarding header called qstring.h.
* tons of files
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3b466b8..18bdc10 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,7 +1,16 @@
2002-10-26 Darin Adler <darin at apple.com>
+ - changed to use #if APPLE_CHANGES and #if !APPLE_CHANGES consistently
+
+ We no longer do #ifdef APPLE_CHANGES or #ifndef APPLE_CHANGES.
+
+ * lots of files
+
+2002-10-26 Darin Adler <darin at apple.com>
+
- changed naming scheme in KWQ for files like qstring.h
- Now use names like KWQString.h and make a forwarding header called qstring.h.
+
+ Now use names like KWQString.h and a forwarding header called qstring.h.
* tons of files
diff --git a/WebCore/khtml/css/css_valueimpl.cpp b/WebCore/khtml/css/css_valueimpl.cpp
index b25d582..a30cd98 100644
--- a/WebCore/khtml/css/css_valueimpl.cpp
+++ b/WebCore/khtml/css/css_valueimpl.cpp
@@ -403,7 +403,7 @@ float CSSPrimitiveValueImpl::computeLengthFloat( khtml::RenderStyle *style, QPai
case CSSPrimitiveValue::CSS_EXS:
{
QFontMetrics fm = style->fontMetrics();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
factor = fm.xHeight();
#else
QRect b = fm.boundingRect('x');
@@ -660,7 +660,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
static const QRegExp parenReg(" \\(.*\\)$");
static const QRegExp braceReg(" \\[.*\\]$");
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
parsedFontName = string;
// a language tag is often added in braces at the end. Remove it.
parsedFontName.replace(parenReg, "");
@@ -706,5 +706,5 @@ FontFamilyValueImpl::FontFamilyValueImpl( const QString &string)
parsedFontName = available.mid( pos1, pos - pos1 );
}
}
-#endif // APPLE_CHANGES not defined
+#endif // !APPLE_CHANGES
}
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 1e4ce0a..1483d32 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -238,7 +238,7 @@ void CSSStyleSelector::computeFontSizes(QPaintDeviceMetrics* paintDeviceMetrics,
void CSSStyleSelector::computeFontSizesFor(QPaintDeviceMetrics* paintDeviceMetrics, int zoomFactor, QValueList<int>& fontSizes, bool isFixed)
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// We don't want to scale the settings by the dpi.
const float toPix = 1;
#else
diff --git a/WebCore/khtml/dom/dom_doc.h b/WebCore/khtml/dom/dom_doc.h
index 243747c..8214ca9 100644
--- a/WebCore/khtml/dom/dom_doc.h
+++ b/WebCore/khtml/dom/dom_doc.h
@@ -75,7 +75,7 @@ class HTMLDocument;
class DOMImplementation
{
friend class Document;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class DOMImplementationImpl;
#endif
@@ -253,7 +253,7 @@ class Document : public Node
friend class HTMLFrameElement;
friend class HTMLIFrameElement;
friend class HTMLObjectElement;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class DocumentImpl;
#endif
@@ -876,7 +876,7 @@ class DocumentType : public Node
{
friend class Document;
friend class DOMImplementation;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class DocumentTypeImpl;
#endif
diff --git a/WebCore/khtml/dom/dom_element.h b/WebCore/khtml/dom/dom_element.h
index da382b1..fc12358 100644
--- a/WebCore/khtml/dom/dom_element.h
+++ b/WebCore/khtml/dom/dom_element.h
@@ -92,7 +92,7 @@ class Attr : public Node
friend class HTMLDocument;
friend class ElementImpl;
friend class NamedAttrMapImpl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class AttrImpl;
#endif
@@ -211,7 +211,7 @@ class Element : public Node
friend class Document;
friend class HTMLDocument;
// friend class AttrImpl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class ElementImpl;
#endif
friend class Attr;
diff --git a/WebCore/khtml/dom/dom_node.h b/WebCore/khtml/dom/dom_node.h
index 3a2debb..95d77e0 100644
--- a/WebCore/khtml/dom/dom_node.h
+++ b/WebCore/khtml/dom/dom_node.h
@@ -231,7 +231,7 @@ protected:
friend class Node;
friend class DocumentType;
friend class NodeImpl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class NamedNodeMapImpl;
#endif
};
@@ -897,7 +897,7 @@ class NodeList
friend class Node;
friend class Document;
friend class HTMLDocument;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class NodeListImpl;
#endif
diff --git a/WebCore/khtml/dom/dom_text.h b/WebCore/khtml/dom/dom_text.h
index 8b051a9..371334c 100644
--- a/WebCore/khtml/dom/dom_text.h
+++ b/WebCore/khtml/dom/dom_text.h
@@ -48,7 +48,7 @@ class CharacterDataImpl;
*/
class CharacterData : public Node
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class CharacterDataImpl;
#endif
@@ -270,7 +270,7 @@ class TextImpl;
class Text : public CharacterData
{
friend class Document;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class TextImpl;
#endif
public:
diff --git a/WebCore/khtml/dom/dom_xml.h b/WebCore/khtml/dom/dom_xml.h
index c24ec2f..210315d 100644
--- a/WebCore/khtml/dom/dom_xml.h
+++ b/WebCore/khtml/dom/dom_xml.h
@@ -261,7 +261,7 @@ protected:
class ProcessingInstruction : public Node
{
friend class Document;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class ProcessingInstructionImpl;
#endif
public:
diff --git a/WebCore/khtml/dom/html_document.cpp b/WebCore/khtml/dom/html_document.cpp
index f26fde8..a6ae03b 100644
--- a/WebCore/khtml/dom/html_document.cpp
+++ b/WebCore/khtml/dom/html_document.cpp
@@ -88,7 +88,7 @@ DOMString HTMLDocument::title() const
void HTMLDocument::setTitle( const DOMString &v )
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (!impl) return;
((HTMLDocumentImpl *)impl)->setTitle(v);
#else
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index f579eed..a6bf2f3 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -65,7 +65,7 @@ namespace KJS {
static QPtrList<PluginInfo> *plugins;
static QPtrList<MimeClassInfo> *mimes;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static void ref();
static void unref();
#endif
@@ -99,7 +99,7 @@ namespace KJS {
class Plugin : public ObjectImp {
public:
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
Plugin( ExecState *exec, PluginBase::PluginInfo *info )
: ObjectImp(exec->interpreter()->builtinObjectPrototype() )
{ m_info = info; PluginBase::ref(); };
@@ -120,7 +120,7 @@ namespace KJS {
class MimeType : public ObjectImp {
public:
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
MimeType( ExecState *exec, PluginBase::MimeClassInfo *info )
: ObjectImp(exec->interpreter()->builtinObjectPrototype() )
{ m_info = info; PluginBase::ref(); };
@@ -212,13 +212,13 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
//kdDebug() << "appName -> Mozilla" << endl;
return String("Gecko");
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return Undefined();
#else
return String("Konqueror/khtml");
#endif
case Vendor:
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return Undefined();
#else
return String("KDE");
@@ -242,7 +242,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
case _MimeTypes:
return Value(new MimeTypes(exec));
case CookieEnabled:
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return Boolean(KWQKCookieJar::cookieEnabled());
#else
return Boolean(true); /// ##### FIXME
@@ -335,7 +335,7 @@ PluginBase::~PluginBase()
}
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
void PluginBase::ref()
{
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index bab8c85..40e13e0 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1761,7 +1761,7 @@ Value History::get(ExecState *exec, const UString &p) const
Value History::getValueProperty(ExecState *, int token) const
{
switch (token) {
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
case Length:
{
KParts::BrowserExtension *ext = part->browserExtension();
diff --git a/WebCore/khtml/html/html_baseimpl.h b/WebCore/khtml/html/html_baseimpl.h
index bb181dc..55b1e0c 100644
--- a/WebCore/khtml/html/html_baseimpl.h
+++ b/WebCore/khtml/html/html_baseimpl.h
@@ -94,7 +94,7 @@ public:
DocumentImpl* contentDocument() const;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
QScrollView::ScrollBarMode scrollingMode() const { return scrolling; }
int getMarginWidth() const { return marginWidth; }
int getMarginHeight() const { return marginHeight; }
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index aa20a22..1a0aa65 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -133,7 +133,7 @@ DOMString HTMLDocumentImpl::lastModified() const
DOMString HTMLDocumentImpl::cookie() const
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return KWQKCookieJar::cookie(URL());
#else
long windowId = 0;
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index c58e795..969757c 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -185,7 +185,7 @@ QByteArray HTMLFormElementImpl::formData(bool& ok)
QCString enc_string = ""; // used for non-multipart data
// find out the QTextcodec to use
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
QString origStr = m_acceptcharset.string();
QChar space(' ');
QChar strChars[origStr.length()];
@@ -226,7 +226,7 @@ QByteArray HTMLFormElementImpl::formData(bool& ok)
if ( codec->mibEnum() == 11 )
codec = QTextCodec::codecForMib( 85 );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
QString encCharset = codec->name();
QChar encChars[encCharset.length()];
for(unsigned int i=0; i < encCharset.length(); i++)
@@ -310,7 +310,7 @@ QByteArray HTMLFormElementImpl::formData(bool& ok)
}
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if (fileUploads.count()) {
int result = KMessageBox::warningContinueCancelList( 0,
i18n("You're about to transfer the following files from "
@@ -1545,14 +1545,14 @@ void HTMLSelectElementImpl::setValue(DOMStringImpl* /*value*/)
QString HTMLSelectElementImpl::state( )
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
QString state;
#endif /* APPLE_CHANGES not defined */
QMemArray<HTMLGenericFormElementImpl*> items = listItems();
int l = items.count();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
QChar stateChars[l];
for(int i = 0; i < l; i++)
@@ -1578,7 +1578,7 @@ void HTMLSelectElementImpl::restoreState(const QString &_state)
QString state = _state;
if(!state.isEmpty() && !state.contains('X') && !m_multiple) {
qWarning("should not happen in restoreState!");
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Invalid access to string's internal buffer. Should never get here
// anyway.
//state[0] = 'X';
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 41973aa..917da69 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -190,7 +190,7 @@ void HTMLLinkElementImpl::process()
KHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
// IE extension: location of small icon for locationbar / bookmarks
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if ( part && rel == "shortcut icon" && !m_url.isEmpty() && !part->parentPart())
part->browserExtension()->setIconURL( KURL(m_url.string()) );
@@ -457,7 +457,7 @@ NodeImpl::Id HTMLTitleElementImpl::id() const
void HTMLTitleElementImpl::insertedIntoDocument()
{
HTMLElementImpl::insertedIntoDocument();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Only allow title to be set by first <title> encountered.
if (getDocument()->title().isEmpty())
getDocument()->setTitle(m_title);
@@ -482,7 +482,7 @@ void HTMLTitleElementImpl::childrenChanged()
if ((c->nodeType() == Node::TEXT_NODE) || (c->nodeType() == Node::CDATA_SECTION_NODE))
m_title += c->nodeValue();
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Only allow title to be set by first <title> encountered.
if (inDocument() && getDocument()->title().isEmpty())
#else
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 0d238e8..b77572e 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -133,7 +133,7 @@ void HTMLAppletElementImpl::attach()
}
bool HTMLAppletElementImpl::getMember(const QString & name, JType & type, QString & val) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return false;
#else
#ifndef Q_WS_QWS // We don't have Java in Qt Embedded
@@ -148,7 +148,7 @@ bool HTMLAppletElementImpl::getMember(const QString & name, JType & type, QStrin
}
bool HTMLAppletElementImpl::callMember(const QString & name, const QStringList & args, JType & type, QString & val) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return false;
#else
#ifndef Q_WS_QWS // We don't have Java in Qt Embedded
@@ -335,7 +335,7 @@ void HTMLObjectElementImpl::attach()
KHTMLView* w = getDocument()->view();
bool loadplugin = w->part()->pluginsEnabled();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// This check showed up during the KDE 3.0 -> 3.0.1 transition.
// We can't figure out exactly what it's supposed to do, but it prevents
// plugins from working properly for us, so we've rolled back to the way
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 380035b..bcf77f9 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -89,7 +89,7 @@ static const char titleEnd [] = "</title";
//
// There may be better equivalents
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Note that we have more Unicode characters than Qt, so we use the
// official mapping table from the Unicode 2.0 standard here instead of
@@ -518,7 +518,7 @@ void HTMLTokenizer::scriptHandler()
void HTMLTokenizer::scriptExecution( const QString& str, QString scriptURL,
int baseLine)
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (!view->part())
return;
#endif
diff --git a/WebCore/khtml/html/htmltokenizer.h b/WebCore/khtml/html/htmltokenizer.h
index 2e3019b..4b0a7ff 100644
--- a/WebCore/khtml/html/htmltokenizer.h
+++ b/WebCore/khtml/html/htmltokenizer.h
@@ -44,7 +44,7 @@ class HTMLTokenizer;
#include "xml/dom_elementimpl.h"
#include "xml/dom_docimpl.h"
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#ifdef __OBJC__
#define id id_AVOID_KEYWORD
#endif
@@ -350,7 +350,7 @@ protected:
KHTMLView *view;
};
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#undef id
#endif
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 7ff4920..c265e84 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -27,7 +27,7 @@
#define SPEED_DEBUG
#include "khtml_part.h"
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#define DIRECT_LINKAGE_TO_ECMA
#define QT_NO_CLIPBOARD
#define QT_NO_DRAGANDDROP
@@ -138,7 +138,7 @@ KHTMLPart::KHTMLPart( QWidget *parentWidget, const char *widgetname, QObject *pa
d = 0;
KHTMLFactory::registerPart( this );
setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// The widget is made outside this class in our case.
init( 0, prof );
#else
@@ -146,7 +146,7 @@ KHTMLPart::KHTMLPart( QWidget *parentWidget, const char *widgetname, QObject *pa
#endif
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
KHTMLPart::KHTMLPart( KHTMLView *view, QObject *parent, const char *name, GUIProfile prof )
: KParts::ReadOnlyPart( parent, name )
@@ -179,7 +179,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_bSecurityInQuestion = false;
d->m_paLoadImages = 0;
d->m_bMousePressed = false;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_paViewDocument = new KAction( i18n( "View Document Source" ), 0, this, SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
@@ -223,7 +223,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled();
d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
connect( this, SIGNAL( completed() ),
this, SLOT( updateActions() ) );
connect( this, SIGNAL( completed( bool ) ),
@@ -246,11 +246,11 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
connect( &d->m_redirectionTimer, SIGNAL( timeout() ),
this, SLOT( slotRedirect() ) );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_dcopobject = new KHTMLPartIface(this);
#endif
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
kwq = new KWQKHTMLPart(this);
#endif
}
@@ -258,7 +258,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
KHTMLPart::~KHTMLPart()
{
//kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( d->m_findDialog )
disconnect( d->m_findDialog, SIGNAL( destroyed() ),
this, SLOT( slotFindDialogDestroyed() ) );
@@ -346,7 +346,7 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_redirectionTimer.stop();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
// check to see if this is an "error://" URL. This is caused when an error
// occurs before this part was loaded (e.g. KonqRun), and is passed to
// khtmlpart so that it can display the error.
@@ -488,7 +488,7 @@ bool KHTMLPart::openURL( const KURL &url )
bool KHTMLPart::closeURL()
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
kwq->saveDocumentState();
#endif
@@ -731,7 +731,7 @@ KJavaAppletContext *KHTMLPart::createJavaContext()
{
#ifndef Q_WS_QWS
if ( !d->m_javaContext ) {
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_javaContext = new KJavaAppletContext(d->m_dcopobject);
#else
d->m_javaContext = new KJavaAppletContext(d->m_dcopobject, this);
@@ -761,7 +761,7 @@ bool KHTMLPart::pluginsEnabled() const
return d->m_bPluginsEnabled;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::slotShowDocument( const QString &url, const QString &target )
{
@@ -846,7 +846,7 @@ void KHTMLPart::setAutoloadImages( bool enable )
if ( d->m_doc )
d->m_doc->docLoader()->setAutoloadImages( enable );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
unplugActionList( "loadImages" );
if ( enable ) {
@@ -880,7 +880,7 @@ void KHTMLPart::clear()
d->m_bClearing = true;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
{
ConstFrameIt it = d->m_frames.begin();
ConstFrameIt end = d->m_frames.end();
@@ -929,7 +929,7 @@ void KHTMLPart::clear()
delete d->m_decoder;
d->m_decoder = 0;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
{
ConstFrameIt it = d->m_frames.begin();
ConstFrameIt end = d->m_frames.end();
@@ -957,7 +957,7 @@ void KHTMLPart::clear()
d->m_redirectLockHistory = true;
d->m_bHTTPRefresh = false;
d->m_bClearing = false;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_frameNameId = 1;
#endif
d->m_bFirstData = true;
@@ -1035,7 +1035,7 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const QByteArray &data )
if (p && p->d->m_ssl_in_use != d->m_ssl_in_use) {
while (p->parentPart()) p = p->parentPart();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
p->d->m_paSecurity->setIcon( "halfencrypted" );
#endif
p->d->m_bSecurityInQuestion = true;
@@ -1043,7 +1043,7 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const QByteArray &data )
}
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_paSecurity->setIcon( d->m_ssl_in_use ? "encrypted" : "decrypted" );
kdDebug(6050) << "setIcon " << ( d->m_ssl_in_use ? "encrypted" : "decrypted" ) << " done." << endl;
#endif
@@ -1141,7 +1141,7 @@ void KHTMLPart::slotRestoreData(const QByteArray &data )
}
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::showError( KIO::Job* job )
{
@@ -1275,12 +1275,12 @@ void KHTMLPart::slotFinished( KIO::Job * job )
{
KHTMLPageCache::self()->cancelEntry(d->m_cacheId);
d->m_job = 0L;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
emit canceled( job->errorString() );
#endif
// TODO: what else ?
checkCompleted();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
showError( job );
#endif
return;
@@ -1308,7 +1308,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_bLoadEventEmitted = false;
if(url.isValid()) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
KHTMLFactory::vLinks()->insert( kwq->requestedURLString() );
#else
QString urlString = url.url();
@@ -1332,7 +1332,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
m_url = url;
KURL baseurl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// We don't need KDE chained URI handling or window caption setting
if ( !m_url.isEmpty() )
{
@@ -1373,7 +1373,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
kwq->updatePolicyBaseURL();
#endif
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_paUseStylesheet->setItems(QStringList());
d->m_paUseStylesheet->setEnabled( false );
#endif
@@ -1383,7 +1383,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
if ( !userStyleSheet.isEmpty() )
setUserStyleSheet( KURL( userStyleSheet ) );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
kwq->restoreDocumentState();
#else
d->m_doc->setRestoreState(args.docState);
@@ -1394,7 +1394,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_view->resizeContents( 0, 0 );
connect(d->m_doc,SIGNAL(finishedParsing()),this,SLOT(slotFinishedParsing()));
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
emit d->m_extension->enableAction( "print", true );
#endif
@@ -1464,7 +1464,7 @@ void KHTMLPart::end()
d->m_doc->finishParsing();
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::paint(QPainter *p, const QRect &rc, int yOff, bool *more)
{
@@ -1508,7 +1508,7 @@ void KHTMLPart::slotFinishedParsing()
checkCompleted();
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObject *obj )
{
@@ -1639,7 +1639,7 @@ void KHTMLPart::checkCompleted()
QStringList sheets;
if (d->m_doc)
sheets = d->m_doc->availableStyleSheets();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->m_paUseStylesheet->setItems( sheets );
d->m_paUseStylesheet->setEnabled( !sheets.isEmpty() );
if (!sheets.isEmpty())
@@ -1780,7 +1780,7 @@ bool KHTMLPart::setEncoding( const QString &name, bool override )
d->m_encoding = name;
d->m_haveEncoding = override;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if( !m_url.isEmpty() ) {
// reload document
closeURL();
@@ -1910,7 +1910,7 @@ bool KHTMLPart::findTextNext( const QString &str, bool forward, bool caseSensiti
QConstString s(t->s, t->l);
int matchLen = 0;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( isRegExp ) {
QRegExp matcher( str );
matcher.setCaseSensitive( caseSensitive );
@@ -2318,7 +2318,7 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
}
KURL cURL = completeURL(url);
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
// special case for <a href="">
if ( url.isEmpty() )
cURL.setFileName( url );
@@ -2330,7 +2330,7 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
//kdDebug( 6000 ) << "urlSelected: complete URL:" << cURL.url() << " target = " << target << endl;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( button == LeftButton && ( state & ShiftButton ) )
{
KIO::MetaData metaData;
@@ -2358,7 +2358,7 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
args.metaData().insert("ssl_was_in_use", d->m_ssl_in_use ? "TRUE":"FALSE");
args.metaData().insert("ssl_activate_warnings", "TRUE");
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
args.metaData()["referrer"] = d->m_referrer;
kwq->urlSelected(cURL, button, state, args);
#else
@@ -2392,7 +2392,7 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
#endif // APPLE_CHANGES
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::slotViewDocumentSource()
{
@@ -2633,7 +2633,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
(*it).m_frame = frame;
(*it).m_params = params;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
// Support for <frame src="javascript:string">
if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
@@ -2648,7 +2648,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
return requestObject( &(*it), completeURL( url ));
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
unsigned KHTMLPartPrivate::m_frameNameId = 0;
#endif
@@ -2675,7 +2675,7 @@ bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, con
bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args )
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if (!checkLinkSecurity(url))
return false;
#endif
@@ -2691,7 +2691,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
KParts::URLArgs args( _args );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( child->m_run )
child->m_run->abort();
#endif
@@ -2715,7 +2715,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty())
args.serviceType = QString::fromLatin1( "text/html" );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return processObjectRequest( child, url, args.serviceType );
#else
if ( args.serviceType.isEmpty() ) {
@@ -2781,7 +2781,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
//CRITICAL STUFF
if ( child->m_part )
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part );
#endif
delete (KParts::ReadOnlyPart *)child->m_part;
@@ -2791,7 +2791,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
if ( child->m_frame )
child->m_frame->setWidget( part->widget() );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( child->m_type != khtml::ChildFrame::Object )
partManager()->addPart( part, false );
// else
@@ -2909,7 +2909,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
return true;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
KParts::ReadOnlyPart *KHTMLPart::createPart( QWidget *parentWidget, const char *widgetName,
QObject *parent, const char *name, const QString &mimetype,
@@ -2990,7 +2990,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
return;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
// Form security checks
//
@@ -3058,7 +3058,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
return;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if (!checkLinkSecurity(u,
i18n( "<qt>The form will be submitted to <BR><B>%1</B><BR>on your local filesystem.<BR>Do you want to submit the form?" ),
i18n( "Submit" )))
@@ -3138,7 +3138,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
args.setContentType( "Content-Type: " + contentType + "; boundary=" + boundary );
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
kwq->submitForm(u, args);
#else
if ( d->m_doc->parsing() || d->m_runningScripts > 0 ) {
@@ -3164,7 +3164,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
void KHTMLPart::popupMenu( const QString &linkUrl )
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
KURL popupURL;
KURL linkKURL;
if ( linkUrl.isEmpty() ) // click on background
@@ -3236,7 +3236,7 @@ void KHTMLPart::slotChildCompleted( bool complete )
checkCompleted();
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
{
@@ -3348,7 +3348,7 @@ KHTMLPart *KHTMLPart::findFrame( const QString &f )
}
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
{
@@ -3387,7 +3387,7 @@ KHTMLPart *KHTMLPart::parentPart()
return (KHTMLPart *)parent();
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args,
bool callParent )
@@ -3697,7 +3697,7 @@ DOM::Node KHTMLPart::nodeUnderMouse() const
void KHTMLPart::emitSelectionChanged()
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
emit d->m_extension->enableAction( "copy", hasSelection() );
emit d->m_extension->selectionInfo( selectedText() );
emit selectionChanged();
@@ -3746,7 +3746,7 @@ void KHTMLPart::slotDecZoom()
void KHTMLPart::setZoomFactor (int percent)
{
-#ifndef APPLE_CHANGES // limits are client's responsibility
+#if !APPLE_CHANGES // limits are client's responsibility
if (percent < minZoom) percent = minZoom;
if (percent > maxZoom) percent = maxZoom;
#endif
@@ -3806,7 +3806,7 @@ QString KHTMLPart::lastModified() const
return d->m_lastModified;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::slotLoadImages()
{
@@ -3877,7 +3877,7 @@ QPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
return res;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
@@ -3942,7 +3942,7 @@ void KHTMLPart::customEvent( QCustomEvent *event )
KParts::ReadOnlyPart::customEvent( event );
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static bool firstSlaveAt (khtml::RenderObject *renderNode, int y, DOM::NodeImpl*&startNode, long &startOffset)
{
bool found = false;
@@ -4066,7 +4066,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
d->m_bMousePressed = true;
#ifndef KHTML_NO_SELECTION
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
d->m_selectionInitiatedWithDoubleClick = false;
d->m_selectionInitiatedWithTripleClick = false;
@@ -4200,7 +4200,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
emitSelectionChanged();
startAutoScroll();
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
}
#endif
#else
@@ -4339,7 +4339,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
// kdDebug( 6000 ) << "setting end of selection to " << d->m_selectionEnd.handle()->renderer() << "/"
// << d->m_endOffset << endl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Don't modify the selection if we're not on a node.
if (node == 0)
return;
@@ -4360,7 +4360,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
}
n = next;
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if ( d->m_selectionInitiatedWithDoubleClick){
if (d->m_startBeforeEnd) {
if (node == d->m_initialSelectionStart.handle() && node == d->m_initialSelectionEnd.handle()){
@@ -4547,7 +4547,7 @@ void KHTMLPart::khtmlDrawContentsEvent( khtml::DrawContentsEvent * )
{
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event )
{
@@ -4656,7 +4656,7 @@ void KHTMLPart::slotSelectAll()
void KHTMLPart::startAutoScroll()
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
connect(&d->m_scrollTimer, SIGNAL( timeout() ), this, SLOT( slotAutoScroll() ));
d->m_scrollTimer.start(100, false);
#endif
@@ -4664,7 +4664,7 @@ void KHTMLPart::startAutoScroll()
void KHTMLPart::stopAutoScroll()
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
disconnect(&d->m_scrollTimer, SIGNAL( timeout() ), this, SLOT( slotAutoScroll() ));
if (d->m_scrollTimer.isActive())
d->m_scrollTimer.stop();
@@ -4740,7 +4740,7 @@ void KHTMLPart::selectAll()
emitSelectionChanged();
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const QString &message, const QString &button)
{
@@ -4802,7 +4802,7 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part )
d->m_activeFrame = 0L;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
{
@@ -4904,7 +4904,7 @@ void KHTMLPart::preloadScript(const QString &url, const QString &script)
khtml::Cache::preloadScript(url, script);
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
QCString KHTMLPart::dcopObjectId() const
{
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index ad091b2..87b9375 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -34,7 +34,7 @@
#include <qregexp.h>
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#include "KWQKHTMLPart.h"
#endif
@@ -207,7 +207,7 @@ public:
*/
virtual bool closeURL();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
/**
* is called when a certain error situation (i.e. connection timed out) occured.
* default implementation either shows a KIO error dialog or loads a more verbose
@@ -593,7 +593,7 @@ public:
*/
KParts::PartManager *partManager();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
/**
* Saves the KHTMLPart's complete state (including child frame
* objects) to the provided @ref QDataStream.
@@ -780,7 +780,7 @@ protected:
*/
virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
/**
* Internal reimplementation of KParts::Part::guiActivateEvent .
*/
@@ -795,7 +795,7 @@ protected:
virtual void urlSelected( const QString &url, int button, int state,
const QString &_target, KParts::URLArgs args = KParts::URLArgs());
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
/**
* This method is called when a new embedded object (include html frames) is to be created.
* Reimplement it if you want to add support for certain embeddable objects without registering
@@ -869,7 +869,7 @@ private slots:
* @internal
*/
void slotDebugRenderTree();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
/**
* @internal
*/
@@ -1080,7 +1080,7 @@ private:
KHTMLPartPrivate *d;
friend class KHTMLPartPrivate;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
public:
KWQKHTMLPart *kwq;
friend class KWQKHTMLPart;
diff --git a/WebCore/khtml/khtmlpart_p.h b/WebCore/khtml/khtmlpart_p.h
index 4f3eeb0..721d1ee 100644
--- a/WebCore/khtml/khtmlpart_p.h
+++ b/WebCore/khtml/khtmlpart_p.h
@@ -56,7 +56,7 @@ namespace khtml
ChildFrame() { m_bCompleted = false; m_bPreloaded = false; m_type = Frame; m_bNotify = false; }
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
~ChildFrame() { if (m_run) m_run->abort(); }
#endif
@@ -69,7 +69,7 @@ namespace khtml
bool m_bCompleted;
QString m_name;
KParts::URLArgs m_args;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
QGuardedPtr<KHTMLRun> m_run;
#endif
bool m_bPreloaded;
@@ -126,7 +126,7 @@ public:
m_javaContext = 0;
#endif
m_cacheId = 0;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
m_frameNameId = 1;
#endif
@@ -221,7 +221,7 @@ public:
bool m_metaRefreshEnabled :1;
bool m_bPluginsOverride :1;
bool m_restored :1;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Made this static so frame names are globally unique and unsigned
// so overflow is handled more gracefully.
static unsigned m_frameNameId;
@@ -317,7 +317,7 @@ public:
bool m_bMousePressed;
DOM::Node m_mousePressNode; //node under the mouse when the mouse was pressed (set in the mouse handler)
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
DOM::Node m_initialSelectionStart;
long m_initialSelectionStartOffset;
DOM::Node m_initialSelectionEnd;
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 6ab1af5..b0a6962 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -205,7 +205,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, QWidget *parent, const char *name)
m_medium = "screen";
m_part = part;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
m_part->ref();
#endif
d = new KHTMLViewPrivate;
@@ -240,7 +240,7 @@ KHTMLView::~KHTMLView()
if (doc)
doc->detach();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
m_part->deref();
#endif
}
@@ -250,7 +250,7 @@ KHTMLView::~KHTMLView()
void KHTMLView::init()
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if(!d->paintBuffer) d->paintBuffer = new QPixmap(PAINT_BUFFER_HEIGHT, PAINT_BUFFER_HEIGHT);
if(!d->tp) d->tp = new QPainter();
#endif
@@ -320,7 +320,7 @@ void KHTMLView::resizeEvent (QResizeEvent* e)
KApplication::sendPostedEvents(viewport(), QEvent::Paint);
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
// this is to get rid of a compiler virtual overload mismatch warning. do not remove
void KHTMLView::drawContents( QPainter*)
@@ -429,7 +429,7 @@ void KHTMLView::viewportMousePressEvent( QMouseEvent *_mouse )
DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MousePress );
m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if (d->clickCount > 0 &&
QPoint(d->clickX-xm,d->clickY-ym).manhattanLength() <= QApplication::startDragDistance())
d->clickCount++;
@@ -471,7 +471,7 @@ void KHTMLView::viewportMouseDoubleClickEvent( QMouseEvent *_mouse )
DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseDblClick );
m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
d->clickCount = _mouse->clickCount();
bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEUP_EVENT,mev.innerNode.handle(),true,
d->clickCount,_mouse,false,DOM::NodeImpl::MouseRelease);
@@ -1002,7 +1002,7 @@ QString KHTMLView::mediaType() const
return m_medium;
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLView::print()
{
@@ -1193,7 +1193,7 @@ void KHTMLView::restoreScrollBar ( )
layout();
// scheduleRepaint(contentsX(),contentsY(),visibleWidth(),visibleHeight());
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
d->prevScrollbarVisible = verticalScrollBar()->isVisible();
#endif
}
@@ -1367,7 +1367,7 @@ void KHTMLView::setIgnoreWheelEvents( bool e )
void KHTMLView::viewportWheelEvent(QWheelEvent* e)
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( d->ignoreWheelEvents && !verticalScrollBar()->isVisible() && m_part->parentPart() ) {
if ( m_part->parentPart()->view() )
m_part->parentPart()->view()->wheelEvent( e );
@@ -1384,7 +1384,7 @@ void KHTMLView::viewportWheelEvent(QWheelEvent* e)
}
#endif
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void KHTMLView::dragEnterEvent( QDragEnterEvent* ev )
{
// Handle drops onto frames (#16820)
diff --git a/WebCore/khtml/khtmlview.h b/WebCore/khtml/khtmlview.h
index aea9885..a812acf 100644
--- a/WebCore/khtml/khtmlview.h
+++ b/WebCore/khtml/khtmlview.h
@@ -82,7 +82,7 @@ class KHTMLView : public QScrollView
friend class khtml::RenderWidget;
friend class khtml::CSSStyleSelector;
friend void khtml::applyRule(DOM::CSSProperty *prop);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
friend class KWQKHTMLPart;
#endif
@@ -151,14 +151,14 @@ signals:
protected:
void clear();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
public:
#endif
virtual void resizeEvent ( QResizeEvent * event );
virtual void showEvent ( QShowEvent * );
virtual void hideEvent ( QHideEvent *);
virtual bool focusNextPrevChild( bool next );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
virtual void drawContents( QPainter* );
#endif
@@ -171,7 +171,7 @@ public:
#ifndef QT_NO_WHEELEVENT
virtual void viewportWheelEvent(QWheelEvent*);
#endif
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
virtual void dragEnterEvent( QDragEnterEvent* );
virtual void dropEvent( QDropEvent* );
#endif
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index 5d4e1d0..4e5fe42 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -296,13 +296,13 @@ void Decoder::setEncoding(const char *_encoding, bool force)
#endif
if(enc.isNull() || enc.isEmpty())
return;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if(enc == "visual") // hebrew visually ordered
enc = "iso8859-8";
#endif
bool b;
m_codec = KGlobal::charsets()->codecForName(enc, b);
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if(m_codec->mibEnum() == 11) {
// iso8859-8 (visually ordered)
m_codec = QTextCodec::codecForName("iso8859-8-i");
@@ -356,7 +356,7 @@ QString Decoder::decode(const char *data, int len)
i--;
}
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
QString appendString(data, len);
buffer += appendString;
#else
@@ -366,7 +366,7 @@ QString Decoder::decode(const char *data, int len)
// the following tags are allowed in <head>:
// SCRIPT|STYLE|META|LINK|OBJECT|TITLE|BASE
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
const char *ptr = buffer.latin1();
const char *pEnd = ptr + buffer.length();
while(ptr != pEnd)
@@ -469,7 +469,7 @@ QString Decoder::decode(const char *data, int len)
return QString::null;
}
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
else {
QString appendString(data, len);
buffer += appendString;
@@ -525,7 +525,7 @@ QString Decoder::decode(const char *data, int len)
}
QString out;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// We don't need to special-case unicode like this, and doing so
// will drop the buffer which is really bad!
if(!buffer.isEmpty()) {
@@ -547,7 +547,7 @@ QString Decoder::decode(const char *data, int len)
}
}
out = m_decoder->toUnicode(data, len);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
} // need to balance braces for benefit of ChangeLog script
#else
}
diff --git a/WebCore/khtml/misc/decoder.h b/WebCore/khtml/misc/decoder.h
index 8a34d40..bd12905 100644
--- a/WebCore/khtml/misc/decoder.h
+++ b/WebCore/khtml/misc/decoder.h
@@ -53,7 +53,7 @@ protected:
QTextDecoder *m_decoder; // only used for utf16
QCString enc;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
QString buffer;
#else
QCString buffer;
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index fcdc890..325805b 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -64,7 +64,7 @@
using namespace khtml;
using namespace DOM;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static bool cacheDisabled;
#endif
@@ -311,7 +311,7 @@ void CachedScript::error( int /*err*/, const char */*text*/ )
// ------------------------------------------------------------------------------------------
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
namespace khtml
{
@@ -480,11 +480,11 @@ static bool crossDomain(const QString &a, const QString &b)
CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, time_t _expireDate)
: QObject(), CachedObject(url, Image, _cachePolicy, _expireDate)
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
, m_dataSize(0)
#endif
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
static const QString &acceptHeader = KGlobal::staticQString( buildAcceptHeader() );
#endif
@@ -493,7 +493,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl
pixPart = 0;
bg = 0;
bgColor = qRgba( 0, 0, 0, 0xFF );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
typeChecked = false;
#endif
isFullyTransparent = false;
@@ -503,7 +503,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl
m_status = Unknown;
m_size = 0;
imgSource = 0;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
setAccept( acceptHeader );
#endif
m_showAnimations = dl->showAnimations();
@@ -551,7 +551,7 @@ void CachedImage::deref( CachedObjectClient *c )
const QPixmap &CachedImage::tiled_pixmap(const QColor& newc)
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return pixmap();
#else
static QRgb bgTransparant = qRgba( 0, 0, 0, 0xFF );
@@ -635,7 +635,7 @@ const QPixmap &CachedImage::pixmap( ) const
if(errorOccured)
return *Cache::brokenPixmap;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (p)
return *p;
#else
@@ -683,7 +683,7 @@ void CachedImage::do_notify(const QPixmap& p, const QRect& r)
c->setPixmap( p, r, this);
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void CachedImage::movieUpdated( const QRect& r )
{
@@ -787,7 +787,7 @@ void CachedImage::movieResize(const QSize& /*s*/)
void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
{
m_showAnimations = showAnimations;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
imgSource->cleanBuffer();
delete p;
@@ -802,7 +802,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati
#endif
}
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
void CachedImage::deleteMovie()
{
@@ -821,7 +821,7 @@ void CachedImage::clear()
formatType = 0;
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
typeChecked = false;
#endif
m_size = 0;
@@ -836,7 +836,7 @@ void CachedImage::data ( QBuffer &_buffer, bool eof )
kdDebug( 6060 ) << this << "in CachedImage::data(buffersize " << _buffer.buffer().size() <<", eof=" << eof << endl;
#endif
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if ( !typeChecked )
{
formatType = QImageDecoder::formatName( (const uchar*)_buffer.buffer().data(), _buffer.size());
@@ -927,7 +927,7 @@ void CachedImage::error( int /*err*/, const char */*text*/ )
#endif
clear();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
typeChecked = true;
#endif
errorOccured = true;
@@ -960,7 +960,7 @@ DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
m_part = part;
m_doc = doc;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
Cache::init();
#endif
Cache::docloader->append( this );
@@ -1013,7 +1013,7 @@ CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
KURL fullURL = m_doc->completeURL( url.string() );
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (KWQCheckIfReloading(this)) {
setCachePolicy(KIO::CC_Reload);
}
@@ -1021,7 +1021,7 @@ CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
bool reload = needReload(fullURL);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
CachedImage *cachedObject = Cache::requestImage(this, url, reload, m_expireDate);
KWQCheckCacheObjectStatus(this, cachedObject);
return cachedObject;
@@ -1035,7 +1035,7 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co
KURL fullURL = m_doc->completeURL( url.string() );
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (KWQCheckIfReloading(this)) {
setCachePolicy(KIO::CC_Reload);
}
@@ -1043,7 +1043,7 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co
bool reload = needReload(fullURL);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
CachedCSSStyleSheet *cachedObject = Cache::requestStyleSheet(this, url, reload, m_expireDate, charset);
KWQCheckCacheObjectStatus(this, cachedObject);
return cachedObject;
@@ -1057,7 +1057,7 @@ CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const QString
KURL fullURL = m_doc->completeURL( url.string() );
if ( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (KWQCheckIfReloading(this)) {
setCachePolicy(KIO::CC_Reload);
}
@@ -1065,7 +1065,7 @@ CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const QString
bool reload = needReload(fullURL);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
CachedScript *cachedObject = Cache::requestScript(this, url, reload, m_expireDate, charset);
KWQCheckCacheObjectStatus(this, cachedObject);
return cachedObject;
@@ -1138,7 +1138,7 @@ void Loader::load(DocLoader* dl, CachedObject *object, bool incremental)
Request *req = new Request(dl, object, incremental);
m_requestsPending.append(req);
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
emit requestStarted( req->m_docLoader, req->object );
#endif
@@ -1180,7 +1180,7 @@ void Loader::servePendingRequests()
connect( job, SIGNAL( data( KIO::Job*, const QByteArray &)),
SLOT( slotData( KIO::Job*, const QByteArray &)));
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (KWQServeRequest(this, req, job))
m_requestsLoading.insert(job, req);
#else
@@ -1210,7 +1210,7 @@ void Loader::slotFinished( KIO::Job* job )
r->object->data(r->m_buffer, true);
emit requestDone( r->m_docLoader, r->object );
time_t expireDate = j->queryMetaData("expire-date").toLong();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
kdDebug(6060) << "Loader::slotFinished, url = " << j->url().url() << " expires " << ctime(&expireDate) << endl;
#endif
r->object->setExpireDate(expireDate, false);
@@ -1236,7 +1236,7 @@ void Loader::receivedResponse(KIO::Job* job, void *response)
}
#endif
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
void Loader::slotData( KIO::Job*job, const char *data, int size )
#else
void Loader::slotData( KIO::Job*job, const QByteArray &data )
@@ -1251,7 +1251,7 @@ void Loader::slotData( KIO::Job*job, const QByteArray &data )
if ( !r->m_buffer.isOpen() )
r->m_buffer.open( IO_WriteOnly );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
r->m_buffer.writeBlock( data, size );
#else
r->m_buffer.writeBlock( data.data(), data.size() );
@@ -1361,7 +1361,7 @@ void Cache::init()
nullPixmap = new QPixmap;
if ( !brokenPixmap )
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
brokenPixmap = new QPixmap;
#else
// brokenPixmap = new QPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::FileSystem, 16, KIcon::DisabledState));
@@ -1403,7 +1403,7 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
cachePolicy = KIO::CC_Verify;
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Checking if the URL is malformed is lots of extra work for little benefit.
#else
if( kurl.isMalformed() )
@@ -1425,14 +1425,14 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
#endif
CachedImage *im = new CachedImage(dl, kurl.url(), cachePolicy, _expireDate);
if ( dl && dl->autoloadImages() ) Cache::loader()->load(dl, im, true);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (cacheDisabled)
im->setFree(true);
else {
#endif
cache->insert( kurl.url(), im );
moveToHeadOfLRUList(im);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
}
#endif
o = im;
@@ -1458,7 +1458,7 @@ CachedImage *Cache::requestImage( DocLoader* dl, const DOMString & url, bool rel
moveToHeadOfLRUList(o);
if ( dl ) {
dl->m_docObjects.remove( o );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (!cacheDisabled)
#endif
dl->m_docObjects.append( o );
@@ -1482,7 +1482,7 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
cachePolicy = KIO::CC_Verify;
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Checking if the URL is malformed is lots of extra work for little benefit.
#else
if( kurl.isMalformed() )
@@ -1499,14 +1499,14 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
#endif
CachedCSSStyleSheet *sheet = new CachedCSSStyleSheet(dl, kurl.url(), cachePolicy, _expireDate, charset);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (cacheDisabled)
sheet->setFree(true);
else {
#endif
cache->insert( kurl.url(), sheet );
moveToHeadOfLRUList(sheet);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
}
#endif
o = sheet;
@@ -1532,7 +1532,7 @@ CachedCSSStyleSheet *Cache::requestStyleSheet( DocLoader* dl, const DOMString &
moveToHeadOfLRUList(o);
if ( dl ) {
dl->m_docObjects.remove( o );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (!cacheDisabled)
#endif
dl->m_docObjects.append( o );
@@ -1566,7 +1566,7 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
cachePolicy = KIO::CC_Verify;
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Checking if the URL is malformed is lots of extra work for little benefit.
#else
if( kurl.isMalformed() )
@@ -1583,14 +1583,14 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
kdDebug( 6060 ) << "Cache: new: " << kurl.url() << endl;
#endif
CachedScript *script = new CachedScript(dl, kurl.url(), cachePolicy, _expireDate, charset);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (cacheDisabled)
script->setFree(true);
else {
#endif
cache->insert( kurl.url(), script );
moveToHeadOfLRUList(script);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
}
#endif
o = script;
@@ -1616,7 +1616,7 @@ CachedScript *Cache::requestScript( DocLoader* dl, const DOM::DOMString &url, bo
moveToHeadOfLRUList(o);
if ( dl ) {
dl->m_docObjects.remove( o );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (!cacheDisabled)
#endif
dl->m_docObjects.append( o );
@@ -1800,7 +1800,7 @@ void CachedObjectClient::notifyFinished(CachedObject * /*finishedObj*/) {}
#include "loader.moc"
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
Cache::Statistics Cache::getStatistics()
{
diff --git a/WebCore/khtml/misc/loader.h b/WebCore/khtml/misc/loader.h
index 1e663c3..af144d8 100644
--- a/WebCore/khtml/misc/loader.h
+++ b/WebCore/khtml/misc/loader.h
@@ -108,7 +108,7 @@ namespace khtml
m_free = false;
m_cachePolicy = _cachePolicy;
m_request = 0;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
m_response = 0;
#endif
m_expireDate = _expireDate;
@@ -152,7 +152,7 @@ namespace khtml
void setRequest(Request *_request);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
void *response() { return m_response; }
void setResponse (void *response);
#endif
@@ -177,7 +177,7 @@ namespace khtml
DOM::DOMString m_url;
QString m_accept;
Request *m_request;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
void *m_response;
#endif
Type m_type;
@@ -322,7 +322,7 @@ namespace khtml
friend class Cache;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
public:
int dataSize() const { return m_dataSize; }
private:
@@ -414,7 +414,7 @@ namespace khtml
protected slots:
void slotFinished( KIO::Job * );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
void slotData( KIO::Job *, const char *data, int size );
void receivedResponse ( KIO::Job *, void *response );
#else
@@ -511,7 +511,7 @@ namespace khtml
static void removeCacheEntry( CachedObject *object );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
struct TypeStatistic {
int count;
int size;
diff --git a/WebCore/khtml/rendering/font.cpp b/WebCore/khtml/rendering/font.cpp
index abba2aa..80fbbb5 100644
--- a/WebCore/khtml/rendering/font.cpp
+++ b/WebCore/khtml/rendering/font.cpp
@@ -40,7 +40,7 @@ using namespace khtml;
void Font::drawText( QPainter *p, int x, int y, QChar *str, int slen, int pos, int len,
int toAdd, QPainter::TextDirection d, int from, int to, QColor bg ) const
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
p->drawText(x, y, str + pos, std::min(slen - pos, len), from, to, toAdd, bg, d);
#else
QString qstr = QConstString(str, slen).string();
@@ -100,7 +100,7 @@ void Font::drawText( QPainter *p, int x, int y, QChar *str, int slen, int pos, i
#endif
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
float Font::floatWidth( QChar *chs, int slen, int pos, int len ) const
{
@@ -117,7 +117,7 @@ void Font::floatCharacterWidths( QChar *str, int slen, int pos, int len, int toA
int Font::width( QChar *chs, int slen, int pos, int len ) const
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return fm.width(chs + pos, len);
#else
QString qstr = QConstString(chs+pos, len).string();
@@ -150,7 +150,7 @@ int Font::width( QChar *chs, int slen, int pos, int len ) const
int Font::width( QChar *chs, int slen, int pos ) const
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
return width(chs, slen, pos, 1);
#else
int w;
@@ -175,7 +175,7 @@ void Font::update( QPaintDeviceMetrics* devMetrics ) const
f.setItalic( fontDef.italic );
f.setWeight( fontDef.weight );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
f.setPixelSize(fontDef.size);
#else
QFontDatabase db;
@@ -223,7 +223,7 @@ void Font::update( QPaintDeviceMetrics* devMetrics ) const
fm = QFontMetrics( f );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
fontDef.hasNbsp = fm.inFont( 0xa0 );
#endif
}
diff --git a/WebCore/khtml/rendering/font.h b/WebCore/khtml/rendering/font.h
index 3eb7849..99df338 100644
--- a/WebCore/khtml/rendering/font.h
+++ b/WebCore/khtml/rendering/font.h
@@ -87,7 +87,7 @@ public:
void drawText( QPainter *p, int x, int y, QChar *str, int slen, int pos, int len, int width,
QPainter::TextDirection d, int from=-1, int to=-1, QColor bg=QColor() ) const;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
float floatWidth( QChar *str, int slen, int pos, int len ) const;
void floatCharacterWidths( QChar *str, int slen, int pos, int len, int toAdd, float *buffer) const;
#endif
diff --git a/WebCore/khtml/rendering/render_applet.cpp b/WebCore/khtml/rendering/render_applet.cpp
index 49a1b53..9ae84c2 100644
--- a/WebCore/khtml/rendering/render_applet.cpp
+++ b/WebCore/khtml/rendering/render_applet.cpp
@@ -120,7 +120,7 @@ void RenderApplet::layout()
void RenderApplet::processArguments(const QMap<QString, QString> &args)
{
KJavaAppletWidget *w = static_cast<KJavaAppletWidget*>(m_widget);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (w)
w->processArguments(args);
#endif
diff --git a/WebCore/khtml/rendering/render_body.cpp b/WebCore/khtml/rendering/render_body.cpp
index 6ed1dfb..be9354e 100644
--- a/WebCore/khtml/rendering/render_body.cpp
+++ b/WebCore/khtml/rendering/render_body.cpp
@@ -89,7 +89,7 @@ void RenderBody::layout()
{
RenderFlow::layout();
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
if (!scrollbarsStyled)
{
if (root()->view())
diff --git a/WebCore/khtml/rendering/render_container.cpp b/WebCore/khtml/rendering/render_container.cpp
index e601596..dd5ae87 100644
--- a/WebCore/khtml/rendering/render_container.cpp
+++ b/WebCore/khtml/rendering/render_container.cpp
@@ -96,7 +96,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
//kdDebug( 6040 ) << "adding cell" << endl;
if ( !isTableRow() )
needsTable = true;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// I'm not 100% sure this is the best way to fix this, but without this
// change we recurse infinitely when trying to render the CSS2 test page:
// http://www.bath.ac.uk/%7Epy8ieh/internet/eviltests/htmlbodyheadrendering2.html.
diff --git a/WebCore/khtml/rendering/render_form.h b/WebCore/khtml/rendering/render_form.h
index 85b5a4c..09813f7 100644
--- a/WebCore/khtml/rendering/render_form.h
+++ b/WebCore/khtml/rendering/render_form.h
@@ -338,7 +338,7 @@ public:
virtual const char *renderName() const { return "RenderSelect"; }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
short baselinePosition( bool f ) const;
#endif
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index bc0bfda..3db50f5 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -439,7 +439,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
}
if (m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
KHTMLView *v = root()->view();
QPainter paint;
@@ -451,7 +451,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
paint.setPen( Qt::gray );
paint.setBrush( Qt::gray );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
paint.setRasterOp( Qt::XorROP );
#endif
QRect r(xPos(), yPos(), width(), height());
@@ -460,14 +460,14 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
int p = m_resizing ? (m_vSplit > -1 ? _x : _y) : -1;
if (m_vSplit > -1) {
if ( m_oldpos >= 0 )
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
v->updateContents( m_oldpos + sw/2 - rBord , r.y(), 2*rBord, r.height(), true );
#else
paint.drawRect( m_oldpos + sw/2 - rBord , r.y(),
2*rBord, r.height() );
#endif
if ( p >= 0 ){
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
paint.setPen( Qt::NoPen );
paint.setBrush( Qt::gray );
v->setDrawingAlpha((float)0.25);
@@ -479,14 +479,14 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
}
} else {
if ( m_oldpos >= 0 )
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
v->updateContents( r.x(), m_oldpos + sw/2 - rBord, r.width(), 2*rBord, true );
#else
paint.drawRect( r.x(), m_oldpos + sw/2 - rBord,
r.width(), 2*rBord );
#endif
if ( p >= 0 ){
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
paint.setPen( Qt::NoPen );
paint.setBrush( Qt::gray );
v->setDrawingAlpha((float)0.25);
@@ -499,7 +499,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
}
m_oldpos = p;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
v->unlockDrawingFocus();
v->enableFlushDrawing();
#endif
@@ -613,7 +613,7 @@ void RenderFrame::slotViewCleared()
QScrollView *view = static_cast<QScrollView *>(m_widget);
if(!element()->frameBorder || !((static_cast<HTMLFrameSetElementImpl *>(element()->parentNode()))->frameBorder()))
view->setFrameStyle(QFrame::NoFrame);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Qt creates QScrollView w/ a default style of QFrame::StyledPanel | QFrame::Sunken.
else
view->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
@@ -748,7 +748,7 @@ void RenderPartObject::updateWidget()
#endif
return;
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Fix for 2894742
// The EMBED attributes must override the PARAM attributes.
// This mimics IE's behavior.
@@ -942,7 +942,7 @@ void RenderPartObject::layout( )
KHTMLAssert( !layouted() );
KHTMLAssert( minMaxKnown() );
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
short m_oldwidth = m_width;
int m_oldheight = m_height;
#endif
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index 007ff91..042617d 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -142,7 +142,7 @@ void RenderImage::setPixmap( const QPixmap &p, const QRect& r, CachedImage *o)
m_height = oldheight;
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Stop the previous image, if it may be animating.
pix.stopAnimations();
#endif
@@ -196,7 +196,7 @@ void RenderImage::printObject(QPainter *p, int /*_x*/, int /*_y*/, int /*_w*/, i
{
if(cWidth > 2 && cHeight > 2)
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if ( !berrorPic ) {
//qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
p->setPen (Qt::lightGray);
@@ -361,7 +361,7 @@ bool RenderImage::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty)
void RenderImage::updateFromElement()
{
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Treat a lack of src or empty string for src as no image at all, not the page itself
// loaded as an image.
DOMString attr = element()->getAttribute(ATTR_SRC);
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 472d149..330aa46 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -131,7 +131,7 @@ void RenderListItem::setStyle(RenderStyle *_style)
RenderStyle *newStyle = new RenderStyle();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
newStyle->ref();
#endif
@@ -154,7 +154,7 @@ void RenderListItem::setStyle(RenderStyle *_style)
m_marker->setStyle(newStyle);
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
newStyle->deref();
#endif
}
@@ -367,7 +367,7 @@ void RenderListMarker::printObject(QPainter *p, int, int _y,
return;
default:
if (m_item != QString::null) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Text should be drawn on the baseline, so we add in the ascent of the font.
// For some inexplicable reason, this works in Konqueror. I'm not sure why.
// - dwh
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index f5f8997..19e9b54 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1016,7 +1016,7 @@ short RenderObject::getVerticalPosition( bool firstLine ) const
vpos += ( baselinePosition( firstLine ) - parent()->baselinePosition( firstLine ) +
halfleading );
} else if ( va == MIDDLE ) {
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
vpos += - (int)(QFontMetrics(f).xHeight()/2) - lineHeight( firstLine )/2 + baselinePosition( firstLine );
#else
QRect b = QFontMetrics(f).boundingRect('x');
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index e801754..29ca898 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -143,7 +143,7 @@ RenderWidget::~RenderWidget()
void RenderWidget::resizeWidget( QWidget *widget, int w, int h )
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
// ugly hack to limit the maximum size of the widget (as X11 has problems if it's bigger)
h = QMIN( h, 3072 );
w = QMIN( w, 2000 );
diff --git a/WebCore/khtml/rendering/render_root.cpp b/WebCore/khtml/rendering/render_root.cpp
index 1b0da89..cdb7645 100644
--- a/WebCore/khtml/rendering/render_root.cpp
+++ b/WebCore/khtml/rendering/render_root.cpp
@@ -24,7 +24,7 @@
#include "khtmlview.h"
#include <kdebug.h>
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#include "khtml_part.h"
#endif
@@ -263,7 +263,7 @@ void RenderRoot::close()
//printTree();
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static QRect enclosingPositionedRect (RenderObject *n)
{
RenderObject *enclosingParent = (RenderObject*)n;
@@ -295,7 +295,7 @@ void RenderRoot::setSelection(RenderObject *s, int sp, RenderObject *e, int ep)
}
//kdDebug( 6040 ) << "RenderRoot::setSelection(" << s << "," << sp << "," << e << "," << ep << ")" << endl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// Cut out early if the selection hasn't changed.
if (m_selectionStart == s && m_selectionStartPos == sp &&
m_selectionEnd == e && m_selectionEndPos == ep){
@@ -374,7 +374,7 @@ void RenderRoot::setSelection(RenderObject *s, int sp, RenderObject *e, int ep)
if (no)
no = no->nextSibling();
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (o->selectionState() == SelectionInside && !newSelectedInside.containsRef(o))
newSelectedInside.append(o);
#endif
@@ -385,7 +385,7 @@ void RenderRoot::setSelection(RenderObject *s, int sp, RenderObject *e, int ep)
e->setSelectionState(SelectionEnd);
if(s == e) s->setSelectionState(SelectionBoth);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (!m_view)
return;
@@ -472,7 +472,7 @@ void RenderRoot::setSelection(RenderObject *s, int sp, RenderObject *e, int ep)
}
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
void RenderRoot::clearSelection(bool doRepaint)
#else
void RenderRoot::clearSelection()
@@ -483,7 +483,7 @@ void RenderRoot::clearSelection()
while (o && o!=m_selectionEnd)
{
if (o->selectionState()!=SelectionNone)
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (doRepaint)
#endif
o->repaint();
@@ -503,7 +503,7 @@ void RenderRoot::clearSelection()
if (m_selectionEnd)
{
m_selectionEnd->setSelectionState(SelectionNone);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (doRepaint)
#endif
m_selectionEnd->repaint();
diff --git a/WebCore/khtml/rendering/render_text.h b/WebCore/khtml/rendering/render_text.h
index 21eb369..cc9f0b9 100644
--- a/WebCore/khtml/rendering/render_text.h
+++ b/WebCore/khtml/rendering/render_text.h
@@ -190,7 +190,7 @@ public:
DOM::TextImpl *element() const
{ return static_cast<DOM::TextImpl*>(RenderObject::element()); }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
TextSlave * findTextSlave( int offset, int &pos );
TextSlaveArray textSlaves() { return m_lines; }
#endif
@@ -198,7 +198,7 @@ public:
protected:
void printTextOutline(QPainter *p, int tx, int ty, const QRect &prevLine, const QRect &thisLine, const QRect &nextLine);
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
TextSlave * findTextSlave( int offset, int &pos );
#endif
diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index f404aa0..2753123 100644
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -62,7 +62,7 @@ namespace DOM {
class DocumentImpl;
class DocumentType;
class DocumentTypeImpl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
class DOMImplementation;
#endif
class ElementImpl;
@@ -113,7 +113,7 @@ public:
// ever be present, and is used as a factory method for creating DocumentImpl objects
static DOMImplementationImpl *instance();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static DOMImplementation createInstance (DOMImplementationImpl *impl);
#endif
@@ -525,7 +525,7 @@ public:
DOMImplementationImpl *implementation() const { return m_implementation; }
void copyFrom(const DocumentTypeImpl&);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static DocumentType createInstance (DocumentTypeImpl *impl);
#endif
diff --git a/WebCore/khtml/xml/dom_elementimpl.h b/WebCore/khtml/xml/dom_elementimpl.h
index 9d78a63..a3ad117 100644
--- a/WebCore/khtml/xml/dom_elementimpl.h
+++ b/WebCore/khtml/xml/dom_elementimpl.h
@@ -30,7 +30,7 @@
#include "xml/dom_stringimpl.h"
#include "misc/shared.h"
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#ifdef __OBJC__
#define id id_AVOID_KEYWORD
#endif
@@ -137,7 +137,7 @@ public:
virtual bool childAllowed( NodeImpl *newChild );
virtual bool childTypeAllowed( unsigned short type );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static Attr createInstance(AttrImpl *impl);
#endif
@@ -210,7 +210,7 @@ public:
virtual void dump(QTextStream *stream, QString ind = "") const;
#endif
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static Element createInstance(ElementImpl *impl);
#endif
protected:
@@ -301,7 +301,7 @@ protected:
}; //namespace
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
#undef id
#endif
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index 41fd921..4729e68 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -471,7 +471,7 @@ bool NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent)
// If tempEvent is true, this means that the DOM implementation will not be storing a reference to the event, i.e.
// there is no way to retrieve it from javascript if a script does not already have a reference to it in a variable.
// So there is no need for the interpreter to keep the event in it's cache
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
if (tempEvent && view && view->part() && view->part()->jScript())
view->part()->jScript()->finishedWithEvent(evt);
#else
diff --git a/WebCore/khtml/xml/dom_nodeimpl.h b/WebCore/khtml/xml/dom_nodeimpl.h
index 28c3fd2..841ac78 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.h
+++ b/WebCore/khtml/xml/dom_nodeimpl.h
@@ -355,7 +355,7 @@ public:
*/
virtual void childrenChanged();
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static Node nodeInstance(NodeImpl *impl);
#endif
@@ -463,7 +463,7 @@ public:
// Other methods (not part of DOM)
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static NodeList createInstance(NodeListImpl *impl);
#endif
protected:
@@ -561,7 +561,7 @@ public:
virtual NodeImpl::Id mapId(const DOMString& namespaceURI, const DOMString& localName, bool readonly) = 0;
virtual bool isReadOnly() { return false; }
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static NamedNodeMap createInstance(NamedNodeMapImpl *impl);
#endif
};
diff --git a/WebCore/khtml/xml/dom_stringimpl.cpp b/WebCore/khtml/xml/dom_stringimpl.cpp
index a82dbd4..b003883 100644
--- a/WebCore/khtml/xml/dom_stringimpl.cpp
+++ b/WebCore/khtml/xml/dom_stringimpl.cpp
@@ -178,7 +178,7 @@ Length DOMStringImpl::toLength() const
khtml::Length* DOMStringImpl::toLengthArray(int& len) const
{
-#ifndef APPLE_CHANGES
+#if !APPLE_CHANGES
QString str(s, l);
#endif /* APPLE_CHANGES not defined */
int pos = 0;
@@ -188,7 +188,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
// to fix lists like "1,2px 3 ,4"
// make sure not to break percentage or relative widths
// ### what about "auto" ?
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
// This alternate version works around a limitation in our QString implementation.
QChar spacified[l];
QChar space(' ');
diff --git a/WebCore/khtml/xml/dom_textimpl.h b/WebCore/khtml/xml/dom_textimpl.h
index ec50886..9255477 100644
--- a/WebCore/khtml/xml/dom_textimpl.h
+++ b/WebCore/khtml/xml/dom_textimpl.h
@@ -29,7 +29,7 @@
namespace DOM {
class DocumentImpl;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
class CharacterData;
class Text;
#endif
@@ -65,7 +65,7 @@ public:
virtual void dump(QTextStream *stream, QString ind = "") const;
#endif
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static CharacterData createInstance(CharacterDataImpl *impl);
#endif
@@ -123,7 +123,7 @@ public:
virtual void recalcStyle( StyleChange = NoChange );
virtual bool childTypeAllowed( unsigned short type );
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static Text createInstance(TextImpl *impl);
#endif
diff --git a/WebCore/khtml/xml/dom_xmlimpl.h b/WebCore/khtml/xml/dom_xmlimpl.h
index 5995f00..37f56cc 100644
--- a/WebCore/khtml/xml/dom_xmlimpl.h
+++ b/WebCore/khtml/xml/dom_xmlimpl.h
@@ -38,7 +38,7 @@ class DocumentImpl;
class CSSStyleSheetImpl;
class StyleSheetImpl;
class DOMString;
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
class ProcessingInstruction;
#endif
@@ -153,7 +153,7 @@ public:
virtual void setStyleSheet(const DOM::DOMString &url, const DOM::DOMString &sheet);
virtual void setStyleSheet(CSSStyleSheetImpl* sheet);
-#ifdef APPLE_CHANGES
+#if APPLE_CHANGES
static ProcessingInstruction createInstance(ProcessingInstructionImpl *impl);
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list