[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:09:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 90df65629319be8f7dbcd6b2e294f1fedca30d1e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 24 16:49:55 2002 +0000
Get rid of all NEED_BOGUS_XXX.
* khtml/java/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS and
-DNEED_BOGUS_X_DEFINES.
* khtml/rendering/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES.
* khtml/xml/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS.
* kwq/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES and KWQKJavaEmbed.mm.
* kwq/KWQKJavaEmbed.mm: Removed.
* kwq/KWQDef.h: Remove XEvent define (inside NEED_BOGUS_X_DEFINES).
* kwq/qt/qtextstream.h: Don't look at NEED_BOGUS_TEXTSTREAMS.
* kwq/KWQtextstream.mm: Don't look at NEED_BOGUS_TEXTSTREAMS.
* khtml/java/javaembed.h: Made this just a QWidget typedef for now.
* khtml/java/kjavaappletwidget.cpp: ifdef out the unused setWindow function.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1069 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 24b3fef..6cbb7af 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-04-24 Darin Adler <darin at apple.com>
+
+ Get rid of all NEED_BOGUS_XXX.
+
+ * khtml/java/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS and
+ -DNEED_BOGUS_X_DEFINES.
+ * khtml/rendering/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES.
+ * khtml/xml/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS.
+ * kwq/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES and KWQKJavaEmbed.mm.
+ * kwq/KWQKJavaEmbed.mm: Removed.
+
+ * kwq/KWQDef.h: Remove XEvent define (inside NEED_BOGUS_X_DEFINES).
+
+ * kwq/qt/qtextstream.h: Don't look at NEED_BOGUS_TEXTSTREAMS.
+ * kwq/KWQtextstream.mm: Don't look at NEED_BOGUS_TEXTSTREAMS.
+
+ * khtml/java/javaembed.h: Made this just a QWidget typedef for now.
+ * khtml/java/kjavaappletwidget.cpp: ifdef out the unused setWindow function.
+
2002-04-23 Darin Adler <darin at apple.com>
* khtml/css/css_valueimpl.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 24b3fef..6cbb7af 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2002-04-24 Darin Adler <darin at apple.com>
+
+ Get rid of all NEED_BOGUS_XXX.
+
+ * khtml/java/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS and
+ -DNEED_BOGUS_X_DEFINES.
+ * khtml/rendering/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES.
+ * khtml/xml/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS.
+ * kwq/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES and KWQKJavaEmbed.mm.
+ * kwq/KWQKJavaEmbed.mm: Removed.
+
+ * kwq/KWQDef.h: Remove XEvent define (inside NEED_BOGUS_X_DEFINES).
+
+ * kwq/qt/qtextstream.h: Don't look at NEED_BOGUS_TEXTSTREAMS.
+ * kwq/KWQtextstream.mm: Don't look at NEED_BOGUS_TEXTSTREAMS.
+
+ * khtml/java/javaembed.h: Made this just a QWidget typedef for now.
+ * khtml/java/kjavaappletwidget.cpp: ifdef out the unused setWindow function.
+
2002-04-23 Darin Adler <darin at apple.com>
* khtml/css/css_valueimpl.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 24b3fef..6cbb7af 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2002-04-24 Darin Adler <darin at apple.com>
+
+ Get rid of all NEED_BOGUS_XXX.
+
+ * khtml/java/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS and
+ -DNEED_BOGUS_X_DEFINES.
+ * khtml/rendering/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES.
+ * khtml/xml/Makefile.am: Remove -DNEED_BOGUS_TEXTSTREAMS.
+ * kwq/Makefile.am: Remove -DNEED_BOGUS_X_DEFINES and KWQKJavaEmbed.mm.
+ * kwq/KWQKJavaEmbed.mm: Removed.
+
+ * kwq/KWQDef.h: Remove XEvent define (inside NEED_BOGUS_X_DEFINES).
+
+ * kwq/qt/qtextstream.h: Don't look at NEED_BOGUS_TEXTSTREAMS.
+ * kwq/KWQtextstream.mm: Don't look at NEED_BOGUS_TEXTSTREAMS.
+
+ * khtml/java/javaembed.h: Made this just a QWidget typedef for now.
+ * khtml/java/kjavaappletwidget.cpp: ifdef out the unused setWindow function.
+
2002-04-23 Darin Adler <darin at apple.com>
* khtml/css/css_valueimpl.cpp:
diff --git a/WebCore/khtml/java/Makefile.am b/WebCore/khtml/java/Makefile.am
index d7e2979..f3d6f19 100644
--- a/WebCore/khtml/java/Makefile.am
+++ b/WebCore/khtml/java/Makefile.am
@@ -20,13 +20,7 @@ libkhtmljava_o_SOURCES = \
$(NULL)
-# FIXME: Need a hack here to give the xml tokenizer text stream
-# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-# can be removed when we have Qt text streams implemented
-
INCLUDES = \
- -DNEED_BOGUS_TEXTSTREAMS \
- -DNEED_BOGUS_X_DEFINES \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
diff --git a/WebCore/khtml/java/javaembed.h b/WebCore/khtml/java/javaembed.h
index a970b5a..232e7de 100644
--- a/WebCore/khtml/java/javaembed.h
+++ b/WebCore/khtml/java/javaembed.h
@@ -28,6 +28,10 @@
#include <qwidget.h>
+#ifdef APPLE_CHANGES
+typedef QWidget KJavaEmbed;
+#else
+
#ifndef Q_WS_QWS // FIXME(E)? I don't think this is possible with Qt Embedded.
class KJavaEmbedPrivate;
class KJavaEmbed : public QWidget
@@ -76,3 +80,4 @@ private:
#endif
#endif
+#endif
diff --git a/WebCore/khtml/java/kjavaappletwidget.cpp b/WebCore/khtml/java/kjavaappletwidget.cpp
index 0a8d9a9..559b3ed 100644
--- a/WebCore/khtml/java/kjavaappletwidget.cpp
+++ b/WebCore/khtml/java/kjavaappletwidget.cpp
@@ -52,6 +52,7 @@ void KJavaAppletWidget::showApplet()
m_applet->create();
}
+#ifndef APPLE_CHANGES
void KJavaAppletWidget::setWindow( WId w )
{
//make sure that this window has the right name, if so, embed it...
@@ -74,6 +75,7 @@ void KJavaAppletWidget::setWindow( WId w )
setFocus();
}
}
+#endif
QSize KJavaAppletWidget::sizeHint()
{
diff --git a/WebCore/khtml/rendering/Makefile.am b/WebCore/khtml/rendering/Makefile.am
index 9246dfe..f887fd9 100644
--- a/WebCore/khtml/rendering/Makefile.am
+++ b/WebCore/khtml/rendering/Makefile.am
@@ -9,8 +9,8 @@ libkhtmlrendering_o_SOURCES = \
bidi.h \
break_lines.cpp \
break_lines.h \
- font.cpp \
- font.h \
+ font.cpp \
+ font.h \
render_applet.cpp \
render_applet.h \
render_body.cpp \
@@ -49,7 +49,6 @@ libkhtmlrendering_o_SOURCES = \
INCLUDES = \
- -DNEED_BOGUS_X_DEFINES \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
diff --git a/WebCore/khtml/xml/Makefile.am b/WebCore/khtml/xml/Makefile.am
index 21e2073..6e3c0d8 100644
--- a/WebCore/khtml/xml/Makefile.am
+++ b/WebCore/khtml/xml/Makefile.am
@@ -29,13 +29,7 @@ libkhtmlxml_o_SOURCES = \
xml_tokenizer.h \
$(NULL)
-
-# FIXME: Need a hack here to give the xml tokenizer text stream
-# defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-# can be removed when we have Qt text streams implemented
-
INCLUDES = \
- -DNEED_BOGUS_TEXTSTREAMS \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
diff --git a/WebCore/kwq/KWQDef.h b/WebCore/kwq/KWQDef.h
index 192826a..944dbf1 100644
--- a/WebCore/kwq/KWQDef.h
+++ b/WebCore/kwq/KWQDef.h
@@ -72,10 +72,6 @@ typedef int WId;
void qDebug(const char *msg, ...);
void qWarning(const char *msg, ...);
-#ifdef NEED_BOGUS_X_DEFINES
-typedef int XEvent;
-#endif
-
/* FIXME: Let's not worrying about malloc/new failing for now.... */
#define CHECK_PTR(p)
diff --git a/WebCore/kwq/KWQKJavaEmbed.mm b/WebCore/kwq/KWQKJavaEmbed.mm
deleted file mode 100644
index 667567d..0000000
--- a/WebCore/kwq/KWQKJavaEmbed.mm
+++ /dev/null
@@ -1,75 +0,0 @@
-/* This file is part of the KDE project
-*
-* Copyright (C) 2000 Wynn Wilkes <wynnw at caldera.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Library General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Library General Public License for more details.
-*
-* You should have received a copy of the GNU Library General Public License
-* along with this library; see the file COPYING.LIB. If not, write to
-* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-* Boston, MA 02111-1307, USA.
-*/
-
-/****************************************************************************
-This is a modified version of QXEmbed from Troll Tech. It's been modified
-to work better with java applets.
-*****************************************************************************/
-
-
-#include <kwqdebug.h>
-#include <java/javaembed.h>
-
-//FIX ME:
-static QSize *tempQSize = NULL;
-
-KJavaEmbed::KJavaEmbed( QWidget *parent=0, const char *name=0, WFlags f = 0 )
-{
- _logNotYetImplemented();
-}
-
-
-KJavaEmbed::~KJavaEmbed()
-{
- _logNotYetImplemented();
-}
-
-
-void KJavaEmbed::embed( WId w )
-{
- _logNotYetImplemented();
-}
-
-
-QSize KJavaEmbed::sizeHint() const
-{
- _logNotYetImplemented();
- if (tempQSize == NULL) {
- tempQSize = new QSize(0,0);
- }
- return *tempQSize;
-}
-
-
-QSize KJavaEmbed::minimumSizeHint() const
-{
- _logNotYetImplemented();
- if (tempQSize == NULL) {
- tempQSize = new QSize(0,0);
- }
- return *tempQSize;
-}
-
-
-void KJavaEmbed::focusOutEvent( QFocusEvent * )
-{
- _logNotYetImplemented();
-}
-
diff --git a/WebCore/kwq/KWQTextStream.h b/WebCore/kwq/KWQTextStream.h
index fba6002..fe679d6 100644
--- a/WebCore/kwq/KWQTextStream.h
+++ b/WebCore/kwq/KWQTextStream.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,48 +26,21 @@
#ifndef QTEXTSTREAM_H_
#define QTEXTSTREAM_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-// USING_BORROWED_QTEXTSTREAM ==================================================
-
-// FIXME: Need a hack here to give the xml tokenizer text stream
-// defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-// can be removed when we have Qt text streams implemented
-
-#if defined USING_BORROWED_QTEXTSTREAM && ! defined NEED_BOGUS_TEXTSTREAMS
-#include <_qtextstream.h>
-#else
-
#include "qstring.h"
-// class QTextStream ===========================================================
-
class QTextStream;
-typedef QTextStream& (*QTextStreamManipulator)(QTextStream &);
+typedef QTextStream &(*QTextStreamManipulator)(QTextStream &);
QTextStream &endl(QTextStream& stream);
class QTextStream {
public:
-
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QTextStream();
QTextStream(QByteArray, int);
QTextStream(QString *, int);
virtual ~QTextStream();
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
QTextStream &operator<<(char);
QTextStream &operator<<(const char *);
QTextStream &operator<<(const QCString &);
@@ -75,112 +48,29 @@ public:
QTextStream &operator<<(const QTextStreamManipulator &);
QTextStream &operator<<(const void *);
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
QTextStream(const QTextStream &);
QTextStream &operator=(const QTextStream &);
-}; // class QTextStream ========================================================
-
-
-// class QTextIStream ==========================================================
+};
class QTextIStream : public QTextStream {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QTextIStream(QString *);
-
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QTextIStream() {}
-#endif
-
- // member functions --------------------------------------------------------
-
QString readLine();
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- QTextIStream(const QTextIStream &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- QTextIStream &operator=(const QTextIStream &);
-#endif
-
-}; // class QTextIStream =======================================================
-
-
-// class QTextOStream ==========================================================
+};
class QTextOStream : public QTextStream {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QTextOStream(QString *);
QTextOStream(QByteArray);
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QTextOStream() {}
-#endif
-
- // member functions --------------------------------------------------------
-
QString readLine();
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
+};
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- QTextOStream(const QTextOStream &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- QTextOStream &operator=(const QTextOStream &);
#endif
-
-}; // class QTextOStream =======================================================
-
-
-#endif // USING_BORROWED_QTEXTSTREAM
-
-#endif
-
-
diff --git a/WebCore/kwq/KWQTextStream.mm b/WebCore/kwq/KWQTextStream.mm
index 8deeb4c..8e7ee1a 100644
--- a/WebCore/kwq/KWQTextStream.mm
+++ b/WebCore/kwq/KWQTextStream.mm
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define NEED_BOGUS_TEXTSTREAMS 1
-
#include <kwqdebug.h>
#include <qtextstream.h>
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 4471e93..9ed5547 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -64,7 +64,6 @@ libkwq_o_SOURCES = \
KWQKIconLoader.mm \
KWQKImageIO.mm \
KWQKInstance.mm \
- KWQKJavaEmbed.mm \
KWQKJob.mm \
KWQKLineEdit.mm \
KWQKListBox.mm \
@@ -139,7 +138,6 @@ libkwq_o_SOURCES = \
$(NULL)
INCLUDES = \
- -DNEED_BOGUS_X_DEFINES \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(WEBCORE_INCLUDES) \
diff --git a/WebCore/kwq/qt/qtextstream.h b/WebCore/kwq/qt/qtextstream.h
index fba6002..fe679d6 100644
--- a/WebCore/kwq/qt/qtextstream.h
+++ b/WebCore/kwq/qt/qtextstream.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,48 +26,21 @@
#ifndef QTEXTSTREAM_H_
#define QTEXTSTREAM_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-// USING_BORROWED_QTEXTSTREAM ==================================================
-
-// FIXME: Need a hack here to give the xml tokenizer text stream
-// defines from Qt. The NEED_BOGUS_TEXTSTREAMS symbol
-// can be removed when we have Qt text streams implemented
-
-#if defined USING_BORROWED_QTEXTSTREAM && ! defined NEED_BOGUS_TEXTSTREAMS
-#include <_qtextstream.h>
-#else
-
#include "qstring.h"
-// class QTextStream ===========================================================
-
class QTextStream;
-typedef QTextStream& (*QTextStreamManipulator)(QTextStream &);
+typedef QTextStream &(*QTextStreamManipulator)(QTextStream &);
QTextStream &endl(QTextStream& stream);
class QTextStream {
public:
-
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QTextStream();
QTextStream(QByteArray, int);
QTextStream(QString *, int);
virtual ~QTextStream();
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
QTextStream &operator<<(char);
QTextStream &operator<<(const char *);
QTextStream &operator<<(const QCString &);
@@ -75,112 +48,29 @@ public:
QTextStream &operator<<(const QTextStreamManipulator &);
QTextStream &operator<<(const void *);
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
QTextStream(const QTextStream &);
QTextStream &operator=(const QTextStream &);
-}; // class QTextStream ========================================================
-
-
-// class QTextIStream ==========================================================
+};
class QTextIStream : public QTextStream {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QTextIStream(QString *);
-
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QTextIStream() {}
-#endif
-
- // member functions --------------------------------------------------------
-
QString readLine();
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- QTextIStream(const QTextIStream &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- QTextIStream &operator=(const QTextIStream &);
-#endif
-
-}; // class QTextIStream =======================================================
-
-
-// class QTextOStream ==========================================================
+};
class QTextOStream : public QTextStream {
public:
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
QTextOStream(QString *);
QTextOStream(QByteArray);
-// add no-op destructor
-#ifdef _KWQ_PEDANTIC_
- ~QTextOStream() {}
-#endif
-
- // member functions --------------------------------------------------------
-
QString readLine();
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
+};
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- QTextOStream(const QTextOStream &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- QTextOStream &operator=(const QTextOStream &);
#endif
-
-}; // class QTextOStream =======================================================
-
-
-#endif // USING_BORROWED_QTEXTSTREAM
-
-#endif
-
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list