[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:19:40 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f255143b7ab74c3c128403bdf16581aeea1d137e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jun 15 21:34:18 2002 +0000
* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
* kwq/WCLoadProgress.h: Removed.
* kwq/WCWebDataSource.h: Removed.
* kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
* *.mm: Changed all includes to imports using a perl script.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 17af3a2..3279521 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
2002-06-15 Darin Adler <darin at apple.com>
+ * kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
+ * kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
+ * kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
+
+ * kwq/WCLoadProgress.h: Removed.
+ * kwq/WCWebDataSource.h: Removed.
+ * kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
+
+ * *.mm: Changed all includes to imports using a perl script.
+
+2002-06-15 Darin Adler <darin at apple.com>
+
- fixed 2942808 -- remove all calls to WebKit from WebCore
More work on the bridge. Now we don't call anything in WebKit explicitly,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 17af3a2..3279521 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
2002-06-15 Darin Adler <darin at apple.com>
+ * kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
+ * kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
+ * kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
+
+ * kwq/WCLoadProgress.h: Removed.
+ * kwq/WCWebDataSource.h: Removed.
+ * kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
+
+ * *.mm: Changed all includes to imports using a perl script.
+
+2002-06-15 Darin Adler <darin at apple.com>
+
- fixed 2942808 -- remove all calls to WebKit from WebCore
More work on the bridge. Now we don't call anything in WebKit explicitly,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 17af3a2..3279521 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
2002-06-15 Darin Adler <darin at apple.com>
+ * kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
+ * kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
+ * kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
+
+ * kwq/WCLoadProgress.h: Removed.
+ * kwq/WCWebDataSource.h: Removed.
+ * kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
+
+ * *.mm: Changed all includes to imports using a perl script.
+
+2002-06-15 Darin Adler <darin at apple.com>
+
- fixed 2942808 -- remove all calls to WebKit from WebCore
More work on the bridge. Now we don't call anything in WebKit explicitly,
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index 2439178..7b45431 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qapplication.h>
-#include <kwqdebug.h>
+#import <qapplication.h>
+#import <kwqdebug.h>
QPalette QApplication::palette(const QWidget *p)
{
diff --git a/WebCore/kwq/KWQArrayImpl.mm b/WebCore/kwq/KWQArrayImpl.mm
index 3dacfed..5e74e27 100644
--- a/WebCore/kwq/KWQArrayImpl.mm
+++ b/WebCore/kwq/KWQArrayImpl.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQArrayImpl.h>
+#import <KWQArrayImpl.h>
-#include <new>
-#include <string.h>
+#import <new>
+#import <string.h>
#define MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/WebCore/kwq/KWQBuffer.mm b/WebCore/kwq/KWQBuffer.mm
index 090dcfd..a68d89c 100644
--- a/WebCore/kwq/KWQBuffer.mm
+++ b/WebCore/kwq/KWQBuffer.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qbuffer.h>
+#import <qbuffer.h>
void QBuffer::open(int)
{
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index f7478e7..ff93500 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qbutton.h>
+#import <qbutton.h>
-#include <KWQView.h>
-#include <kwqdebug.h>
+#import <KWQView.h>
+#import <kwqdebug.h>
QButton::QButton(QWidget *parent)
{
diff --git a/WebCore/kwq/KWQCString.mm b/WebCore/kwq/KWQCString.mm
index 3cdfa77..3a81537 100644
--- a/WebCore/kwq/KWQCString.mm
+++ b/WebCore/kwq/KWQCString.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qcstring.h>
+#import <qcstring.h>
-#include <ctype.h>
+#import <ctype.h>
QCString::QCString() : QByteArray(0)
{
diff --git a/WebCore/kwq/KWQChar.mm b/WebCore/kwq/KWQChar.mm
index b684049..fcd7b76 100644
--- a/WebCore/kwq/KWQChar.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <Foundation/Foundation.h>
-#include <qstring.h>
+#import <kwqdebug.h>
+#import <Foundation/Foundation.h>
+#import <qstring.h>
#ifndef USING_BORROWED_QSTRING
diff --git a/WebCore/kwq/KWQCharsets.mm b/WebCore/kwq/KWQCharsets.mm
index 04a8160..d835813 100644
--- a/WebCore/kwq/KWQCharsets.mm
+++ b/WebCore/kwq/KWQCharsets.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "KWQCharsets.h"
-#include <CoreFoundation/CoreFoundation.h>
+#import "KWQCharsets.h"
+#import <CoreFoundation/CoreFoundation.h>
typedef struct CharsetEntry {
const char *name;
@@ -34,7 +34,7 @@ typedef struct CharsetEntry {
/* The following autogenerated file includes the charset data. */
-#include "KWQCharsetData.c"
+#import "KWQCharsetData.c"
static CFMutableDictionaryRef nameToEncoding = NULL;
static CFMutableDictionaryRef mibToEncoding = NULL;
diff --git a/WebCore/kwq/KWQCheckBox.mm b/WebCore/kwq/KWQCheckBox.mm
index 49e8327..dba4e5e 100644
--- a/WebCore/kwq/KWQCheckBox.mm
+++ b/WebCore/kwq/KWQCheckBox.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qcheckbox.h>
+#import <qcheckbox.h>
-#include <KWQView.h>
+#import <KWQView.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QCheckBox::QCheckBox(QWidget *w) : QButton (w)
{
diff --git a/WebCore/kwq/KWQCollection.mm b/WebCore/kwq/KWQCollection.mm
index 1242d40..ccfcf3f 100644
--- a/WebCore/kwq/KWQCollection.mm
+++ b/WebCore/kwq/KWQCollection.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qcollection.h>
+#import <qcollection.h>
QPtrCollection::~QPtrCollection()
{
diff --git a/WebCore/kwq/KWQColor.mm b/WebCore/kwq/KWQColor.mm
index 12d7149..c185aed 100644
--- a/WebCore/kwq/KWQColor.mm
+++ b/WebCore/kwq/KWQColor.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qcolor.h>
+#import <qcolor.h>
-#include <qnamespace.h>
-#include <qstring.h>
-#include <kwqdebug.h>
+#import <qnamespace.h>
+#import <qstring.h>
+#import <kwqdebug.h>
static void createStaticConstructorAutoreleasePool()
{
diff --git a/WebCore/kwq/KWQColorGroup.mm b/WebCore/kwq/KWQColorGroup.mm
index e2eaa6d..107789a 100644
--- a/WebCore/kwq/KWQColorGroup.mm
+++ b/WebCore/kwq/KWQColorGroup.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpalette.h>
+#import <qpalette.h>
QColorGroup::QColorGroup()
{
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 4fcc8f8..91f0c3a 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -22,11 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qcombobox.h>
+#import <qcombobox.h>
-#include <KWQView.h>
+#import <KWQView.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QComboBox::QComboBox(QWidget *parent, const char *name)
diff --git a/WebCore/kwq/KWQCompletion.mm b/WebCore/kwq/KWQCompletion.mm
index 4504bbd..8c280c4 100644
--- a/WebCore/kwq/KWQCompletion.mm
+++ b/WebCore/kwq/KWQCompletion.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQCompletion.h>
-#include <kwqdebug.h>
+#import <KWQCompletion.h>
+#import <kwqdebug.h>
void KCompletion::setItems(const QStringList &)
{
diff --git a/WebCore/kwq/KWQCursor.mm b/WebCore/kwq/KWQCursor.mm
index 932d7a7..c57e33d 100644
--- a/WebCore/kwq/KWQCursor.mm
+++ b/WebCore/kwq/KWQCursor.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qcursor.h>
-#include <kwqdebug.h>
+#import <qcursor.h>
+#import <kwqdebug.h>
const QCursor Qt::sizeAllCursor;
const QCursor Qt::splitHCursor;
diff --git a/WebCore/kwq/KWQDateTime.mm b/WebCore/kwq/KWQDateTime.mm
index bd4d306..84e144f 100644
--- a/WebCore/kwq/KWQDateTime.mm
+++ b/WebCore/kwq/KWQDateTime.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <Foundation/Foundation.h>
-#include <qdatetime.h>
-#include <time.h>
+#import <Foundation/Foundation.h>
+#import <qdatetime.h>
+#import <time.h>
// QTime class ===============================================================
diff --git a/WebCore/kwq/KWQDictImpl.mm b/WebCore/kwq/KWQDictImpl.mm
index 4046805..9ba2050 100644
--- a/WebCore/kwq/KWQDictImpl.mm
+++ b/WebCore/kwq/KWQDictImpl.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQDictImpl.h>
-#include <CoreFoundation/CoreFoundation.h>
+#import <KWQDictImpl.h>
+#import <CoreFoundation/CoreFoundation.h>
KWQDictImpl::KWQDictImpl(int size, bool caseSensitive, void (*deleteFunc)(void *)) :
KWQPtrDictImpl(size, deleteFunc, &kCFCopyStringDictionaryKeyCallBacks)
diff --git a/WebCore/kwq/KWQDrawUtil.mm b/WebCore/kwq/KWQDrawUtil.mm
index 57d458c..d3edb45 100644
--- a/WebCore/kwq/KWQDrawUtil.mm
+++ b/WebCore/kwq/KWQDrawUtil.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <qdrawutil.h>
+#import <kwqdebug.h>
+#import <qdrawutil.h>
void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, const QColorGroup &g, bool
sunken, int lineWidth, const QBrush *fill)
diff --git a/WebCore/kwq/KWQEvent.mm b/WebCore/kwq/KWQEvent.mm
index a8e107b..aee17fc 100644
--- a/WebCore/kwq/KWQEvent.mm
+++ b/WebCore/kwq/KWQEvent.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <qevent.h>
+#import <kwqdebug.h>
+#import <qevent.h>
// class QEvent ================================================================
diff --git a/WebCore/kwq/KWQFile.mm b/WebCore/kwq/KWQFile.mm
index 4c4b1d7..506bb1d 100644
--- a/WebCore/kwq/KWQFile.mm
+++ b/WebCore/kwq/KWQFile.mm
@@ -23,20 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qfile.h>
+#import <qfile.h>
#ifndef USING_BORROWED_QFILE
-#include <kwqdebug.h>
+#import <kwqdebug.h>
#import <Foundation/Foundation.h>
-#include <sys/param.h>
-#include <qstring.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <qiodevice.h>
+#import <sys/param.h>
+#import <qstring.h>
+#import <unistd.h>
+#import <sys/types.h>
+#import <sys/stat.h>
+#import <fcntl.h>
+
+#import <qiodevice.h>
class QFile::KWQFilePrivate
{
diff --git a/WebCore/kwq/KWQFont.mm b/WebCore/kwq/KWQFont.mm
index 02bec09..91a8e45 100644
--- a/WebCore/kwq/KWQFont.mm
+++ b/WebCore/kwq/KWQFont.mm
@@ -26,7 +26,7 @@
#import <qfont.h>
#import <qstring.h>
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
QFont::QFont()
: _family([@"" retain])
diff --git a/WebCore/kwq/KWQFontInfo.mm b/WebCore/kwq/KWQFontInfo.mm
index 8a34b36..ab5208b 100644
--- a/WebCore/kwq/KWQFontInfo.mm
+++ b/WebCore/kwq/KWQFontInfo.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qfontinfo.h>
-#include <kwqdebug.h>
+#import <qfontinfo.h>
+#import <kwqdebug.h>
QFontInfo::QFontInfo(const QFont &f)
: font(f)
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 9614962..fa805d7 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -25,7 +25,7 @@
#import <qfontmetrics.h>
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
#import <qfont.h>
#import <WebCoreTextRendererFactory.h>
diff --git a/WebCore/kwq/KWQFrame.mm b/WebCore/kwq/KWQFrame.mm
index 6d78de9..e3dc57b 100644
--- a/WebCore/kwq/KWQFrame.mm
+++ b/WebCore/kwq/KWQFrame.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qframe.h>
+#import <qframe.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QFrame::QFrame(QWidget *parent)
: QWidget(parent)
diff --git a/WebCore/kwq/KWQGuardedPtr.mm b/WebCore/kwq/KWQGuardedPtr.mm
index 98d1e16..c560abe 100644
--- a/WebCore/kwq/KWQGuardedPtr.mm
+++ b/WebCore/kwq/KWQGuardedPtr.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qguardedptr.h>
+#import <qguardedptr.h>
KWQGuardedPtrBase::KWQGuardedPtrBase(QObject *o)
{
diff --git a/WebCore/kwq/KWQHBox.mm b/WebCore/kwq/KWQHBox.mm
index e533fe6..7f22cde 100644
--- a/WebCore/kwq/KWQHBox.mm
+++ b/WebCore/kwq/KWQHBox.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qhbox.h>
+#import <qhbox.h>
-#include <kwqdebug.h>
-#include <KWQView.h>
+#import <kwqdebug.h>
+#import <KWQView.h>
// This class is ONLY used by FORM <input type=file> elements. It's used
// to stretch a LineEditWidget. We probably don't need it at all.
diff --git a/WebCore/kwq/KWQInputDialog.mm b/WebCore/kwq/KWQInputDialog.mm
index fa35ad5..15c6ed5 100644
--- a/WebCore/kwq/KWQInputDialog.mm
+++ b/WebCore/kwq/KWQInputDialog.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qinputdialog.h>
-#include <kwqdebug.h>
+#import <qinputdialog.h>
+#import <kwqdebug.h>
QString QInputDialog::getText(const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *)
{
diff --git a/WebCore/kwq/KWQKCharsets.mm b/WebCore/kwq/KWQKCharsets.mm
index ef8c843..535bd80 100644
--- a/WebCore/kwq/KWQKCharsets.mm
+++ b/WebCore/kwq/KWQKCharsets.mm
@@ -25,9 +25,9 @@
// FIXME: obviously many functions here can be made inline
-#include <kcharsets.h>
-#include <qtextcodec.h>
-#include <kwqdebug.h>
+#import <kcharsets.h>
+#import <qtextcodec.h>
+#import <kwqdebug.h>
// constructors, copy constructors, and destructors ----------------------------
diff --git a/WebCore/kwq/KWQKComboBox.mm b/WebCore/kwq/KWQKComboBox.mm
index f4d1082..c0719bc 100644
--- a/WebCore/kwq/KWQKComboBox.mm
+++ b/WebCore/kwq/KWQKComboBox.mm
@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <kcombobox.h>
+#import <kwqdebug.h>
+#import <kcombobox.h>
-#include <KWQView.h>
+#import <KWQView.h>
KComboBox::KComboBox(QWidget *parent, const char *name)
{
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index 8c170b9..7005d09 100644
--- a/WebCore/kwq/KWQKCursor.mm
+++ b/WebCore/kwq/KWQKCursor.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kcursor.h>
+#import <kcursor.h>
@interface NSCursor (_WebCoreCursorAdditions)
diff --git a/WebCore/kwq/KWQKDebug.mm b/WebCore/kwq/KWQKDebug.mm
index c2017f5..0285af2 100644
--- a/WebCore/kwq/KWQKDebug.mm
+++ b/WebCore/kwq/KWQKDebug.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kdebug.h>
+#import <kdebug.h>
kdbgstream::kdbgstream(unsigned int area, unsigned int level, bool print)
diff --git a/WebCore/kwq/KWQKFileDialog.mm b/WebCore/kwq/KWQKFileDialog.mm
index 625a9d1..9a13ddf 100644
--- a/WebCore/kwq/KWQKFileDialog.mm
+++ b/WebCore/kwq/KWQKFileDialog.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kfiledialog.h>
-#include <kwqdebug.h>
+#import <kfiledialog.h>
+#import <kwqdebug.h>
QString KFileDialog::getOpenFileName(const QString &startDir,
const QString &filter, QWidget *parent, const QString &caption)
diff --git a/WebCore/kwq/KWQKFileItem.mm b/WebCore/kwq/KWQKFileItem.mm
index 1930b65..45eca6b 100644
--- a/WebCore/kwq/KWQKFileItem.mm
+++ b/WebCore/kwq/KWQKFileItem.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kfileitem.h>
+#import <kfileitem.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
KFileItem::KFileItem(const KIO::UDSEntry &, const KURL &, bool, bool)
{
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index a7cb127..3a4f542 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -22,16 +22,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
+#import <kwqdebug.h>
-#include <kglobal.h>
-#include <kconfig.h>
-#include <kcharsets.h>
-#include <klocale.h>
+#import <kglobal.h>
+#import <kconfig.h>
+#import <kcharsets.h>
+#import <klocale.h>
-#include <qdict.h>
+#import <qdict.h>
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
KWQStaticStringDict *KGlobal::_stringDict = 0;
KInstance *KGlobal::_instance = 0;
diff --git a/WebCore/kwq/KWQKGlobalSettings.mm b/WebCore/kwq/KWQKGlobalSettings.mm
index 1c3889a..86369e5 100644
--- a/WebCore/kwq/KWQKGlobalSettings.mm
+++ b/WebCore/kwq/KWQKGlobalSettings.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qfont.h>
+#import <qfont.h>
-#include <kglobalsettings.h>
+#import <kglobalsettings.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QFont KGlobalSettings::generalFont()
{
diff --git a/WebCore/kwq/KWQKHTMLFactory.mm b/WebCore/kwq/KWQKHTMLFactory.mm
index 1ef11ae..93b3e86 100644
--- a/WebCore/kwq/KWQKHTMLFactory.mm
+++ b/WebCore/kwq/KWQKHTMLFactory.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <khtml_factory.h>
+#import <khtml_factory.h>
-#include <kinstance.h>
-#include <khtml_settings.h>
+#import <kinstance.h>
+#import <khtml_settings.h>
KInstance *KHTMLFactory::instance()
{
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index bf08df3..ed03257 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -37,7 +37,6 @@
#import <WebCoreViewFactory.h>
#import <WebCoreBridge.h>
-#import <WCWebDataSource.h>
#import <kwqdebug.h>
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index bf08df3..ed03257 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -37,7 +37,6 @@
#import <WebCoreViewFactory.h>
#import <WebCoreBridge.h>
-#import <WCWebDataSource.h>
#import <kwqdebug.h>
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index 6aeda76..bc04ea1 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -22,8 +22,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <khtml_settings.h>
+#import <kwqdebug.h>
+#import <khtml_settings.h>
KHTMLSettings::KHTMLSettings()
{
diff --git a/WebCore/kwq/KWQKHTMLView.mm b/WebCore/kwq/KWQKHTMLView.mm
index 03d83e7..5325fcb 100644
--- a/WebCore/kwq/KWQKHTMLView.mm
+++ b/WebCore/kwq/KWQKHTMLView.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <khtmlview.h>
+#import <khtmlview.h>
/*
Currently this files just extends the kde implementation.
diff --git a/WebCore/kwq/KWQKHistoryProvider.mm b/WebCore/kwq/KWQKHistoryProvider.mm
index 5f9c90b..6d532aa 100644
--- a/WebCore/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQKHistoryProvider.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <historyprovider.h>
+#import <historyprovider.h>
namespace KParts {
diff --git a/WebCore/kwq/KWQKIONetAccess.mm b/WebCore/kwq/KWQKIONetAccess.mm
index 61433ce..d51bd52 100644
--- a/WebCore/kwq/KWQKIONetAccess.mm
+++ b/WebCore/kwq/KWQKIONetAccess.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <netaccess.h>
+#import <kwqdebug.h>
+#import <netaccess.h>
//FIX ME:
static QString *tempQString;
diff --git a/WebCore/kwq/KWQKIconLoader.mm b/WebCore/kwq/KWQKIconLoader.mm
index 9bdba20..9acbf3b 100644
--- a/WebCore/kwq/KWQKIconLoader.mm
+++ b/WebCore/kwq/KWQKIconLoader.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <kiconloader.h>
+#import <kwqdebug.h>
+#import <kiconloader.h>
QPixmap KIconLoader::loadIcon(const QString &name, int group, int size, int state) const
{
diff --git a/WebCore/kwq/KWQKImageIO.mm b/WebCore/kwq/KWQKImageIO.mm
index e6c8498..80afb0c 100644
--- a/WebCore/kwq/KWQKImageIO.mm
+++ b/WebCore/kwq/KWQKImageIO.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kimageio.h>
-#include <kwqdebug.h>
+#import <kimageio.h>
+#import <kwqdebug.h>
QStringList KImageIO::mimeTypes(Mode)
{
diff --git a/WebCore/kwq/KWQKJob.mm b/WebCore/kwq/KWQKJob.mm
index 5bea6d3..f52c756 100644
--- a/WebCore/kwq/KWQKJob.mm
+++ b/WebCore/kwq/KWQKJob.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <job.h>
-#include <kwqdebug.h>
+#import <job.h>
+#import <kwqdebug.h>
namespace KIO {
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 225588f..79be8ff 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -31,7 +31,12 @@
#include <qstring.h>
#ifdef __OBJC__
-#import <WebFoundation/WebFoundation.h>
+ at protocol IFURLHandleClient;
+ at class IFURLHandle;
+typedef id <IFURLHandleClient> IFURLHandleClientPtr;
+#else
+typedef struct IFURLHandleClient IFURLHandleClientPtr;
+class IFURLHandle;
#endif
namespace KIO {
@@ -58,12 +63,10 @@ public:
void addMetaData(const QString &key, const QString &value);
void kill();
-#ifdef __OBJC__
- void begin(id <IFURLHandleClient> client, void *userData);
+ void begin(IFURLHandleClientPtr, void *userData);
IFURLHandle *handle() const;
NSURL *url() const;
-#endif
private:
TransferJobPrivate *d;
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index de4c7b1..ba3b55a 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -23,14 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
+#import <kwqdebug.h>
-#include <qstring.h>
-#include <jobclasses.h>
+#import <qstring.h>
+#import <jobclasses.h>
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
-#include <WebFoundation/IFURLHandleClient.h>
+#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/IFURLHandleClient.h>
namespace KIO {
diff --git a/WebCore/kwq/KWQKLineEdit.mm b/WebCore/kwq/KWQKLineEdit.mm
index b641227..85f8db2 100644
--- a/WebCore/kwq/KWQKLineEdit.mm
+++ b/WebCore/kwq/KWQKLineEdit.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <klineedit.h>
+#import <klineedit.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
KLineEdit::KLineEdit(QWidget *parent)
: QLineEdit(parent)
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index 93fbeef..aa9bb9c 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -22,9 +22,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <qstring.h>
-#include <klocale.h>
+#import <kwqdebug.h>
+#import <qstring.h>
+#import <klocale.h>
QString i18n(const char* text)
{
diff --git a/WebCore/kwq/KWQKMimeType.mm b/WebCore/kwq/KWQKMimeType.mm
index 1ace780..534b60c 100644
--- a/WebCore/kwq/KWQKMimeType.mm
+++ b/WebCore/kwq/KWQKMimeType.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kmimetype.h>
-#include <kwqdebug.h>
+#import <kmimetype.h>
+#import <kwqdebug.h>
KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t, bool, bool)
{
diff --git a/WebCore/kwq/KWQKPartsBrowserInterface.mm b/WebCore/kwq/KWQKPartsBrowserInterface.mm
index de5d2cb..5085bcc 100644
--- a/WebCore/kwq/KWQKPartsBrowserInterface.mm
+++ b/WebCore/kwq/KWQKPartsBrowserInterface.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <browserinterface.h>
+#import <browserinterface.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
namespace KParts {
diff --git a/WebCore/kwq/KWQKPartsEvent.mm b/WebCore/kwq/KWQKPartsEvent.mm
index 1db8659..509c91a 100644
--- a/WebCore/kwq/KWQKPartsEvent.mm
+++ b/WebCore/kwq/KWQKPartsEvent.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <event.h>
+#import <kwqdebug.h>
+#import <event.h>
class QPainter;
diff --git a/WebCore/kwq/KWQKPrinter.mm b/WebCore/kwq/KWQKPrinter.mm
index b5f54fd..a16850f 100644
--- a/WebCore/kwq/KWQKPrinter.mm
+++ b/WebCore/kwq/KWQKPrinter.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprinter.h>
-#include <kwqdebug.h>
+#import <kprinter.h>
+#import <kwqdebug.h>
KPrinter::KPrinter(QPrinter::PrinterMode)
{
diff --git a/WebCore/kwq/KWQKProtocolManager.mm b/WebCore/kwq/KWQKProtocolManager.mm
index a8d9049..ec3273c 100644
--- a/WebCore/kwq/KWQKProtocolManager.mm
+++ b/WebCore/kwq/KWQKProtocolManager.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprotocolmanager.h>
+#import <kprotocolmanager.h>
-#include <qstring.h>
+#import <qstring.h>
QString KProtocolManager::userAgentForHost( const QString& )
{
diff --git a/WebCore/kwq/KWQKSimpleConfig.mm b/WebCore/kwq/KWQKSimpleConfig.mm
index defe3a6..13d2126 100644
--- a/WebCore/kwq/KWQKSimpleConfig.mm
+++ b/WebCore/kwq/KWQKSimpleConfig.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <ksimpleconfig.h>
+#import <kwqdebug.h>
+#import <ksimpleconfig.h>
KSimpleConfig::KSimpleConfig(const QString &s, bool bReadOnly) : KConfig (s, bReadOnly)
diff --git a/WebCore/kwq/KWQKStandardDirs.mm b/WebCore/kwq/KWQKStandardDirs.mm
index 2f205ac..f5ffbec 100644
--- a/WebCore/kwq/KWQKStandardDirs.mm
+++ b/WebCore/kwq/KWQKStandardDirs.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kstandarddirs.h>
+#import <kstandarddirs.h>
QString locate(const char *type, const QString& filename, const KInstance* instance)
{
diff --git a/WebCore/kwq/KWQKStringHandler.mm b/WebCore/kwq/KWQKStringHandler.mm
index e642476..fcc7bdf 100644
--- a/WebCore/kwq/KWQKStringHandler.mm
+++ b/WebCore/kwq/KWQKStringHandler.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kstringhandler.h>
+#import <kstringhandler.h>
QString KStringHandler::csqueeze(const QString &str, uint maxlen)
{
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index e17c6ac..d92fada 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kurl.h>
-#include <kwqdebug.h>
+#import <kurl.h>
+#import <kwqdebug.h>
#import <Foundation/NSURLPathUtilities.h>
diff --git a/WebCore/kwq/KWQKWin.mm b/WebCore/kwq/KWQKWin.mm
index a455a52..b5318a7 100644
--- a/WebCore/kwq/KWQKWin.mm
+++ b/WebCore/kwq/KWQKWin.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwin.h>
+#import <kwin.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
KWin::Info KWin::info(int win)
{
diff --git a/WebCore/kwq/KWQKWinModule.mm b/WebCore/kwq/KWQKWinModule.mm
index 688d0b9..98a9035 100644
--- a/WebCore/kwq/KWQKWinModule.mm
+++ b/WebCore/kwq/KWQKWinModule.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwinmodule.h>
-#include <kwqdebug.h>
+#import <kwinmodule.h>
+#import <kwqdebug.h>
QRect KWinModule::workArea() const
{
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 98823d6..69df0a8 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -23,10 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQLoaderImpl.h>
+#import <KWQLoaderImpl.h>
#import <kio/jobclasses.h>
#import <misc/loader.h>
+
+#import <WebFoundation/IFError.h>
+#import <WebFoundation/IFURLHandle.h>
+
#import <KWQKHTMLPartImpl.h>
#import <WebCoreBridge.h>
#import <kwqdebug.h>
diff --git a/WebCore/kwq/KWQKnetaccess.mm b/WebCore/kwq/KWQKnetaccess.mm
index 61433ce..d51bd52 100644
--- a/WebCore/kwq/KWQKnetaccess.mm
+++ b/WebCore/kwq/KWQKnetaccess.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <netaccess.h>
+#import <kwqdebug.h>
+#import <netaccess.h>
//FIX ME:
static QString *tempQString;
diff --git a/WebCore/kwq/KWQKstddirs.mm b/WebCore/kwq/KWQKstddirs.mm
index 2f205ac..f5ffbec 100644
--- a/WebCore/kwq/KWQKstddirs.mm
+++ b/WebCore/kwq/KWQKstddirs.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kstandarddirs.h>
+#import <kstandarddirs.h>
QString locate(const char *type, const QString& filename, const KInstance* instance)
{
diff --git a/WebCore/kwq/KWQLabel.mm b/WebCore/kwq/KWQLabel.mm
index 9753dcb..0e79a37 100644
--- a/WebCore/kwq/KWQLabel.mm
+++ b/WebCore/kwq/KWQLabel.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qlabel.h>
+#import <qlabel.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QLabel::QLabel(const QString &, QWidget *parent)
: QFrame(parent)
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index d6df05a..2ccadf0 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -22,11 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qlineedit.h>
+#import <qlineedit.h>
-#include <KWQNSTextField.h>
+#import <KWQNSTextField.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QLineEdit::QLineEdit(QWidget *parent, const char *name)
{
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 8d0c451..5457d6e 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
+#import <kwqdebug.h>
-#include <KWQView.h>
-#include <KWQListBox.h>
+#import <KWQView.h>
+#import <KWQListBox.h>
@interface KWQBrowserDelegate : NSObject
diff --git a/WebCore/kwq/KWQListImpl.mm b/WebCore/kwq/KWQListImpl.mm
index 0c68a10..d24fece 100644
--- a/WebCore/kwq/KWQListImpl.mm
+++ b/WebCore/kwq/KWQListImpl.mm
@@ -23,12 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQListImpl.h>
+#import <KWQListImpl.h>
-#include <cstddef>
-#include <algorithm>
-#include <CoreFoundation/CFArray.h>
-#include <kwqdebug.h>
+#import <cstddef>
+#import <algorithm>
+#import <CoreFoundation/CFArray.h>
+#import <kwqdebug.h>
class KWQListNode
{
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 98823d6..69df0a8 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -23,10 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQLoaderImpl.h>
+#import <KWQLoaderImpl.h>
#import <kio/jobclasses.h>
#import <misc/loader.h>
+
+#import <WebFoundation/IFError.h>
+#import <WebFoundation/IFURLHandle.h>
+
#import <KWQKHTMLPartImpl.h>
#import <WebCoreBridge.h>
#import <kwqdebug.h>
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 98823d6..69df0a8 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -23,10 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQLoaderImpl.h>
+#import <KWQLoaderImpl.h>
#import <kio/jobclasses.h>
#import <misc/loader.h>
+
+#import <WebFoundation/IFError.h>
+#import <WebFoundation/IFURLHandle.h>
+
#import <KWQKHTMLPartImpl.h>
#import <WebCoreBridge.h>
#import <kwqdebug.h>
diff --git a/WebCore/kwq/KWQMapImpl.mm b/WebCore/kwq/KWQMapImpl.mm
index 8f8a2f1..fc93314 100644
--- a/WebCore/kwq/KWQMapImpl.mm
+++ b/WebCore/kwq/KWQMapImpl.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQMapImpl.h>
+#import <KWQMapImpl.h>
#ifndef USING_BORROWED_QMAP
diff --git a/WebCore/kwq/KWQMovie.mm b/WebCore/kwq/KWQMovie.mm
index 07f7263..f4631fc 100644
--- a/WebCore/kwq/KWQMovie.mm
+++ b/WebCore/kwq/KWQMovie.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qmovie.h>
+#import <qmovie.h>
const QRect &QMovie::getValidRect() const
{
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 5c78c7b..a6df8cf 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qobject.h>
-#include <qvariant.h>
-#include <qguardedptr.h>
+#import <qobject.h>
+#import <qvariant.h>
+#import <qguardedptr.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
bool QObject::connect(const QObject *sender, const char *signal, const QObject *dest, const char *slot)
{
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.mm b/WebCore/kwq/KWQPaintDeviceMetrics.mm
index 776a559..82a159f 100644
--- a/WebCore/kwq/KWQPaintDeviceMetrics.mm
+++ b/WebCore/kwq/KWQPaintDeviceMetrics.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpaintdevicemetrics.h>
+#import <qpaintdevicemetrics.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
#import <ApplicationServices/ApplicationServices.h>
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index f203033..f1a4baf 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpainter.h>
-#include <qwidget.h>
-#include <qfontmetrics.h>
-#include <qpixmap.h>
-#include <qstack.h>
-#include <qpoint.h>
-
-#include <kwqdebug.h>
+#import <qpainter.h>
+#import <qwidget.h>
+#import <qfontmetrics.h>
+#import <qpixmap.h>
+#import <qstack.h>
+#import <qpoint.h>
+
+#import <kwqdebug.h>
#import <WebCoreTextRendererFactory.h>
#import <WebCoreTextRenderer.h>
diff --git a/WebCore/kwq/KWQPalette.mm b/WebCore/kwq/KWQPalette.mm
index daf7f94..b945816 100644
--- a/WebCore/kwq/KWQPalette.mm
+++ b/WebCore/kwq/KWQPalette.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpalette.h>
+#import <qpalette.h>
const QColor& QPalette::color(ColorGroup cg, QColorGroup::ColorRole role) const
{
diff --git a/WebCore/kwq/KWQPen.mm b/WebCore/kwq/KWQPen.mm
index e53e545..7abfc6d 100644
--- a/WebCore/kwq/KWQPen.mm
+++ b/WebCore/kwq/KWQPen.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpen.h>
+#import <qpen.h>
QPen::QPen(const QColor &color, uint width, PenStyle style) : penStyle(style), penWidth(width), penColor(color)
{
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index 2799c02..9f50b7d 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpixmap.h>
-#include <kwqdebug.h>
-#include <qbitmap.h>
+#import <qpixmap.h>
+#import <kwqdebug.h>
+#import <qbitmap.h>
#import <WebCoreImageRenderer.h>
#import <WebCoreImageRendererFactory.h>
diff --git a/WebCore/kwq/KWQPoint.mm b/WebCore/kwq/KWQPoint.mm
index f69d1bf..eccaf24 100644
--- a/WebCore/kwq/KWQPoint.mm
+++ b/WebCore/kwq/KWQPoint.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpoint.h>
+#import <qpoint.h>
QPoint::QPoint() : xCoord(0), yCoord(0)
{
diff --git a/WebCore/kwq/KWQPointArray.mm b/WebCore/kwq/KWQPointArray.mm
index fddb085..609b408 100644
--- a/WebCore/kwq/KWQPointArray.mm
+++ b/WebCore/kwq/KWQPointArray.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "qpoint.h"
-#include <stdarg.h>
+#import "qpoint.h"
+#import <stdarg.h>
QPointArray::QPointArray(int nPoints, const int *points)
{
diff --git a/WebCore/kwq/KWQPtrDictImpl.mm b/WebCore/kwq/KWQPtrDictImpl.mm
index 7def6b2..c876fe3 100644
--- a/WebCore/kwq/KWQPtrDictImpl.mm
+++ b/WebCore/kwq/KWQPtrDictImpl.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQPtrDictImpl.h>
+#import <KWQPtrDictImpl.h>
-#include <new>
+#import <new>
typedef void (* DeleteFunction) (void *);
diff --git a/WebCore/kwq/KWQPushButton.mm b/WebCore/kwq/KWQPushButton.mm
index 26d20f2..bd6c817 100644
--- a/WebCore/kwq/KWQPushButton.mm
+++ b/WebCore/kwq/KWQPushButton.mm
@@ -22,11 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qpushbutton.h>
+#import <qpushbutton.h>
-#include <KWQView.h>
+#import <KWQView.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
// Should require no additional code over KWQButton
diff --git a/WebCore/kwq/KWQRadioButton.mm b/WebCore/kwq/KWQRadioButton.mm
index 2f9a785..dacfe27 100644
--- a/WebCore/kwq/KWQRadioButton.mm
+++ b/WebCore/kwq/KWQRadioButton.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qradiobutton.h>
+#import <qradiobutton.h>
-#include <KWQView.h>
+#import <KWQView.h>
QRadioButton::QRadioButton(QWidget *w) : QButton(w)
{
diff --git a/WebCore/kwq/KWQRect.mm b/WebCore/kwq/KWQRect.mm
index c180a0f..1712cc4 100644
--- a/WebCore/kwq/KWQRect.mm
+++ b/WebCore/kwq/KWQRect.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qrect.h>
+#import <qrect.h>
-#include <algorithm>
+#import <algorithm>
using std::max;
using std::min;
diff --git a/WebCore/kwq/KWQRegExp.mm b/WebCore/kwq/KWQRegExp.mm
index d7f0f3b..ab50727 100644
--- a/WebCore/kwq/KWQRegExp.mm
+++ b/WebCore/kwq/KWQRegExp.mm
@@ -24,10 +24,10 @@
*/
-#include <qregexp.h>
+#import <qregexp.h>
-#include <sys/types.h>
-#include <regex.h>
+#import <sys/types.h>
+#import <regex.h>
class QRegExp::KWQRegExpPrivate
diff --git a/WebCore/kwq/KWQRegion.mm b/WebCore/kwq/KWQRegion.mm
index 2c68920..a0403ac 100644
--- a/WebCore/kwq/KWQRegion.mm
+++ b/WebCore/kwq/KWQRegion.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qregion.h>
+#import <qregion.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QRegion::QRegion()
: path(nil)
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 417205a..88f7d4a 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qscrollview.h>
+#import <qscrollview.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
/*
This class implementation does NOT actually emulate the Qt QScrollView.
diff --git a/WebCore/kwq/KWQSignalStubs.mm b/WebCore/kwq/KWQSignalStubs.mm
index 5893408..4e3e1b8 100644
--- a/WebCore/kwq/KWQSignalStubs.mm
+++ b/WebCore/kwq/KWQSignalStubs.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <khtmlview.h>
-#include <misc/loader.h>
+#import <khtmlview.h>
+#import <misc/loader.h>
void KHTMLView::cleared()
{
diff --git a/WebCore/kwq/KWQSize.mm b/WebCore/kwq/KWQSize.mm
index c460927..19d4f20 100644
--- a/WebCore/kwq/KWQSize.mm
+++ b/WebCore/kwq/KWQSize.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qsize.h>
+#import <qsize.h>
QSize::QSize() : w(-1), h(-1)
{
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index dd70779..c5b3fd6 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -31,11 +31,11 @@
the string.
*/
-#include <Foundation/Foundation.h>
-#include <kwqdebug.h>
-#include <qstring.h>
-#include <qregexp.h>
-#include <stdio.h>
+#import <Foundation/Foundation.h>
+#import <kwqdebug.h>
+#import <qstring.h>
+#import <qregexp.h>
+#import <stdio.h>
#ifndef USING_BORROWED_QSTRING
diff --git a/WebCore/kwq/KWQStringList.mm b/WebCore/kwq/KWQStringList.mm
index 6e395a3..5ae691f 100644
--- a/WebCore/kwq/KWQStringList.mm
+++ b/WebCore/kwq/KWQStringList.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qstringlist.h>
+#import <qstringlist.h>
-#include <CoreFoundation/CoreFoundation.h>
+#import <CoreFoundation/CoreFoundation.h>
// No need to CFRelease return value
static CFStringRef GetCFString(const QString &s)
diff --git a/WebCore/kwq/KWQStyle.mm b/WebCore/kwq/KWQStyle.mm
index 62aec75..80da04e 100644
--- a/WebCore/kwq/KWQStyle.mm
+++ b/WebCore/kwq/KWQStyle.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <KWQStyle.h>
+#import <kwqdebug.h>
+#import <KWQStyle.h>
QStyle::QStyle()
{
diff --git a/WebCore/kwq/KWQStyleSheet.mm b/WebCore/kwq/KWQStyleSheet.mm
index 98ba089..812c884 100644
--- a/WebCore/kwq/KWQStyleSheet.mm
+++ b/WebCore/kwq/KWQStyleSheet.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qstylesheet.h>
-#include <qstring.h>
+#import <qstylesheet.h>
+#import <qstring.h>
QString QStyleSheet::convertFromPlainText(const QString &str)
{
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index 087f600..2438eb3 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -25,9 +25,9 @@
// FIXME: obviously many functions here can be made inline
-#include <qtextcodec.h>
-#include <kwqdebug.h>
-#include <KWQCharsets.h>
+#import <qtextcodec.h>
+#import <kwqdebug.h>
+#import <KWQCharsets.h>
// USING_BORROWED_QSTRING ======================================================
#ifndef USING_BORROWED_QSTRING
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index 8b8aaa0..a0b6984 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qtextedit.h>
+#import <qtextedit.h>
#import <KWQTextArea.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
QTextEdit::QTextEdit(QWidget *parent)
{
diff --git a/WebCore/kwq/KWQTextStream.mm b/WebCore/kwq/KWQTextStream.mm
index 8e7ee1a..55dd537 100644
--- a/WebCore/kwq/KWQTextStream.mm
+++ b/WebCore/kwq/KWQTextStream.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
+#import <kwqdebug.h>
-#include <qtextstream.h>
+#import <qtextstream.h>
// class QTextStream ===========================================================
diff --git a/WebCore/kwq/KWQTimer.mm b/WebCore/kwq/KWQTimer.mm
index 5f8e9f6..3a520a6 100644
--- a/WebCore/kwq/KWQTimer.mm
+++ b/WebCore/kwq/KWQTimer.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qtimer.h>
+#import <qtimer.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
void QTimer::singleShot(int, QObject *, const char *)
{
diff --git a/WebCore/kwq/KWQToolTip.mm b/WebCore/kwq/KWQToolTip.mm
index f4dc79e..af4d4ec 100644
--- a/WebCore/kwq/KWQToolTip.mm
+++ b/WebCore/kwq/KWQToolTip.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <qtooltip.h>
+#import <kwqdebug.h>
+#import <qtooltip.h>
QPalette QToolTip::palette()
{
diff --git a/WebCore/kwq/KWQValueListImpl.mm b/WebCore/kwq/KWQValueListImpl.mm
index d9ef97f..bac1f62 100644
--- a/WebCore/kwq/KWQValueListImpl.mm
+++ b/WebCore/kwq/KWQValueListImpl.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQValueListImpl.h>
+#import <KWQValueListImpl.h>
#ifndef USING_BORROWED_QVALUELIST
-#include <stdlib.h>
+#import <stdlib.h>
KWQValueListNodeImpl::KWQValueListNodeImpl() :
prev(NULL),
diff --git a/WebCore/kwq/KWQVariant.mm b/WebCore/kwq/KWQVariant.mm
index f1d65be..d56f228 100644
--- a/WebCore/kwq/KWQVariant.mm
+++ b/WebCore/kwq/KWQVariant.mm
@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
+#import <kwqdebug.h>
-#include <qvariant.h>
-#include <qstring.h>
+#import <qvariant.h>
+#import <qstring.h>
class QVariant::QVariantPrivate {
public:
diff --git a/WebCore/kwq/KWQVectorImpl.mm b/WebCore/kwq/KWQVectorImpl.mm
index 4d01ff6..77fab6e 100644
--- a/WebCore/kwq/KWQVectorImpl.mm
+++ b/WebCore/kwq/KWQVectorImpl.mm
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQVectorImpl.h>
+#import <KWQVectorImpl.h>
#ifndef USING_BORROWED_QVECTOR
-#include <CoreFoundation/CFArray.h>
+#import <CoreFoundation/CFArray.h>
-#include <new>
-#include <stdlib.h>
+#import <new>
+#import <stdlib.h>
#import <Foundation/NSData.h>
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index b98b024..0bb838e 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -26,12 +26,12 @@
#import "kwqdebug.h"
-#include <khtmlview.h>
-#include <khtml_part.h>
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <html/html_documentimpl.h>
+#import <khtmlview.h>
+#import <khtml_part.h>
+#import <qwidget.h>
+#import <qpainter.h>
+#import <qevent.h>
+#import <html/html_documentimpl.h>
diff --git a/WebCore/kwq/KWQWMatrix.mm b/WebCore/kwq/KWQWMatrix.mm
index b2ff6ad..dae5644 100644
--- a/WebCore/kwq/KWQWMatrix.mm
+++ b/WebCore/kwq/KWQWMatrix.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
-#include <qpainter.h>
+#import <kwqdebug.h>
+#import <qpainter.h>
// Simple implementation. Only allows for scaling, and scaling once!
diff --git a/WebCore/kwq/KWQXml.mm b/WebCore/kwq/KWQXml.mm
index a539e68..311fa07 100644
--- a/WebCore/kwq/KWQXml.mm
+++ b/WebCore/kwq/KWQXml.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qxml.h>
+#import <qxml.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
-#include <qstring.h>
+#import <qstring.h>
QString QXmlAttributes::value(const QString &) const
{
diff --git a/WebCore/kwq/KWQbrowserinterface.mm b/WebCore/kwq/KWQbrowserinterface.mm
index de5d2cb..5085bcc 100644
--- a/WebCore/kwq/KWQbrowserinterface.mm
+++ b/WebCore/kwq/KWQbrowserinterface.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <browserinterface.h>
+#import <browserinterface.h>
-#include <kwqdebug.h>
+#import <kwqdebug.h>
namespace KParts {
diff --git a/WebCore/kwq/KWQsignals.mm b/WebCore/kwq/KWQsignals.mm
index 5893408..4e3e1b8 100644
--- a/WebCore/kwq/KWQsignals.mm
+++ b/WebCore/kwq/KWQsignals.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <khtmlview.h>
-#include <misc/loader.h>
+#import <khtmlview.h>
+#import <misc/loader.h>
void KHTMLView::cleared()
{
diff --git a/WebCore/kwq/WCLoadProgress.h b/WebCore/kwq/WCLoadProgress.h
deleted file mode 100644
index c33f1b4..0000000
--- a/WebCore/kwq/WCLoadProgress.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2001 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __WCLOADPROGRESS__
-#define __WCLOADPROGRESS__
-
-#import <Foundation/Foundation.h>
-
-
-typedef id (*WCIFLoadProgressMakeFunc)();
-void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func);
-
-extern WCIFLoadProgressMakeFunc WCIFLoadProgressMake;
-
-#endif /* __WCLOADPROGRESS__ */
diff --git a/WebCore/kwq/WCWebDataSource.h b/WebCore/kwq/WCWebDataSource.h
deleted file mode 100644
index da932a5..0000000
--- a/WebCore/kwq/WCWebDataSource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2001 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WCWEBDATASOURCE_H_
-#define WCWEBDATASOURCE_H_
-
-#import <Foundation/Foundation.h>
-
-typedef id (*WCIFWebDataSourceMakeFunc)(void *, void *, unsigned);
-
-void WCSetIFWebDataSourceMakeFunc(WCIFWebDataSourceMakeFunc);
-
-#endif /* __WCWEBDATASOURCE__ */
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 225588f..79be8ff 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -31,7 +31,12 @@
#include <qstring.h>
#ifdef __OBJC__
-#import <WebFoundation/WebFoundation.h>
+ at protocol IFURLHandleClient;
+ at class IFURLHandle;
+typedef id <IFURLHandleClient> IFURLHandleClientPtr;
+#else
+typedef struct IFURLHandleClient IFURLHandleClientPtr;
+class IFURLHandle;
#endif
namespace KIO {
@@ -58,12 +63,10 @@ public:
void addMetaData(const QString &key, const QString &value);
void kill();
-#ifdef __OBJC__
- void begin(id <IFURLHandleClient> client, void *userData);
+ void begin(IFURLHandleClientPtr, void *userData);
IFURLHandle *handle() const;
NSURL *url() const;
-#endif
private:
TransferJobPrivate *d;
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index 11054b1..a26f145 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
+#import <kwqdebug.h>
#ifndef NDEBUG
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list