[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:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b381a87d9de9892eea4f79661c8d793b53df911c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 26 23:08:48 2002 +0000
- changed naming scheme in KWQ for files like qstring.h
Now use names like KWQString.h and make a forwarding header called qstring.h.
* tons of files
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2478 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8f66530..3b466b8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
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.
+
+ * tons of files
+
+2002-10-26 Darin Adler <darin at apple.com>
+
- fixed 3068404 -- eliminate all user-visible messages from WebCore
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Use runJavaScriptPrompt
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8f66530..3b466b8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
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.
+
+ * tons of files
+
+2002-10-26 Darin Adler <darin at apple.com>
+
- fixed 3068404 -- eliminate all user-visible messages from WebCore
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Use runJavaScriptPrompt
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8f66530..3b466b8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
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.
+
+ * tons of files
+
+2002-10-26 Darin Adler <darin at apple.com>
+
- fixed 3068404 -- eliminate all user-visible messages from WebCore
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Use runJavaScriptPrompt
diff --git a/WebCore/ForwardingHeaders/dcopclient.h b/WebCore/ForwardingHeaders/dcopclient.h
new file mode 100644
index 0000000..054b8aa
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dcopclient.h
@@ -0,0 +1 @@
+#include "KWQDCOPClient.h"
diff --git a/WebCore/ForwardingHeaders/java/kjavaappletcontext.h b/WebCore/ForwardingHeaders/java/kjavaappletcontext.h
index 8208b48..58ba7a1 100644
--- a/WebCore/ForwardingHeaders/java/kjavaappletcontext.h
+++ b/WebCore/ForwardingHeaders/java/kjavaappletcontext.h
@@ -1 +1 @@
-#include <kjavaappletcontext.h>
+#include "KWQKJavaAppletContext.h"
diff --git a/WebCore/ForwardingHeaders/java/kjavaappletwidget.h b/WebCore/ForwardingHeaders/java/kjavaappletwidget.h
index fbf3112..688f242 100644
--- a/WebCore/ForwardingHeaders/java/kjavaappletwidget.h
+++ b/WebCore/ForwardingHeaders/java/kjavaappletwidget.h
@@ -1 +1 @@
-#include <kjavaappletwidget.h>
+#include "KWQKJavaAppletWidget.h"
diff --git a/WebCore/ForwardingHeaders/kaction.h b/WebCore/ForwardingHeaders/kaction.h
new file mode 100644
index 0000000..6f1bb32
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kaction.h
@@ -0,0 +1 @@
+#include "KWQKKAction.h"
diff --git a/WebCore/ForwardingHeaders/kapplication.h b/WebCore/ForwardingHeaders/kapplication.h
new file mode 100644
index 0000000..e23c838
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kapplication.h
@@ -0,0 +1 @@
+#include "KWQKApplication.h"
diff --git a/WebCore/ForwardingHeaders/kcharsets.h b/WebCore/ForwardingHeaders/kcharsets.h
new file mode 100644
index 0000000..03fc967
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kcharsets.h
@@ -0,0 +1 @@
+#include "KWQKCharsets.h"
diff --git a/WebCore/ForwardingHeaders/kcombobox.h b/WebCore/ForwardingHeaders/kcombobox.h
new file mode 100644
index 0000000..83a2664
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kcombobox.h
@@ -0,0 +1 @@
+#include "KWQKComboBox.h"
diff --git a/WebCore/ForwardingHeaders/kcompletionbox.h b/WebCore/ForwardingHeaders/kcompletionbox.h
new file mode 100644
index 0000000..433c55e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kcompletionbox.h
@@ -0,0 +1 @@
+#include "KWQKCompletionBox.h"
diff --git a/WebCore/ForwardingHeaders/kconfig.h b/WebCore/ForwardingHeaders/kconfig.h
new file mode 100644
index 0000000..3cc2af0
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kconfig.h
@@ -0,0 +1 @@
+#include "KWQKConfigBase.h"
diff --git a/WebCore/ForwardingHeaders/kcursor.h b/WebCore/ForwardingHeaders/kcursor.h
new file mode 100644
index 0000000..9231f66
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kcursor.h
@@ -0,0 +1 @@
+#include "KWQKCursor.h"
diff --git a/WebCore/ForwardingHeaders/kdebug.h b/WebCore/ForwardingHeaders/kdebug.h
new file mode 100644
index 0000000..5d485cd
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kdebug.h
@@ -0,0 +1 @@
+#include "KWQKDebug.h"
diff --git a/WebCore/ForwardingHeaders/kfiledialog.h b/WebCore/ForwardingHeaders/kfiledialog.h
new file mode 100644
index 0000000..694336d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kfiledialog.h
@@ -0,0 +1 @@
+#include "KWQKFileDialog.h"
diff --git a/WebCore/ForwardingHeaders/kfileitem.h b/WebCore/ForwardingHeaders/kfileitem.h
new file mode 100644
index 0000000..24ab8a3
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kfileitem.h
@@ -0,0 +1 @@
+#include "KWQKFileItem.h"
diff --git a/WebCore/ForwardingHeaders/kglobal.h b/WebCore/ForwardingHeaders/kglobal.h
new file mode 100644
index 0000000..1ec03ee
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kglobal.h
@@ -0,0 +1 @@
+#include "KWQKGlobal.h"
diff --git a/WebCore/ForwardingHeaders/kglobalsettings.h b/WebCore/ForwardingHeaders/kglobalsettings.h
new file mode 100644
index 0000000..e3ea880
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kglobalsettings.h
@@ -0,0 +1 @@
+#include "KWQKGlobalSettings.h"
diff --git a/WebCore/ForwardingHeaders/khtml_ext.h b/WebCore/ForwardingHeaders/khtml_ext.h
new file mode 100644
index 0000000..87d8172
--- /dev/null
+++ b/WebCore/ForwardingHeaders/khtml_ext.h
@@ -0,0 +1 @@
+#include "KWQKHTMLPartBrowserExtension.h"
diff --git a/WebCore/ForwardingHeaders/khtml_factory.h b/WebCore/ForwardingHeaders/khtml_factory.h
new file mode 100644
index 0000000..cc85b9c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/khtml_factory.h
@@ -0,0 +1 @@
+#include "KWQKHTMLFactory.h"
diff --git a/WebCore/ForwardingHeaders/khtml_find.h b/WebCore/ForwardingHeaders/khtml_find.h
new file mode 100644
index 0000000..bad248a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/khtml_find.h
@@ -0,0 +1 @@
+#include "KWQKHTMLFind.h"
diff --git a/WebCore/ForwardingHeaders/khtml_pagecache.h b/WebCore/ForwardingHeaders/khtml_pagecache.h
new file mode 100644
index 0000000..8838ef1
--- /dev/null
+++ b/WebCore/ForwardingHeaders/khtml_pagecache.h
@@ -0,0 +1 @@
+#include "KWQKHTMLPageCache.h"
diff --git a/WebCore/ForwardingHeaders/khtml_settings.h b/WebCore/ForwardingHeaders/khtml_settings.h
new file mode 100644
index 0000000..510b1e1
--- /dev/null
+++ b/WebCore/ForwardingHeaders/khtml_settings.h
@@ -0,0 +1 @@
+#include "KWQKHTMLSettings.h"
diff --git a/WebCore/ForwardingHeaders/kiconloader.h b/WebCore/ForwardingHeaders/kiconloader.h
new file mode 100644
index 0000000..e76a7fe
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kiconloader.h
@@ -0,0 +1 @@
+#include "KWQKIconLoader.h"
diff --git a/WebCore/ForwardingHeaders/kimageio.h b/WebCore/ForwardingHeaders/kimageio.h
new file mode 100644
index 0000000..17dbabd
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kimageio.h
@@ -0,0 +1 @@
+#include "KWQKImageIO.h"
diff --git a/WebCore/ForwardingHeaders/kinstance.h b/WebCore/ForwardingHeaders/kinstance.h
new file mode 100644
index 0000000..09c8d7b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kinstance.h
@@ -0,0 +1 @@
+#include "KWQKInstance.h"
diff --git a/WebCore/ForwardingHeaders/kio/global.h b/WebCore/ForwardingHeaders/kio/global.h
index 88e15e0..74cec74 100644
--- a/WebCore/ForwardingHeaders/kio/global.h
+++ b/WebCore/ForwardingHeaders/kio/global.h
@@ -1 +1 @@
-#include <global.h>
+#include "KWQKIOGlobal.h"
diff --git a/WebCore/ForwardingHeaders/kio/job.h b/WebCore/ForwardingHeaders/kio/job.h
index bda81c8..8b4ea3e 100644
--- a/WebCore/ForwardingHeaders/kio/job.h
+++ b/WebCore/ForwardingHeaders/kio/job.h
@@ -1 +1 @@
-#include <job.h>
+#include "KWQKJob.h"
diff --git a/WebCore/ForwardingHeaders/kio/jobclasses.h b/WebCore/ForwardingHeaders/kio/jobclasses.h
index f52b97e..ff7bf6c 100644
--- a/WebCore/ForwardingHeaders/kio/jobclasses.h
+++ b/WebCore/ForwardingHeaders/kio/jobclasses.h
@@ -1 +1 @@
-#include <jobclasses.h>
+#include "KWQKJobClasses.h"
diff --git a/WebCore/ForwardingHeaders/klibloader.h b/WebCore/ForwardingHeaders/klibloader.h
new file mode 100644
index 0000000..000c7e9
--- /dev/null
+++ b/WebCore/ForwardingHeaders/klibloader.h
@@ -0,0 +1 @@
+#include "KWQKLibrary.h"
diff --git a/WebCore/ForwardingHeaders/klineedit.h b/WebCore/ForwardingHeaders/klineedit.h
new file mode 100644
index 0000000..0ba3c0c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/klineedit.h
@@ -0,0 +1 @@
+#include "KWQKLineEdit.h"
diff --git a/WebCore/ForwardingHeaders/klistbox.h b/WebCore/ForwardingHeaders/klistbox.h
new file mode 100644
index 0000000..66f3b30
--- /dev/null
+++ b/WebCore/ForwardingHeaders/klistbox.h
@@ -0,0 +1 @@
+#include "KWQKListBox.h"
diff --git a/WebCore/ForwardingHeaders/klocale.h b/WebCore/ForwardingHeaders/klocale.h
new file mode 100644
index 0000000..4066e8e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/klocale.h
@@ -0,0 +1 @@
+#include "KWQKLocale.h"
diff --git a/WebCore/ForwardingHeaders/kmimetype.h b/WebCore/ForwardingHeaders/kmimetype.h
new file mode 100644
index 0000000..92f0719
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kmimetype.h
@@ -0,0 +1 @@
+#include "KWQKMimeType.h"
diff --git a/WebCore/ForwardingHeaders/kparts/browserextension.h b/WebCore/ForwardingHeaders/kparts/browserextension.h
index 4144293..6f75e71 100644
--- a/WebCore/ForwardingHeaders/kparts/browserextension.h
+++ b/WebCore/ForwardingHeaders/kparts/browserextension.h
@@ -1 +1 @@
-#include <browserextension.h>
+#include "KWQKPartsBrowserExtension.h"
diff --git a/WebCore/ForwardingHeaders/kparts/browserinterface.h b/WebCore/ForwardingHeaders/kparts/browserinterface.h
index 8744192..f1992b7 100644
--- a/WebCore/ForwardingHeaders/kparts/browserinterface.h
+++ b/WebCore/ForwardingHeaders/kparts/browserinterface.h
@@ -1 +1 @@
-#include <browserinterface.h>
+#include "KWQKPartsBrowserInterface.h"
diff --git a/WebCore/ForwardingHeaders/kparts/event.h b/WebCore/ForwardingHeaders/kparts/event.h
index 3efc1e9..986e2b3 100644
--- a/WebCore/ForwardingHeaders/kparts/event.h
+++ b/WebCore/ForwardingHeaders/kparts/event.h
@@ -1 +1 @@
-#include <event.h>
+#include "KWQKPartsEvent.h"
diff --git a/WebCore/ForwardingHeaders/kparts/factory.h b/WebCore/ForwardingHeaders/kparts/factory.h
new file mode 100644
index 0000000..0045257
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/factory.h
@@ -0,0 +1 @@
+#include "KWQKPartsFactory.h"
diff --git a/WebCore/ForwardingHeaders/kparts/historyprovider.h b/WebCore/ForwardingHeaders/kparts/historyprovider.h
new file mode 100644
index 0000000..31b189f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/historyprovider.h
@@ -0,0 +1 @@
+#include "KWQKPartsHistoryProvider.h"
diff --git a/WebCore/ForwardingHeaders/kparts/part.h b/WebCore/ForwardingHeaders/kparts/part.h
index 360ef09..de873fb 100644
--- a/WebCore/ForwardingHeaders/kparts/part.h
+++ b/WebCore/ForwardingHeaders/kparts/part.h
@@ -1 +1 @@
-#include <part.h>
+#include "KWQKPartsPart.h"
diff --git a/WebCore/ForwardingHeaders/kparts/partmanager.h b/WebCore/ForwardingHeaders/kparts/partmanager.h
index de8a375..db832b8 100644
--- a/WebCore/ForwardingHeaders/kparts/partmanager.h
+++ b/WebCore/ForwardingHeaders/kparts/partmanager.h
@@ -1 +1 @@
-#include <partmanager.h>
+#include "KWQKPartsPartManager.h"
diff --git a/WebCore/ForwardingHeaders/ksimpleconfig.h b/WebCore/ForwardingHeaders/ksimpleconfig.h
new file mode 100644
index 0000000..cda8873
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ksimpleconfig.h
@@ -0,0 +1 @@
+#include "KWQKSimpleConfig.h"
diff --git a/WebCore/ForwardingHeaders/ksslkeygen.h b/WebCore/ForwardingHeaders/ksslkeygen.h
new file mode 100644
index 0000000..d0ad084
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ksslkeygen.h
@@ -0,0 +1 @@
+#include "KWQKSSLKeyGen.h"
diff --git a/WebCore/ForwardingHeaders/kstandarddirs.h b/WebCore/ForwardingHeaders/kstandarddirs.h
new file mode 100644
index 0000000..fa823d7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kstandarddirs.h
@@ -0,0 +1 @@
+#include "KWQKStandardDirs.h"
diff --git a/WebCore/ForwardingHeaders/kstaticdeleter.h b/WebCore/ForwardingHeaders/kstaticdeleter.h
new file mode 100644
index 0000000..7df83e1
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kstaticdeleter.h
@@ -0,0 +1 @@
+#include "KWQKStaticDeleter.h"
diff --git a/WebCore/ForwardingHeaders/kstddirs.h b/WebCore/ForwardingHeaders/kstddirs.h
new file mode 100644
index 0000000..fa823d7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kstddirs.h
@@ -0,0 +1 @@
+#include "KWQKStandardDirs.h"
diff --git a/WebCore/ForwardingHeaders/kstringhandler.h b/WebCore/ForwardingHeaders/kstringhandler.h
new file mode 100644
index 0000000..3e413c6
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kstringhandler.h
@@ -0,0 +1 @@
+#include "KWQKStringHandler.h"
diff --git a/WebCore/ForwardingHeaders/kurl.h b/WebCore/ForwardingHeaders/kurl.h
new file mode 100644
index 0000000..804016a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kurl.h
@@ -0,0 +1 @@
+#include "KWQKURL.h"
diff --git a/WebCore/ForwardingHeaders/kwin.h b/WebCore/ForwardingHeaders/kwin.h
new file mode 100644
index 0000000..fde83e6
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kwin.h
@@ -0,0 +1 @@
+#include "KWQKWin.h"
diff --git a/WebCore/ForwardingHeaders/kwinmodule.h b/WebCore/ForwardingHeaders/kwinmodule.h
new file mode 100644
index 0000000..f90cb0d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kwinmodule.h
@@ -0,0 +1 @@
+#include "KWQKWinModule.h"
diff --git a/WebCore/ForwardingHeaders/netaccess.h b/WebCore/ForwardingHeaders/netaccess.h
new file mode 100644
index 0000000..f0b1a31
--- /dev/null
+++ b/WebCore/ForwardingHeaders/netaccess.h
@@ -0,0 +1 @@
+#include "KWQKIONetAccess.h"
diff --git a/WebCore/ForwardingHeaders/qapplication.h b/WebCore/ForwardingHeaders/qapplication.h
new file mode 100644
index 0000000..55838a6
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qapplication.h
@@ -0,0 +1 @@
+#include "KWQApplication.h"
diff --git a/WebCore/ForwardingHeaders/qarray.h b/WebCore/ForwardingHeaders/qarray.h
new file mode 100644
index 0000000..8002621
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qarray.h
@@ -0,0 +1 @@
+#include "KWQMemArray.h"
diff --git a/WebCore/ForwardingHeaders/qasyncio.h b/WebCore/ForwardingHeaders/qasyncio.h
new file mode 100644
index 0000000..7d2a8fa
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qasyncio.h
@@ -0,0 +1 @@
+#include "KWQQAsyncIO.h"
diff --git a/WebCore/ForwardingHeaders/qbrush.h b/WebCore/ForwardingHeaders/qbrush.h
new file mode 100644
index 0000000..d005407
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qbrush.h
@@ -0,0 +1 @@
+#include "KWQBrush.h"
diff --git a/WebCore/ForwardingHeaders/qbuffer.h b/WebCore/ForwardingHeaders/qbuffer.h
new file mode 100644
index 0000000..5bbe061
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qbuffer.h
@@ -0,0 +1 @@
+#include "KWQBuffer.h"
diff --git a/WebCore/ForwardingHeaders/qbutton.h b/WebCore/ForwardingHeaders/qbutton.h
new file mode 100644
index 0000000..6743d1e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qbutton.h
@@ -0,0 +1 @@
+#include "KWQButton.h"
diff --git a/WebCore/ForwardingHeaders/qcheckbox.h b/WebCore/ForwardingHeaders/qcheckbox.h
new file mode 100644
index 0000000..4011c2e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qcheckbox.h
@@ -0,0 +1 @@
+#include "KWQCheckBox.h"
diff --git a/WebCore/ForwardingHeaders/qcollection.h b/WebCore/ForwardingHeaders/qcollection.h
new file mode 100644
index 0000000..8d85d59
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qcollection.h
@@ -0,0 +1 @@
+#include "KWQCollection.h"
diff --git a/WebCore/ForwardingHeaders/qcolor.h b/WebCore/ForwardingHeaders/qcolor.h
new file mode 100644
index 0000000..ff46757
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qcolor.h
@@ -0,0 +1 @@
+#include "KWQColor.h"
diff --git a/WebCore/ForwardingHeaders/qcombobox.h b/WebCore/ForwardingHeaders/qcombobox.h
new file mode 100644
index 0000000..f79bab3
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qcombobox.h
@@ -0,0 +1 @@
+#include "KWQComboBox.h"
diff --git a/WebCore/ForwardingHeaders/qcstring.h b/WebCore/ForwardingHeaders/qcstring.h
new file mode 100644
index 0000000..7d177a6
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qcstring.h
@@ -0,0 +1 @@
+#include "KWQCString.h"
diff --git a/WebCore/ForwardingHeaders/qcursor.h b/WebCore/ForwardingHeaders/qcursor.h
new file mode 100644
index 0000000..9b0381c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qcursor.h
@@ -0,0 +1 @@
+#include "KWQCursor.h"
diff --git a/WebCore/ForwardingHeaders/qdatetime.h b/WebCore/ForwardingHeaders/qdatetime.h
new file mode 100644
index 0000000..9a79657
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qdatetime.h
@@ -0,0 +1 @@
+#include "KWQDateTime.h"
diff --git a/WebCore/ForwardingHeaders/qdict.h b/WebCore/ForwardingHeaders/qdict.h
new file mode 100644
index 0000000..0d95695
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qdict.h
@@ -0,0 +1 @@
+#include "KWQDict.h"
diff --git a/WebCore/ForwardingHeaders/qdrawutil.h b/WebCore/ForwardingHeaders/qdrawutil.h
new file mode 100644
index 0000000..9cbc9ab
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qdrawutil.h
@@ -0,0 +1 @@
+#include "KWQDrawUtil.h"
diff --git a/WebCore/ForwardingHeaders/qevent.h b/WebCore/ForwardingHeaders/qevent.h
new file mode 100644
index 0000000..1bbc63e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qevent.h
@@ -0,0 +1 @@
+#include "KWQEvent.h"
diff --git a/WebCore/ForwardingHeaders/qfile.h b/WebCore/ForwardingHeaders/qfile.h
new file mode 100644
index 0000000..2c4c8a6
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qfile.h
@@ -0,0 +1 @@
+#include "KWQFile.h"
diff --git a/WebCore/ForwardingHeaders/qfont.h b/WebCore/ForwardingHeaders/qfont.h
new file mode 100644
index 0000000..0bc917d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qfont.h
@@ -0,0 +1 @@
+#include "KWQFont.h"
diff --git a/WebCore/ForwardingHeaders/qfontinfo.h b/WebCore/ForwardingHeaders/qfontinfo.h
new file mode 100644
index 0000000..88c8d3a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qfontinfo.h
@@ -0,0 +1 @@
+#include "KWQFontInfo.h"
diff --git a/WebCore/ForwardingHeaders/qfontmetrics.h b/WebCore/ForwardingHeaders/qfontmetrics.h
new file mode 100644
index 0000000..ec47bac
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qfontmetrics.h
@@ -0,0 +1 @@
+#include "KWQFontMetrics.h"
diff --git a/WebCore/ForwardingHeaders/qframe.h b/WebCore/ForwardingHeaders/qframe.h
new file mode 100644
index 0000000..ec7cfc2
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qframe.h
@@ -0,0 +1 @@
+#include "KWQFrame.h"
diff --git a/WebCore/ForwardingHeaders/qguardedptr.h b/WebCore/ForwardingHeaders/qguardedptr.h
new file mode 100644
index 0000000..53a6255
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qguardedptr.h
@@ -0,0 +1 @@
+#include "KWQGuardedPtr.h"
diff --git a/WebCore/ForwardingHeaders/qimage.h b/WebCore/ForwardingHeaders/qimage.h
new file mode 100644
index 0000000..2c2addd
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qimage.h
@@ -0,0 +1 @@
+#include "KWQImage.h"
diff --git a/WebCore/ForwardingHeaders/qiodevice.h b/WebCore/ForwardingHeaders/qiodevice.h
new file mode 100644
index 0000000..a898ea8
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qiodevice.h
@@ -0,0 +1 @@
+#include "KWQIODevice.h"
diff --git a/WebCore/ForwardingHeaders/qlabel.h b/WebCore/ForwardingHeaders/qlabel.h
new file mode 100644
index 0000000..1ee3085
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qlabel.h
@@ -0,0 +1 @@
+#include "KWQLabel.h"
diff --git a/WebCore/ForwardingHeaders/qlineedit.h b/WebCore/ForwardingHeaders/qlineedit.h
new file mode 100644
index 0000000..0605634
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qlineedit.h
@@ -0,0 +1 @@
+#include "KWQLineEdit.h"
diff --git a/WebCore/ForwardingHeaders/qlist.h b/WebCore/ForwardingHeaders/qlist.h
new file mode 100644
index 0000000..745dfcf
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qlist.h
@@ -0,0 +1 @@
+#include "KWQPtrList.h"
diff --git a/WebCore/ForwardingHeaders/qmap.h b/WebCore/ForwardingHeaders/qmap.h
new file mode 100644
index 0000000..7e683a4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qmap.h
@@ -0,0 +1 @@
+#include "KWQMap.h"
diff --git a/WebCore/ForwardingHeaders/qmemarray.h b/WebCore/ForwardingHeaders/qmemarray.h
new file mode 100644
index 0000000..8002621
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qmemarray.h
@@ -0,0 +1 @@
+#include "KWQMemArray.h"
diff --git a/WebCore/ForwardingHeaders/qmovie.h b/WebCore/ForwardingHeaders/qmovie.h
new file mode 100644
index 0000000..c0b9829
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qmovie.h
@@ -0,0 +1 @@
+#include "KWQMovie.h"
diff --git a/WebCore/ForwardingHeaders/qnamespace.h b/WebCore/ForwardingHeaders/qnamespace.h
new file mode 100644
index 0000000..2bd27ee
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qnamespace.h
@@ -0,0 +1 @@
+#include "KWQNamespace.h"
diff --git a/WebCore/ForwardingHeaders/qobject.h b/WebCore/ForwardingHeaders/qobject.h
new file mode 100644
index 0000000..7751241
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qobject.h
@@ -0,0 +1 @@
+#include "KWQObject.h"
diff --git a/WebCore/ForwardingHeaders/qpaintdevice.h b/WebCore/ForwardingHeaders/qpaintdevice.h
new file mode 100644
index 0000000..83e5b56
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpaintdevice.h
@@ -0,0 +1 @@
+#include "KWQPaintDevice.h"
diff --git a/WebCore/ForwardingHeaders/qpaintdevicemetrics.h b/WebCore/ForwardingHeaders/qpaintdevicemetrics.h
new file mode 100644
index 0000000..159845b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpaintdevicemetrics.h
@@ -0,0 +1 @@
+#include "KWQPaintDeviceMetrics.h"
diff --git a/WebCore/ForwardingHeaders/qpainter.h b/WebCore/ForwardingHeaders/qpainter.h
new file mode 100644
index 0000000..59116ff
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpainter.h
@@ -0,0 +1 @@
+#include "KWQPainter.h"
diff --git a/WebCore/ForwardingHeaders/qpalette.h b/WebCore/ForwardingHeaders/qpalette.h
new file mode 100644
index 0000000..c833a1f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpalette.h
@@ -0,0 +1 @@
+#include "KWQPalette.h"
diff --git a/WebCore/ForwardingHeaders/qpen.h b/WebCore/ForwardingHeaders/qpen.h
new file mode 100644
index 0000000..24e273c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpen.h
@@ -0,0 +1 @@
+#include "KWQPen.h"
diff --git a/WebCore/ForwardingHeaders/qpixmap.h b/WebCore/ForwardingHeaders/qpixmap.h
new file mode 100644
index 0000000..3bf4887
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpixmap.h
@@ -0,0 +1 @@
+#include "KWQPixmap.h"
diff --git a/WebCore/ForwardingHeaders/qpoint.h b/WebCore/ForwardingHeaders/qpoint.h
new file mode 100644
index 0000000..b4f9309
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpoint.h
@@ -0,0 +1 @@
+#include "KWQPointArray.h"
diff --git a/WebCore/ForwardingHeaders/qpointarray.h b/WebCore/ForwardingHeaders/qpointarray.h
new file mode 100644
index 0000000..b4f9309
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpointarray.h
@@ -0,0 +1 @@
+#include "KWQPointArray.h"
diff --git a/WebCore/ForwardingHeaders/qprinter.h b/WebCore/ForwardingHeaders/qprinter.h
new file mode 100644
index 0000000..fb301b6
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qprinter.h
@@ -0,0 +1 @@
+#include "KWQPrinter.h"
diff --git a/WebCore/ForwardingHeaders/qptrdict.h b/WebCore/ForwardingHeaders/qptrdict.h
new file mode 100644
index 0000000..9ef2245
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qptrdict.h
@@ -0,0 +1 @@
+#include "KWQPtrDict.h"
diff --git a/WebCore/ForwardingHeaders/qptrlist.h b/WebCore/ForwardingHeaders/qptrlist.h
new file mode 100644
index 0000000..745dfcf
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qptrlist.h
@@ -0,0 +1 @@
+#include "KWQPtrList.h"
diff --git a/WebCore/ForwardingHeaders/qptrqueue.h b/WebCore/ForwardingHeaders/qptrqueue.h
new file mode 100644
index 0000000..1dad259
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qptrqueue.h
@@ -0,0 +1 @@
+#include "KWQPtrQueue.h"
diff --git a/WebCore/ForwardingHeaders/qptrstack.h b/WebCore/ForwardingHeaders/qptrstack.h
new file mode 100644
index 0000000..f0d7dff
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qptrstack.h
@@ -0,0 +1 @@
+#include "KWQPtrStack.h"
diff --git a/WebCore/ForwardingHeaders/qptrvector.h b/WebCore/ForwardingHeaders/qptrvector.h
new file mode 100644
index 0000000..f9ee8ea
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qptrvector.h
@@ -0,0 +1 @@
+#include "KWQPtrVector.h"
diff --git a/WebCore/ForwardingHeaders/qpushbutton.h b/WebCore/ForwardingHeaders/qpushbutton.h
new file mode 100644
index 0000000..d5e52cd
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qpushbutton.h
@@ -0,0 +1 @@
+#include "KWQPushButton.h"
diff --git a/WebCore/ForwardingHeaders/qradiobutton.h b/WebCore/ForwardingHeaders/qradiobutton.h
new file mode 100644
index 0000000..f39c766
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qradiobutton.h
@@ -0,0 +1 @@
+#include "KWQRadioButton.h"
diff --git a/WebCore/ForwardingHeaders/qrect.h b/WebCore/ForwardingHeaders/qrect.h
new file mode 100644
index 0000000..46e0071
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qrect.h
@@ -0,0 +1 @@
+#include "KWQRect.h"
diff --git a/WebCore/ForwardingHeaders/qregexp.h b/WebCore/ForwardingHeaders/qregexp.h
new file mode 100644
index 0000000..2672797
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qregexp.h
@@ -0,0 +1 @@
+#include "KWQRegExp.h"
diff --git a/WebCore/ForwardingHeaders/qregion.h b/WebCore/ForwardingHeaders/qregion.h
new file mode 100644
index 0000000..af0874a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qregion.h
@@ -0,0 +1 @@
+#include "KWQRegion.h"
diff --git a/WebCore/ForwardingHeaders/qscrollview.h b/WebCore/ForwardingHeaders/qscrollview.h
new file mode 100644
index 0000000..3315cd7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qscrollview.h
@@ -0,0 +1 @@
+#include "KWQScrollView.h"
diff --git a/WebCore/ForwardingHeaders/qsize.h b/WebCore/ForwardingHeaders/qsize.h
new file mode 100644
index 0000000..7a7decc
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qsize.h
@@ -0,0 +1 @@
+#include "KWQSize.h"
diff --git a/WebCore/ForwardingHeaders/qsortedlist.h b/WebCore/ForwardingHeaders/qsortedlist.h
new file mode 100644
index 0000000..4e39207
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qsortedlist.h
@@ -0,0 +1 @@
+#include "KWQSortedList.h"
diff --git a/WebCore/ForwardingHeaders/qstack.h b/WebCore/ForwardingHeaders/qstack.h
new file mode 100644
index 0000000..f0d7dff
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qstack.h
@@ -0,0 +1 @@
+#include "KWQPtrStack.h"
diff --git a/WebCore/ForwardingHeaders/qstring.h b/WebCore/ForwardingHeaders/qstring.h
new file mode 100644
index 0000000..38543d3
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qstring.h
@@ -0,0 +1 @@
+#include "KWQString.h"
diff --git a/WebCore/ForwardingHeaders/qstringlist.h b/WebCore/ForwardingHeaders/qstringlist.h
new file mode 100644
index 0000000..e398e43
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qstringlist.h
@@ -0,0 +1 @@
+#include "KWQStringList.h"
diff --git a/WebCore/ForwardingHeaders/qstyle.h b/WebCore/ForwardingHeaders/qstyle.h
new file mode 100644
index 0000000..9d8d398
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qstyle.h
@@ -0,0 +1 @@
+#include "KWQStyle.h"
diff --git a/WebCore/ForwardingHeaders/qstylesheet.h b/WebCore/ForwardingHeaders/qstylesheet.h
new file mode 100644
index 0000000..a0415b3
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qstylesheet.h
@@ -0,0 +1 @@
+#include "KWQQStyleSheet.h"
diff --git a/WebCore/ForwardingHeaders/qtextcodec.h b/WebCore/ForwardingHeaders/qtextcodec.h
new file mode 100644
index 0000000..d1b0973
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qtextcodec.h
@@ -0,0 +1 @@
+#include "KWQTextCodec.h"
diff --git a/WebCore/ForwardingHeaders/qtextedit.h b/WebCore/ForwardingHeaders/qtextedit.h
new file mode 100644
index 0000000..3d67c29
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qtextedit.h
@@ -0,0 +1 @@
+#include "KWQTextEdit.h"
diff --git a/WebCore/ForwardingHeaders/qtextstream.h b/WebCore/ForwardingHeaders/qtextstream.h
new file mode 100644
index 0000000..039f8a4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qtextstream.h
@@ -0,0 +1 @@
+#include "KWQTextStream.h"
diff --git a/WebCore/ForwardingHeaders/qtimer.h b/WebCore/ForwardingHeaders/qtimer.h
new file mode 100644
index 0000000..2444120
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qtimer.h
@@ -0,0 +1 @@
+#include "KWQTimer.h"
diff --git a/WebCore/ForwardingHeaders/qtooltip.h b/WebCore/ForwardingHeaders/qtooltip.h
new file mode 100644
index 0000000..0b399e9
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qtooltip.h
@@ -0,0 +1 @@
+#include "KWQToolTip.h"
diff --git a/WebCore/ForwardingHeaders/qvaluelist.h b/WebCore/ForwardingHeaders/qvaluelist.h
new file mode 100644
index 0000000..351c13b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qvaluelist.h
@@ -0,0 +1 @@
+#include "KWQValueList.h"
diff --git a/WebCore/ForwardingHeaders/qvariant.h b/WebCore/ForwardingHeaders/qvariant.h
new file mode 100644
index 0000000..80b425d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qvariant.h
@@ -0,0 +1 @@
+#include "KWQVariant.h"
diff --git a/WebCore/ForwardingHeaders/qvector.h b/WebCore/ForwardingHeaders/qvector.h
new file mode 100644
index 0000000..f9ee8ea
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qvector.h
@@ -0,0 +1 @@
+#include "KWQPtrVector.h"
diff --git a/WebCore/ForwardingHeaders/qwidget.h b/WebCore/ForwardingHeaders/qwidget.h
new file mode 100644
index 0000000..287faf7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qwidget.h
@@ -0,0 +1 @@
+#include "KWQWidget.h"
diff --git a/WebCore/ForwardingHeaders/qxml.h b/WebCore/ForwardingHeaders/qxml.h
new file mode 100644
index 0000000..a6a9a6e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/qxml.h
@@ -0,0 +1 @@
+#include "KWQXml.h"
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 77c7db7..5813c8a 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -3932,7 +3932,7 @@
F54A61D302E3523B01A80180 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQKHTMLPartImpl.cpp;
+ path = KWQKHTMLPart.cpp;
refType = 4;
};
F54A61D402E3523B01A80180 = {
@@ -3950,8 +3950,7 @@
F550D70A02E13281018635CA = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPushButton.mm;
- path = ../KWQPushButton.mm;
+ path = KWQPushButton.mm;
refType = 4;
};
F550D70B02E13281018635CA = {
@@ -4124,8 +4123,7 @@
F57B0EE002EBC78B018635CA = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQStyle.mm;
- path = ../KWQStyle.mm;
+ path = KWQStyle.mm;
refType = 4;
};
F57B0EE102EBC78B018635CA = {
@@ -4167,42 +4165,37 @@
F58784C502DE375801EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQArrayImpl.h;
- path = ../KWQArrayImpl.h;
+ path = KWQArrayImpl.h;
refType = 4;
};
F58784C602DE375801EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQArrayImpl.mm;
- path = ../KWQArrayImpl.mm;
+ path = KWQArrayImpl.mm;
refType = 4;
};
F58784C702DE375801EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQbrowserinterface.mm;
+ path = KWQKPartsBrowserInterface.mm;
refType = 4;
};
F58784C802DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQBuffer.mm;
- path = ../KWQBuffer.mm;
+ path = KWQBuffer.mm;
refType = 4;
};
F58784C902DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQButton.mm;
- path = ../KWQButton.mm;
+ path = KWQButton.mm;
refType = 4;
};
F58784CA02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQChar.mm;
- path = ../KWQChar.mm;
+ path = KWQChar.mm;
refType = 4;
};
F58784CC02DE375901EA4122 = {
@@ -4220,36 +4213,31 @@
F58784CE02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQCheckBox.mm;
- path = ../KWQCheckBox.mm;
+ path = KWQCheckBox.mm;
refType = 4;
};
F58784CF02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQCollection.mm;
- path = ../KWQCollection.mm;
+ path = KWQCollection.mm;
refType = 4;
};
F58784D002DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQColor.mm;
- path = ../KWQColor.mm;
+ path = KWQColor.mm;
refType = 4;
};
F58784D102DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQColorGroup.mm;
- path = ../KWQColorGroup.mm;
+ path = KWQColorGroup.mm;
refType = 4;
};
F58784D202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQComboBox.mm;
- path = ../KWQComboBox.mm;
+ path = KWQComboBox.mm;
refType = 4;
};
F58784D302DE375901EA4122 = {
@@ -4267,22 +4255,19 @@
F58784D502DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQCString.mm;
- path = ../KWQCString.mm;
+ path = KWQCString.mm;
refType = 4;
};
F58784D602DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQCursor.mm;
- path = ../KWQCursor.mm;
+ path = KWQCursor.mm;
refType = 4;
};
F58784D702DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQDateTime.mm;
- path = ../KWQDateTime.mm;
+ path = KWQDateTime.mm;
refType = 4;
};
F58784DA02DE375901EA4122 = {
@@ -4294,71 +4279,61 @@
F58784DB02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQDictImpl.h;
- path = ../KWQDictImpl.h;
+ path = KWQDictImpl.h;
refType = 4;
};
F58784DC02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQDictImpl.mm;
- path = ../KWQDictImpl.mm;
+ path = KWQDictImpl.mm;
refType = 4;
};
F58784DD02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQDrawUtil.mm;
- path = ../KWQDrawUtil.mm;
+ path = KWQDrawUtil.mm;
refType = 4;
};
F58784DE02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQEvent.mm;
- path = ../KWQEvent.mm;
+ path = KWQEvent.mm;
refType = 4;
};
F58784DF02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQFile.mm;
- path = ../KWQFile.mm;
+ path = KWQFile.mm;
refType = 4;
};
F58784E002DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQFont.mm;
- path = ../KWQFont.mm;
+ path = KWQFont.mm;
refType = 4;
};
F58784E102DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQFontInfo.mm;
- path = ../KWQFontInfo.mm;
+ path = KWQFontInfo.mm;
refType = 4;
};
F58784E202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQFontMetrics.mm;
- path = ../KWQFontMetrics.mm;
+ path = KWQFontMetrics.mm;
refType = 4;
};
F58784E302DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQFrame.h;
- path = ../KWQFrame.h;
+ path = KWQFrame.h;
refType = 4;
};
F58784E402DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQFrame.mm;
- path = ../KWQFrame.mm;
+ path = KWQFrame.mm;
refType = 4;
};
F58784E502DE375901EA4122 = {
@@ -4370,8 +4345,7 @@
F58784E602DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQGuardedPtr.mm;
- path = ../KWQGuardedPtr.mm;
+ path = KWQGuardedPtr.mm;
refType = 4;
};
F58784EB02DE375901EA4122 = {
@@ -4443,7 +4417,7 @@
F58784F802DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQKHTMLPartImpl.mm;
+ path = KWQKHTMLPart.mm;
refType = 4;
};
F58784F902DE375901EA4122 = {
@@ -4455,7 +4429,7 @@
F58784FA02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQKHTMLPartImpl.h;
+ path = KWQKHTMLPart.h;
refType = 4;
};
F58784FB02DE375901EA4122 = {
@@ -4491,13 +4465,13 @@
F587850102DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQKjobclasses.mm;
+ path = KWQKJobClasses.mm;
refType = 4;
};
F587850302DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQLoaderImpl.mm;
+ path = KWQLoader.mm;
refType = 4;
};
F587850402DE375901EA4122 = {
@@ -4515,7 +4489,7 @@
F587850702DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQKnetaccess.mm;
+ path = KWQKIONetAccess.mm;
refType = 4;
};
F587850802DE375901EA4122 = {
@@ -4533,7 +4507,7 @@
F587850C02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQKstddirs.mm;
+ path = KWQKStandardDirs.mm;
refType = 4;
};
F587850D02DE375901EA4122 = {
@@ -4563,166 +4537,145 @@
F587851102DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQLabel.mm;
- path = ../KWQLabel.mm;
+ path = KWQLabel.mm;
refType = 4;
};
F587851202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQLineEdit.mm;
- path = ../KWQLineEdit.mm;
+ path = KWQLineEdit.mm;
refType = 4;
};
F587851302DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQListBox.h;
- path = ../KWQListBox.h;
+ path = KWQListBox.h;
refType = 4;
};
F587851402DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQListBox.mm;
- path = ../KWQListBox.mm;
+ path = KWQListBox.mm;
refType = 4;
};
F587851502DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQListImpl.h;
- path = ../KWQListImpl.h;
+ path = KWQListImpl.h;
refType = 4;
};
F587851602DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQListImpl.mm;
- path = ../KWQListImpl.mm;
+ path = KWQListImpl.mm;
refType = 4;
};
F587851702DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQLoaderImpl.h;
+ path = KWQLoader.h;
refType = 4;
};
F587851802DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQMapImpl.h;
- path = ../KWQMapImpl.h;
+ path = KWQMapImpl.h;
refType = 4;
};
F587851902DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQMapImpl.mm;
- path = ../KWQMapImpl.mm;
+ path = KWQMapImpl.mm;
refType = 4;
};
F587851A02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQMovie.mm;
- path = ../KWQMovie.mm;
+ path = KWQMovie.mm;
refType = 4;
};
F587851B02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQNSTextField.h;
+ path = KWQTextField.h;
refType = 4;
};
F587851C02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQNSTextField.mm;
+ path = KWQTextField.mm;
refType = 4;
};
F587851D02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQObject.mm;
- path = ../KWQObject.mm;
+ path = KWQObject.mm;
refType = 4;
};
F587851E02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPaintDeviceMetrics.mm;
- path = ../KWQPaintDeviceMetrics.mm;
+ path = KWQPaintDeviceMetrics.mm;
refType = 4;
};
F587851F02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPainter.mm;
- path = ../KWQPainter.mm;
+ path = KWQPainter.mm;
refType = 4;
};
F587852002DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPalette.mm;
- path = ../KWQPalette.mm;
+ path = KWQPalette.mm;
refType = 4;
};
F587852102DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPen.mm;
- path = ../KWQPen.mm;
+ path = KWQPen.mm;
refType = 4;
};
F587852202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPixmap.mm;
- path = ../KWQPixmap.mm;
+ path = KWQPixmap.mm;
refType = 4;
};
F587852302DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPoint.mm;
- path = ../KWQPoint.mm;
+ path = KWQPoint.mm;
refType = 4;
};
F587852402DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPointArray.mm;
- path = ../KWQPointArray.mm;
+ path = KWQPointArray.mm;
refType = 4;
};
F587852502DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPtrDictImpl.h;
- path = ../KWQPtrDictImpl.h;
+ path = KWQPtrDictImpl.h;
refType = 4;
};
F587852602DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQPtrDictImpl.mm;
- path = ../KWQPtrDictImpl.mm;
+ path = KWQPtrDictImpl.mm;
refType = 4;
};
F587852802DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQRadioButton.mm;
- path = ../KWQRadioButton.mm;
+ path = KWQRadioButton.mm;
refType = 4;
};
F587852902DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQRect.mm;
- path = ../KWQRect.mm;
+ path = KWQRect.mm;
refType = 4;
};
F587852A02DE375901EA4122 = {
@@ -4734,49 +4687,43 @@
F587852B02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQRegExp.mm;
- path = ../KWQRegExp.mm;
+ path = KWQRegExp.mm;
refType = 4;
};
F587852C02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQRegion.mm;
- path = ../KWQRegion.mm;
+ path = KWQRegion.mm;
refType = 4;
};
F587852E02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQScrollView.mm;
- path = ../KWQScrollView.mm;
+ path = KWQScrollView.mm;
refType = 4;
};
F587852F02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = KWQsignals.mm;
+ path = KWQSignalStubs.mm;
refType = 4;
};
F587853002DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQSize.mm;
- path = ../KWQSize.mm;
+ path = KWQSize.mm;
refType = 4;
};
F587853102DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQString.mm;
- path = ../KWQString.mm;
+ path = KWQString.mm;
refType = 4;
};
F587853202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQStringList.mm;
- path = ../KWQStringList.mm;
+ path = KWQStringList.mm;
refType = 4;
};
F587853502DE375901EA4122 = {
@@ -4794,64 +4741,55 @@
F587853702DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQtextcodec.mm;
- path = ../KWQtextcodec.mm;
+ path = KWQTextCodec.mm;
refType = 4;
};
F587853802DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQTextEdit.mm;
- path = ../KWQTextEdit.mm;
+ path = KWQTextEdit.mm;
refType = 4;
};
F587853902DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQtextstream.mm;
- path = ../KWQtextstream.mm;
+ path = KWQTextStream.mm;
refType = 4;
};
F587853A02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQTimer.mm;
- path = ../KWQTimer.mm;
+ path = KWQTimer.mm;
refType = 4;
};
F587853B02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQValueListImpl.h;
- path = ../KWQValueListImpl.h;
+ path = KWQValueListImpl.h;
refType = 4;
};
F587853C02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQValueListImpl.mm;
- path = ../KWQValueListImpl.mm;
+ path = KWQValueListImpl.mm;
refType = 4;
};
F587853D02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQVariant.mm;
- path = ../KWQVariant.mm;
+ path = KWQVariant.mm;
refType = 4;
};
F587853E02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQVectorImpl.h;
- path = ../KWQVectorImpl.h;
+ path = KWQVectorImpl.h;
refType = 4;
};
F587853F02DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQVectorImpl.mm;
- path = ../KWQVectorImpl.mm;
+ path = KWQVectorImpl.mm;
refType = 4;
};
F587854002DE375901EA4122 = {
@@ -4869,8 +4807,7 @@
F587854202DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQWidget.mm;
- path = ../KWQWidget.mm;
+ path = KWQWidget.mm;
refType = 4;
};
F587854302DE375901EA4122 = {
@@ -4888,8 +4825,7 @@
F587854602DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = KWQxml.mm;
- path = ../KWQxml.mm;
+ path = KWQXml.mm;
refType = 4;
};
F587854702DE375901EA4122 = {
@@ -5815,7 +5751,7 @@
F58785EA02DE37CB01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = dcopclient.h;
+ path = KWQDCOPClient.h;
refType = 4;
};
F58785EC02DE37CB01EA4122 = {
@@ -5829,133 +5765,116 @@
F58785EA02DE37CB01EA4122,
);
isa = PBXGroup;
- path = dcop;
+ name = dcop;
+ path = "";
refType = 4;
};
F58785F002DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kapplication.h;
- path = kdecore/kapplication.h;
+ path = KWQKApplication.h;
refType = 4;
};
F58785F102DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kcharsets.h;
- path = kdecore/kcharsets.h;
+ path = KWQKCharsets.h;
refType = 4;
};
F58785F302DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kconfig.h;
- path = kdecore/kconfig.h;
+ path = KWQKConfigBase.h;
refType = 4;
};
F58785F402DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kdebug.h;
- path = kdecore/kdebug.h;
+ path = KWQKDebug.h;
refType = 4;
};
F58785F502DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kglobal.h;
- path = kdecore/kglobal.h;
+ path = KWQKGlobal.h;
refType = 4;
};
F58785F602DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kglobalsettings.h;
- path = kdecore/kglobalsettings.h;
+ path = KWQKGlobalSettings.h;
refType = 4;
};
F58785F702DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kiconloader.h;
- path = kdecore/kiconloader.h;
+ path = KWQKIconLoader.h;
refType = 4;
};
F58785F802DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kinstance.h;
- path = kdecore/kinstance.h;
+ path = KWQKInstance.h;
refType = 4;
};
F58785F902DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = klibloader.h;
- path = kdecore/klibloader.h;
+ path = KWQKLibrary.h;
refType = 4;
};
F58785FA02DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = klocale.h;
- path = kdecore/klocale.h;
+ path = KWQKLocale.h;
refType = 4;
};
F58785FC02DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = ksimpleconfig.h;
- path = kdecore/ksimpleconfig.h;
+ path = KWQKSimpleConfig.h;
refType = 4;
};
F58785FD02DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kstandarddirs.h;
- path = kdecore/kstandarddirs.h;
+ path = KWQKStandardDirs.h;
refType = 4;
};
F58785FE02DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kstaticdeleter.h;
- path = kdecore/kstaticdeleter.h;
+ path = KWQKStaticDeleter.h;
refType = 4;
};
F58785FF02DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kstddirs.h;
- path = kdecore/kstddirs.h;
+ path = KWQKStandardDirs.h;
refType = 4;
};
F587860002DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kstringhandler.h;
- path = kdecore/kstringhandler.h;
+ path = KWQKStringHandler.h;
refType = 4;
};
F587860202DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kurl.h;
- path = kdecore/kurl.h;
+ path = KWQKURL.h;
refType = 4;
};
F587860402DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kwin.h;
- path = kdecore/kwin.h;
+ path = KWQKWin.h;
refType = 4;
};
F587860502DE382001EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kwinmodule.h;
- path = kdecore/kwinmodule.h;
+ path = KWQKWinModule.h;
refType = 4;
};
F587860602DE382001EA4122 = {
@@ -6108,43 +6027,37 @@
F587861D02DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kaction.h;
- path = kdeui/kaction.h;
+ path = KWQKKAction.h;
refType = 4;
};
F587861E02DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kcombobox.h;
- path = kdeui/kcombobox.h;
+ path = KWQKComboBox.h;
refType = 4;
};
F587861F02DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kcompletionbox.h;
- path = kdeui/kcompletionbox.h;
+ path = KWQKCompletionBox.h;
refType = 4;
};
F587862002DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kcursor.h;
- path = kdeui/kcursor.h;
+ path = KWQKCursor.h;
refType = 4;
};
F587862102DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = klineedit.h;
- path = kdeui/klineedit.h;
+ path = KWQKLineEdit.h;
refType = 4;
};
F587862202DE398401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = klistbox.h;
- path = kdeui/klistbox.h;
+ path = KWQKListBox.h;
refType = 4;
};
F587862602DE398401EA4122 = {
@@ -6201,8 +6114,7 @@
F587863002DE39E601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kfiledialog.h;
- path = kfile/kfiledialog.h;
+ path = KWQKFileDialog.h;
refType = 4;
};
F587863102DE39E601EA4122 = {
@@ -6224,36 +6136,31 @@
F587863302DE3A1401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = khtml_ext.h;
- path = khtml/khtml_ext.h;
+ path = KWQKHTMLPartBrowserExtension.h;
refType = 4;
};
F587863402DE3A1401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = khtml_factory.h;
- path = khtml/khtml_factory.h;
+ path = KWQKHTMLFactory.h;
refType = 4;
};
F587863502DE3A1401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = khtml_find.h;
- path = khtml/khtml_find.h;
+ path = KWQKHTMLFind.h;
refType = 4;
};
F587863702DE3A1401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = khtml_pagecache.h;
- path = khtml/khtml_pagecache.h;
+ path = KWQKHTMLPageCache.h;
refType = 4;
};
F587863A02DE3A1401EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = khtml_settings.h;
- path = khtml/khtml_settings.h;
+ path = KWQKHTMLSettings.h;
refType = 4;
};
F587863B02DE3A1401EA4122 = {
@@ -6305,15 +6212,13 @@
F587864402DE3A7701EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kjavaappletcontext.h;
- path = khtml/java/kjavaappletcontext.h;
+ path = KWQKJavaAppletContext.h;
refType = 4;
};
F587864502DE3A7701EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kjavaappletwidget.h;
- path = khtml/java/kjavaappletwidget.h;
+ path = KWQKJavaAppletWidget.h;
refType = 4;
};
F587864602DE3A7701EA4122 = {
@@ -6342,50 +6247,43 @@
F587864902DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = global.h;
- path = kio/global.h;
+ path = KWQKIOGlobal.h;
refType = 4;
};
F587864A02DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = job.h;
- path = kio/job.h;
+ path = KWQKJob.h;
refType = 4;
};
F587864B02DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = jobclasses.h;
- path = kio/jobclasses.h;
+ path = KWQKJobClasses.h;
refType = 4;
};
F587864C02DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kfileitem.h;
- path = kio/kfileitem.h;
+ path = KWQKFileItem.h;
refType = 4;
};
F587864D02DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kimageio.h;
- path = kio/kimageio.h;
+ path = KWQKImageIO.h;
refType = 4;
};
F587864E02DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = kmimetype.h;
- path = kio/kmimetype.h;
+ path = KWQKMimeType.h;
refType = 4;
};
F587865202DE3A9A01EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = netaccess.h;
- path = kio/netaccess.h;
+ path = KWQKIONetAccess.h;
refType = 4;
};
F587865402DE3A9A01EA4122 = {
@@ -6455,8 +6353,7 @@
F587866202DE3B1101EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = ksslkeygen.h;
- path = kio/kssl/ksslkeygen.h;
+ path = KWQKSSLKeyGen.h;
refType = 4;
};
F587866502DE3B1101EA4122 = {
@@ -6477,50 +6374,43 @@
F587866702DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = browserextension.h;
- path = kparts/browserextension.h;
+ path = KWQKPartsBrowserExtension.h;
refType = 4;
};
F587866802DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = browserinterface.h;
- path = kparts/browserinterface.h;
+ path = KWQKPartsBrowserInterface.h;
refType = 4;
};
F587866902DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = event.h;
- path = kparts/event.h;
+ path = KWQKPartsEvent.h;
refType = 4;
};
F587866A02DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = factory.h;
- path = kparts/factory.h;
+ path = KWQKPartsFactory.h;
refType = 4;
};
F587866B02DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = historyprovider.h;
- path = kparts/historyprovider.h;
+ path = KWQKPartsHistoryProvider.h;
refType = 4;
};
F587866C02DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = part.h;
- path = kparts/part.h;
+ path = KWQKPartsPart.h;
refType = 4;
};
F587866D02DE3B3201EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- name = partmanager.h;
- path = kparts/partmanager.h;
+ path = KWQKPartsPartManager.h;
refType = 4;
};
F587866E02DE3B3201EA4122 = {
@@ -6588,415 +6478,415 @@
fileEncoding = 30;
isa = PBXFileReference;
lineEnding = 0;
- path = qapplication.h;
+ path = KWQApplication.h;
refType = 4;
};
F587867702DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qarray.h;
+ path = KWQMemArray.h;
refType = 4;
};
F587867902DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qasyncio.h;
+ path = KWQQAsyncIO.h;
refType = 4;
};
F587867B02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qbrush.h;
+ path = KWQBrush.h;
refType = 4;
};
F587867C02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qbuffer.h;
+ path = KWQBuffer.h;
refType = 4;
};
F587867D02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qbutton.h;
+ path = KWQButton.h;
refType = 4;
};
F587867E02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qcheckbox.h;
+ path = KWQCheckBox.h;
refType = 4;
};
F587868002DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qcollection.h;
+ path = KWQCollection.h;
refType = 4;
};
F587868102DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qcolor.h;
+ path = KWQColor.h;
refType = 4;
};
F587868202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qcombobox.h;
+ path = KWQComboBox.h;
refType = 4;
};
F587868302DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qcstring.h;
+ path = KWQCString.h;
refType = 4;
};
F587868402DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qcursor.h;
+ path = KWQCursor.h;
refType = 4;
};
F587868502DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qdatetime.h;
+ path = KWQDateTime.h;
refType = 4;
};
F587868602DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qdict.h;
+ path = KWQDict.h;
refType = 4;
};
F587868702DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qdrawutil.h;
+ path = KWQDrawUtil.h;
refType = 4;
};
F587868802DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qevent.h;
+ path = KWQEvent.h;
refType = 4;
};
F587868902DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qfile.h;
+ path = KWQFile.h;
refType = 4;
};
F587868A02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qfont.h;
+ path = KWQFont.h;
refType = 4;
};
F587868C02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qfontinfo.h;
+ path = KWQFontInfo.h;
refType = 4;
};
F587868D02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qfontmetrics.h;
+ path = KWQFontMetrics.h;
refType = 4;
};
F587868E02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qframe.h;
+ path = KWQFrame.h;
refType = 4;
};
F587869002DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qguardedptr.h;
+ path = KWQGuardedPtr.h;
refType = 4;
};
F587869202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qimage.h;
+ path = KWQImage.h;
refType = 4;
};
F587869602DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qiodevice.h;
+ path = KWQIODevice.h;
refType = 4;
};
F587869702DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qlabel.h;
+ path = KWQLabel.h;
refType = 4;
};
F587869802DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qlineedit.h;
+ path = KWQLineEdit.h;
refType = 4;
};
F587869902DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qlist.h;
+ path = KWQPtrList.h;
refType = 4;
};
F587869A02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qmap.h;
+ path = KWQMap.h;
refType = 4;
};
F587869B02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qmemarray.h;
+ path = KWQMemArray.h;
refType = 4;
};
F587869D02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qmovie.h;
+ path = KWQMovie.h;
refType = 4;
};
F587869E02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qnamespace.h;
+ path = KWQNamespace.h;
refType = 4;
};
F587869F02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qobject.h;
+ path = KWQObject.h;
refType = 4;
};
F58786A102DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpaintdevice.h;
+ path = KWQPaintDevice.h;
refType = 4;
};
F58786A202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpaintdevicemetrics.h;
+ path = KWQPaintDeviceMetrics.h;
refType = 4;
};
F58786A302DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpainter.h;
+ path = KWQPainter.h;
refType = 4;
};
F58786A402DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpalette.h;
+ path = KWQPalette.h;
refType = 4;
};
F58786A502DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpen.h;
+ path = KWQPen.h;
refType = 4;
};
F58786A602DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpixmap.h;
+ path = KWQPixmap.h;
refType = 4;
};
F58786A702DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpoint.h;
+ path = KWQPointArray.h;
refType = 4;
};
F58786A802DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpointarray.h;
+ path = KWQPointArray.h;
refType = 4;
};
F58786AA02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qprinter.h;
+ path = KWQPrinter.h;
refType = 4;
};
F58786AB02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qptrdict.h;
+ path = KWQPtrDict.h;
refType = 4;
};
F58786AC02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qptrlist.h;
+ path = KWQPtrList.h;
refType = 4;
};
F58786AD02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qptrqueue.h;
+ path = KWQPtrQueue.h;
refType = 4;
};
F58786AE02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qptrstack.h;
+ path = KWQPtrStack.h;
refType = 4;
};
F58786AF02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qptrvector.h;
+ path = KWQPtrVector.h;
refType = 4;
};
F58786B002DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qpushbutton.h;
+ path = KWQPushButton.h;
refType = 4;
};
F58786B102DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qradiobutton.h;
+ path = KWQRadioButton.h;
refType = 4;
};
F58786B202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qrect.h;
+ path = KWQRect.h;
refType = 4;
};
F58786B302DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qregexp.h;
+ path = KWQRegExp.h;
refType = 4;
};
F58786B402DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qregion.h;
+ path = KWQRegion.h;
refType = 4;
};
F58786B502DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qscrollview.h;
+ path = KWQScrollView.h;
refType = 4;
};
F58786B602DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qsize.h;
+ path = KWQSize.h;
refType = 4;
};
F58786B702DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qsortedlist.h;
+ path = KWQSortedList.h;
refType = 4;
};
F58786B802DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qstack.h;
+ path = KWQPtrStack.h;
refType = 4;
};
F58786B902DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qstring.h;
+ path = KWQString.h;
refType = 4;
};
F58786BA02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qstringlist.h;
+ path = KWQStringList.h;
refType = 4;
};
F58786BB02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qstyle.h;
+ path = KWQStyle.h;
refType = 4;
};
F58786BC02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qstylesheet.h;
+ path = KWQQStyleSheet.h;
refType = 4;
};
F58786BD02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qtextcodec.h;
+ path = KWQTextCodec.h;
refType = 4;
};
F58786BE02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qtextedit.h;
+ path = KWQTextEdit.h;
refType = 4;
};
F58786BF02DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qtextstream.h;
+ path = KWQTextStream.h;
refType = 4;
};
F58786C002DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qtimer.h;
+ path = KWQTimer.h;
refType = 4;
};
F58786C102DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qtooltip.h;
+ path = KWQToolTip.h;
refType = 4;
};
F58786C202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qvaluelist.h;
+ path = KWQValueList.h;
refType = 4;
};
F58786C302DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qvariant.h;
+ path = KWQVariant.h;
refType = 4;
};
F58786C402DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qvector.h;
+ path = KWQPtrVector.h;
refType = 4;
};
F58786C502DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qwidget.h;
+ path = KWQWidget.h;
refType = 4;
};
F58786C602DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
- path = qxml.h;
+ path = KWQXml.h;
refType = 4;
};
F58786C702DE3B8601EA4122 = {
@@ -7554,7 +7444,8 @@
F587854602DE375901EA4122,
);
isa = PBXGroup;
- path = qt;
+ name = qt;
+ path = "";
refType = 4;
};
F58C8A07025BD3BC018635CA = {
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index af158c5..f579eed 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -32,8 +32,9 @@
#include "kjs_navigator.lut.h"
#include "kjs_binding.h"
#include "khtml_part.h"
-#ifdef APPLE_CHANGES
-#include <KWQKCookieJar.h>
+
+#if APPLE_CHANGES
+#include "KWQKCookieJar.h"
#endif
using namespace KJS;
@@ -177,7 +178,7 @@ Value Navigator::get(ExecState *exec, const UString &propertyName) const
Value Navigator::getValueProperty(ExecState *exec, int token) const
{
#if APPLE_CHANGES
- QString userAgent = m_part->impl->userAgent();
+ QString userAgent = m_part->kwq->userAgent();
#else
KURL url = m_part->url();
QString userAgent = KProtocolManager::userAgentForHost(url.host());
diff --git a/WebCore/khtml/ecma/kjs_proxy.cpp b/WebCore/khtml/ecma/kjs_proxy.cpp
index 6fa38e3..69fdae1 100644
--- a/WebCore/khtml/ecma/kjs_proxy.cpp
+++ b/WebCore/khtml/ecma/kjs_proxy.cpp
@@ -275,7 +275,7 @@ void KJSProxyImpl::initScript()
"debug", Value(new TestFunctionImp()), Internal);
#if APPLE_CHANGES
- QString userAgent = m_part->impl->userAgent();
+ QString userAgent = m_part->kwq->userAgent();
#else
QString userAgent = KProtocolManager::userAgentForHost(m_part->url().host());
#endif
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 06bee6b..bab8c85 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -34,7 +34,7 @@
#include <qstyle.h>
#if APPLE_CHANGES
-#include <KWQLogging.h>
+#include "KWQLogging.h"
#define _COLLECTOR
#endif
#include <kjs/collector.h>
@@ -858,7 +858,7 @@ void Window::scheduleClose()
kdDebug(6070) << "Window::scheduleClose window.close() " << m_part << endl;
Q_ASSERT(winq);
#if APPLE_CHANGES
- m_part->impl->scheduleClose();
+ m_part->kwq->scheduleClose();
#else
QTimer::singleShot( 0, winq, SLOT( timeoutClose() ) );
#endif
@@ -988,7 +988,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
case Window::Alert:
part->xmlDocImpl()->updateRendering();
#if APPLE_CHANGES
- part->impl->runJavaScriptAlert(str);
+ part->kwq->runJavaScriptAlert(str);
#else
KMessageBox::error(widget, QStyleSheet::convertFromPlainText(str), "JavaScript");
#endif
@@ -996,7 +996,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
case Window::Confirm:
part->xmlDocImpl()->updateRendering();
#if APPLE_CHANGES
- return Boolean(part->impl->runJavaScriptConfirm(str));
+ return Boolean(part->kwq->runJavaScriptConfirm(str));
#else
return Boolean((KMessageBox::warningYesNo(widget, QStyleSheet::convertFromPlainText(str), "JavaScript",
i18n("OK"), i18n("Cancel")) == KMessageBox::Yes));
@@ -1005,7 +1005,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
part->xmlDocImpl()->updateRendering();
bool ok;
#if APPLE_CHANGES
- ok = part->impl->runJavaScriptPrompt(str, args.size() >= 2 ? args[1].toString(exec).qstring() : QString::null, str2);
+ ok = part->kwq->runJavaScriptPrompt(str, args.size() >= 2 ? args[1].toString(exec).qstring() : QString::null, str2);
#else
if (args.size() >= 2)
str2 = QInputDialog::getText(i18n("Konqueror: Prompt"),
@@ -1326,7 +1326,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined();
case Window::Blur:
#if APPLE_CHANGES
- part->impl->unfocusWindow();
+ part->kwq->unfocusWindow();
#else
// TODO
#endif
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index e078deb..aa20a22 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -54,8 +54,8 @@
#include <stdlib.h>
#include <qptrstack.h>
-#ifdef APPLE_CHANGES
-#include <KWQKCookieJar.h>
+#if APPLE_CHANGES
+#include "KWQKCookieJar.h"
#endif
template class QPtrStack<DOM::NodeImpl>;
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 3bb392a..7ff4920 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -251,7 +251,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
#endif
#ifdef APPLE_CHANGES
- impl = new KWQKHTMLPartImpl(this);
+ kwq = new KWQKHTMLPart(this);
#endif
}
@@ -294,8 +294,8 @@ KHTMLPart::~KHTMLPart()
d->m_view->m_part = 0;
}
-#ifdef APPLE_CHANGES
- delete impl;
+#if APPLE_CHANGES
+ delete kwq;
delete d->m_hostExtension;
#endif
@@ -489,7 +489,7 @@ bool KHTMLPart::openURL( const KURL &url )
bool KHTMLPart::closeURL()
{
#ifdef APPLE_CHANGES
- impl->saveDocumentState();
+ kwq->saveDocumentState();
#endif
if ( d->m_job )
@@ -1309,7 +1309,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
if(url.isValid()) {
#ifdef APPLE_CHANGES
- KHTMLFactory::vLinks()->insert( impl->requestedURLString() );
+ KHTMLFactory::vLinks()->insert( kwq->requestedURLString() );
#else
QString urlString = url.url();
KHTMLFactory::vLinks()->insert( urlString );
@@ -1370,7 +1370,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->docLoader()->setShowAnimations( KHTMLFactory::defaultHTMLSettings()->showAnimations() );
#if APPLE_CHANGES
- impl->updatePolicyBaseURL();
+ kwq->updatePolicyBaseURL();
#endif
#ifndef APPLE_CHANGES
@@ -1384,7 +1384,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
setUserStyleSheet( KURL( userStyleSheet ) );
#ifdef APPLE_CHANGES
- impl->restoreDocumentState();
+ kwq->restoreDocumentState();
#else
d->m_doc->setRestoreState(args.docState);
#endif
@@ -2360,7 +2360,7 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
#ifdef APPLE_CHANGES
args.metaData()["referrer"] = d->m_referrer;
- impl->urlSelected(cURL, button, state, args);
+ kwq->urlSelected(cURL, button, state, args);
#else
if ( hasTarget )
{
@@ -2757,11 +2757,11 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
{
KHTMLPart *part = dynamic_cast<KHTMLPart *>(&*child->m_part);
if (part)
- part->impl->openURL(url);
+ part->kwq->openURL(url);
}
else
{
- KParts::ReadOnlyPart *part = impl->createPart(*child, url, mimetype);
+ KParts::ReadOnlyPart *part = kwq->createPart(*child, url, mimetype);
#else
if ( !child->m_services.contains( mimetype ) )
{
@@ -3139,7 +3139,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
}
#ifdef APPLE_CHANGES
- impl->submitForm(u, args);
+ kwq->submitForm(u, args);
#else
if ( d->m_doc->parsing() || d->m_runningScripts > 0 ) {
if( d->m_submitForm ) {
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 2e1171b..ad091b2 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -35,7 +35,7 @@
#include <qregexp.h>
#ifdef APPLE_CHANGES
-#include <KWQKHTMLPartImpl.h>
+#include "KWQKHTMLPart.h"
#endif
class KHTMLPartPrivate;
@@ -1082,8 +1082,8 @@ private:
#ifdef APPLE_CHANGES
public:
- KWQKHTMLPartImpl *impl;
- friend class KWQKHTMLPartImpl;
+ KWQKHTMLPart *kwq;
+ friend class KWQKHTMLPart;
void completed();
void completed(bool);
diff --git a/WebCore/khtml/khtmlview.h b/WebCore/khtml/khtmlview.h
index f039120..aea9885 100644
--- a/WebCore/khtml/khtmlview.h
+++ b/WebCore/khtml/khtmlview.h
@@ -83,7 +83,7 @@ class KHTMLView : public QScrollView
friend class khtml::CSSStyleSelector;
friend void khtml::applyRule(DOM::CSSProperty *prop);
#ifdef APPLE_CHANGES
- friend class KWQKHTMLPartImpl;
+ friend class KWQKHTMLPart;
#endif
public:
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 38183c2..fcdc890 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -56,9 +56,9 @@
#include "css/css_stylesheetimpl.h"
#include "xml/dom_docimpl.h"
-#ifdef APPLE_CHANGES
-#include <KWQAssertions.h>
-#include <KWQLoaderImpl.h>
+#if APPLE_CHANGES
+#include "KWQAssertions.h"
+#include "KWQLoader.h"
#endif
using namespace khtml;
diff --git a/WebCore/khtml/rendering/render_root.cpp b/WebCore/khtml/rendering/render_root.cpp
index 4f1baaf..1b0da89 100644
--- a/WebCore/khtml/rendering/render_root.cpp
+++ b/WebCore/khtml/rendering/render_root.cpp
@@ -120,10 +120,10 @@ void RenderRoot::calcMinMaxWidth()
void RenderRoot::layout()
{
-#ifdef APPLE_CHANGES
- // Let the KWQKHTMLPartImpl know we are doing a layout.
+#if APPLE_CHANGES
+ // Let the KWQKHTMLPart know we are doing a layout.
if (m_view && m_view->part())
- m_view->part()->impl->layout();
+ m_view->part()->kwq->layout();
#endif
//kdDebug(6040) << "RenderRoot::layout()" << endl;
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index d71cde2..fefe7f7 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -515,8 +515,8 @@ void DocumentImpl::setTitle(DOMString _title)
{
m_title = _title;
-#ifdef APPLE_CHANGES
- view()->part()->impl->setTitle(_title);
+#if APPLE_CHANGES
+ view()->part()->kwq->setTitle(_title);
#else
QString titleStr = m_title.string();
for (int i = 0; i < titleStr.length(); ++i)
diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index d9d150d..f404aa0 100644
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -37,7 +37,7 @@
#include <kurl.h>
#if APPLE_CHANGES
-#include <KWQSignal.h>
+#include "KWQSignal.h"
#endif
class QPaintDevice;
diff --git a/WebCore/khtml/xml/xml_tokenizer.h b/WebCore/khtml/xml/xml_tokenizer.h
index 3de8004..cee5d09 100644
--- a/WebCore/khtml/xml/xml_tokenizer.h
+++ b/WebCore/khtml/xml/xml_tokenizer.h
@@ -29,7 +29,7 @@
#include "misc/loader_client.h"
#if APPLE_CHANGES
-#include <KWQSignal.h>
+#include "KWQSignal.h"
#endif
class KHTMLView;
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index 768ed8d..d0f138d 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -26,10 +26,10 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include <qobject.h>
-#include <qwidget.h>
-#include <qpalette.h>
-#include <qsize.h>
+#include "KWQObject.h"
+#include "KWQWidget.h"
+#include "KWQPalette.h"
+#include "KWQSize.h"
class QDesktopWidget;
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index a8a29af..af6bd66 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.
*/
-#import <qapplication.h>
-#import <KWQLogging.h>
+#import "KWQApplication.h"
+#import "KWQLogging.h"
QPalette QApplication::palette(const QWidget *p)
{
diff --git a/WebCore/kwq/KWQArrayImpl.h b/WebCore/kwq/KWQArrayImpl.h
index b7a0fde..9b16766 100644
--- a/WebCore/kwq/KWQArrayImpl.h
+++ b/WebCore/kwq/KWQArrayImpl.h
@@ -26,8 +26,8 @@
#ifndef KWQ_ARRAY_IMPL_H
#define KWQ_ARRAY_IMPL_H
-#include <KWQRefPtr.h>
-#include <KWQDef.h>
+#include "KWQRefPtr.h"
+#include "KWQDef.h"
#include <stddef.h>
class KWQArrayImpl
diff --git a/WebCore/kwq/KWQArrayImpl.mm b/WebCore/kwq/KWQArrayImpl.mm
index 4b59096..78c2f00 100644
--- a/WebCore/kwq/KWQArrayImpl.mm
+++ b/WebCore/kwq/KWQArrayImpl.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQArrayImpl.h>
+#import "KWQArrayImpl.h"
#import <new>
#import <string.h>
diff --git a/WebCore/kwq/KWQBrush.h b/WebCore/kwq/KWQBrush.h
index b655967..7d1b0d3 100644
--- a/WebCore/kwq/KWQBrush.h
+++ b/WebCore/kwq/KWQBrush.h
@@ -26,8 +26,8 @@
#ifndef QBRUSH_H_
#define QBRUSH_H_
-#include <qcolor.h>
-#include <qnamespace.h>
+#include "KWQColor.h"
+#include "KWQNamespace.h"
class QBrush : public Qt {
public:
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
index f506012..2140c65 100644
--- a/WebCore/kwq/KWQBuffer.h
+++ b/WebCore/kwq/KWQBuffer.h
@@ -26,11 +26,11 @@
#ifndef QBUFFER_H_
#define QBUFFER_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
-#include <qarray.h>
-#include <qstring.h>
-#include <qiodevice.h>
+#include "KWQMemArray.h"
+#include "KWQString.h"
+#include "KWQIODevice.h"
class QBuffer {
public:
diff --git a/WebCore/kwq/KWQBuffer.mm b/WebCore/kwq/KWQBuffer.mm
index a68d89c..244e17f 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.
*/
-#import <qbuffer.h>
+#import "KWQBuffer.h"
void QBuffer::open(int)
{
diff --git a/WebCore/kwq/KWQButton.h b/WebCore/kwq/KWQButton.h
index dba87da..57cc95b 100644
--- a/WebCore/kwq/KWQButton.h
+++ b/WebCore/kwq/KWQButton.h
@@ -26,9 +26,9 @@
#ifndef QBUTTON_H_
#define QBUTTON_H_
-#include <qwidget.h>
-#include <qstring.h>
-#include <KWQSignal.h>
+#include "KWQWidget.h"
+#include "KWQString.h"
+#include "KWQSignal.h"
#ifdef __OBJC__
@class KWQButtonAdapter;
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index 6ce0cdb..0fcde5a 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qbutton.h>
+#import "KWQButton.h"
-#import <qcheckbox.h>
+#import "KWQCheckBox.h"
@interface KWQButtonAdapter : NSObject
{
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 8fd0868..70f29f1 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -26,7 +26,7 @@
#ifndef QCSTRING_H_
#define QCSTRING_H_
-#include <qarray.h>
+#include "KWQMemArray.h"
#include <string.h>
typedef QMemArray<char> QByteArray;
diff --git a/WebCore/kwq/KWQCString.mm b/WebCore/kwq/KWQCString.mm
index 6fff275..342d98e 100644
--- a/WebCore/kwq/KWQCString.mm
+++ b/WebCore/kwq/KWQCString.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qcstring.h>
+#import "KWQCString.h"
#import <ctype.h>
diff --git a/WebCore/kwq/KWQChar.mm b/WebCore/kwq/KWQChar.mm
index 0ddf547..2269fc1 100644
--- a/WebCore/kwq/KWQChar.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qstring.h>
-#import <KWQLogging.h>
+#import "KWQString.h"
+#import "KWQLogging.h"
#import <Foundation/Foundation.h>
#import <CoreFoundation/CFBidi.h>
diff --git a/WebCore/kwq/KWQCheckBox.h b/WebCore/kwq/KWQCheckBox.h
index c3ecdbb..a167359 100644
--- a/WebCore/kwq/KWQCheckBox.h
+++ b/WebCore/kwq/KWQCheckBox.h
@@ -26,7 +26,7 @@
#ifndef QCHECKBOX_H_
#define QCHECKBOX_H_
-#include <qbutton.h>
+#include "KWQButton.h"
class QCheckBox : public QButton {
public:
diff --git a/WebCore/kwq/KWQCheckBox.mm b/WebCore/kwq/KWQCheckBox.mm
index 97d438b..e78d110 100644
--- a/WebCore/kwq/KWQCheckBox.mm
+++ b/WebCore/kwq/KWQCheckBox.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qcheckbox.h>
+#import "KWQCheckBox.h"
// We empirically determined that check boxes have these dimensions.
// It would be better to get this info from AppKit somehow.
diff --git a/WebCore/kwq/KWQCollection.h b/WebCore/kwq/KWQCollection.h
index a1cb8ca..ac96299 100644
--- a/WebCore/kwq/KWQCollection.h
+++ b/WebCore/kwq/KWQCollection.h
@@ -26,7 +26,7 @@
#ifndef QCOLLECTION_H
#define QCOLLECTION_H
-#include <KWQDef.h>
+#include "KWQDef.h"
class QPtrCollection {
public:
diff --git a/WebCore/kwq/KWQCollection.mm b/WebCore/kwq/KWQCollection.mm
index ccfcf3f..b329bc1 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.
*/
-#import <qcollection.h>
+#import "KWQCollection.h"
QPtrCollection::~QPtrCollection()
{
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 8a73ca3..100c252 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -26,7 +26,7 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
-#include <qstring.h>
+#include "KWQString.h"
#ifdef __OBJC__
@class NSColor;
diff --git a/WebCore/kwq/KWQColor.mm b/WebCore/kwq/KWQColor.mm
index 55cef4c..ad08522 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.
*/
-#import <qcolor.h>
+#import "KWQColor.h"
-#import <qnamespace.h>
-#import <qstring.h>
-#import <KWQAssertions.h>
+#import "KWQNamespace.h"
+#import "KWQString.h"
+#import "KWQAssertions.h"
const QColor Qt::black (0x00, 0x00, 0x00);
const QColor Qt::white (0xFF, 0xFF, 0xFF);
diff --git a/WebCore/kwq/KWQColorGroup.mm b/WebCore/kwq/KWQColorGroup.mm
index 107789a..12f9b25 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.
*/
-#import <qpalette.h>
+#import "KWQPalette.h"
QColorGroup::QColorGroup()
{
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index 21a2160..2305d50 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -26,8 +26,8 @@
#ifndef QCOMBOBOX_H_
#define QCOMBOBOX_H_
-#include <KWQListBox.h>
-#include <qwidget.h>
+#include "KWQListBox.h"
+#include "KWQWidget.h"
#ifdef __OBJC__
@class KWQComboBoxAdapter;
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index bd6249a..13a3d04 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qcombobox.h>
+#import "KWQComboBox.h"
-#import <KWQKHTMLPartImpl.h>
-#import <WebCoreBridge.h>
+#import "KWQKHTMLPart.h"
+#import "WebCoreBridge.h"
// We empirically determined that combo boxes have these extra pixels on all
// sides. It would be better to get this info from AppKit somehow.
@@ -180,7 +180,7 @@ int QComboBox::currentItem() const
// use a Carbon implementation, and it uses the default run loop mode.
// See bug 3021018 for more information.
- WebCoreBridge *bridge = KWQKHTMLPartImpl::bridgeForWidget(widget);
+ WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
BOOL wasDeferringLoading = [bridge defersLoading];
if (!wasDeferringLoading) {
[bridge setDefersLoading:YES];
diff --git a/WebCore/kwq/KWQCompletion.h b/WebCore/kwq/KWQCompletion.h
index 76b7fb8..49436aa 100644
--- a/WebCore/kwq/KWQCompletion.h
+++ b/WebCore/kwq/KWQCompletion.h
@@ -26,8 +26,8 @@
#ifndef KWQCOMPLETION_H_
#define KWQCOMPLETION_H_
-#include <qobject.h>
-#include <qstringlist.h>
+#include "KWQObject.h"
+#include "KWQStringList.h"
class KCompletion : public QObject {
public:
diff --git a/WebCore/kwq/KWQCompletion.mm b/WebCore/kwq/KWQCompletion.mm
index bc78739..058fba4 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.
*/
-#import <KWQCompletion.h>
-#import <KWQLogging.h>
+#import "KWQCompletion.h"
+#import "KWQLogging.h"
void KCompletion::setItems(const QStringList &)
{
diff --git a/WebCore/kwq/KWQCursor.h b/WebCore/kwq/KWQCursor.h
index 03d1c4a..38a1e8f 100644
--- a/WebCore/kwq/KWQCursor.h
+++ b/WebCore/kwq/KWQCursor.h
@@ -26,8 +26,8 @@
#ifndef QCURSOR_H
#define QCURSOR_H
-#include <qpixmap.h>
-#include <qpoint.h>
+#include "KWQPixmap.h"
+#include "KWQPointArray.h"
#ifdef __OBJC__
@class NSCursor;
diff --git a/WebCore/kwq/KWQCursor.mm b/WebCore/kwq/KWQCursor.mm
index 17434a1..a657534 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.
*/
-#import <qcursor.h>
-#import <KWQLogging.h>
+#import "KWQCursor.h"
+#import "KWQLogging.h"
const QCursor Qt::sizeAllCursor;
const QCursor Qt::splitHCursor;
diff --git a/WebCore/kwq/KWQDCOPClient.h b/WebCore/kwq/KWQDCOPClient.h
index fd3e6d0..d8c3b40 100644
--- a/WebCore/kwq/KWQDCOPClient.h
+++ b/WebCore/kwq/KWQDCOPClient.h
@@ -26,8 +26,8 @@
#ifndef DCOPCLIENT_H_
#define DCOPCLIENT_H_
-#include <qobject.h>
-#include <qcstring.h>
+#include "KWQObject.h"
+#include "KWQCString.h"
class DCOPClient { };
diff --git a/WebCore/kwq/KWQDOMNode.cpp b/WebCore/kwq/KWQDOMNode.cpp
index c296821..f8b9d43 100644
--- a/WebCore/kwq/KWQDOMNode.cpp
+++ b/WebCore/kwq/KWQDOMNode.cpp
@@ -25,10 +25,10 @@
#include "KWQDOMNode.h"
-#include <dom_elementimpl.h>
-#include <dom_nodeimpl.h>
-#include <htmlattrs.h>
-#include <htmltags.h>
+#include "dom_elementimpl.h"
+#include "dom_nodeimpl.h"
+#include "htmlattrs.h"
+#include "htmltags.h"
bool isImage(DOM::NodeImpl *node)
{
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/KWQDateTime.h
index d6a5a76..5c7ccd4 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/KWQDateTime.h
@@ -26,7 +26,7 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
#include <CoreFoundation/CFDate.h>
#ifdef _KWQ_IOSTREAM_
diff --git a/WebCore/kwq/KWQDateTime.mm b/WebCore/kwq/KWQDateTime.mm
index 5f070cd..c351562 100644
--- a/WebCore/kwq/KWQDateTime.mm
+++ b/WebCore/kwq/KWQDateTime.mm
@@ -24,7 +24,7 @@
*/
#import <Foundation/Foundation.h>
-#import <qdatetime.h>
+#import "KWQDateTime.h"
#import <time.h>
static CFTimeZoneRef systemTimeZone()
diff --git a/WebCore/kwq/KWQDict.h b/WebCore/kwq/KWQDict.h
index a53b817..9fb1ad8 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -26,10 +26,10 @@
#ifndef QDICT_H_
#define QDICT_H_
-#include <qcollection.h>
-#include <qstring.h>
+#include "KWQCollection.h"
+#include "KWQString.h"
-#include <KWQDictImpl.h>
+#include "KWQDictImpl.h"
template<class T> class QDictIterator;
diff --git a/WebCore/kwq/KWQDictImpl.h b/WebCore/kwq/KWQDictImpl.h
index ce307da..d67792c 100644
--- a/WebCore/kwq/KWQDictImpl.h
+++ b/WebCore/kwq/KWQDictImpl.h
@@ -26,8 +26,8 @@
#ifndef KWQ_DICT_IMPL_H
#define KWQ_DICT_IMPL_H
-#include <KWQPtrDictImpl.h>
-#include <qstring.h>
+#include "KWQPtrDictImpl.h"
+#include "KWQString.h"
class KWQDictImpl : public KWQPtrDictImpl {
public:
diff --git a/WebCore/kwq/KWQDictImpl.mm b/WebCore/kwq/KWQDictImpl.mm
index 0b0bb91..b106189 100644
--- a/WebCore/kwq/KWQDictImpl.mm
+++ b/WebCore/kwq/KWQDictImpl.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQDictImpl.h>
+#import "KWQDictImpl.h"
#import <CoreFoundation/CoreFoundation.h>
KWQDictImpl::KWQDictImpl(int size, bool caseSensitive, void (*deleteFunc)(void *)) :
diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/kwq/KWQDrawUtil.h
index 3393e7c..8544787 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/kwq/KWQDrawUtil.h
@@ -26,9 +26,9 @@
#ifndef QDRAWUTIL_H_
#define QDRAWUTIL_H_
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qbrush.h"
+#include "KWQPainter.h"
+#include "KWQPalette.h"
+#include "KWQBrush.h"
void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
diff --git a/WebCore/kwq/KWQDrawUtil.mm b/WebCore/kwq/KWQDrawUtil.mm
index fd75b98..0a2e4b1 100644
--- a/WebCore/kwq/KWQDrawUtil.mm
+++ b/WebCore/kwq/KWQDrawUtil.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qdrawutil.h>
+#import "KWQDrawUtil.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.h b/WebCore/kwq/KWQEvent.h
index 2190d5a..4e91f1c 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -26,10 +26,10 @@
#ifndef QEVENT_H_
#define QEVENT_H_
-#include <qnamespace.h>
-#include <qregion.h>
-#include <qpoint.h>
-#include <qstring.h>
+#include "KWQNamespace.h"
+#include "KWQRegion.h"
+#include "KWQPointArray.h"
+#include "KWQString.h"
class QEvent : public Qt {
public:
diff --git a/WebCore/kwq/KWQEvent.mm b/WebCore/kwq/KWQEvent.mm
index 9683041..134746d 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.
*/
-#import <qevent.h>
-#import <KWQLogging.h>
+#import "KWQEvent.h"
+#import "KWQLogging.h"
QEvent::~QEvent()
{
diff --git a/WebCore/kwq/KWQFile.h b/WebCore/kwq/KWQFile.h
index 3fa5b6e..3f8c4d3 100644
--- a/WebCore/kwq/KWQFile.h
+++ b/WebCore/kwq/KWQFile.h
@@ -26,10 +26,10 @@
#ifndef QFILE_H_
#define QFILE_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
-#include <qstring.h>
-#include <qiodevice.h>
+#include "KWQString.h"
+#include "KWQIODevice.h"
class QFile
{
diff --git a/WebCore/kwq/KWQFile.mm b/WebCore/kwq/KWQFile.mm
index 882361d..d623ab3 100644
--- a/WebCore/kwq/KWQFile.mm
+++ b/WebCore/kwq/KWQFile.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qfile.h>
+#import "KWQFile.h"
QFile::QFile(const QString &n) : name(strdup([n.getNSString() fileSystemRepresentation])), fd(-1)
{
diff --git a/WebCore/kwq/KWQFileButton.h b/WebCore/kwq/KWQFileButton.h
index 6b91041..5b36052 100644
--- a/WebCore/kwq/KWQFileButton.h
+++ b/WebCore/kwq/KWQFileButton.h
@@ -26,7 +26,7 @@
#ifndef KWQFILEBUTTON_H
#define KWQFILEBUTTON_H
-#include <qwidget.h>
+#include "KWQWidget.h"
#ifdef __OBJC__
@class KWQFileButtonAdapter;
diff --git a/WebCore/kwq/KWQFont.mm b/WebCore/kwq/KWQFont.mm
index bc74fb4..0789696 100644
--- a/WebCore/kwq/KWQFont.mm
+++ b/WebCore/kwq/KWQFont.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qfont.h>
-#import <qstring.h>
+#import "KWQFont.h"
+#import "KWQString.h"
#import <Cocoa/Cocoa.h>
-#import <WebCoreTextRendererFactory.h>
+#import "WebCoreTextRendererFactory.h"
QFont::QFont()
: _family(@"")
diff --git a/WebCore/kwq/KWQFontInfo.h b/WebCore/kwq/KWQFontInfo.h
index ed1bf2c..f2399f2 100644
--- a/WebCore/kwq/KWQFontInfo.h
+++ b/WebCore/kwq/KWQFontInfo.h
@@ -26,7 +26,7 @@
#ifndef QFONTINFO_H_
#define QFONTINFO_H_
-#include <qfont.h>
+#include "KWQFont.h"
class QFontInfo {
public:
diff --git a/WebCore/kwq/KWQFontInfo.mm b/WebCore/kwq/KWQFontInfo.mm
index 5207f90..9675b2d 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.
*/
-#import <qfontinfo.h>
-#import <KWQLogging.h>
+#import "KWQFontInfo.h"
+#import "KWQLogging.h"
QFontInfo::QFontInfo(const QFont &f)
: font(f)
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 064966d..a2c62c2 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -26,11 +26,11 @@
#ifndef QFONTMETRICS_H_
#define QFONTMETRICS_H_
-#include "qrect.h"
-#include "qsize.h"
-#include "qstring.h"
-#include "qfont.h"
-#include "qfontinfo.h"
+#include "KWQRect.h"
+#include "KWQSize.h"
+#include "KWQString.h"
+#include "KWQFont.h"
+#include "KWQFontInfo.h"
class QFontMetricsPrivate;
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 5adfe84..eb58b75 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qfontmetrics.h>
+#import "KWQFontMetrics.h"
#import <Cocoa/Cocoa.h>
-#import <qfont.h>
-#import <WebCoreTextRendererFactory.h>
-#import <WebCoreTextRenderer.h>
-#import <KWQLogging.h>
+#import "KWQFont.h"
+#import "WebCoreTextRendererFactory.h"
+#import "WebCoreTextRenderer.h"
+#import "KWQLogging.h"
struct QFontMetricsPrivate
{
diff --git a/WebCore/kwq/KWQFrame.h b/WebCore/kwq/KWQFrame.h
index d5be2f0..d7f67bb 100644
--- a/WebCore/kwq/KWQFrame.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -26,7 +26,7 @@
#ifndef QFRAME_H_
#define QFRAME_H_
-#include <qwidget.h>
+#include "KWQWidget.h"
class QFrame : public QWidget {
public:
diff --git a/WebCore/kwq/KWQFrame.mm b/WebCore/kwq/KWQFrame.mm
index 738f79c..fb92972 100644
--- a/WebCore/kwq/KWQFrame.mm
+++ b/WebCore/kwq/KWQFrame.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qframe.h>
+#import "KWQFrame.h"
void QFrame::setFrameStyle(int s)
{
diff --git a/WebCore/kwq/KWQGuardedPtr.h b/WebCore/kwq/KWQGuardedPtr.h
index bd0962c..aceca07 100644
--- a/WebCore/kwq/KWQGuardedPtr.h
+++ b/WebCore/kwq/KWQGuardedPtr.h
@@ -26,7 +26,7 @@
#ifndef QGUARDEDPTR_H_
#define QGUARDEDPTR_H_
-#include "qptrlist.h"
+#include "KWQPtrList.h"
class QObject;
diff --git a/WebCore/kwq/KWQGuardedPtr.mm b/WebCore/kwq/KWQGuardedPtr.mm
index 301c282..3b9f7a5 100644
--- a/WebCore/kwq/KWQGuardedPtr.mm
+++ b/WebCore/kwq/KWQGuardedPtr.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "qguardedptr.h"
+#import "KWQGuardedPtr.h"
-#import "qobject.h"
+#import "KWQObject.h"
KWQGuardedPtrBase::KWQGuardedPtrBase(QObject *o)
{
diff --git a/WebCore/kwq/KWQKApplication.h b/WebCore/kwq/KWQKApplication.h
index e83aebb..5ce4ac0 100644
--- a/WebCore/kwq/KWQKApplication.h
+++ b/WebCore/kwq/KWQKApplication.h
@@ -26,12 +26,12 @@
#ifndef KAPP_H_
#define KAPP_H_
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <dcopclient.h>
-#include <qapplication.h>
-#include <qpalette.h>
-#include <qregexp.h>
+#include "KWQKGlobal.h"
+#include "KWQKGlobalSettings.h"
+#include "KWQDCOPClient.h"
+#include "KWQApplication.h"
+#include "KWQPalette.h"
+#include "KWQRegExp.h"
class KApplication : public QApplication { };
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKCharsets.h
index 2a1e5cc..fb879b6 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKCharsets.h
@@ -26,8 +26,8 @@
#ifndef KCHARSETS_H_
#define KCHARSETS_H_
-#include <qfont.h>
-#include <qstring.h>
+#include "KWQFont.h"
+#include "KWQString.h"
class QTextCodec;
diff --git a/WebCore/kwq/KWQKCharsets.mm b/WebCore/kwq/KWQKCharsets.mm
index d24dddb..37ed0a9 100644
--- a/WebCore/kwq/KWQKCharsets.mm
+++ b/WebCore/kwq/KWQKCharsets.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kcharsets.h>
-#import <qtextcodec.h>
+#import "KWQKCharsets.h"
+#import "KWQTextCodec.h"
QTextCodec *KCharsets::codecForName(const QString &qs) const
{
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKComboBox.h
index df31902..9bc9d7d 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKComboBox.h
@@ -26,8 +26,8 @@
#ifndef KCOMBOBOX_H_
#define KCOMBOBOX_H_
-#include <qcombobox.h>
-#include <KWQCompletion.h>
+#include "KWQComboBox.h"
+#include "KWQCompletion.h"
class KComboBox : public QComboBox, public KCompletionBase {
public:
diff --git a/WebCore/kwq/KWQKCompletionBox.h b/WebCore/kwq/KWQKCompletionBox.h
index be9b58c..ef60b1b 100644
--- a/WebCore/kwq/KWQKCompletionBox.h
+++ b/WebCore/kwq/KWQKCompletionBox.h
@@ -26,8 +26,8 @@
#ifndef KCOMPLETIONBOX_H_
#define KCOMPLETIONBOX_H_
-#include <klistbox.h>
-#include <kglobalsettings.h>
+#include "KWQKListBox.h"
+#include "KWQKGlobalSettings.h"
class KCompletionBox : public KListBox {
public:
diff --git a/WebCore/kwq/KWQKConfigBase.h b/WebCore/kwq/KWQKConfigBase.h
index 531c93e..e7b5c87 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -26,7 +26,7 @@
#ifndef KCONFIG_H_
#define KCONFIG_H_
-#include <qstring.h>
+#include "KWQString.h"
class QColor;
class QStringList;
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 98b7c0f..0470c34 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kconfig.h>
+#import "KWQKConfigBase.h"
#import "KWQLogging.h"
-#import <qcolor.h>
-#import <qstringlist.h>
+#import "KWQColor.h"
+#import "KWQStringList.h"
#import "WebCoreSettings.h"
#import "WebCoreViewFactory.h"
diff --git a/WebCore/kwq/KWQKCookieJar.mm b/WebCore/kwq/KWQKCookieJar.mm
index f0ca8db..2f00bc3 100644
--- a/WebCore/kwq/KWQKCookieJar.mm
+++ b/WebCore/kwq/KWQKCookieJar.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQKCookieJar.h>
-#import <WebCoreCookieAdapter.h>
-#import <kurl.h>
+#import "KWQKCookieJar.h"
+#import "WebCoreCookieAdapter.h"
+#import "KWQKURL.h"
QString KWQKCookieJar::cookie(const KURL &url)
{
diff --git a/WebCore/kwq/KWQKCursor.h b/WebCore/kwq/KWQKCursor.h
index f81abfd..717de73 100644
--- a/WebCore/kwq/KWQKCursor.h
+++ b/WebCore/kwq/KWQKCursor.h
@@ -26,7 +26,7 @@
#ifndef KCURSOR_H_
#define KCURSOR_H_
-#include <qcursor.h>
+#include "KWQCursor.h"
class KCursor {
public:
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index 08bd3fd..4c9e514 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.
*/
-#import <kcursor.h>
+#import "KWQKCursor.h"
@interface KWQKCursorBundleDummy : NSObject { }
@end
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
index 272b50e..3ba997d 100644
--- a/WebCore/kwq/KWQKDebug.h
+++ b/WebCore/kwq/KWQKDebug.h
@@ -26,8 +26,8 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
-#include <qstring.h>
-#include <qtextstream.h>
+#include "KWQString.h"
+#include "KWQTextStream.h"
class kdbgstream;
diff --git a/WebCore/kwq/KWQKFileDialog.h b/WebCore/kwq/KWQKFileDialog.h
index 101b15e..b1063f3 100644
--- a/WebCore/kwq/KWQKFileDialog.h
+++ b/WebCore/kwq/KWQKFileDialog.h
@@ -26,8 +26,8 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
-#include <qstring.h>
-#include <qwidget.h>
+#include "KWQString.h"
+#include "KWQWidget.h"
class KFileDialog {
public:
diff --git a/WebCore/kwq/KWQKFileDialog.mm b/WebCore/kwq/KWQKFileDialog.mm
index 8de1ba9..cc470ea 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.
*/
-#import <kfiledialog.h>
-#import <KWQLogging.h>
+#import "KWQKFileDialog.h"
+#import "KWQLogging.h"
QString KFileDialog::getOpenFileName(const QString &startDir,
const QString &filter, QWidget *parent, const QString &caption)
diff --git a/WebCore/kwq/KWQKFileItem.h b/WebCore/kwq/KWQKFileItem.h
index 5661937..e2e5ad2 100644
--- a/WebCore/kwq/KWQKFileItem.h
+++ b/WebCore/kwq/KWQKFileItem.h
@@ -26,7 +26,7 @@
#ifndef KFILEITEM_H_
#define KFILEITEM_H_
-#include <netaccess.h>
+#include "KWQKIONetAccess.h"
class KFileItem {
public:
diff --git a/WebCore/kwq/KWQKFileItem.mm b/WebCore/kwq/KWQKFileItem.mm
index 78df31a..4d9f567 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.
*/
-#import <kfileitem.h>
+#import "KWQKFileItem.h"
-#import <KWQLogging.h>
+#import "KWQLogging.h"
KFileItem::KFileItem(const KIO::UDSEntry &, const KURL &, bool, bool)
{
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index d87b506..f02681a 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -26,8 +26,8 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
-#include <qstring.h>
-#include <kinstance.h>
+#include "KWQString.h"
+#include "KWQKInstance.h"
class KCharsets;
class KLocale;
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index 6edcca1..8997b87 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kglobal.h>
+#import "KWQKGlobal.h"
-#import <kconfig.h>
-#import <qdict.h>
+#import "KWQKConfigBase.h"
+#import "KWQDict.h"
KConfig *KGlobal::config()
{
diff --git a/WebCore/kwq/KWQKGlobalSettings.mm b/WebCore/kwq/KWQKGlobalSettings.mm
index 423d8d1..91c114a 100644
--- a/WebCore/kwq/KWQKGlobalSettings.mm
+++ b/WebCore/kwq/KWQKGlobalSettings.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kglobalsettings.h>
+#import "KWQKGlobalSettings.h"
-#import <qfont.h>
+#import "KWQFont.h"
QFont KGlobalSettings::generalFont()
{
diff --git a/WebCore/kwq/KWQKHTMLFactory.h b/WebCore/kwq/KWQKHTMLFactory.h
index 4e87beb..a51cd13 100644
--- a/WebCore/kwq/KWQKHTMLFactory.h
+++ b/WebCore/kwq/KWQKHTMLFactory.h
@@ -26,9 +26,9 @@
#ifndef __khtml_factory_h__
#define __khtml_factory_h__
-#include <khtml_part.h>
-#include <factory.h>
-#include <historyprovider.h>
+#include "khtml_part.h"
+#include "KWQKPartsFactory.h"
+#include "KWQKPartsHistoryProvider.h"
class KInstance;
class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLFactory.mm b/WebCore/kwq/KWQKHTMLFactory.mm
index 93b3e86..2aa7393 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.
*/
-#import <khtml_factory.h>
+#import "KWQKHTMLFactory.h"
-#import <kinstance.h>
-#import <khtml_settings.h>
+#import "KWQKInstance.h"
+#import "KWQKHTMLSettings.h"
KInstance *KHTMLFactory::instance()
{
diff --git a/WebCore/kwq/KWQKHTMLPageCache.h b/WebCore/kwq/KWQKHTMLPageCache.h
index 0c47b64..c45b225 100644
--- a/WebCore/kwq/KWQKHTMLPageCache.h
+++ b/WebCore/kwq/KWQKHTMLPageCache.h
@@ -26,7 +26,7 @@
#ifndef KHTML_PAGECACHE_H_
#define KHTML_PAGECACHE_H_
-#include <qcstring.h>
+#include "KWQCString.h"
class QObject;
diff --git a/WebCore/kwq/KWQKHTMLPart.cpp b/WebCore/kwq/KWQKHTMLPart.cpp
index 34c8754..966247a 100644
--- a/WebCore/kwq/KWQKHTMLPart.cpp
+++ b/WebCore/kwq/KWQKHTMLPart.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <KWQKHTMLPartImpl.h>
+#include <KWQKHTMLPart.h>
#include <html_documentimpl.h>
#include <html_elementimpl.h>
@@ -34,7 +34,7 @@ using DOM::DocumentImpl;
using DOM::HTMLDocumentImpl;
using DOM::NodeImpl;
-bool KWQKHTMLPartImpl::isFrameSet()
+bool KWQKHTMLPart::isFrameSet()
{
DocumentImpl *document = d->m_doc;
if (!document->isHTMLDocument())
@@ -44,7 +44,7 @@ bool KWQKHTMLPartImpl::isFrameSet()
}
-int KWQKHTMLPartImpl::selectionStartOffset() const { return d->m_startOffset; }
-int KWQKHTMLPartImpl::selectionEndOffset() const { return d->m_endOffset; }
-DOM::NodeImpl *KWQKHTMLPartImpl::selectionStart() const { return d->m_selectionStart.handle(); }
-DOM::NodeImpl *KWQKHTMLPartImpl::selectionEnd() const { return d->m_selectionEnd.handle(); }
+int KWQKHTMLPart::selectionStartOffset() const { return d->m_startOffset; }
+int KWQKHTMLPart::selectionEndOffset() const { return d->m_endOffset; }
+DOM::NodeImpl *KWQKHTMLPart::selectionStart() const { return d->m_selectionStart.handle(); }
+DOM::NodeImpl *KWQKHTMLPart::selectionEnd() const { return d->m_selectionEnd.handle(); }
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index b4abca5..55c72af 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -23,12 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWQKHTMLPARTIMPL_H
-#define KWQKHTMLPARTIMPL_H
+#ifndef KWQKHTMLPart_H
+#define KWQKHTMLPart_H
-#include <qobject.h>
-#include <kurl.h>
-#include <KWQSignal.h>
+#include "KWQObject.h"
+#include "KWQKURL.h"
+#include "KWQSignal.h"
class KHTMLPart;
class KHTMLPartPrivate;
@@ -64,11 +64,11 @@ enum KWQSelectionDirection {
KWQSelectingPrevious
};
-class KWQKHTMLPartImpl : public QObject
+class KWQKHTMLPart : public QObject
{
public:
- KWQKHTMLPartImpl(KHTMLPart *);
- ~KWQKHTMLPartImpl();
+ KWQKHTMLPart(KHTMLPart *);
+ ~KWQKHTMLPart();
void setBridge(WebCoreBridge *p) { _bridge = p; }
WebCoreBridge *bridge() const { return _bridge; }
@@ -132,7 +132,7 @@ public:
QString referrer() const;
- static const QPtrList<KWQKHTMLPartImpl> &instances() { return mutableInstances(); }
+ static const QPtrList<KWQKHTMLPart> &instances() { return mutableInstances(); }
QString requestedURLString() const;
@@ -148,7 +148,7 @@ private:
NSView *nextKeyViewInFrame(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
static DOM::NodeImpl *nodeForWidget(QWidget *);
- static KWQKHTMLPartImpl *partForNode(DOM::NodeImpl *);
+ static KWQKHTMLPart *partForNode(DOM::NodeImpl *);
KHTMLPart *part;
KHTMLPartPrivate *d;
@@ -161,7 +161,7 @@ private:
bool _needsToSetWidgetsAside;
- static QPtrList<KWQKHTMLPartImpl> &mutableInstances();
+ static QPtrList<KWQKHTMLPart> &mutableInstances();
friend class KHTMLPart;
};
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 6c4d968..753904b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "KWQKHTMLPartImpl.h"
+#import "KWQKHTMLPart.h"
#import "htmltokenizer.h"
#import "html_documentimpl.h"
@@ -54,12 +54,12 @@ using KParts::URLArgs;
void KHTMLPart::completed()
{
- impl->_completed.call();
+ kwq->_completed.call();
}
void KHTMLPart::completed(bool arg)
{
- impl->_completed.call(arg);
+ kwq->_completed.call(arg);
}
void KHTMLPart::nodeActivated(const DOM::Node &aNode)
@@ -72,21 +72,21 @@ void KHTMLPart::onURL(const QString &)
void KHTMLPart::setStatusBarText(const QString &status)
{
- impl->setStatusBarText(status);
+ kwq->setStatusBarText(status);
}
void KHTMLPart::started(Job *j)
{
- impl->_started.call(j);
+ kwq->_started.call(j);
}
static void redirectionTimerMonitor(void *context)
{
- KWQKHTMLPartImpl *impl = static_cast<KWQKHTMLPartImpl *>(context);
- impl->redirectionTimerStartedOrStopped();
+ KWQKHTMLPart *kwq = static_cast<KWQKHTMLPart *>(context);
+ kwq->redirectionTimerStartedOrStopped();
}
-KWQKHTMLPartImpl::KWQKHTMLPartImpl(KHTMLPart *p)
+KWQKHTMLPart::KWQKHTMLPart(KHTMLPart *p)
: part(p), d(part->d)
, _started(p, SIGNAL(started(KIO::Job *)))
, _completed(p, SIGNAL(completed()))
@@ -97,18 +97,18 @@ KWQKHTMLPartImpl::KWQKHTMLPartImpl(KHTMLPart *p)
d->m_redirectionTimer.setMonitor(redirectionTimerMonitor, this);
}
-KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
+KWQKHTMLPart::~KWQKHTMLPart()
{
mutableInstances().remove(this);
}
-WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
+WebCoreBridge *KWQKHTMLPart::bridgeForFrameName(const QString &frameName)
{
WebCoreBridge *frame;
if (frameName.isEmpty()) {
// If we're the only frame in a frameset then pop the frame.
KHTMLPart *parentPart = part->parentPart();
- frame = parentPart ? parentPart->impl->_bridge : nil;
+ frame = parentPart ? parentPart->kwq->_bridge : nil;
if ([[frame childFrames] count] != 1) {
frame = _bridge;
}
@@ -119,7 +119,7 @@ WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
return frame;
}
-void KWQKHTMLPartImpl::openURL(const KURL &url)
+void KWQKHTMLPart::openURL(const KURL &url)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
@@ -129,7 +129,7 @@ void KWQKHTMLPartImpl::openURL(const KURL &url)
}
}
-void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
+void KWQKHTMLPart::openURLRequest(const KURL &url, const URLArgs &args)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
@@ -139,7 +139,7 @@ void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
}
}
-void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
+void KWQKHTMLPart::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
{
if (!d->m_workingURL.isEmpty()) {
part->begin(d->m_workingURL, 0, 0);
@@ -157,7 +157,7 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const ch
part->write(bytes, length);
}
-void KWQKHTMLPartImpl::urlSelected(const KURL &url, int button, int state, const URLArgs &args)
+void KWQKHTMLPart::urlSelected(const KURL &url, int button, int state, const URLArgs &args)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
@@ -174,7 +174,7 @@ class KWQPluginPart : public ReadOnlyPart
virtual bool closeURL() { return true; }
};
-ReadOnlyPart *KWQKHTMLPartImpl::createPart(const ChildFrame &child, const KURL &url, const QString &mimeType)
+ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url, const QString &mimeType)
{
NSURL *childURL = url.getNSURL();
if (childURL == nil) {
@@ -204,7 +204,7 @@ ReadOnlyPart *KWQKHTMLPartImpl::createPart(const ChildFrame &child, const KURL &
}
}
-void KWQKHTMLPartImpl::submitForm(const KURL &u, const URLArgs &args)
+void KWQKHTMLPart::submitForm(const KURL &u, const URLArgs &args)
{
if (!args.doPost()) {
[bridgeForFrameName(args.frameName) loadURL:u.getNSURL()];
@@ -217,38 +217,38 @@ void KWQKHTMLPartImpl::submitForm(const KURL &u, const URLArgs &args)
}
}
-void KWQKHTMLPartImpl::setView(KHTMLView *view)
+void KWQKHTMLPart::setView(KHTMLView *view)
{
d->m_view = view;
part->setWidget(view);
}
-KHTMLView *KWQKHTMLPartImpl::view() const
+KHTMLView *KWQKHTMLPart::view() const
{
return d->m_view;
}
-void KWQKHTMLPartImpl::setTitle(const DOMString &title)
+void KWQKHTMLPart::setTitle(const DOMString &title)
{
[_bridge setTitle:title.string().getNSString()];
}
-void KWQKHTMLPartImpl::setStatusBarText(const QString &status)
+void KWQKHTMLPart::setStatusBarText(const QString &status)
{
[_bridge setStatusText:status.getNSString()];
}
-void KWQKHTMLPartImpl::scheduleClose()
+void KWQKHTMLPart::scheduleClose()
{
[[_bridge window] performSelector:@selector(close) withObject:nil afterDelay:0.0];
}
-void KWQKHTMLPartImpl::unfocusWindow()
+void KWQKHTMLPart::unfocusWindow()
{
[_bridge unfocusWindow];
}
-void KWQKHTMLPartImpl::jumpToSelection()
+void KWQKHTMLPart::jumpToSelection()
{
// Assumes that selection will only ever be text nodes. This is currently
// true, but will it always be so?
@@ -264,7 +264,7 @@ void KWQKHTMLPartImpl::jumpToSelection()
}
}
-void KWQKHTMLPartImpl::redirectionTimerStartedOrStopped()
+void KWQKHTMLPart::redirectionTimerStartedOrStopped()
{
if (d->m_redirectionTimer.isActive()) {
[_bridge reportClientRedirectTo:KURL(d->m_redirectURL).getNSURL()
@@ -290,14 +290,14 @@ static void moveWidgetsAside(RenderObject *object)
}
}
-void KWQKHTMLPartImpl::layout()
+void KWQKHTMLPart::layout()
{
// Since not all widgets will get a print call, it's important to move them away
// so that they won't linger in an old position left over from a previous print.
_needsToSetWidgetsAside = true;
}
-void KWQKHTMLPartImpl::paint(QPainter *p, const QRect &rect)
+void KWQKHTMLPart::paint(QPainter *p, const QRect &rect)
{
#ifdef DEBUG_DRAWING
[[NSColor redColor] set];
@@ -313,23 +313,23 @@ void KWQKHTMLPartImpl::paint(QPainter *p, const QRect &rect)
}
}
-DocumentImpl *KWQKHTMLPartImpl::document()
+DocumentImpl *KWQKHTMLPart::document()
{
return part->xmlDocImpl();
}
-RenderObject *KWQKHTMLPartImpl::renderer()
+RenderObject *KWQKHTMLPart::renderer()
{
DocumentImpl *doc = part->xmlDocImpl();
return doc ? doc->renderer() : 0;
}
-QString KWQKHTMLPartImpl::userAgent() const
+QString KWQKHTMLPart::userAgent() const
{
return QString::fromNSString([_bridge userAgentForURL:part->m_url.getNSURL()]);
}
-NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirection direction)
+NSView *KWQKHTMLPart::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirection direction)
{
DocumentImpl *doc = document();
for (;;) {
@@ -343,7 +343,7 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirecti
QWidget *widget = renderWidget->widget();
KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
if (childFrameWidget) {
- NSView *view = childFrameWidget->part()->impl->nextKeyViewInFrame(0, direction);
+ NSView *view = childFrameWidget->part()->kwq->nextKeyViewInFrame(0, direction);
if (view) {
return view;
}
@@ -362,7 +362,7 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirecti
}
}
-NSView *KWQKHTMLPartImpl::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelectionDirection direction)
+NSView *KWQKHTMLPart::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelectionDirection direction)
{
NSView *next = nextKeyViewInFrame(node, direction);
if (next) {
@@ -371,7 +371,7 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelecti
KHTMLPart *parentPart = part->parentPart();
if (parentPart) {
- next = parentPart->impl->nextKeyView(parentPart->frame(part)->m_frame->element(), direction);
+ next = parentPart->kwq->nextKeyView(parentPart->frame(part)->m_frame->element(), direction);
if (next) {
return next;
}
@@ -380,7 +380,7 @@ NSView *KWQKHTMLPartImpl::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelecti
return nil;
}
-NSView *KWQKHTMLPartImpl::nextKeyView(NodeImpl *node, KWQSelectionDirection direction)
+NSView *KWQKHTMLPart::nextKeyView(NodeImpl *node, KWQSelectionDirection direction)
{
NSView *next = nextKeyViewInFrameHierarchy(node, direction);
if (next) {
@@ -399,7 +399,7 @@ NSView *KWQKHTMLPartImpl::nextKeyView(NodeImpl *node, KWQSelectionDirection dire
return nextKeyViewInFrameHierarchy(0, direction);
}
-NSView *KWQKHTMLPartImpl::nextKeyViewForWidget(QWidget *startingWidget, KWQSelectionDirection direction)
+NSView *KWQKHTMLPart::nextKeyViewForWidget(QWidget *startingWidget, KWQSelectionDirection direction)
{
// Use the event filter object to figure out which RenderWidget owns this QWidget and get to the DOM.
// Then get the next key view in the order determined by the DOM.
@@ -407,49 +407,49 @@ NSView *KWQKHTMLPartImpl::nextKeyViewForWidget(QWidget *startingWidget, KWQSelec
return partForNode(node)->nextKeyView(node, direction);
}
-WebCoreBridge *KWQKHTMLPartImpl::bridgeForWidget(QWidget *widget)
+WebCoreBridge *KWQKHTMLPart::bridgeForWidget(QWidget *widget)
{
return partForNode(nodeForWidget(widget))->bridge();
}
-KWQKHTMLPartImpl *KWQKHTMLPartImpl::partForNode(NodeImpl *node)
+KWQKHTMLPart *KWQKHTMLPart::partForNode(NodeImpl *node)
{
- return node->getDocument()->view()->part()->impl;
+ return node->getDocument()->view()->part()->kwq;
}
-NodeImpl *KWQKHTMLPartImpl::nodeForWidget(QWidget *widget)
+NodeImpl *KWQKHTMLPart::nodeForWidget(QWidget *widget)
{
return static_cast<const RenderWidget *>(widget->eventFilterObject())->element();
}
-void KWQKHTMLPartImpl::setDocumentFocus(QWidget *widget)
+void KWQKHTMLPart::setDocumentFocus(QWidget *widget)
{
NodeImpl *node = nodeForWidget(widget);
node->getDocument()->setFocusNode(node);
}
-void KWQKHTMLPartImpl::clearDocumentFocus(QWidget *widget)
+void KWQKHTMLPart::clearDocumentFocus(QWidget *widget)
{
nodeForWidget(widget)->getDocument()->setFocusNode(0);
}
-void KWQKHTMLPartImpl::saveDocumentState()
+void KWQKHTMLPart::saveDocumentState()
{
[_bridge saveDocumentState];
}
-void KWQKHTMLPartImpl::restoreDocumentState()
+void KWQKHTMLPart::restoreDocumentState()
{
[_bridge restoreDocumentState];
}
-QPtrList<KWQKHTMLPartImpl> &KWQKHTMLPartImpl::mutableInstances()
+QPtrList<KWQKHTMLPart> &KWQKHTMLPart::mutableInstances()
{
- static QPtrList<KWQKHTMLPartImpl> instancesList;
+ static QPtrList<KWQKHTMLPart> instancesList;
return instancesList;
}
-void KWQKHTMLPartImpl::updatePolicyBaseURL()
+void KWQKHTMLPart::updatePolicyBaseURL()
{
if (part->parentPart()) {
setPolicyBaseURL(part->parentPart()->docImpl()->policyBaseURL());
@@ -458,7 +458,7 @@ void KWQKHTMLPartImpl::updatePolicyBaseURL()
}
}
-void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
+void KWQKHTMLPart::setPolicyBaseURL(const DOM::DOMString &s)
{
// XML documents will cause this to return null. docImpl() is
// an HTMLdocument only. -dwh
@@ -467,16 +467,16 @@ void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
ConstFrameIt end = d->m_frames.end();
for (ConstFrameIt it = d->m_frames.begin(); it != end; ++it) {
ReadOnlyPart *subpart = (*it).m_part;
- static_cast<KHTMLPart *>(subpart)->impl->setPolicyBaseURL(s);
+ static_cast<KHTMLPart *>(subpart)->kwq->setPolicyBaseURL(s);
}
}
-QString KWQKHTMLPartImpl::requestedURLString() const
+QString KWQKHTMLPart::requestedURLString() const
{
return QString::fromNSString([[_bridge requestedURL] absoluteString]);
}
-void KWQKHTMLPartImpl::forceLayout()
+void KWQKHTMLPart::forceLayout()
{
KHTMLView *v = d->m_view;
if (v) {
@@ -485,22 +485,22 @@ void KWQKHTMLPartImpl::forceLayout()
}
}
-QString KWQKHTMLPartImpl::referrer() const
+QString KWQKHTMLPart::referrer() const
{
return d->m_referrer;
}
-void KWQKHTMLPartImpl::runJavaScriptAlert(const QString &message)
+void KWQKHTMLPart::runJavaScriptAlert(const QString &message)
{
[[WebCoreViewFactory sharedFactory] runJavaScriptAlertPanelWithMessage:message.getNSString()];
}
-bool KWQKHTMLPartImpl::runJavaScriptConfirm(const QString &message)
+bool KWQKHTMLPart::runJavaScriptConfirm(const QString &message)
{
return [[WebCoreViewFactory sharedFactory] runJavaScriptConfirmPanelWithMessage:message.getNSString()];
}
-bool KWQKHTMLPartImpl::runJavaScriptPrompt(const QString &prompt, const QString &defaultValue, QString &result)
+bool KWQKHTMLPart::runJavaScriptPrompt(const QString &prompt, const QString &defaultValue, QString &result)
{
NSString *returnedText;
bool ok = [[WebCoreViewFactory sharedFactory] runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.h b/WebCore/kwq/KWQKHTMLPartBrowserExtension.h
index 262b2ef..80026f3 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.h
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.h
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <browserextension.h>
+#include "KWQKPartsBrowserExtension.h"
class QWidget;
class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index 83d91fd..d765a01 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <khtml_ext.h>
-#import <khtml_part.h>
-#import <WebCoreBridge.h>
+#import "KWQKHTMLPartBrowserExtension.h"
+#import "khtml_part.h"
+#import "WebCoreBridge.h"
KHTMLPartBrowserExtension::KHTMLPartBrowserExtension(KHTMLPart *part)
{
@@ -35,7 +35,7 @@ KHTMLPartBrowserExtension::KHTMLPartBrowserExtension(KHTMLPart *part)
void KHTMLPartBrowserExtension::openURLRequest(const KURL &url,
const KParts::URLArgs &args)
{
- m_part->impl->openURLRequest(url, args);
+ m_part->kwq->openURLRequest(url, args);
}
void KHTMLPartBrowserExtension::openURLNotify()
@@ -66,7 +66,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
WebCoreBridge *bridge;
if (frameName != nil) {
- bridge = [m_part->impl->bridge() findFramedNamed:frameName];
+ bridge = [m_part->kwq->bridge() findFramedNamed:frameName];
if (bridge != nil) {
if (!url.isEmpty()) {
[bridge openURL:url.getNSURL()];
@@ -77,7 +77,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
}
NSURL *cocoaURL = url.isEmpty() ? nil : url.getNSURL();
- bridge = [m_part->impl->bridge() createWindowWithURL:cocoaURL frameName:frameName];
+ bridge = [m_part->kwq->bridge() createWindowWithURL:cocoaURL frameName:frameName];
if (!winArgs.toolBarsVisible) {
[bridge setToolbarsVisible:NO];
@@ -129,10 +129,10 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
void KHTMLPartBrowserExtension::setIconURL(const KURL &url)
{
- [m_part->impl->bridge() setIconURL:url.getNSURL()];
+ [m_part->kwq->bridge() setIconURL:url.getNSURL()];
}
void KHTMLPartBrowserExtension::setTypedIconURL(const KURL &url, const QString &type)
{
- [m_part->impl->bridge() setIconURL:url.getNSURL() withType:type.getNSString()];
+ [m_part->kwq->bridge() setIconURL:url.getNSURL() withType:type.getNSString()];
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.cpp b/WebCore/kwq/KWQKHTMLPartImpl.cpp
deleted file mode 100644
index 34c8754..0000000
--- a/WebCore/kwq/KWQKHTMLPartImpl.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#include <KWQKHTMLPartImpl.h>
-
-#include <html_documentimpl.h>
-#include <html_elementimpl.h>
-#include <htmltokenizer.h>
-#include <khtmlpart_p.h>
-
-using DOM::DocumentImpl;
-using DOM::HTMLDocumentImpl;
-using DOM::NodeImpl;
-
-bool KWQKHTMLPartImpl::isFrameSet()
-{
- DocumentImpl *document = d->m_doc;
- if (!document->isHTMLDocument())
- return false;
- NodeImpl *body = static_cast<HTMLDocumentImpl *>(document)->body();
- return body && body->renderer() && body->id() == ID_FRAMESET;
-}
-
-
-int KWQKHTMLPartImpl::selectionStartOffset() const { return d->m_startOffset; }
-int KWQKHTMLPartImpl::selectionEndOffset() const { return d->m_endOffset; }
-DOM::NodeImpl *KWQKHTMLPartImpl::selectionStart() const { return d->m_selectionStart.handle(); }
-DOM::NodeImpl *KWQKHTMLPartImpl::selectionEnd() const { return d->m_selectionEnd.handle(); }
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
deleted file mode 100644
index b4abca5..0000000
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 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
- * 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 KWQKHTMLPARTIMPL_H
-#define KWQKHTMLPARTIMPL_H
-
-#include <qobject.h>
-#include <kurl.h>
-#include <KWQSignal.h>
-
-class KHTMLPart;
-class KHTMLPartPrivate;
-class KHTMLView;
-
-namespace KParts {
- class ReadOnlyPart;
- class URLArgs;
-}
-
-namespace DOM {
- class DOMString;
- class DocumentImpl;
- class NodeImpl;
-}
-
-namespace khtml {
- class ChildFrame;
- class RenderObject;
- class RenderPart;
-}
-
-#ifdef __OBJC__
- at class NSView;
- at class WebCoreBridge;
-#else
-class NSView;
-class WebCoreBridge;
-#endif
-
-enum KWQSelectionDirection {
- KWQSelectingNext,
- KWQSelectingPrevious
-};
-
-class KWQKHTMLPartImpl : public QObject
-{
-public:
- KWQKHTMLPartImpl(KHTMLPart *);
- ~KWQKHTMLPartImpl();
-
- void setBridge(WebCoreBridge *p) { _bridge = p; }
- WebCoreBridge *bridge() const { return _bridge; }
- void setView(KHTMLView *view);
- KHTMLView *view() const;
-
- void openURL(const KURL &);
- void openURLRequest(const KURL &, const KParts::URLArgs &);
-
- void slotData(NSString *, bool forceEncoding, const char *bytes, int length, bool complete = false);
-
- void setTitle(const DOM::DOMString &);
- void setStatusBarText(const QString &status);
-
- void urlSelected(const KURL &url, int button, int state, const KParts::URLArgs &args);
- bool requestObject(khtml::RenderPart *frame, const QString &url, const QString &serviceType, const QStringList &args);
- KParts::ReadOnlyPart *createPart(const khtml::ChildFrame &child, const KURL &url, const QString &mimeType);
-
- void submitForm(const KURL &url, const KParts::URLArgs &);
-
- void scheduleClose();
-
- void unfocusWindow();
-
- void saveDocumentState();
- void restoreDocumentState();
-
- bool isFrameSet();
-
- void jumpToSelection();
-
- void layout();
-
- QString userAgent() const;
-
- void updatePolicyBaseURL();
-
- NSView *nextKeyView(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
- NSView *nextKeyViewInFrameHierarchy(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
- static NSView *nextKeyViewForWidget(QWidget *startingPoint, KWQSelectionDirection);
-
- static void setDocumentFocus(QWidget *);
- static void clearDocumentFocus(QWidget *);
-
- static void runJavaScriptAlert(const QString &message);
- static bool runJavaScriptConfirm(const QString &message);
- static bool runJavaScriptPrompt(const QString &message, const QString &defaultValue, QString &result);
-
- static WebCoreBridge *bridgeForWidget(QWidget *);
-
- // Incoming calls, used by the bridge.
-
- DOM::DocumentImpl *document();
- khtml::RenderObject *renderer();
- void forceLayout();
- void paint(QPainter *, const QRect &);
-
- // Used internally, but need to be public because they are used by non-member functions.
-
- void redirectionTimerStartedOrStopped();
-
- QString referrer() const;
-
- static const QPtrList<KWQKHTMLPartImpl> &instances() { return mutableInstances(); }
-
- QString requestedURLString() const;
-
- int selectionStartOffset() const;
- int selectionEndOffset() const;
- DOM::NodeImpl *selectionStart() const;
- DOM::NodeImpl *selectionEnd() const;
-
-private:
- void setPolicyBaseURL(const DOM::DOMString &);
-
- WebCoreBridge *bridgeForFrameName(const QString &frameName);
-
- NSView *nextKeyViewInFrame(DOM::NodeImpl *startingPoint, KWQSelectionDirection);
- static DOM::NodeImpl *nodeForWidget(QWidget *);
- static KWQKHTMLPartImpl *partForNode(DOM::NodeImpl *);
-
- KHTMLPart *part;
- KHTMLPartPrivate *d;
-
- WebCoreBridge *_bridge;
-
- KWQSignal _started;
- KWQSignal _completed;
- KWQSignal _completedWithBool;
-
- bool _needsToSetWidgetsAside;
-
- static QPtrList<KWQKHTMLPartImpl> &mutableInstances();
-
- friend class KHTMLPart;
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
deleted file mode 100644
index 6c4d968..0000000
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import "KWQKHTMLPartImpl.h"
-
-#import "htmltokenizer.h"
-#import "html_documentimpl.h"
-#import "render_root.h"
-#import "render_frames.h"
-#import "render_text.h"
-#import "khtmlpart_p.h"
-#import "khtmlview.h"
-
-#import "WebCoreBridge.h"
-#import "WebCoreViewFactory.h"
-
-#import "KWQLogging.h"
-
-#undef _KWQ_TIMING
-
-using khtml::ChildFrame;
-using khtml::Decoder;
-using khtml::RenderObject;
-using khtml::RenderPart;
-using khtml::RenderText;
-using khtml::RenderWidget;
-
-using KIO::Job;
-
-using KParts::ReadOnlyPart;
-using KParts::URLArgs;
-
-void KHTMLPart::completed()
-{
- impl->_completed.call();
-}
-
-void KHTMLPart::completed(bool arg)
-{
- impl->_completed.call(arg);
-}
-
-void KHTMLPart::nodeActivated(const DOM::Node &aNode)
-{
-}
-
-void KHTMLPart::onURL(const QString &)
-{
-}
-
-void KHTMLPart::setStatusBarText(const QString &status)
-{
- impl->setStatusBarText(status);
-}
-
-void KHTMLPart::started(Job *j)
-{
- impl->_started.call(j);
-}
-
-static void redirectionTimerMonitor(void *context)
-{
- KWQKHTMLPartImpl *impl = static_cast<KWQKHTMLPartImpl *>(context);
- impl->redirectionTimerStartedOrStopped();
-}
-
-KWQKHTMLPartImpl::KWQKHTMLPartImpl(KHTMLPart *p)
- : part(p), d(part->d)
- , _started(p, SIGNAL(started(KIO::Job *)))
- , _completed(p, SIGNAL(completed()))
- , _completedWithBool(p, SIGNAL(completed(bool)))
- , _needsToSetWidgetsAside(false)
-{
- mutableInstances().prepend(this);
- d->m_redirectionTimer.setMonitor(redirectionTimerMonitor, this);
-}
-
-KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
-{
- mutableInstances().remove(this);
-}
-
-WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
-{
- WebCoreBridge *frame;
- if (frameName.isEmpty()) {
- // If we're the only frame in a frameset then pop the frame.
- KHTMLPart *parentPart = part->parentPart();
- frame = parentPart ? parentPart->impl->_bridge : nil;
- if ([[frame childFrames] count] != 1) {
- frame = _bridge;
- }
- } else {
- frame = [_bridge findOrCreateFramedNamed:frameName.getNSString()];
- }
-
- return frame;
-}
-
-void KWQKHTMLPartImpl::openURL(const KURL &url)
-{
- NSURL *cocoaURL = url.getNSURL();
- if (cocoaURL == nil) {
- // FIXME: We need to report this error to someone.
- } else {
- [_bridge loadURL:cocoaURL];
- }
-}
-
-void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
-{
- NSURL *cocoaURL = url.getNSURL();
- if (cocoaURL == nil) {
- // FIXME: We need to report this error to someone.
- } else {
- [bridgeForFrameName(args.frameName) loadURL:cocoaURL];
- }
-}
-
-void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
-{
- if (!d->m_workingURL.isEmpty()) {
- part->begin(d->m_workingURL, 0, 0);
- d->m_workingURL = KURL();
- }
-
- if (encoding) {
- part->setEncoding(QString::fromNSString(encoding), forceEncoding);
- } else {
- part->setEncoding(QString::null, false);
- }
-
- ASSERT(d->m_doc != NULL);
-
- part->write(bytes, length);
-}
-
-void KWQKHTMLPartImpl::urlSelected(const KURL &url, int button, int state, const URLArgs &args)
-{
- NSURL *cocoaURL = url.getNSURL();
- if (cocoaURL == nil) {
- // FIXME: Do we need to report an error to someone?
- return;
- }
-
- [bridgeForFrameName(args.frameName) loadURL:cocoaURL];
-}
-
-class KWQPluginPart : public ReadOnlyPart
-{
- virtual bool openURL(const KURL &) { return true; }
- virtual bool closeURL() { return true; }
-};
-
-ReadOnlyPart *KWQKHTMLPartImpl::createPart(const ChildFrame &child, const KURL &url, const QString &mimeType)
-{
- NSURL *childURL = url.getNSURL();
- if (childURL == nil) {
- // FIXME: Do we need to report an error to someone?
- return 0;
- }
-
- if (child.m_type == ChildFrame::Object) {
- NSMutableArray *attributesArray = [NSMutableArray arrayWithCapacity:child.m_params.count()];
- for (uint i = 0; i < child.m_params.count(); i++) {
- [attributesArray addObject:child.m_params[i].getNSString()];
- }
-
- KWQPluginPart *newPart = new KWQPluginPart;
- newPart->setWidget(new QWidget([_bridge viewForPluginWithURL:childURL
- attributes:attributesArray
- baseURL:KURL(d->m_doc->baseURL()).getNSURL()
- MIMEType:child.m_args.serviceType.getNSString()]));
- return newPart;
- } else {
- LOG(Frames, "name %s", child.m_name.ascii());
- HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(child.m_frame->element());
- WebCoreBridge *childBridge = [_bridge createChildFrameNamed:child.m_name.getNSString() withURL:childURL
- renderPart:child.m_frame allowsScrolling:o->scrollingMode() != QScrollView::AlwaysOff
- marginWidth:o->getMarginWidth() marginHeight:o->getMarginHeight()];
- return [childBridge part];
- }
-}
-
-void KWQKHTMLPartImpl::submitForm(const KURL &u, const URLArgs &args)
-{
- if (!args.doPost()) {
- [bridgeForFrameName(args.frameName) loadURL:u.getNSURL()];
- } else {
- QString contentType = args.contentType();
- ASSERT(contentType.startsWith("Content-Type: "));
- [bridgeForFrameName(args.frameName) postWithURL:u.getNSURL()
- data:[NSData dataWithBytes:args.postData.data() length:args.postData.size()]
- contentType:contentType.mid(14).getNSString()];
- }
-}
-
-void KWQKHTMLPartImpl::setView(KHTMLView *view)
-{
- d->m_view = view;
- part->setWidget(view);
-}
-
-KHTMLView *KWQKHTMLPartImpl::view() const
-{
- return d->m_view;
-}
-
-void KWQKHTMLPartImpl::setTitle(const DOMString &title)
-{
- [_bridge setTitle:title.string().getNSString()];
-}
-
-void KWQKHTMLPartImpl::setStatusBarText(const QString &status)
-{
- [_bridge setStatusText:status.getNSString()];
-}
-
-void KWQKHTMLPartImpl::scheduleClose()
-{
- [[_bridge window] performSelector:@selector(close) withObject:nil afterDelay:0.0];
-}
-
-void KWQKHTMLPartImpl::unfocusWindow()
-{
- [_bridge unfocusWindow];
-}
-
-void KWQKHTMLPartImpl::jumpToSelection()
-{
- // Assumes that selection will only ever be text nodes. This is currently
- // true, but will it always be so?
- if (!d->m_selectionStart.isNull()) {
- RenderText *rt = dynamic_cast<RenderText *>(d->m_selectionStart.handle()->renderer());
- if (rt) {
- int x = 0, y = 0;
- rt->posOfChar(d->m_startOffset, x, y);
- // The -50 offset is copied from KHTMLPart::findTextNext, which sets the contents position
- // after finding a matched text string.
- d->m_view->setContentsPos(x - 50, y - 50);
- }
- }
-}
-
-void KWQKHTMLPartImpl::redirectionTimerStartedOrStopped()
-{
- if (d->m_redirectionTimer.isActive()) {
- [_bridge reportClientRedirectTo:KURL(d->m_redirectURL).getNSURL()
- delay:d->m_delayRedirect
- fireDate:[d->m_redirectionTimer.getNSTimer() fireDate]];
- } else {
- [_bridge reportClientRedirectCancelled];
- }
-}
-
-static void moveWidgetsAside(RenderObject *object)
-{
- // Would use dynamic_cast, but a virtual function call is faster.
- if (object->isWidget()) {
- QWidget *widget = static_cast<RenderWidget *>(object)->widget();
- if (widget) {
- widget->move(999999, 0);
- }
- }
-
- for (RenderObject *child = object->firstChild(); child; child = child->nextSibling()) {
- moveWidgetsAside(child);
- }
-}
-
-void KWQKHTMLPartImpl::layout()
-{
- // Since not all widgets will get a print call, it's important to move them away
- // so that they won't linger in an old position left over from a previous print.
- _needsToSetWidgetsAside = true;
-}
-
-void KWQKHTMLPartImpl::paint(QPainter *p, const QRect &rect)
-{
-#ifdef DEBUG_DRAWING
- [[NSColor redColor] set];
- [NSBezierPath fillRect:[view()->getView() visibleRect]];
-#endif
-
- if (renderer()) {
- if (_needsToSetWidgetsAside) {
- moveWidgetsAside(renderer());
- _needsToSetWidgetsAside = false;
- }
- renderer()->layer()->paint(p, rect.x(), rect.y(), rect.width(), rect.height());
- }
-}
-
-DocumentImpl *KWQKHTMLPartImpl::document()
-{
- return part->xmlDocImpl();
-}
-
-RenderObject *KWQKHTMLPartImpl::renderer()
-{
- DocumentImpl *doc = part->xmlDocImpl();
- return doc ? doc->renderer() : 0;
-}
-
-QString KWQKHTMLPartImpl::userAgent() const
-{
- return QString::fromNSString([_bridge userAgentForURL:part->m_url.getNSURL()]);
-}
-
-NSView *KWQKHTMLPartImpl::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirection direction)
-{
- DocumentImpl *doc = document();
- for (;;) {
- node = direction == KWQSelectingNext
- ? doc->nextFocusNode(node) : doc->previousFocusNode(node);
- if (!node) {
- return nil;
- }
- RenderWidget *renderWidget = dynamic_cast<RenderWidget *>(node->renderer());
- if (renderWidget) {
- QWidget *widget = renderWidget->widget();
- KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
- if (childFrameWidget) {
- NSView *view = childFrameWidget->part()->impl->nextKeyViewInFrame(0, direction);
- if (view) {
- return view;
- }
- } else if (widget) {
- NSView *view = widget->getView();
- // AppKit won't be able to handle scrolling and making us the first responder
- // well unless we are actually installed in the correct place. KHTML only does
- // that for visible widgets, so we need to do it explicitly here.
- int x, y;
- if (view && renderWidget->absolutePosition(x, y)) {
- renderWidget->view()->addChild(widget, x, y);
- return view;
- }
- }
- }
- }
-}
-
-NSView *KWQKHTMLPartImpl::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelectionDirection direction)
-{
- NSView *next = nextKeyViewInFrame(node, direction);
- if (next) {
- return next;
- }
-
- KHTMLPart *parentPart = part->parentPart();
- if (parentPart) {
- next = parentPart->impl->nextKeyView(parentPart->frame(part)->m_frame->element(), direction);
- if (next) {
- return next;
- }
- }
-
- return nil;
-}
-
-NSView *KWQKHTMLPartImpl::nextKeyView(NodeImpl *node, KWQSelectionDirection direction)
-{
- NSView *next = nextKeyViewInFrameHierarchy(node, direction);
- if (next) {
- return next;
- }
-
- // Look at views from the top level part up, looking for a next key view that we can use.
- next = direction == KWQSelectingNext
- ? [_bridge nextKeyViewOutsideWebViews]
- : [_bridge previousKeyViewOutsideWebViews];
- if (next) {
- return next;
- }
-
- // If all else fails, make a loop by starting from 0.
- return nextKeyViewInFrameHierarchy(0, direction);
-}
-
-NSView *KWQKHTMLPartImpl::nextKeyViewForWidget(QWidget *startingWidget, KWQSelectionDirection direction)
-{
- // Use the event filter object to figure out which RenderWidget owns this QWidget and get to the DOM.
- // Then get the next key view in the order determined by the DOM.
- NodeImpl *node = nodeForWidget(startingWidget);
- return partForNode(node)->nextKeyView(node, direction);
-}
-
-WebCoreBridge *KWQKHTMLPartImpl::bridgeForWidget(QWidget *widget)
-{
- return partForNode(nodeForWidget(widget))->bridge();
-}
-
-KWQKHTMLPartImpl *KWQKHTMLPartImpl::partForNode(NodeImpl *node)
-{
- return node->getDocument()->view()->part()->impl;
-}
-
-NodeImpl *KWQKHTMLPartImpl::nodeForWidget(QWidget *widget)
-{
- return static_cast<const RenderWidget *>(widget->eventFilterObject())->element();
-}
-
-void KWQKHTMLPartImpl::setDocumentFocus(QWidget *widget)
-{
- NodeImpl *node = nodeForWidget(widget);
- node->getDocument()->setFocusNode(node);
-}
-
-void KWQKHTMLPartImpl::clearDocumentFocus(QWidget *widget)
-{
- nodeForWidget(widget)->getDocument()->setFocusNode(0);
-}
-
-void KWQKHTMLPartImpl::saveDocumentState()
-{
- [_bridge saveDocumentState];
-}
-
-void KWQKHTMLPartImpl::restoreDocumentState()
-{
- [_bridge restoreDocumentState];
-}
-
-QPtrList<KWQKHTMLPartImpl> &KWQKHTMLPartImpl::mutableInstances()
-{
- static QPtrList<KWQKHTMLPartImpl> instancesList;
- return instancesList;
-}
-
-void KWQKHTMLPartImpl::updatePolicyBaseURL()
-{
- if (part->parentPart()) {
- setPolicyBaseURL(part->parentPart()->docImpl()->policyBaseURL());
- } else {
- setPolicyBaseURL(part->m_url.url());
- }
-}
-
-void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
-{
- // XML documents will cause this to return null. docImpl() is
- // an HTMLdocument only. -dwh
- if (part->docImpl())
- part->docImpl()->setPolicyBaseURL(s);
- ConstFrameIt end = d->m_frames.end();
- for (ConstFrameIt it = d->m_frames.begin(); it != end; ++it) {
- ReadOnlyPart *subpart = (*it).m_part;
- static_cast<KHTMLPart *>(subpart)->impl->setPolicyBaseURL(s);
- }
-}
-
-QString KWQKHTMLPartImpl::requestedURLString() const
-{
- return QString::fromNSString([[_bridge requestedURL] absoluteString]);
-}
-
-void KWQKHTMLPartImpl::forceLayout()
-{
- KHTMLView *v = d->m_view;
- if (v) {
- v->layout();
- v->unscheduleRelayout();
- }
-}
-
-QString KWQKHTMLPartImpl::referrer() const
-{
- return d->m_referrer;
-}
-
-void KWQKHTMLPartImpl::runJavaScriptAlert(const QString &message)
-{
- [[WebCoreViewFactory sharedFactory] runJavaScriptAlertPanelWithMessage:message.getNSString()];
-}
-
-bool KWQKHTMLPartImpl::runJavaScriptConfirm(const QString &message)
-{
- return [[WebCoreViewFactory sharedFactory] runJavaScriptConfirmPanelWithMessage:message.getNSString()];
-}
-
-bool KWQKHTMLPartImpl::runJavaScriptPrompt(const QString &prompt, const QString &defaultValue, QString &result)
-{
- NSString *returnedText;
- bool ok = [[WebCoreViewFactory sharedFactory] runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
- defaultText:defaultValue.getNSString() returningText:&returnedText];
- if (ok)
- result = QString::fromNSString(returnedText);
- return ok;
-}
diff --git a/WebCore/kwq/KWQKHTMLSettings.h b/WebCore/kwq/KWQKHTMLSettings.h
index 7b96a5d..11774a8 100644
--- a/WebCore/kwq/KWQKHTMLSettings.h
+++ b/WebCore/kwq/KWQKHTMLSettings.h
@@ -26,10 +26,10 @@
#ifndef KHTML_SETTINGS_H_
#define KHTML_SETTINGS_H_
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfont.h>
-#include <qmap.h>
+#include "KWQString.h"
+#include "KWQStringList.h"
+#include "KWQFont.h"
+#include "KWQMap.h"
class KHTMLSettings
{
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index bc98be7..b335fcf 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <khtml_settings.h>
+#import "KWQKHTMLSettings.h"
-#import <WebCoreSettings.h>
+#import "WebCoreSettings.h"
QString KHTMLSettings::stdFontName() const
{
diff --git a/WebCore/kwq/KWQKHTMLView.mm b/WebCore/kwq/KWQKHTMLView.mm
index 5325fcb..ae9af79 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.
*/
-#import <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 89dcc39..2876126 100644
--- a/WebCore/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQKHistoryProvider.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <historyprovider.h>
+#import "KWQKPartsHistoryProvider.h"
-#import <kurl.h>
-#import <WebCoreHistory.h>
+#import "KWQKURL.h"
+#import "WebCoreHistory.h"
namespace KParts {
diff --git a/WebCore/kwq/KWQKIOGlobal.h b/WebCore/kwq/KWQKIOGlobal.h
index 3bac1ba..0c5774a 100644
--- a/WebCore/kwq/KWQKIOGlobal.h
+++ b/WebCore/kwq/KWQKIOGlobal.h
@@ -26,8 +26,8 @@
#ifndef KIO_GLOBAL_H_
#define KIO_GLOBAL_H_
-#include <qstring.h>
-#include <qmap.h>
+#include "KWQString.h"
+#include "KWQMap.h"
namespace KIO {
diff --git a/WebCore/kwq/KWQKIONetAccess.h b/WebCore/kwq/KWQKIONetAccess.h
index abf2b49..1e11b59 100644
--- a/WebCore/kwq/KWQKIONetAccess.h
+++ b/WebCore/kwq/KWQKIONetAccess.h
@@ -26,8 +26,8 @@
#ifndef NETACCESS_H_
#define NETACCESS_H_
-#include <qvaluelist.h>
-#include <kurl.h>
+#include "KWQValueList.h"
+#include "KWQKURL.h"
namespace KIO {
diff --git a/WebCore/kwq/KWQKIONetAccess.mm b/WebCore/kwq/KWQKIONetAccess.mm
index de80368..da0fb89 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.
*/
-#import <KWQLogging.h>
-#import <netaccess.h>
+#import "KWQLogging.h"
+#import "KWQKIONetAccess.h"
namespace KIO {
diff --git a/WebCore/kwq/KWQKIconLoader.h b/WebCore/kwq/KWQKIconLoader.h
index 9759a23..9714a67 100644
--- a/WebCore/kwq/KWQKIconLoader.h
+++ b/WebCore/kwq/KWQKIconLoader.h
@@ -26,9 +26,9 @@
#ifndef KICONLOADER_H_
#define KICONLOADER_H_
-#include <qpixmap.h>
-#include <qstring.h>
-#include <kinstance.h>
+#include "KWQPixmap.h"
+#include "KWQString.h"
+#include "KWQKInstance.h"
class KIcon {
public:
diff --git a/WebCore/kwq/KWQKIconLoader.mm b/WebCore/kwq/KWQKIconLoader.mm
index 2cd4391..311c28d 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.
*/
-#import <KWQLogging.h>
-#import <kiconloader.h>
+#import "KWQLogging.h"
+#import "KWQKIconLoader.h"
QPixmap KIconLoader::loadIcon(const QString &name, int group, int size, int state) const
{
diff --git a/WebCore/kwq/KWQKImageIO.h b/WebCore/kwq/KWQKImageIO.h
index 815a588..358e40d 100644
--- a/WebCore/kwq/KWQKImageIO.h
+++ b/WebCore/kwq/KWQKImageIO.h
@@ -26,7 +26,7 @@
#ifndef KIMAGEIO_H_
#define KIMAGEIO_H_
-#include <qstringlist.h>
+#include "KWQStringList.h"
class KImageIO {
public:
diff --git a/WebCore/kwq/KWQKJavaAppletContext.h b/WebCore/kwq/KWQKJavaAppletContext.h
index a12f02e..f736e6f 100644
--- a/WebCore/kwq/KWQKJavaAppletContext.h
+++ b/WebCore/kwq/KWQKJavaAppletContext.h
@@ -26,7 +26,7 @@
#ifndef KJAVAAPPLETCONTEXT_H
#define KJAVAAPPLETCONTEXT_H
-#include <qobject.h>
+#include "KWQObject.h"
#include "khtml_part.h"
class DCOPObject;
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.h b/WebCore/kwq/KWQKJavaAppletWidget.h
index 5cb12d8..dba2340 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.h
+++ b/WebCore/kwq/KWQKJavaAppletWidget.h
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qwidget.h>
-#include <qmap.h>
-#include <qstring.h>
+#include "KWQWidget.h"
+#include "KWQMap.h"
+#include "KWQString.h"
class KJavaAppletContext;
class KJavaAppletWidget;
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 5244b5e..e134094 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -23,12 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kjavaappletwidget.h>
+#import "KWQKJavaAppletWidget.h"
-#import <kjavaappletcontext.h>
-#import <kurl.h>
-#import <KWQKHTMLPartImpl.h>
-#import <WebCoreBridge.h>
+#import "KWQKJavaAppletContext.h"
+#import "KWQKURL.h"
+#import "KWQKHTMLPart.h"
+#import "WebCoreBridge.h"
KJavaAppletWidget::KJavaAppletWidget(KJavaAppletContext *c, QWidget *)
: m_applet(*this)
@@ -68,7 +68,7 @@ void KJavaAppletWidget::processArguments(const QMap<QString, QString> &arguments
void KJavaAppletWidget::showApplet()
{
- setView([m_context->part()->impl->bridge()
+ setView([m_context->part()->kwq->bridge()
viewForJavaAppletWithFrame:NSMakeRect(pos().x(), pos().y(), size().width(), size().height())
attributes:m_parameters
baseURL:m_baseURL]);
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/kwq/KWQKJob.h
index 6960730..aa4700e 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/kwq/KWQKJob.h
@@ -26,8 +26,8 @@
#ifndef JOB_H_
#define JOB_H_
-#include <kurl.h>
-#include <jobclasses.h>
+#include "KWQKURL.h"
+#include "KWQKJobClasses.h"
// for time_t
#include <sys/types.h>
diff --git a/WebCore/kwq/KWQKJob.mm b/WebCore/kwq/KWQKJob.mm
index 20ce502..19c696d 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.
*/
-#import <job.h>
-#import <KWQLogging.h>
+#import "KWQKJob.h"
+#import "KWQLogging.h"
namespace KIO {
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 0c2cc22..1352b18 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -26,11 +26,11 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
-#include <qmap.h>
-#include <qobject.h>
-#include <qstring.h>
+#include "KWQMap.h"
+#include "KWQObject.h"
+#include "KWQString.h"
-#include <kurl.h>
+#include "KWQKURL.h"
#ifdef __OBJC__
@protocol WebCoreResourceHandle;
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index bff67e5..f245b84 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQLogging.h>
+#import "KWQLogging.h"
-#import <qstring.h>
-#import <jobclasses.h>
+#import "KWQString.h"
+#import "KWQKJobClasses.h"
#import <Foundation/Foundation.h>
-#import <WebCoreResourceLoader.h>
+#import "WebCoreResourceLoader.h"
namespace KIO {
diff --git a/WebCore/kwq/KWQKLibrary.h b/WebCore/kwq/KWQKLibrary.h
index f5e7453..e169eec 100644
--- a/WebCore/kwq/KWQKLibrary.h
+++ b/WebCore/kwq/KWQKLibrary.h
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <global.h>
+#include "KWQKIOGlobal.h"
class KLibrary
{
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index a198edf..b9402db 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -26,9 +26,9 @@
#ifndef KLINEEDIT_H_
#define KLINEEDIT_H_
-#include <qlineedit.h>
-#include <KWQCompletion.h>
-#include <kcompletionbox.h>
+#include "KWQLineEdit.h"
+#include "KWQCompletion.h"
+#include "KWQKCompletionBox.h"
class KLineEdit : public QLineEdit, public KCompletionBase {
public:
diff --git a/WebCore/kwq/KWQKListBox.h b/WebCore/kwq/KWQKListBox.h
index e7fd341..1dc1e1d 100644
--- a/WebCore/kwq/KWQKListBox.h
+++ b/WebCore/kwq/KWQKListBox.h
@@ -26,7 +26,7 @@
#ifndef KLISTBOX_H_
#define KLISTBOX_H_
-#include <KWQListBox.h>
+#include "KWQListBox.h"
class KListBox : public QListBox {
public:
diff --git a/WebCore/kwq/KWQKLocale.h b/WebCore/kwq/KWQKLocale.h
index 1cd7381..b8a4aac 100644
--- a/WebCore/kwq/KWQKLocale.h
+++ b/WebCore/kwq/KWQKLocale.h
@@ -26,7 +26,7 @@
#ifndef KLOCALE_H_
#define KLOCALE_H_
-#include <qstringlist.h>
+#include "KWQStringList.h"
QString inputElementAltText();
QString resetButtonDefaultLabel();
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index 5eec253..e112bbc 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "klocale.h"
+#import "KWQKLocale.h"
#import "KWQLogging.h"
-#import "qstring.h"
+#import "KWQString.h"
#import "WebCoreViewFactory.h"
QString inputElementAltText()
diff --git a/WebCore/kwq/KWQKMimeType.h b/WebCore/kwq/KWQKMimeType.h
index fc07e46..017f81f 100644
--- a/WebCore/kwq/KWQKMimeType.h
+++ b/WebCore/kwq/KWQKMimeType.h
@@ -26,11 +26,11 @@
#ifndef KMIMETYPE_H_
#define KMIMETYPE_H_
-#include <kglobal.h>
+#include "KWQKGlobal.h"
-#include <kurl.h>
+#include "KWQKURL.h"
#include <sys/types.h>
-#include <qstring.h>
+#include "KWQString.h"
template<class T> class KSharedPtr {
public:
diff --git a/WebCore/kwq/KWQKMimeType.mm b/WebCore/kwq/KWQKMimeType.mm
index 2336a5e..6be14e9 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.
*/
-#import <kmimetype.h>
-#import <KWQLogging.h>
+#import "KWQKMimeType.h"
+#import "KWQLogging.h"
KMimeType::Ptr KMimeType::findByURL(const KURL &, mode_t, bool, bool)
{
diff --git a/WebCore/kwq/KWQKPartsBrowserExtension.h b/WebCore/kwq/KWQKPartsBrowserExtension.h
index ee29cad..064e02f 100644
--- a/WebCore/kwq/KWQKPartsBrowserExtension.h
+++ b/WebCore/kwq/KWQKPartsBrowserExtension.h
@@ -26,14 +26,14 @@
#ifndef BROWSEREXTENSION_H_
#define BROWSEREXTENSION_H_
-#include <qevent.h>
-#include <qmap.h>
-#include <qpoint.h>
+#include "KWQEvent.h"
+#include "KWQMap.h"
+#include "KWQPointArray.h"
-#include <kurl.h>
+#include "KWQKURL.h"
-#include "part.h"
-#include "browserinterface.h"
+#include "KWQKPartsPart.h"
+#include "KWQKPartsBrowserInterface.h"
class KXMLGUIClient { };
diff --git a/WebCore/kwq/KWQKPartsBrowserInterface.h b/WebCore/kwq/KWQKPartsBrowserInterface.h
index 8746784..4c838ef 100644
--- a/WebCore/kwq/KWQKPartsBrowserInterface.h
+++ b/WebCore/kwq/KWQKPartsBrowserInterface.h
@@ -26,8 +26,8 @@
#ifndef BROWSERINTERFACE_H_
#define BROWSERINTERFACE_H_
-#include <qobject.h>
-#include <qvariant.h>
+#include "KWQObject.h"
+#include "KWQVariant.h"
namespace KParts {
diff --git a/WebCore/kwq/KWQKPartsBrowserInterface.mm b/WebCore/kwq/KWQKPartsBrowserInterface.mm
index c355968..d4adaff 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.
*/
-#import <browserinterface.h>
+#import "KWQKPartsBrowserInterface.h"
-#import <KWQLogging.h>
+#import "KWQLogging.h"
namespace KParts {
diff --git a/WebCore/kwq/KWQKPartsEvent.h b/WebCore/kwq/KWQKPartsEvent.h
index d4110e0..c799571 100644
--- a/WebCore/kwq/KWQKPartsEvent.h
+++ b/WebCore/kwq/KWQKPartsEvent.h
@@ -26,7 +26,7 @@
#ifndef EVENT_H_
#define EVENT_H_
-#include <qevent.h>
+#include "KWQEvent.h"
class QPainter;
diff --git a/WebCore/kwq/KWQKPartsEvent.mm b/WebCore/kwq/KWQKPartsEvent.mm
index c73c416..2c673cc 100644
--- a/WebCore/kwq/KWQKPartsEvent.mm
+++ b/WebCore/kwq/KWQKPartsEvent.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <event.h>
+#import "KWQKPartsEvent.h"
class QPainter;
diff --git a/WebCore/kwq/KWQKPartsFactory.h b/WebCore/kwq/KWQKPartsFactory.h
index 5a85674..65e2114 100644
--- a/WebCore/kwq/KWQKPartsFactory.h
+++ b/WebCore/kwq/KWQKPartsFactory.h
@@ -26,7 +26,7 @@
#ifndef FACTORY_H_
#define FACTORY_H_
-#include <part.h>
+#include "KWQKPartsPart.h"
namespace KParts {
class Factory;
diff --git a/WebCore/kwq/KWQKPartsHistoryProvider.h b/WebCore/kwq/KWQKPartsHistoryProvider.h
index 799cd19..9d84aef 100644
--- a/WebCore/kwq/KWQKPartsHistoryProvider.h
+++ b/WebCore/kwq/KWQKPartsHistoryProvider.h
@@ -26,7 +26,7 @@
#ifndef HISTORYPROVIDER_H_
#define HISTORYPROVIDER_H_
-#include <qobject.h>
+#include "KWQObject.h"
namespace KParts {
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index b19823b..a6b085c 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -26,13 +26,13 @@
#ifndef PART_H_
#define PART_H_
-#include <kinstance.h>
-#include <kurl.h>
-#include <qobject.h>
-#include <qvariant.h>
-#include <qlist.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include "KWQKInstance.h"
+#include "KWQKURL.h"
+#include "KWQObject.h"
+#include "KWQVariant.h"
+#include "KWQPtrList.h"
+#include "KWQStringList.h"
+#include "KWQValueList.h"
class QWidget;
diff --git a/WebCore/kwq/KWQKPartsPartManager.h b/WebCore/kwq/KWQKPartsPartManager.h
index dff5a24..d0582bd 100644
--- a/WebCore/kwq/KWQKPartsPartManager.h
+++ b/WebCore/kwq/KWQKPartsPartManager.h
@@ -26,9 +26,9 @@
#ifndef KPARTS_PARTMANAGER_H
#define KPARTS_PARTMANAGER_H
-#include <qguardedptr.h>
-#include <qtimer.h>
-#include <qdatetime.h>
+#include "KWQGuardedPtr.h"
+#include "KWQTimer.h"
+#include "KWQDateTime.h"
namespace KParts {
diff --git a/WebCore/kwq/KWQKSSLKeyGen.h b/WebCore/kwq/KWQKSSLKeyGen.h
index a90b6cf..d4e6d2d 100644
--- a/WebCore/kwq/KWQKSSLKeyGen.h
+++ b/WebCore/kwq/KWQKSSLKeyGen.h
@@ -26,7 +26,7 @@
#ifndef KSSLKEYGEN_H_
#define KSSLKEYGEN_H_
-#include <qstringlist.h>
+#include "KWQStringList.h"
class QDialog
{
diff --git a/WebCore/kwq/KWQKSimpleConfig.h b/WebCore/kwq/KWQKSimpleConfig.h
index c137bba..34ce9e6 100644
--- a/WebCore/kwq/KWQKSimpleConfig.h
+++ b/WebCore/kwq/KWQKSimpleConfig.h
@@ -26,8 +26,8 @@
#ifndef KSIMPLECONFIG_H_
#define KSIMPLECONFIG_H_
-#include <kconfig.h>
-#include <qstring.h>
+#include "KWQKConfigBase.h"
+#include "KWQString.h"
class KSimpleConfig : public KConfig {
public:
diff --git a/WebCore/kwq/KWQKSimpleConfig.mm b/WebCore/kwq/KWQKSimpleConfig.mm
index 7f2d1dc..67895ee 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.
*/
-#import <KWQLogging.h>
-#import <ksimpleconfig.h>
+#import "KWQLogging.h"
+#import "KWQKSimpleConfig.h"
KSimpleConfig::KSimpleConfig(const QString &s, bool bReadOnly) : KConfig (s, bReadOnly)
diff --git a/WebCore/kwq/KWQKStandardDirs.h b/WebCore/kwq/KWQKStandardDirs.h
index da5cca7..6d70a01 100644
--- a/WebCore/kwq/KWQKStandardDirs.h
+++ b/WebCore/kwq/KWQKStandardDirs.h
@@ -26,8 +26,8 @@
#ifndef KSTDDIRS_H_
#define KSTDDIRS_H_
-#include <qstring.h>
-#include <kglobal.h>
+#include "KWQString.h"
+#include "KWQKGlobal.h"
QString locate(const char *type, const QString& filename,
const KInstance* instance=KGlobal::instance());
diff --git a/WebCore/kwq/KWQKStandardDirs.mm b/WebCore/kwq/KWQKStandardDirs.mm
index 88aff60..10e9bfe 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.
*/
-#import <kstandarddirs.h>
+#import "KWQKStandardDirs.h"
@interface KWQKStandardDirsBundleDummy : NSObject { }
@end
diff --git a/WebCore/kwq/KWQKStringHandler.h b/WebCore/kwq/KWQKStringHandler.h
index 8c38334..62e0550 100644
--- a/WebCore/kwq/KWQKStringHandler.h
+++ b/WebCore/kwq/KWQKStringHandler.h
@@ -26,7 +26,7 @@
#ifndef KSTRINGHANDLER_H_
#define KSTRINGHANDLER_H_
-#include <qstring.h>
+#include "KWQString.h"
class KStringHandler {
public:
diff --git a/WebCore/kwq/KWQKStringHandler.mm b/WebCore/kwq/KWQKStringHandler.mm
index fcc7bdf..9f54a9f 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.
*/
-#import <kstringhandler.h>
+#import "KWQKStringHandler.h"
QString KStringHandler::csqueeze(const QString &str, uint maxlen)
{
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index 39f7b20..901a852 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -26,9 +26,9 @@
#ifndef KURL_H_
#define KURL_H_
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <KWQRefPtr.h>
+#include "KWQString.h"
+#include "KWQValueList.h"
+#include "KWQRefPtr.h"
#ifdef __OBJC__
@class NSURL;
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index cb824fe..3b53cd0 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kurl.h>
+#import "KWQKURL.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
typedef enum {
// alpha
diff --git a/WebCore/kwq/KWQKWin.h b/WebCore/kwq/KWQKWin.h
index c238d08..9885a5c 100644
--- a/WebCore/kwq/KWQKWin.h
+++ b/WebCore/kwq/KWQKWin.h
@@ -26,7 +26,7 @@
#ifndef KWIN_H_
#define KWIN_H_
-#include <qrect.h>
+#include "KWQRect.h"
class KWin {
public:
diff --git a/WebCore/kwq/KWQKWin.mm b/WebCore/kwq/KWQKWin.mm
index 8e80fe8..9f2b84b 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.
*/
-#import <kwin.h>
+#import "KWQKWin.h"
-#import <qwidget.h>
+#import "KWQWidget.h"
KWin::Info KWin::info(long win)
{
diff --git a/WebCore/kwq/KWQKWinModule.h b/WebCore/kwq/KWQKWinModule.h
index 0e6d2e4..ba13719 100644
--- a/WebCore/kwq/KWQKWinModule.h
+++ b/WebCore/kwq/KWQKWinModule.h
@@ -26,7 +26,7 @@
#ifndef KWINMODULE_H_
#define KWINMODULE_H_
-#include <qobject.h>
+#include "KWQObject.h"
class KWinModule : public QObject {
public:
diff --git a/WebCore/kwq/KWQKWinModule.mm b/WebCore/kwq/KWQKWinModule.mm
index 1de9646..477d2f5 100644
--- a/WebCore/kwq/KWQKWinModule.mm
+++ b/WebCore/kwq/KWQKWinModule.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <kwinmodule.h>
+#import "KWQKWinModule.h"
QRect KWinModule::workArea() const
{
diff --git a/WebCore/kwq/KWQKnetaccess.mm b/WebCore/kwq/KWQKnetaccess.mm
deleted file mode 100644
index de80368..0000000
--- a/WebCore/kwq/KWQKnetaccess.mm
+++ /dev/null
@@ -1,55 +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.
- */
-
-#import <KWQLogging.h>
-#import <netaccess.h>
-
-namespace KIO {
-
-bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
-{
- return true;
-}
-
-
-QString NetAccess::lastErrorString()
-{
- return QString::null;
-}
-
-
-bool NetAccess::download(const KURL &url, QString &filename)
-{
- filename = url.path();
- return true;
-}
-
-
-void NetAccess::removeTempFile(const QString &)
-{
-}
-
-} // namespace KIO
-
diff --git a/WebCore/kwq/KWQKstddirs.mm b/WebCore/kwq/KWQKstddirs.mm
deleted file mode 100644
index 88aff60..0000000
--- a/WebCore/kwq/KWQKstddirs.mm
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import <kstandarddirs.h>
-
- at interface KWQKStandardDirsBundleDummy : NSObject { }
- at end
- at implementation KWQKStandardDirsBundleDummy
- at end
-
-QString locate(const char *type, const QString &filename, const KInstance *instance)
-{
- NSBundle *bundle = [NSBundle bundleForClass:[KWQKStandardDirsBundleDummy class]];
- return QString::fromNSString([bundle pathForResource:@"html4" ofType:@"css"]);
-}
-
-QString locateLocal(const char *type, const QString &filename, const KInstance *instance)
-{
- return QString();
-}
diff --git a/WebCore/kwq/KWQLabel.h b/WebCore/kwq/KWQLabel.h
index 9ca179a..415be95 100644
--- a/WebCore/kwq/KWQLabel.h
+++ b/WebCore/kwq/KWQLabel.h
@@ -26,9 +26,9 @@
#ifndef QLABEL_H_
#define QLABEL_H_
-#include <qframe.h>
-#include <qwidget.h>
-#include <qstring.h>
+#include "KWQFrame.h"
+#include "KWQWidget.h"
+#include "KWQString.h"
class QLabel : public QFrame {
public:
diff --git a/WebCore/kwq/KWQLabel.mm b/WebCore/kwq/KWQLabel.mm
index 8099129..16059c0 100644
--- a/WebCore/kwq/KWQLabel.mm
+++ b/WebCore/kwq/KWQLabel.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qlabel.h>
+#import "KWQLabel.h"
QLabel::QLabel(const QString &, QWidget *)
{
diff --git a/WebCore/kwq/KWQLineEdit.h b/WebCore/kwq/KWQLineEdit.h
index a748ca2..d243436 100644
--- a/WebCore/kwq/KWQLineEdit.h
+++ b/WebCore/kwq/KWQLineEdit.h
@@ -26,10 +26,10 @@
#ifndef QLINEEDIT_H_
#define QLINEEDIT_H_
-#include <qwidget.h>
-#include <qevent.h>
-#include <qstring.h>
-#include <KWQSignal.h>
+#include "KWQWidget.h"
+#include "KWQEvent.h"
+#include "KWQString.h"
+#include "KWQSignal.h"
class QLineEdit : public QWidget {
public:
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index e0ca802..bb75898 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qlineedit.h>
+#import "KWQLineEdit.h"
-#import <KWQNSTextField.h>
-#import <KWQLogging.h>
-#import <WebCoreTextRendererFactory.h>
+#import "KWQTextField.h"
+#import "KWQLogging.h"
+#import "WebCoreTextRendererFactory.h"
// This replicates constants from [NSTextFieldCell drawingRectForBounds].
#define VERTICAL_FUDGE_FACTOR 3
diff --git a/WebCore/kwq/KWQListBox.h b/WebCore/kwq/KWQListBox.h
index 7185822..c84ea81 100644
--- a/WebCore/kwq/KWQListBox.h
+++ b/WebCore/kwq/KWQListBox.h
@@ -26,9 +26,9 @@
#ifndef KWQLISTBOX_H_
#define KWQLISTBOX_H_
-#include <qscrollview.h>
-#include <qstring.h>
-#include <KWQSignal.h>
+#include "KWQScrollView.h"
+#include "KWQString.h"
+#include "KWQSignal.h"
class QListBoxItem;
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 1784094..9991e30 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQListBox.h>
+#import "KWQListBox.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
// FIXME: We have to switch to NSTableView instead of NSBrowser.
diff --git a/WebCore/kwq/KWQListImpl.h b/WebCore/kwq/KWQListImpl.h
index d2f6718..08d61ba 100644
--- a/WebCore/kwq/KWQListImpl.h
+++ b/WebCore/kwq/KWQListImpl.h
@@ -26,7 +26,7 @@
#ifndef KWQ_LIST_IMPL_H
#define KWQ_LIST_IMPL_H
-#include <KWQDef.h>
+#include "KWQDef.h"
class KWQListNode;
class KWQListIteratorImpl;
diff --git a/WebCore/kwq/KWQListImpl.mm b/WebCore/kwq/KWQListImpl.mm
index a6a9f58..a9e99bb 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.
*/
-#import <KWQListImpl.h>
+#import "KWQListImpl.h"
#import <cstddef>
#import <algorithm>
#import <CoreFoundation/CFArray.h>
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
class KWQListNode
{
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 6b65266..ca490e0 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -23,17 +23,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQLoaderImpl.h>
+#import "KWQLoader.h"
-#import <jobclasses.h>
-#import <loader.h>
+#import "KWQKJobClasses.h"
+#import "loader.h"
-#import <khtml_part.h>
+#import "khtml_part.h"
-#import <WebCoreBridge.h>
-#import <WebCoreResourceLoader.h>
+#import "WebCoreBridge.h"
+#import "WebCoreResourceLoader.h"
-#import <KWQLogging.h>
+#import "KWQLogging.h"
using khtml::CachedObject;
using khtml::CachedImage;
@@ -102,7 +102,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
request->m_docLoader->part()->baseURL().url().latin1(),
request->object->url().string().latin1());
- WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->impl->bridge();
+ WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->kwq->bridge();
NSURL *URL = job->url().getNSURL();
if (URL == nil) {
@@ -125,7 +125,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
bool KWQCheckIfReloading(DocLoader *loader)
{
- return [((KHTMLPart *)loader->part())->impl->bridge() isReloading];
+ return [((KHTMLPart *)loader->part())->kwq->bridge() isReloading];
}
void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
@@ -148,7 +148,7 @@ void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
ASSERT(cachedObject->response());
// Notify the caller that we "loaded".
- WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->bridge();
+ WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->kwq->bridge();
NSURL *URL = [[NSURL alloc] initWithString:cachedObject->url().string().getNSString()];
ASSERT(URL);
CachedImage *cachedImage = dynamic_cast<CachedImage *>(cachedObject);
diff --git a/WebCore/kwq/KWQLoaderImpl.h b/WebCore/kwq/KWQLoaderImpl.h
deleted file mode 100644
index defd3fc..0000000
--- a/WebCore/kwq/KWQLoaderImpl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 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
- * 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.
- */
-
-namespace khtml {
- class CachedObject;
- class DocLoader;
- class Loader;
- class Request;
-}
-
-namespace KIO {
- class TransferJob;
-}
-
-bool KWQServeRequest(khtml::Loader *, khtml::Request *, KIO::TransferJob *);
-void KWQCheckCacheObjectStatus(khtml::DocLoader *, khtml::CachedObject *);
-bool KWQCheckIfReloading(khtml::DocLoader *loader);
-void KWQRetainResponse(void *response);
-void KWQReleaseResponse(void *response);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
deleted file mode 100644
index 6b65266..0000000
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import <KWQLoaderImpl.h>
-
-#import <jobclasses.h>
-#import <loader.h>
-
-#import <khtml_part.h>
-
-#import <WebCoreBridge.h>
-#import <WebCoreResourceLoader.h>
-
-#import <KWQLogging.h>
-
-using khtml::CachedObject;
-using khtml::CachedImage;
-using khtml::DocLoader;
-using khtml::Loader;
-using khtml::Request;
-using KIO::TransferJob;
-
- at interface WebCoreResourceLoader : NSObject <WebCoreResourceLoader>
-{
- Loader *loader;
- TransferJob *job;
-}
-
--(id)initWithLoader:(Loader *)loader job:(TransferJob *)job;
-
- at end
-
- at implementation WebCoreResourceLoader
-
--(id)initWithLoader:(Loader *)l job:(TransferJob *)j;
-{
- [super init];
-
- loader = l;
- job = j;
-
- return self;
-}
-
-- (void)dealloc
-{
- delete job;
- [super dealloc];
-}
-
-- (void)receivedResponse:(id)response
-{
- ASSERT(response);
- loader->receivedResponse(job, response);
-}
-
-- (void)addData:(NSData *)data
-{
- loader->slotData(job, (const char *)[data bytes], [data length]);
-}
-
-- (void)cancel
-{
- job->setError(1);
- job->setHandle(0);
- job = 0;
-}
-
-- (void)finish
-{
- loader->slotFinished(job);
- job->setHandle(0);
-}
-
- at end
-
-bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
-{
- LOG(Loading, "Serving request for base %s, url %s",
- request->m_docLoader->part()->baseURL().url().latin1(),
- request->object->url().string().latin1());
-
- WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->impl->bridge();
-
- NSURL *URL = job->url().getNSURL();
- if (URL == nil) {
- [bridge reportBadURL:job->url().url().getNSString()];
- delete job;
- return false;
- }
-
- WebCoreResourceLoader *resourceLoader = [[WebCoreResourceLoader alloc] initWithLoader:loader job:job];
- id <WebCoreResourceHandle> handle = [bridge startLoadingResource:resourceLoader withURL:URL];
- [resourceLoader release];
-
- if (handle == nil) {
- return false;
- }
-
- job->setHandle(handle);
- return true;
-}
-
-bool KWQCheckIfReloading(DocLoader *loader)
-{
- return [((KHTMLPart *)loader->part())->impl->bridge() isReloading];
-}
-
-void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
-{
- // Return from the function for objects that we didn't load from the cache.
- if (!cachedObject)
- return;
- switch (cachedObject->status()) {
- case CachedObject::Persistent:
- case CachedObject::Cached:
- case CachedObject::Uncacheable:
- break;
- case CachedObject::NotCached:
- case CachedObject::Unknown:
- case CachedObject::New:
- case CachedObject::Pending:
- return;
- }
-
- ASSERT(cachedObject->response());
-
- // Notify the caller that we "loaded".
- WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->bridge();
- NSURL *URL = [[NSURL alloc] initWithString:cachedObject->url().string().getNSString()];
- ASSERT(URL);
- CachedImage *cachedImage = dynamic_cast<CachedImage *>(cachedObject);
- [bridge objectLoadedFromCache:URL response:(id)cachedObject->response() size:cachedImage ? cachedImage->dataSize() : cachedObject->size()];
- [URL release];
-}
-
-void KWQRetainResponse(void *response)
-{
- [(id)response retain];
-}
-
-void KWQReleaseResponse(void *response)
-{
- [(id)response release];
-}
-
-
diff --git a/WebCore/kwq/KWQLogging.h b/WebCore/kwq/KWQLogging.h
index 5993f05..aa509a2 100644
--- a/WebCore/kwq/KWQLogging.h
+++ b/WebCore/kwq/KWQLogging.h
@@ -6,7 +6,7 @@
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
#ifndef LOG_CHANNEL_PREFIX
#define LOG_CHANNEL_PREFIX KWQLog
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index 6f91e42..1f5a2b5 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -26,9 +26,9 @@
#ifndef QMAP_H_
#define QMAP_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
-#include <KWQMapImpl.h>
+#include "KWQMapImpl.h"
#ifdef _KWQ_IOSTREAM_
#include <ostream>
diff --git a/WebCore/kwq/KWQMapImpl.h b/WebCore/kwq/KWQMapImpl.h
index 888a3d7..d3893a3 100644
--- a/WebCore/kwq/KWQMapImpl.h
+++ b/WebCore/kwq/KWQMapImpl.h
@@ -28,7 +28,7 @@
#include <new>
-#include <KWQRefPtr.h>
+#include "KWQRefPtr.h"
class KWQMapNodeImpl
{
diff --git a/WebCore/kwq/KWQMapImpl.mm b/WebCore/kwq/KWQMapImpl.mm
index f34cb22..23566fc 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.
*/
-#import <KWQMapImpl.h>
+#import "KWQMapImpl.h"
KWQMapNodeImpl::KWQMapNodeImpl() :
prev(NULL),
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index 94aec5a..c8fca8d 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -26,8 +26,8 @@
#ifndef QARRAY_H_
#define QARRAY_H_
-#include <KWQDef.h>
-#include <KWQArrayImpl.h>
+#include "KWQDef.h"
+#include "KWQArrayImpl.h"
#ifdef _KWQ_IOSTREAM_
#include <ostream>
diff --git a/WebCore/kwq/KWQMovie.h b/WebCore/kwq/KWQMovie.h
index b383667..d7631e7 100644
--- a/WebCore/kwq/KWQMovie.h
+++ b/WebCore/kwq/KWQMovie.h
@@ -26,11 +26,11 @@
#ifndef QMOVIE_H_
#define QMOVIE_H_
-#include <qobject.h>
-#include <qasyncio.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qrect.h>
+#include "KWQObject.h"
+#include "KWQQAsyncIO.h"
+#include "KWQPixmap.h"
+#include "KWQImage.h"
+#include "KWQRect.h"
class QMovie {
public:
diff --git a/WebCore/kwq/KWQMovie.mm b/WebCore/kwq/KWQMovie.mm
index f4631fc..6331890 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.
*/
-#import <qmovie.h>
+#import "KWQMovie.h"
const QRect &QMovie::getValidRect() const
{
diff --git a/WebCore/kwq/KWQNSTextField.h b/WebCore/kwq/KWQNSTextField.h
deleted file mode 100644
index e190b24..0000000
--- a/WebCore/kwq/KWQNSTextField.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import <Cocoa/Cocoa.h>
-
-class QLineEdit;
- at class KWQTextFieldFormatter;
-
- at interface KWQNSTextField : NSTextField
-{
- at private
- QLineEdit *widget;
- NSTextField *secureField;
- KWQTextFieldFormatter *formatter;
- BOOL edited;
- BOOL inNextValidKeyView;
-}
-
-- initWithQLineEdit:(QLineEdit *)widget;
-
-- (void)setPasswordMode:(BOOL)flag;
-- (BOOL)passwordMode;
-- (void)setMaximumLength:(int)len;
-- (int)maximumLength;
-- (BOOL)edited;
-- (void)setEdited:(BOOL)edited;
-
- at end
diff --git a/WebCore/kwq/KWQNSTextField.mm b/WebCore/kwq/KWQNSTextField.mm
deleted file mode 100644
index a2dfa14..0000000
--- a/WebCore/kwq/KWQNSTextField.mm
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import <KWQNSTextField.h>
-
-#import <qlineedit.h>
-#import <KWQKHTMLPartImpl.h>
-#import <KWQNSViewExtras.h>
-
-// KWQTextFieldFormatter enforces a maximum length.
-
- at interface KWQTextFieldFormatter : NSFormatter
-{
- int maxLength;
-}
-
-- (void)setMaximumLength:(int)len;
-- (int)maximumLength;
-
- at end
-
-// KWQSecureTextField has two purposes.
-// One is a workaround for bug 3024443.
-// The other is hook up next and previous key views to KHTML.
-
- at interface KWQSecureTextField : NSSecureTextField
-{
- QWidget *widget;
- BOOL inSetFrameSize;
- BOOL inNextValidKeyView;
-}
-
-- initWithQWidget:(QWidget *)widget;
-
- at end
-
- at implementation KWQNSTextField
-
-- (void)setUpTextField:(NSTextField *)field
-{
- // This is initialization that's shared by both self and the secure text field.
-
- [[field cell] setScrollable:YES];
-
- [field setFormatter:formatter];
-
- [field setDelegate:self];
-
- [field setTarget:self];
- [field setAction:@selector(action:)];
-}
-
-- initWithFrame:(NSRect)frame
-{
- [super initWithFrame:frame];
- formatter = [[KWQTextFieldFormatter alloc] init];
- [self setUpTextField:self];
- return self;
-}
-
-- initWithQLineEdit:(QLineEdit *)w
-{
- widget = w;
- return [super init];
-}
-
-- (void)action:sender
-{
- widget->returnPressed();
-}
-
-- (void)dealloc
-{
- [secureField release];
- [formatter release];
- [super dealloc];
-}
-
-- (KWQTextFieldFormatter *)formatter
-{
- return formatter;
-}
-
-- (void)updateSecureFieldFrame
-{
- [secureField setFrame:[self bounds]];
-}
-
-- (void)setFrameSize:(NSSize)size
-{
- [super setFrameSize:size];
- [self updateSecureFieldFrame];
-}
-
-- (void)setPasswordMode:(BOOL)flag
-{
- if (!flag == ![secureField superview]) {
- return;
- }
-
- [self setStringValue:@""];
- if (!flag) {
- [secureField removeFromSuperview];
- } else {
- if (secureField == nil) {
- secureField = [[KWQSecureTextField alloc] initWithQWidget:widget];
- [secureField setFormatter:formatter];
- [secureField setFont:[self font]];
- [self setUpTextField:secureField];
- [self updateSecureFieldFrame];
- }
- [self addSubview:secureField];
- }
- [self setStringValue:@""];
-}
-
-- (void)setEditable:(BOOL)flag
-{
- [secureField setEditable:flag];
- [super setEditable:flag];
-}
-
-- (void)selectText:(id)sender
-{
- if ([self passwordMode]) {
- [secureField selectText:sender];
- return;
- }
- [super selectText:sender];
-}
-
-- (BOOL)isEditable
-{
- return [super isEditable];
-}
-
-- (BOOL)passwordMode
-{
- return [secureField superview] != nil;
-}
-
-- (void)setMaximumLength:(int)len
-{
- NSString *oldValue = [self stringValue];
- if ((int)[oldValue length] > len) {
- [self setStringValue:[oldValue substringToIndex:len]];
- }
- [formatter setMaximumLength:len];
-}
-
-- (int)maximumLength
-{
- return [formatter maximumLength];
-}
-
-- (BOOL)edited
-{
- return edited;
-}
-
-- (void)setEdited:(BOOL)ed
-{
- edited = ed;
-}
-
-- (void)controlTextDidChange:(NSNotification *)aNotification
-{
- edited = true;
- widget->textChanged();
-}
-
-- (NSString *)stringValue
-{
- if ([secureField superview]) {
- return [secureField stringValue];
- }
- return [super stringValue];
-}
-
-- (void)setStringValue:(NSString *)string
-{
- [secureField setStringValue:string];
- [super setStringValue:string];
-}
-
-- (void)setFont:(NSFont *)font
-{
- [secureField setFont:font];
- [super setFont:font];
-}
-
-- (NSView *)nextKeyView
-{
- return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingNext)
- : [super nextKeyView];
-}
-
-- (NSView *)previousKeyView
-{
- return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingPrevious)
- : [super previousKeyView];
-}
-
-- (NSView *)nextValidKeyView
-{
- inNextValidKeyView = YES;
- NSView *view = [super nextValidKeyView];
- inNextValidKeyView = NO;
- return view;
-}
-
-- (NSView *)previousValidKeyView
-{
- inNextValidKeyView = YES;
- NSView *view = [super previousValidKeyView];
- inNextValidKeyView = NO;
- return view;
-}
-
-- (BOOL)becomeFirstResponder
-{
- KWQKHTMLPartImpl::setDocumentFocus(widget);
- [self _KWQ_scrollFrameToVisible];
- return [super becomeFirstResponder];
-}
-
-- (void)display
-{
- // This is a workaround for Radar 2753974.
- // Also, in the web page context, it's never OK to just display.
- [self setNeedsDisplay:YES];
-}
-
- at end
-
- at implementation KWQTextFieldFormatter
-
-- init
-{
- [super init];
- maxLength = INT_MAX;
- return self;
-}
-
-- (void)setMaximumLength:(int)len
-{
- maxLength = len;
-}
-
-- (int)maximumLength
-{
- return maxLength;
-}
-
-- (NSString *)stringForObjectValue:(id)object
-{
- return (NSString *)object;
-}
-
-- (BOOL)getObjectValue:(id *)object forString:(NSString *)string errorDescription:(NSString **)error
-{
- *object = string;
- return YES;
-}
-
-- (BOOL)isPartialStringValid:(NSString *)partialString newEditingString:(NSString **)newString errorDescription:(NSString **)error
-{
- if ((int)[partialString length] > maxLength) {
- *newString = nil;
- return NO;
- }
-
- return YES;
-}
-
-- (NSAttributedString *)attributedStringForObjectValue:(id)anObject withDefaultAttributes:(NSDictionary *)attributes
-{
- return nil;
-}
-
- at end
-
- at implementation KWQSecureTextField
-
-- initWithQWidget:(QWidget *)w
-{
- widget = w;
- return [super init];
-}
-
-- (NSView *)nextKeyView
-{
- return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingNext)
- : [super nextKeyView];
-}
-
-- (NSView *)previousKeyView
-{
- return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingPrevious)
- : [super previousKeyView];
-}
-
-- (NSView *)nextValidKeyView
-{
- inNextValidKeyView = YES;
- NSView *view = [super nextValidKeyView];
- inNextValidKeyView = NO;
- return view;
-}
-
-- (NSView *)previousValidKeyView
-{
- inNextValidKeyView = YES;
- NSView *view = [super previousValidKeyView];
- inNextValidKeyView = NO;
- return view;
-}
-
-// These next two methods are the workaround for bug 3024443.
-// Basically, setFrameSize ends up calling an inappropriate selectText, so we just ignore
-// calls to selectText while setFrameSize is running.
-
-- (void)selectText:(id)sender
-{
- if (sender == self && inSetFrameSize) {
- return;
- }
- [super selectText:sender];
-}
-
-- (void)setFrameSize:(NSSize)size
-{
- inSetFrameSize = YES;
- [super setFrameSize:size];
- inSetFrameSize = NO;
-}
-
-- (BOOL)becomeFirstResponder
-{
- KWQKHTMLPartImpl::setDocumentFocus(widget);
- [self _KWQ_scrollFrameToVisible];
- return [super becomeFirstResponder];
-}
-
-- (void)display
-{
- // This is a workaround for Radar 2753974.
- // Also, in the web page context, it's never OK to just display.
- [self setNeedsDisplay:YES];
-}
-
- at end
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index 2ee8ffa..ea5c6e9 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -26,7 +26,7 @@
#ifndef QNAMESPACE_H_
#define QNAMESPACE_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
class QColor;
class QCursor;
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 123ff2d..ff4874d 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -26,14 +26,14 @@
#ifndef QOBJECT_H_
#define QOBJECT_H_
-#include <KWQDef.h>
-#include <KWQSignal.h>
-
-#include "qnamespace.h"
-#include "qstring.h"
-#include "qevent.h"
-#include "qstringlist.h"
-#include "qptrlist.h"
+#include "KWQDef.h"
+#include "KWQSignal.h"
+
+#include "KWQNamespace.h"
+#include "KWQString.h"
+#include "KWQEvent.h"
+#include "KWQStringList.h"
+#include "KWQPtrList.h"
#define slots : public
#define SLOT(x) "SLOT:" #x
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 851b9ce..c86636a 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "qobject.h"
+#import "KWQObject.h"
-#import "qvariant.h"
+#import "KWQVariant.h"
#import "KWQAssertions.h"
const QObject *QObject::_sender;
@@ -216,8 +216,8 @@ void QObject::killTimers()
// special includes only for inherits
-#import <khtml_part.h>
-#import <khtmlview.h>
+#import "khtml_part.h"
+#import "khtmlview.h"
bool QObject::inherits(const char *className) const
{
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.mm b/WebCore/kwq/KWQPaintDeviceMetrics.mm
index fd9aea2..c486ff2 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.
*/
-#import <qpaintdevicemetrics.h>
+#import "KWQPaintDeviceMetrics.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
QPaintDeviceMetrics::QPaintDeviceMetrics(const QPaintDevice *)
{
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 1067a44..3da9535 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -26,16 +26,16 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
-#include <qnamespace.h>
-#include <qpaintdevice.h>
-#include <qcolor.h>
-#include <qpen.h>
-#include <qbrush.h>
-#include <qrect.h>
-#include <qregion.h>
-#include <qpoint.h>
-#include <qstring.h>
-#include <qfontmetrics.h>
+#include "KWQNamespace.h"
+#include "KWQPaintDevice.h"
+#include "KWQColor.h"
+#include "KWQPen.h"
+#include "KWQBrush.h"
+#include "KWQRect.h"
+#include "KWQRegion.h"
+#include "KWQPointArray.h"
+#include "KWQString.h"
+#include "KWQFontMetrics.h"
class QFont;
class QPixmap;
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index f4ff704..61decbb 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -23,18 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qpainter.h>
-#import <qwidget.h>
-#import <qfontmetrics.h>
-#import <qpixmap.h>
-#import <qstack.h>
-#import <qpoint.h>
-
-#import <KWQAssertions.h>
-
-#import <WebCoreTextRendererFactory.h>
-#import <WebCoreTextRenderer.h>
-#import <WebCoreImageRenderer.h>
+#import "KWQPainter.h"
+#import "KWQWidget.h"
+#import "KWQFontMetrics.h"
+#import "KWQPixmap.h"
+#import "KWQPtrStack.h"
+#import "KWQPointArray.h"
+
+#import "KWQAssertions.h"
+
+#import "WebCoreTextRendererFactory.h"
+#import "WebCoreTextRenderer.h"
+#import "WebCoreImageRenderer.h"
struct QPState {
QPState() : paintingDisabled(false) { }
diff --git a/WebCore/kwq/KWQPalette.h b/WebCore/kwq/KWQPalette.h
index 737c9d5..1385cb0 100644
--- a/WebCore/kwq/KWQPalette.h
+++ b/WebCore/kwq/KWQPalette.h
@@ -26,8 +26,8 @@
#ifndef QPALETTE_H_
#define QPALETTE_H_
-#include <qcolor.h>
-#include <qbrush.h>
+#include "KWQColor.h"
+#include "KWQBrush.h"
class QColorGroupPrivate;
class QPalettePrivate;
diff --git a/WebCore/kwq/KWQPalette.mm b/WebCore/kwq/KWQPalette.mm
index b945816..f8e805e 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.
*/
-#import <qpalette.h>
+#import "KWQPalette.h"
const QColor& QPalette::color(ColorGroup cg, QColorGroup::ColorRole role) const
{
diff --git a/WebCore/kwq/KWQPen.h b/WebCore/kwq/KWQPen.h
index aab7507..43ad934 100644
--- a/WebCore/kwq/KWQPen.h
+++ b/WebCore/kwq/KWQPen.h
@@ -26,8 +26,8 @@
#ifndef QPEN_H_
#define QPEN_H_
-#include <qnamespace.h>
-#include <qcolor.h>
+#include "KWQNamespace.h"
+#include "KWQColor.h"
class QPen : public Qt {
public:
diff --git a/WebCore/kwq/KWQPen.mm b/WebCore/kwq/KWQPen.mm
index 7abfc6d..1dda94e 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.
*/
-#import <qpen.h>
+#import "KWQPen.h"
QPen::QPen(const QColor &color, uint width, PenStyle style) : penStyle(style), penWidth(width), penColor(color)
{
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index 2d5ade2..d5f5837 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -26,14 +26,14 @@
#ifndef QPIXMAP_H_
#define QPIXMAP_H_
-#include "qpaintdevice.h"
-#include "qcolor.h"
-#include "qstring.h"
-#include "qnamespace.h"
-#include "qimage.h"
-#include "qsize.h"
-#include "qrect.h"
-#include "qpainter.h"
+#include "KWQPaintDevice.h"
+#include "KWQColor.h"
+#include "KWQString.h"
+#include "KWQNamespace.h"
+#include "KWQImage.h"
+#include "KWQSize.h"
+#include "KWQRect.h"
+#include "KWQPainter.h"
#ifdef __OBJC__
@protocol WebCoreImageRenderer;
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index d04e208..d0bc0b5 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qpixmap.h>
+#import "KWQPixmap.h"
-#import <WebCoreImageRenderer.h>
-#import <WebCoreImageRendererFactory.h>
+#import "WebCoreImageRenderer.h"
+#import "WebCoreImageRendererFactory.h"
QPixmap::QPixmap()
{
diff --git a/WebCore/kwq/KWQPoint.mm b/WebCore/kwq/KWQPoint.mm
index 4c838c1..0f4d997 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.
*/
-#import <qpoint.h>
+#import "KWQPointArray.h"
QPoint::QPoint() : xCoord(0), yCoord(0)
{
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index 191679c..f0d2f1e 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -26,13 +26,13 @@
#ifndef QPOINT_H_
#define QPOINT_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
#ifdef _KWQ_IOSTREAM_
#include <iosfwd>
#endif
-#include "qarray.h"
+#include "KWQMemArray.h"
typedef struct _NSPoint NSPoint;
diff --git a/WebCore/kwq/KWQPointArray.mm b/WebCore/kwq/KWQPointArray.mm
index 609b408..ee9fefe 100644
--- a/WebCore/kwq/KWQPointArray.mm
+++ b/WebCore/kwq/KWQPointArray.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "qpoint.h"
+#import "KWQPointArray.h"
#import <stdarg.h>
QPointArray::QPointArray(int nPoints, const int *points)
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index 5cf99cf..346f20e 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -26,10 +26,10 @@
#ifndef QPTRDICT_H_
#define QPTRDICT_H_
-#include <KWQDef.h>
-#include <qcollection.h>
+#include "KWQDef.h"
+#include "KWQCollection.h"
-#include <KWQPtrDictImpl.h>
+#include "KWQPtrDictImpl.h"
template <class T> class QPtrDictIterator;
diff --git a/WebCore/kwq/KWQPtrDictImpl.h b/WebCore/kwq/KWQPtrDictImpl.h
index abe838d..20ec489 100644
--- a/WebCore/kwq/KWQPtrDictImpl.h
+++ b/WebCore/kwq/KWQPtrDictImpl.h
@@ -26,7 +26,7 @@
#ifndef KWQ_PTRDICT_IMPL_H
#define KWQ_PTRDICT_IMPL_H
-#include <KWQDef.h>
+#include "KWQDef.h"
#include <stddef.h>
diff --git a/WebCore/kwq/KWQPtrDictImpl.mm b/WebCore/kwq/KWQPtrDictImpl.mm
index c876fe3..da12b29 100644
--- a/WebCore/kwq/KWQPtrDictImpl.mm
+++ b/WebCore/kwq/KWQPtrDictImpl.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQPtrDictImpl.h>
+#import "KWQPtrDictImpl.h"
#import <new>
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 7b3457c..cdd1aea 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -26,9 +26,9 @@
#ifndef QLIST_H_
#define QLIST_H_
-#include <KWQDef.h>
-#include <qcollection.h>
-#include <KWQListImpl.h>
+#include "KWQDef.h"
+#include "KWQCollection.h"
+#include "KWQListImpl.h"
#ifdef _KWQ_IOSTREAM_
#include <ostream>
diff --git a/WebCore/kwq/KWQPtrQueue.h b/WebCore/kwq/KWQPtrQueue.h
index 55f1090..3f070a7 100644
--- a/WebCore/kwq/KWQPtrQueue.h
+++ b/WebCore/kwq/KWQPtrQueue.h
@@ -26,7 +26,7 @@
#ifndef QPTRQUEUE_H_
#define QPTRQUEUE_H_
-#include <qptrlist.h>
+#include "KWQPtrList.h"
template<class T> class QPtrQueue
diff --git a/WebCore/kwq/KWQPtrStack.h b/WebCore/kwq/KWQPtrStack.h
index 730a85e..11e1517 100644
--- a/WebCore/kwq/KWQPtrStack.h
+++ b/WebCore/kwq/KWQPtrStack.h
@@ -26,7 +26,7 @@
#ifndef QSTACK_H_
#define QSTACK_H_
-#include <qlist.h>
+#include "KWQPtrList.h"
template<class T> class QPtrStack {
public:
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index 00c0f18..c82ef00 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -26,10 +26,10 @@
#ifndef QVECTOR_H_
#define QVECTOR_H_
-#include <KWQDef.h>
-#include <qcollection.h>
+#include "KWQDef.h"
+#include "KWQCollection.h"
-#include <KWQVectorImpl.h>
+#include "KWQVectorImpl.h"
#ifdef _KWQ_IOSTREAM_
#include <ostream>
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index 48808cd..eed6a95 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -26,7 +26,7 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
-#include <qbutton.h>
+#include "KWQButton.h"
class QPushButton : public QButton {
public:
diff --git a/WebCore/kwq/KWQPushButton.mm b/WebCore/kwq/KWQPushButton.mm
index a10aee4..2a420ca 100644
--- a/WebCore/kwq/KWQPushButton.mm
+++ b/WebCore/kwq/KWQPushButton.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qpushbutton.h>
+#import "KWQPushButton.h"
// We empirically determined that buttons have these extra pixels on all
// sides. It would be better to get this info from AppKit somehow.
diff --git a/WebCore/kwq/KWQRadioButton.h b/WebCore/kwq/KWQRadioButton.h
index 41039d1..d049cb1 100644
--- a/WebCore/kwq/KWQRadioButton.h
+++ b/WebCore/kwq/KWQRadioButton.h
@@ -26,7 +26,7 @@
#ifndef QRADIOBUTTON_H_
#define QRADIOBUTTON_H_
-#include <qbutton.h>
+#include "KWQButton.h"
class QRadioButton : public QButton {
public:
diff --git a/WebCore/kwq/KWQRadioButton.mm b/WebCore/kwq/KWQRadioButton.mm
index 4db1b0a..376dc12 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.
*/
-#import <qradiobutton.h>
+#import "KWQRadioButton.h"
-#import <KWQView.h>
+#import "KWQView.h"
// We empirically determined that radio buttons have these dimensions.
// It would be better to get this info from AppKit somehow.
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 60b8287..23f503a 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -26,8 +26,8 @@
#ifndef QRECT_H_
#define QRECT_H_
-#include <qsize.h>
-#include <qpoint.h>
+#include "KWQSize.h"
+#include "KWQPointArray.h"
typedef struct _NSRect NSRect;
diff --git a/WebCore/kwq/KWQRect.mm b/WebCore/kwq/KWQRect.mm
index 2932433..ccb4fb9 100644
--- a/WebCore/kwq/KWQRect.mm
+++ b/WebCore/kwq/KWQRect.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qrect.h>
+#import "KWQRect.h"
#import <algorithm>
diff --git a/WebCore/kwq/KWQRegExp.h b/WebCore/kwq/KWQRegExp.h
index 2857973..545e33d 100644
--- a/WebCore/kwq/KWQRegExp.h
+++ b/WebCore/kwq/KWQRegExp.h
@@ -26,9 +26,9 @@
#ifndef QREGEXP_H_
#define QREGEXP_H_
-#include <qstring.h>
+#include "KWQString.h"
-#include <KWQRefPtr.h>
+#include "KWQRefPtr.h"
class QRegExp {
public:
diff --git a/WebCore/kwq/KWQRegExp.mm b/WebCore/kwq/KWQRegExp.mm
index ab50727..da5e2b6 100644
--- a/WebCore/kwq/KWQRegExp.mm
+++ b/WebCore/kwq/KWQRegExp.mm
@@ -24,7 +24,7 @@
*/
-#import <qregexp.h>
+#import "KWQRegExp.h"
#import <sys/types.h>
#import <regex.h>
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index 53f0cdb..9c21360 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -26,9 +26,9 @@
#ifndef QREGION_H_
#define QREGION_H_
-#include <qpoint.h>
-#include <qimage.h>
-#include <qrect.h>
+#include "KWQPointArray.h"
+#include "KWQImage.h"
+#include "KWQRect.h"
#ifdef __OBJC__
@class NSBezierPath;
diff --git a/WebCore/kwq/KWQRegion.mm b/WebCore/kwq/KWQRegion.mm
index 4b2a664..706762a 100644
--- a/WebCore/kwq/KWQRegion.mm
+++ b/WebCore/kwq/KWQRegion.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qregion.h>
+#import "KWQRegion.h"
QRegion::QRegion(const QRect &rect)
: path([[NSBezierPath bezierPathWithRect:rect] retain])
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 0aefa6e..2f7e301 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -26,7 +26,7 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
-#include <qframe.h>
+#include "KWQFrame.h"
#ifdef __OBJC__
@class NSView;
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index a198201..0b9c8cf 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qscrollview.h>
+#import "KWQScrollView.h"
-#import <WebCoreFrameView.h>
+#import "WebCoreFrameView.h"
-#import <KWQLogging.h>
+#import "KWQLogging.h"
/*
This class implementation does NOT actually emulate the Qt QScrollView.
diff --git a/WebCore/kwq/KWQSignal.h b/WebCore/kwq/KWQSignal.h
index 7b33b05..4be7555 100644
--- a/WebCore/kwq/KWQSignal.h
+++ b/WebCore/kwq/KWQSignal.h
@@ -27,7 +27,7 @@
#define KWQSIGNAL_H
#include "KWQSlot.h"
-#include "qvaluelist.h"
+#include "KWQValueList.h"
class KWQSignal {
public:
diff --git a/WebCore/kwq/KWQSignal.mm b/WebCore/kwq/KWQSignal.mm
index 1b8c439..ec21627 100644
--- a/WebCore/kwq/KWQSignal.mm
+++ b/WebCore/kwq/KWQSignal.mm
@@ -25,7 +25,7 @@
#import "KWQSignal.h"
-#import "qobject.h"
+#import "KWQObject.h"
#import "KWQAssertions.h"
using KIO::Job;
diff --git a/WebCore/kwq/KWQSignalStubs.mm b/WebCore/kwq/KWQSignalStubs.mm
index 56e202d..445fccb 100644
--- a/WebCore/kwq/KWQSignalStubs.mm
+++ b/WebCore/kwq/KWQSignalStubs.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <khtmlview.h>
-#import <loader.h>
-#import <xml_tokenizer.h>
+#import "khtmlview.h"
+#import "loader.h"
+#import "xml_tokenizer.h"
void KHTMLView::cleared() { }
diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index adae534..7c20bb5 100644
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -26,7 +26,7 @@
#ifndef QSIZE_H_
#define QSIZE_H_
-#include <KWQDef.h>
+#include "KWQDef.h"
#ifdef _KWQ_IOSTREAM_
#include <iosfwd>
diff --git a/WebCore/kwq/KWQSize.mm b/WebCore/kwq/KWQSize.mm
index 9ef796c..be70a2b 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.
*/
-#import <qsize.h>
+#import "KWQSize.h"
QSize::QSize() : w(-1), h(-1)
{
diff --git a/WebCore/kwq/KWQSlot.h b/WebCore/kwq/KWQSlot.h
index 95ec54f..0e35b8d 100644
--- a/WebCore/kwq/KWQSlot.h
+++ b/WebCore/kwq/KWQSlot.h
@@ -26,7 +26,7 @@
#ifndef KWQSLOT_H
#define KWQSLOT_H
-#include "qguardedptr.h"
+#include "KWQGuardedPtr.h"
class QString;
diff --git a/WebCore/kwq/KWQSortedList.h b/WebCore/kwq/KWQSortedList.h
index 34ca5d8..bca1071 100644
--- a/WebCore/kwq/KWQSortedList.h
+++ b/WebCore/kwq/KWQSortedList.h
@@ -26,7 +26,7 @@
#ifndef QSORTEDLIST_H_
#define QSORTEDLIST_H_
-#include <qptrlist.h>
+#include "KWQPtrList.h"
template<class T> class QSortedList : public QPtrList<T> {
public:
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index a7cf720..7e0b127 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -28,7 +28,7 @@
#include <CoreFoundation/CoreFoundation.h>
-#include <qcstring.h>
+#include "KWQCString.h"
// Make htmltokenizer.cpp happy
#define QT_VERSION 300
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 15de854..591c46a 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -24,9 +24,9 @@
*/
#import <Foundation/Foundation.h>
-#import <KWQLogging.h>
-#import <qstring.h>
-#import <qregexp.h>
+#import "KWQLogging.h"
+#import "KWQString.h"
+#import "KWQRegExp.h"
#import <stdio.h>
#define CHECK_FOR_HANDLE_LEAKS 0
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/kwq/KWQStringList.h
index fab8beb..893cd1e 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/kwq/KWQStringList.h
@@ -26,8 +26,8 @@
#ifndef QSTRINGLIST_H_
#define QSTRINGLIST_H_
-#include <qstring.h>
-#include <qvaluelist.h>
+#include "KWQString.h"
+#include "KWQValueList.h"
class QStringList : public QValueList<QString> {
public:
diff --git a/WebCore/kwq/KWQStringList.mm b/WebCore/kwq/KWQStringList.mm
index bce4bc7..d79577f 100644
--- a/WebCore/kwq/KWQStringList.mm
+++ b/WebCore/kwq/KWQStringList.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qstringlist.h>
+#import "KWQStringList.h"
#import <CoreFoundation/CoreFoundation.h>
diff --git a/WebCore/kwq/KWQStyle.h b/WebCore/kwq/KWQStyle.h
index fdb5cf5..196fdd7 100644
--- a/WebCore/kwq/KWQStyle.h
+++ b/WebCore/kwq/KWQStyle.h
@@ -26,8 +26,8 @@
#ifndef KWQSTYLE_H_
#define KWQSTYLE_H_
-#include <qobject.h>
-#include <qsize.h>
+#include "KWQObject.h"
+#include "KWQSize.h"
class QWidget;
diff --git a/WebCore/kwq/KWQStyle.mm b/WebCore/kwq/KWQStyle.mm
index fed50dc..0041cbc 100644
--- a/WebCore/kwq/KWQStyle.mm
+++ b/WebCore/kwq/KWQStyle.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qstyle.h>
+#import "KWQStyle.h"
-#include <qwidget.h>
+#import "KWQWidget.h"
QSize QStyle::sizeFromContents(ContentType, QWidget *, const QSize &s) const
{
diff --git a/WebCore/kwq/KWQStyleSheet.h b/WebCore/kwq/KWQStyleSheet.h
index f0d1f25..2d822b3 100644
--- a/WebCore/kwq/KWQStyleSheet.h
+++ b/WebCore/kwq/KWQStyleSheet.h
@@ -26,7 +26,7 @@
#ifndef QSTYLESHEET_H
#define QSTYLESHEET_H
-#include <qstring.h>
+#include "KWQString.h"
class QStyleSheet
{
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 59e7157..446e3d7 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQTextArea.h>
+#import "KWQTextArea.h"
-#import <qtextedit.h>
-#import <KWQKHTMLPartImpl.h>
+#import "KWQTextEdit.h"
+#import "KWQKHTMLPart.h"
/*
This widget is used to implement the <TEXTAREA> element.
@@ -407,14 +407,14 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
- (NSView *)nextKeyView
{
return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingNext)
+ ? KWQKHTMLPart::nextKeyViewForWidget(widget, KWQSelectingNext)
: [super nextKeyView];
}
- (NSView *)previousKeyView
{
return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingPrevious)
+ ? KWQKHTMLPart::nextKeyViewForWidget(widget, KWQSelectingPrevious)
: [super previousKeyView];
}
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index 812bfdf..3f3ee52 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -26,8 +26,8 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
-#include <qstring.h>
-#include <qcstring.h>
+#include "KWQString.h"
+#include "KWQCString.h"
class QTextDecoder;
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index a8231c3..85957ea 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qtextcodec.h>
+#import "KWQTextCodec.h"
-#import <KWQCharsets.h>
+#import "KWQCharsets.h"
static CFMutableDictionaryRef encodingToCodec = NULL;
diff --git a/WebCore/kwq/KWQTextEdit.h b/WebCore/kwq/KWQTextEdit.h
index 6a3096e..0775e6c 100644
--- a/WebCore/kwq/KWQTextEdit.h
+++ b/WebCore/kwq/KWQTextEdit.h
@@ -26,9 +26,9 @@
#ifndef QTEXTEDIT_H_
#define QTEXTEDIT_H_
-#include <qscrollview.h>
+#include "KWQScrollView.h"
-#include <KWQSignal.h>
+#include "KWQSignal.h"
class QTextEdit : public QScrollView
{
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index 89e440c..1064f54 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qtextedit.h>
+#import "KWQTextEdit.h"
-#import <KWQTextArea.h>
+#import "KWQTextArea.h"
QTextEdit::QTextEdit(QWidget *parent)
: m_textChanged(this, SIGNAL(textChanged()))
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index a2dfa14..8624744 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQNSTextField.h>
+#import "KWQTextField.h"
-#import <qlineedit.h>
-#import <KWQKHTMLPartImpl.h>
-#import <KWQNSViewExtras.h>
+#import "KWQLineEdit.h"
+#import "KWQKHTMLPart.h"
+#import "KWQNSViewExtras.h"
// KWQTextFieldFormatter enforces a maximum length.
@@ -214,14 +214,14 @@
- (NSView *)nextKeyView
{
return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingNext)
+ ? KWQKHTMLPart::nextKeyViewForWidget(widget, KWQSelectingNext)
: [super nextKeyView];
}
- (NSView *)previousKeyView
{
return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingPrevious)
+ ? KWQKHTMLPart::nextKeyViewForWidget(widget, KWQSelectingPrevious)
: [super previousKeyView];
}
@@ -243,7 +243,7 @@
- (BOOL)becomeFirstResponder
{
- KWQKHTMLPartImpl::setDocumentFocus(widget);
+ KWQKHTMLPart::setDocumentFocus(widget);
[self _KWQ_scrollFrameToVisible];
return [super becomeFirstResponder];
}
@@ -315,14 +315,14 @@
- (NSView *)nextKeyView
{
return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingNext)
+ ? KWQKHTMLPart::nextKeyViewForWidget(widget, KWQSelectingNext)
: [super nextKeyView];
}
- (NSView *)previousKeyView
{
return inNextValidKeyView
- ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingPrevious)
+ ? KWQKHTMLPart::nextKeyViewForWidget(widget, KWQSelectingPrevious)
: [super previousKeyView];
}
@@ -363,7 +363,7 @@
- (BOOL)becomeFirstResponder
{
- KWQKHTMLPartImpl::setDocumentFocus(widget);
+ KWQKHTMLPart::setDocumentFocus(widget);
[self _KWQ_scrollFrameToVisible];
return [super becomeFirstResponder];
}
diff --git a/WebCore/kwq/KWQTextStream.h b/WebCore/kwq/KWQTextStream.h
index fe679d6..20362f3 100644
--- a/WebCore/kwq/KWQTextStream.h
+++ b/WebCore/kwq/KWQTextStream.h
@@ -26,7 +26,7 @@
#ifndef QTEXTSTREAM_H_
#define QTEXTSTREAM_H_
-#include "qstring.h"
+#include "KWQString.h"
class QTextStream;
diff --git a/WebCore/kwq/KWQTextStream.mm b/WebCore/kwq/KWQTextStream.mm
index 31c6ab5..b6b47a6 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.
*/
-#import <KWQLogging.h>
+#import "KWQLogging.h"
-#import <qtextstream.h>
+#import "KWQTextStream.h"
QTextStream::QTextStream()
{
diff --git a/WebCore/kwq/KWQTimer.h b/WebCore/kwq/KWQTimer.h
index fbc4e87..3002ad4 100644
--- a/WebCore/kwq/KWQTimer.h
+++ b/WebCore/kwq/KWQTimer.h
@@ -26,8 +26,8 @@
#ifndef QTIMER_H_
#define QTIMER_H_
-#include <qobject.h>
-#include <KWQSignal.h>
+#include "KWQObject.h"
+#include "KWQSignal.h"
#ifdef __OBJC__
@class NSTimer;
@@ -47,7 +47,7 @@ public:
static void singleShot(int msec, QObject *receiver, const char *member);
- // This is just a hack used by KWQKHTMLPartImpl. The monitor function
+ // This is just a hack used by KWQKHTMLPart. The monitor function
// gets called when the timer starts and when it is stopped before firing,
// but not when the timer fires.
void setMonitor(void (*monitorFunction)(void *context), void *context);
diff --git a/WebCore/kwq/KWQTimer.mm b/WebCore/kwq/KWQTimer.mm
index cf8112a..80dd805 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.
*/
-#import <qtimer.h>
+#import "KWQTimer.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
@interface KWQTimerTarget : NSObject
{
diff --git a/WebCore/kwq/KWQToolTip.h b/WebCore/kwq/KWQToolTip.h
index e0a678c..4fe6dbf 100644
--- a/WebCore/kwq/KWQToolTip.h
+++ b/WebCore/kwq/KWQToolTip.h
@@ -26,7 +26,7 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
-#include <qpalette.h>
+#include "KWQPalette.h"
class QToolTip {
public:
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index ebdabfa..78b44c6 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -26,8 +26,8 @@
#ifndef QVALUELIST_H_
#define QVALUELIST_H_
-#include <KWQDef.h>
-#include <KWQValueListImpl.h>
+#include "KWQDef.h"
+#include "KWQValueListImpl.h"
#ifdef _KWQ_IOSTREAM_
#include <ostream>
diff --git a/WebCore/kwq/KWQValueListImpl.h b/WebCore/kwq/KWQValueListImpl.h
index e0d5315..cabbb82 100644
--- a/WebCore/kwq/KWQValueListImpl.h
+++ b/WebCore/kwq/KWQValueListImpl.h
@@ -26,8 +26,8 @@
#ifndef KWQVALUELIST_H_
#define KWQVALUELIST_H_
-#include <KWQRefPtr.h>
-#include <KWQDef.h>
+#include "KWQRefPtr.h"
+#include "KWQDef.h"
class KWQValueListNodeImpl;
diff --git a/WebCore/kwq/KWQValueListImpl.mm b/WebCore/kwq/KWQValueListImpl.mm
index e2e8406..331d154 100644
--- a/WebCore/kwq/KWQValueListImpl.mm
+++ b/WebCore/kwq/KWQValueListImpl.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQValueListImpl.h>
+#import "KWQValueListImpl.h"
#import <stdlib.h>
diff --git a/WebCore/kwq/KWQVariant.h b/WebCore/kwq/KWQVariant.h
index 340da07..34fe251 100644
--- a/WebCore/kwq/KWQVariant.h
+++ b/WebCore/kwq/KWQVariant.h
@@ -26,8 +26,8 @@
#ifndef QVARIANT_H_
#define QVARIANT_H_
-#include <KWQDef.h>
-#include <KWQRefPtr.h>
+#include "KWQDef.h"
+#include "KWQRefPtr.h"
class QString;
diff --git a/WebCore/kwq/KWQVariant.mm b/WebCore/kwq/KWQVariant.mm
index 4fb0229..2908238 100644
--- a/WebCore/kwq/KWQVariant.mm
+++ b/WebCore/kwq/KWQVariant.mm
@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qvariant.h>
+#import "KWQVariant.h"
-#import <qstring.h>
+#import "KWQString.h"
class QVariant::QVariantPrivate {
public:
diff --git a/WebCore/kwq/KWQVectorImpl.h b/WebCore/kwq/KWQVectorImpl.h
index 2c89818..67ee491 100644
--- a/WebCore/kwq/KWQVectorImpl.h
+++ b/WebCore/kwq/KWQVectorImpl.h
@@ -26,7 +26,7 @@
#ifndef KWQ_VECTOR_IMPL_H
#define KWQ_VECTOR_IMPL_H
-#include <KWQDef.h>
+#include "KWQDef.h"
class KWQVectorImpl
{
diff --git a/WebCore/kwq/KWQVectorImpl.mm b/WebCore/kwq/KWQVectorImpl.mm
index 54af05c..b2165b8 100644
--- a/WebCore/kwq/KWQVectorImpl.mm
+++ b/WebCore/kwq/KWQVectorImpl.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQVectorImpl.h>
+#import "KWQVectorImpl.h"
KWQVectorImpl::KWQVectorImpl(void (*f)(void *))
: m_data(0), m_size(0), m_count(0), m_deleteItemFunction(f)
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 71e62c5..c838fc2 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -26,16 +26,16 @@
#ifndef QWIDGET_H_
#define QWIDGET_H_
-#include <qobject.h>
-#include <qpaintdevice.h>
-#include <qpainter.h>
-#include <qpoint.h>
-#include <qsize.h>
-#include <qpalette.h>
-#include <qfont.h>
-#include <qcursor.h>
-#include <qevent.h>
-#include <qstyle.h>
+#include "KWQObject.h"
+#include "KWQPaintDevice.h"
+#include "KWQPainter.h"
+#include "KWQPointArray.h"
+#include "KWQSize.h"
+#include "KWQPalette.h"
+#include "KWQFont.h"
+#include "KWQCursor.h"
+#include "KWQEvent.h"
+#include "KWQStyle.h"
#ifdef __OBJC__
@class NSView;
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 0d19b42..1b70f20 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -23,16 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qwidget.h>
+#import "KWQWidget.h"
-#import <KWQView.h>
-#import <WebCoreFrameView.h>
-#import <KWQLogging.h>
-#import <KWQWindowWidget.h>
+#import "KWQView.h"
+#import "WebCoreFrameView.h"
+#import "KWQLogging.h"
+#import "KWQWindowWidget.h"
-#import <khtmlview.h>
-#import <render_replaced.h>
-#import <KWQKHTMLPartImpl.h>
+#import "khtmlview.h"
+#import "render_replaced.h"
+#import "KWQKHTMLPart.h"
using khtml::RenderWidget;
@@ -206,7 +206,7 @@ void QWidget::setFocus()
void QWidget::clearFocus()
{
- KWQKHTMLPartImpl::clearDocumentFocus(this);
+ KWQKHTMLPart::clearDocumentFocus(this);
}
QWidget::FocusPolicy QWidget::focusPolicy() const
diff --git a/WebCore/kwq/KWQWindowWidget.h b/WebCore/kwq/KWQWindowWidget.h
index 9d6609c..a647634 100644
--- a/WebCore/kwq/KWQWindowWidget.h
+++ b/WebCore/kwq/KWQWindowWidget.h
@@ -26,7 +26,7 @@
#ifndef KWQKWINDOW_WIDGET_H
#define KWQKWINDOW_WIDGET_H
-#include <qwidget.h>
+#include "KWQWidget.h"
#ifdef __OBJC__
@class NSWindow;
diff --git a/WebCore/kwq/KWQWindowWidget.mm b/WebCore/kwq/KWQWindowWidget.mm
index 21ca14f..22daf54 100644
--- a/WebCore/kwq/KWQWindowWidget.mm
+++ b/WebCore/kwq/KWQWindowWidget.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <KWQWindowWidget.h>
+#import "KWQWindowWidget.h"
#import <Cocoa/Cocoa.h>
diff --git a/WebCore/kwq/KWQXml.mm b/WebCore/kwq/KWQXml.mm
index bc33fbe..82a1d31 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.
*/
-#import <qxml.h>
+#import "KWQXml.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
-#import <qstring.h>
+#import "KWQString.h"
QString QXmlAttributes::value(const QString &) const
{
diff --git a/WebCore/kwq/KWQbrowserinterface.mm b/WebCore/kwq/KWQbrowserinterface.mm
deleted file mode 100644
index c355968..0000000
--- a/WebCore/kwq/KWQbrowserinterface.mm
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import <browserinterface.h>
-
-#import <KWQLogging.h>
-
-namespace KParts {
-
-void BrowserInterface::callMethod(const char *name, const QVariant &argument)
-{
- ERROR("not yet implemented");
-}
-
-} // namespace KParts
-
-
-
diff --git a/WebCore/kwq/KWQsignals.mm b/WebCore/kwq/KWQsignals.mm
deleted file mode 100644
index 56e202d..0000000
--- a/WebCore/kwq/KWQsignals.mm
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-#import <khtmlview.h>
-#import <loader.h>
-#import <xml_tokenizer.h>
-
-void KHTMLView::cleared() { }
-
-void khtml::Loader::requestDone(khtml::DocLoader *, khtml::CachedObject *) { }
-void khtml::Loader::requestFailed(khtml::DocLoader *, khtml::CachedObject *) { }
-
-Tokenizer::Tokenizer()
- : m_finishedParsing(this, SIGNAL(finishedParsing()))
-{
-}
-
-void Tokenizer::finishedParsing()
-{
- m_finishedParsing.call();
-}
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 00f0676..6f255a9 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -23,34 +23,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCoreBridge.h>
-
-#import <dom_node.h>
-#import <dom_docimpl.h>
-#import <dom_nodeimpl.h>
-#import <khtml_part.h>
-#import <khtmlview.h>
-#import <render_frames.h>
-#import <render_image.h>
-#import <render_object.h>
-#import <render_root.h>
-#import <render_style.h>
-
-#import <qfont.h>
-
-#import <KWQAssertions.h>
-#import <html/html_documentimpl.h>
-#import <xml/dom_nodeimpl.h>
-#import <htmlattrs.h>
-#import <htmltags.h>
-#import <csshelper.h>
-#import <KWQDOMNode.h>
-#import <WebCoreImageRenderer.h>
-#import <WebCoreTextRendererFactory.h>
-#import <KWQCharsets.h>
-#import <qframe.h>
-
-#import <WebCoreDOMPrivate.h>
+#import "WebCoreBridge.h"
+
+#import "dom_node.h"
+#import "dom_docimpl.h"
+#import "dom_nodeimpl.h"
+#import "khtml_part.h"
+#import "khtmlview.h"
+#import "render_frames.h"
+#import "render_image.h"
+#import "render_object.h"
+#import "render_root.h"
+#import "render_style.h"
+
+#import "KWQFont.h"
+
+#import "KWQAssertions.h"
+#import "html_documentimpl.h"
+#import "dom_nodeimpl.h"
+#import "htmlattrs.h"
+#import "htmltags.h"
+#import "csshelper.h"
+#import "KWQDOMNode.h"
+#import "WebCoreImageRenderer.h"
+#import "WebCoreTextRendererFactory.h"
+#import "KWQCharsets.h"
+#import "KWQFrame.h"
+
+#import "WebCoreDOMPrivate.h"
using DOM::DocumentImpl;
@@ -66,7 +66,7 @@ using khtml::RenderPart;
[super init];
part = new KHTMLPart;
- part->impl->setBridge(self);
+ part->kwq->setBridge(self);
return self;
}
@@ -78,7 +78,7 @@ using khtml::RenderPart;
if (renderPart) {
renderPart->deref();
}
- part->impl->setBridge(nil);
+ part->kwq->setBridge(nil);
part->deref();
[super dealloc];
@@ -115,12 +115,12 @@ using khtml::RenderPart;
- (void)addData:(NSData *)data withEncoding:(NSString *)encoding
{
- part->impl->slotData(encoding, NO, (const char *)[data bytes], [data length], NO);
+ part->kwq->slotData(encoding, NO, (const char *)[data bytes], [data length], NO);
}
- (void)addData:(NSData *)data withOverrideEncoding:(NSString *)encoding
{
- part->impl->slotData(encoding, YES, (const char *)[data bytes], [data length], NO);
+ part->kwq->slotData(encoding, YES, (const char *)[data bytes], [data length], NO);
}
- (void)closeURL
@@ -130,7 +130,7 @@ using khtml::RenderPart;
- (void)saveDocumentState
{
- DocumentImpl *doc = part->impl->document();
+ DocumentImpl *doc = part->kwq->document();
if (doc != 0){
QStringList list = doc->docState();
NSMutableArray *documentState = [[[NSMutableArray alloc] init] autorelease];
@@ -145,7 +145,7 @@ using khtml::RenderPart;
- (void)restoreDocumentState
{
- DocumentImpl *doc = part->impl->document();
+ DocumentImpl *doc = part->kwq->document();
if (doc != 0){
NSArray *documentState = [self documentState];
@@ -171,7 +171,7 @@ using khtml::RenderPart;
[self removeFromFrame];
KHTMLView *kview = new KHTMLView(part, 0);
- part->impl->setView(kview);
+ part->kwq->setView(kview);
kview->setView(view);
if (mw >= 0)
@@ -199,7 +199,7 @@ using khtml::RenderPart;
- (BOOL)isFrameSet
{
- return part->impl->isFrameSet();
+ return part->kwq->isFrameSet();
}
- (void)reapplyStyles
@@ -209,12 +209,12 @@ using khtml::RenderPart;
- (void)forceLayout
{
- part->impl->forceLayout();
+ part->kwq->forceLayout();
}
- (void)drawRect:(NSRect)rect withPainter:(QPainter *)p
{
- part->impl->paint(p, QRect(rect));
+ part->kwq->paint(p, QRect(rect));
}
- (void)drawRect:(NSRect)rect
@@ -251,7 +251,7 @@ using khtml::RenderPart;
- (NSObject *)copyDOMTree:(id <WebCoreDOMTreeCopier>)copier
{
- DocumentImpl *doc = part->impl->document();
+ DocumentImpl *doc = part->kwq->document();
if (!doc) {
return nil;
}
@@ -287,7 +287,7 @@ using khtml::RenderPart;
- (NSObject *)copyRenderTree:(id <WebCoreRenderTreeCopier>)copier
{
- RenderObject *renderer = part->impl->renderer();
+ RenderObject *renderer = part->kwq->renderer();
if (!renderer) {
return nil;
}
@@ -297,21 +297,21 @@ using khtml::RenderPart;
- (void)removeFromFrame
{
if (bridgeOwnsKHTMLView) {
- delete part->impl->view();
+ delete part->kwq->view();
}
bridgeOwnsKHTMLView = NO;
}
- (void)installInFrame:(NSView *)view
{
- part->impl->view()->setView(view);
+ part->kwq->view()->setView(view);
// If this isn't the main frame, it must have a render part set, or it
// won't ever get installed in the view hierarchy.
ASSERT(self == [self mainFrame] || renderPart != nil);
if (renderPart) {
- renderPart->setWidget(part->impl->view());
+ renderPart->setWidget(part->kwq->view());
// Now that the render part is holding the widget, we don't own it any more.
bridgeOwnsKHTMLView = NO;
}
@@ -357,7 +357,7 @@ using khtml::RenderPart;
}
state |= [self stateForEvent:event];
- if (part->impl->view()) {
+ if (part->kwq->view()) {
int clickCount = [event clickCount];
// Our behavior here is a little different that Qt. Qt always sends
@@ -367,11 +367,11 @@ using khtml::RenderPart;
// viewportMouseDoubleClickEvent.
if (clickCount > 0 && clickCount % 2 == 0) {
QMouseEvent doubleClickEvent(QEvent::MouseButtonDblClick, QPoint(p), button, state, clickCount);
- part->impl->view()->viewportMouseDoubleClickEvent(&doubleClickEvent);
+ part->kwq->view()->viewportMouseDoubleClickEvent(&doubleClickEvent);
}
else {
QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(p), button, state, clickCount);
- part->impl->view()->viewportMouseReleaseEvent(&releaseEvent);
+ part->kwq->view()->viewportMouseReleaseEvent(&releaseEvent);
}
}
}
@@ -397,9 +397,9 @@ using khtml::RenderPart;
}
state |= [self stateForEvent:event];
- if (part->impl->view()) {
+ if (part->kwq->view()) {
QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint(p), button, state, [event clickCount]);
- part->impl->view()->viewportMousePressEvent(&kEvent);
+ part->kwq->view()->viewportMousePressEvent(&kEvent);
}
}
@@ -408,8 +408,8 @@ using khtml::RenderPart;
NSPoint p = [event locationInWindow];
QMouseEvent kEvent(QEvent::MouseMove, QPoint(p), 0, [self stateForEvent:event]);
- if (part->impl->view()) {
- part->impl->view()->viewportMouseMoveEvent(&kEvent);
+ if (part->kwq->view()) {
+ part->kwq->view()->viewportMouseMoveEvent(&kEvent);
}
}
@@ -418,19 +418,19 @@ using khtml::RenderPart;
NSPoint p = [event locationInWindow];
QMouseEvent kEvent(QEvent::MouseMove, QPoint(p), Qt::LeftButton, Qt::LeftButton);
- if (part->impl->view()) {
- part->impl->view()->viewportMouseMoveEvent(&kEvent);
+ if (part->kwq->view()) {
+ part->kwq->view()->viewportMouseMoveEvent(&kEvent);
}
}
- (NSURL *)completeURLForDOMString:(const DOMString &)s
{
- return KURL(part->impl->document()->completeURL(s.string())).getNSURL();
+ return KURL(part->kwq->document()->completeURL(s.string())).getNSURL();
}
- (NSDictionary *)elementAtPoint:(NSPoint)point
{
- RenderObject *renderer = part->impl->renderer();
+ RenderObject *renderer = part->kwq->renderer();
if (!renderer) {
return nil;
}
@@ -464,8 +464,8 @@ using khtml::RenderPart;
}
DOMString target = e->getAttribute(ATTR_TARGET);
- if (target.isEmpty() && part->impl->document()) {
- target = part->impl->document()->baseTarget();
+ if (target.isEmpty() && part->kwq->document()) {
+ target = part->kwq->document()->baseTarget();
}
if (!target.isEmpty()) {
[elementInfo setObject:target.string().getNSString() forKey:WebCoreElementLinkTarget];
@@ -504,7 +504,7 @@ using khtml::RenderPart;
- (void)jumpToSelection
{
- part->impl->jumpToSelection();
+ part->kwq->jumpToSelection();
}
- (void)setTextSizeMultiplier:(float)multiplier
@@ -526,28 +526,28 @@ using khtml::RenderPart;
- (NSView *)nextKeyView
{
- return part->impl->nextKeyView(0, KWQSelectingNext);
+ return part->kwq->nextKeyView(0, KWQSelectingNext);
}
- (NSView *)previousKeyView
{
- return part->impl->nextKeyView(0, KWQSelectingPrevious);
+ return part->kwq->nextKeyView(0, KWQSelectingPrevious);
}
- (NSView *)nextKeyViewInsideWebViews
{
- return part->impl->nextKeyViewInFrameHierarchy(0, KWQSelectingNext);
+ return part->kwq->nextKeyViewInFrameHierarchy(0, KWQSelectingNext);
}
- (NSView *)previousKeyViewInsideWebViews
{
- return part->impl->nextKeyViewInFrameHierarchy(0, KWQSelectingPrevious);
+ return part->kwq->nextKeyViewInFrameHierarchy(0, KWQSelectingPrevious);
}
- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string
{
// FIXME: We want to execute it even without a document, no?
- if (!part->impl->document()) {
+ if (!part->kwq->document()) {
return nil;
}
return part->executeScript(QString::fromNSString(string)).asString().getNSString();
@@ -555,14 +555,14 @@ using khtml::RenderPart;
- (id<WebDOMDocument>)DOMDocument
{
- DocumentImpl *doc = part->impl->document();
+ DocumentImpl *doc = part->kwq->document();
printf ("(id<WebDOMDocument>)DOMDocument doc = %p, lastChild = %p\n", doc, doc->lastChild());
return [WebCoreDOMDocument documentWithImpl:doc];
}
- (void)setSelectionFrom:(id<WebDOMNode>)start startOffset:(int)startOffset to:(id<WebDOMNode>)end endOffset:(int) endOffset
{
- DocumentImpl *doc = part->impl->document();
+ DocumentImpl *doc = part->kwq->document();
doc->setSelection ([(WebCoreDOMNode *)start impl], startOffset, [(WebCoreDOMNode *)end impl], endOffset);
}
@@ -734,7 +734,7 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
- (NSAttributedString *)selectedAttributedString
{
- return attributedString (part->impl->selectionStart(), part->impl->selectionStartOffset(), part->impl->selectionEnd(), part->impl->selectionEndOffset());
+ return attributedString (part->kwq->selectionStart(), part->kwq->selectionStartOffset(), part->kwq->selectionEnd(), part->kwq->selectionEndOffset());
}
- (NSAttributedString *)attributedStringFrom: (id<WebDOMNode>)startNode startOffset: (int)startOffset to: (id<WebDOMNode>)endNode endOffset: (int)endOffset
@@ -745,22 +745,22 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
- (id<WebDOMNode>)selectionStart
{
- return [WebCoreDOMNode nodeWithImpl: part->impl->selectionStart()];
+ return [WebCoreDOMNode nodeWithImpl: part->kwq->selectionStart()];
}
- (int)selectionStartOffset
{
- return part->impl->selectionStartOffset();
+ return part->kwq->selectionStartOffset();
}
- (id<WebDOMNode>)selectionEnd
{
- return [WebCoreDOMNode nodeWithImpl: part->impl->selectionEnd()];
+ return [WebCoreDOMNode nodeWithImpl: part->kwq->selectionEnd()];
}
- (int)selectionEndOffset
{
- return part->impl->selectionEndOffset();
+ return part->kwq->selectionEndOffset();
}
- (void)setContentType:(NSString*)contentType
@@ -787,14 +787,14 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
- (NSString *)referrer
{
- return part->impl->referrer().getNSString();
+ return part->kwq->referrer().getNSString();
}
- (int)frameBorderStyle
{
- if (part->impl->view()->frameStyle() & QFrame::Sunken)
+ if (part->kwq->view()->frameStyle() & QFrame::Sunken)
return SunkenFrameBorder;
- if (part->impl->view()->frameStyle() & QFrame::Plain)
+ if (part->kwq->view()->frameStyle() & QFrame::Plain)
return PlainFrameBorder;
return NoFrameBorder;
}
diff --git a/WebCore/kwq/WebCoreCache.mm b/WebCore/kwq/WebCoreCache.mm
index 5a52135..abdb26b 100644
--- a/WebCore/kwq/WebCoreCache.mm
+++ b/WebCore/kwq/WebCoreCache.mm
@@ -8,7 +8,7 @@
#import "WebCoreCache.h"
-#include <loader.h>
+#import "loader.h"
using khtml::Cache;
diff --git a/WebCore/kwq/WebCoreCookieAdapter.m b/WebCore/kwq/WebCoreCookieAdapter.m
index ad0b4c3..d0aa751 100644
--- a/WebCore/kwq/WebCoreCookieAdapter.m
+++ b/WebCore/kwq/WebCoreCookieAdapter.m
@@ -24,7 +24,7 @@
*/
#import "WebCoreCookieAdapter.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
@implementation WebCoreCookieAdapter
diff --git a/WebCore/kwq/WebCoreDOMDocument.mm b/WebCore/kwq/WebCoreDOMDocument.mm
index 4eb0145..d1e81cb 100644
--- a/WebCore/kwq/WebCoreDOMDocument.mm
+++ b/WebCore/kwq/WebCoreDOMDocument.mm
@@ -2,7 +2,7 @@
WebCoreDOMDocument.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#include "WebCoreDOMPrivate.h"
+#import "WebCoreDOMPrivate.h"
DOM::DOMImplementation DOM::DOMImplementationImpl::createInstance(DOM::DOMImplementationImpl *impl)
{
diff --git a/WebCore/kwq/WebCoreDOMPrivate.h b/WebCore/kwq/WebCoreDOMPrivate.h
index c8810f1..360be29 100644
--- a/WebCore/kwq/WebCoreDOMPrivate.h
+++ b/WebCore/kwq/WebCoreDOMPrivate.h
@@ -2,18 +2,19 @@
WebCoreDOMPrivate.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#include <dom/dom_element.h>
-#include <dom/dom_node.h>
-#include <dom/dom_string.h>
-#include <dom/dom_text.h>
-#include <dom/dom_xml.h>
-#include <xml/dom_textimpl.h>
-#include <xml/dom_xmlimpl.h>
-#include <xml/dom2_rangeimpl.h>
-#include <xml/dom2_eventsimpl.h>
-#include <xml/xml_tokenizer.h>
-#include <xml/dom_docimpl.h>
-#include <xml/dom_nodeimpl.h>
+
+#import "dom_element.h"
+#import "dom_node.h"
+#import "dom_string.h"
+#import "dom_text.h"
+#import "dom_xml.h"
+#import "dom_textimpl.h"
+#import "dom_xmlimpl.h"
+#import "dom2_rangeimpl.h"
+#import "dom2_eventsimpl.h"
+#import "xml_tokenizer.h"
+#import "dom_docimpl.h"
+#import "dom_nodeimpl.h"
#import "WebCoreDOM.h"
diff --git a/WebCore/kwq/WebCoreEncodings.mm b/WebCore/kwq/WebCoreEncodings.mm
index c699715..fddc393 100644
--- a/WebCore/kwq/WebCoreEncodings.mm
+++ b/WebCore/kwq/WebCoreEncodings.mm
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCore/WebCoreEncodings.h>
-#import <KWQCharsets.h>
+#import "WebCoreEncodings.h"
+#import "KWQCharsets.h"
@implementation WebCoreEncodings
diff --git a/WebCore/kwq/WebCoreHistory.m b/WebCore/kwq/WebCoreHistory.m
index e6eede4..e8199ff 100644
--- a/WebCore/kwq/WebCoreHistory.m
+++ b/WebCore/kwq/WebCoreHistory.m
@@ -25,7 +25,7 @@
#import <Foundation/Foundation.h>
-#import <WebCoreHistory.h>
+#import "WebCoreHistory.h"
@implementation WebCoreHistory
diff --git a/WebCore/kwq/WebCoreImageRendererFactory.m b/WebCore/kwq/WebCoreImageRendererFactory.m
index 620e5a7..f49c61c 100644
--- a/WebCore/kwq/WebCoreImageRendererFactory.m
+++ b/WebCore/kwq/WebCoreImageRendererFactory.m
@@ -24,7 +24,7 @@
*/
#import "WebCoreImageRendererFactory.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
@implementation WebCoreImageRendererFactory
diff --git a/WebCore/kwq/WebCoreSettings.mm b/WebCore/kwq/WebCoreSettings.mm
index cf8a080..f7d4651 100644
--- a/WebCore/kwq/WebCoreSettings.mm
+++ b/WebCore/kwq/WebCoreSettings.mm
@@ -25,7 +25,7 @@
#import "WebCoreSettings.h"
-#import "KWQKHTMLPartImpl.h"
+#import "KWQKHTMLPart.h"
#import "WebCoreBridge.h"
@implementation WebCoreSettings
@@ -53,7 +53,7 @@
- (void)_updateAllViews
{
- for (QPtrListIterator<KWQKHTMLPartImpl> it(KWQKHTMLPartImpl::instances()); it.current(); ++it) {
+ for (QPtrListIterator<KWQKHTMLPart> it(KWQKHTMLPart::instances()); it.current(); ++it) {
[it.current()->bridge() setNeedsReapplyStyles];
}
}
diff --git a/WebCore/kwq/WebCoreTextRendererFactory.m b/WebCore/kwq/WebCoreTextRendererFactory.m
index afcc664..fc9f793 100644
--- a/WebCore/kwq/WebCoreTextRendererFactory.m
+++ b/WebCore/kwq/WebCoreTextRendererFactory.m
@@ -24,7 +24,7 @@
*/
#import "WebCoreTextRendererFactory.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
@implementation WebCoreTextRendererFactory
diff --git a/WebCore/kwq/WebCoreTextRendererFactory.mm b/WebCore/kwq/WebCoreTextRendererFactory.mm
index afcc664..fc9f793 100644
--- a/WebCore/kwq/WebCoreTextRendererFactory.mm
+++ b/WebCore/kwq/WebCoreTextRendererFactory.mm
@@ -24,7 +24,7 @@
*/
#import "WebCoreTextRendererFactory.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
@implementation WebCoreTextRendererFactory
diff --git a/WebCore/kwq/WebCoreViewFactory.m b/WebCore/kwq/WebCoreViewFactory.m
index cafd930..affbdfc 100644
--- a/WebCore/kwq/WebCoreViewFactory.m
+++ b/WebCore/kwq/WebCoreViewFactory.m
@@ -24,7 +24,7 @@
*/
#import "WebCoreViewFactory.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
NSString *WebCoreFileButtonFilenameChanged = @"WebCoreFileButtonFilenameChanged";
diff --git a/WebCore/kwq/WebDOMDocument.h b/WebCore/kwq/WebDOMDocument.h
index 9530c5a..8c376ff 100644
--- a/WebCore/kwq/WebDOMDocument.h
+++ b/WebCore/kwq/WebDOMDocument.h
@@ -5,8 +5,6 @@
#import <Foundation/Foundation.h>
-#import <WebKit/WebDOMNode.h>
-
@protocol WebDOMAttr;
@protocol WebDOMComment;
@protocol WebDOMCDATASection;
diff --git a/WebCore/kwq/dcop/dcopclient.h b/WebCore/kwq/dcop/dcopclient.h
deleted file mode 100644
index fd3e6d0..0000000
--- a/WebCore/kwq/dcop/dcopclient.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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
- * 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 DCOPCLIENT_H_
-#define DCOPCLIENT_H_
-
-#include <qobject.h>
-#include <qcstring.h>
-
-class DCOPClient { };
-
-#endif
diff --git a/WebCore/kwq/kdecore/kapplication.h b/WebCore/kwq/kdecore/kapplication.h
deleted file mode 100644
index e83aebb..0000000
--- a/WebCore/kwq/kdecore/kapplication.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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 KAPP_H_
-#define KAPP_H_
-
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <dcopclient.h>
-#include <qapplication.h>
-#include <qpalette.h>
-#include <qregexp.h>
-
-class KApplication : public QApplication { };
-
-KApplication * const kapp = 0;
-
-#endif
diff --git a/WebCore/kwq/kdecore/kcharsets.h b/WebCore/kwq/kdecore/kcharsets.h
deleted file mode 100644
index 2a1e5cc..0000000
--- a/WebCore/kwq/kdecore/kcharsets.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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 KCHARSETS_H_
-#define KCHARSETS_H_
-
-#include <qfont.h>
-#include <qstring.h>
-
-class QTextCodec;
-
-class KCharsets {
-public:
- QTextCodec *codecForName(const QString &) const;
- QTextCodec *codecForName(const QString &, bool &) const;
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kconfig.h b/WebCore/kwq/kdecore/kconfig.h
deleted file mode 100644
index 531c93e..0000000
--- a/WebCore/kwq/kdecore/kconfig.h
+++ /dev/null
@@ -1,68 +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 KCONFIG_H_
-#define KCONFIG_H_
-
-#include <qstring.h>
-
-class QColor;
-class QStringList;
-
-class KWQKConfigImpl;
-
-class KConfig {
-public:
-
- KConfig(const QString &n, bool bReadOnly=false, bool bUseKDEGlobals = true);
- ~KConfig();
-
- void setGroup(const QString &pGroup);
-
- QString readEntry(const char *pKey, const QString& aDefault=QString::null) const;
-
- int readNumEntry(const char *pKey, int nDefault=0) const;
- unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault=0) const;
-
- bool readBoolEntry(const char *pKey, bool nDefault=0) const;
-
- QColor readColorEntry(const char *pKey, const QColor *pDefault=0L) const;
-
- // used only for form completions
- void writeEntry(const QString &pKey, const QStringList &rValue,
- char sep=',', bool bPersistent=true, bool bGlobal=false,
- bool bNLS=false);
- QStringList readListEntry(const QString &pKey, char sep=',') const;
-
-private:
-
- KConfig(const KConfig &);
- KConfig &operator=(const KConfig &);
-
- KWQKConfigImpl *impl;
-
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kdebug.h b/WebCore/kwq/kdecore/kdebug.h
deleted file mode 100644
index 272b50e..0000000
--- a/WebCore/kwq/kdecore/kdebug.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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
- * 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 KDEBUG_H_
-#define KDEBUG_H_
-
-#include <qstring.h>
-#include <qtextstream.h>
-
-class kdbgstream;
-
-typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
-
-class kdbgstream {
-public:
- kdbgstream(unsigned int area = 0, unsigned int level = 0, bool print = true) { }
-
- kdbgstream &operator<<(int) { return *this; }
- kdbgstream &operator<<(const char *) { return *this; }
- kdbgstream &operator<<(const void *) { return *this; }
- kdbgstream &operator<<(const QString &) { return *this; }
- kdbgstream &operator<<(const QCString &) { return *this; }
- kdbgstream &operator<<(KDBGFUNC) { return *this; }
-};
-
-inline kdbgstream &endl(kdbgstream &s) { return s; }
-
-inline kdbgstream kdDebug(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdWarning(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdWarning(bool cond, int area = 0) { return kdbgstream(); }
-inline kdbgstream kdError(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdError(bool cond, int area = 0) { return kdbgstream(); }
-inline kdbgstream kdFatal(int area = 0) { return kdbgstream(); }
-inline kdbgstream kdFatal(bool cond, int area = 0) { return kdbgstream(); }
-inline QString kdBacktrace() { return QString(); }
-
-#endif
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
deleted file mode 100644
index d87b506..0000000
--- a/WebCore/kwq/kdecore/kglobal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
- * 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 KGLOBAL_H_
-#define KGLOBAL_H_
-
-#include <qstring.h>
-#include <kinstance.h>
-
-class KCharsets;
-class KLocale;
-class KStandardDirs;
-class KConfig;
-
-#define kMin(a, b) ((a) < (b) ? (a) : (b))
-#define kMax(a, b) ((a) > (b) ? (a) : (b))
-
-class KGlobal {
-public:
- static KInstance *instance() { return 0; }
- static KCharsets *charsets() { return 0; }
- static KLocale *locale() { return 0; }
- static KStandardDirs *dirs() { return 0; }
- static KConfig *config();
-
- static const QString &staticQString(const QString &);
-
-private:
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kglobalsettings.h b/WebCore/kwq/kdecore/kglobalsettings.h
deleted file mode 100644
index 11ed0ed..0000000
--- a/WebCore/kwq/kdecore/kglobalsettings.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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 KGLOBALSETTINGS_H_
-#define KGLOBALSETTINGS_H_
-
-class QFont;
-
-class KGlobalSettings {
-public:
- static QFont generalFont();
- static QFont windowTitleFont();
- static QFont menuFont();
-
- static int contrast();
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kiconloader.h b/WebCore/kwq/kdecore/kiconloader.h
deleted file mode 100644
index 9759a23..0000000
--- a/WebCore/kwq/kdecore/kiconloader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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
- * 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 KICONLOADER_H_
-#define KICONLOADER_H_
-
-#include <qpixmap.h>
-#include <qstring.h>
-#include <kinstance.h>
-
-class KIcon {
-public:
- enum Context { FileSystem, Desktop };
- enum States { DefaultState, DisabledState };
-};
-
-class KIconLoader {
-public:
- QPixmap loadIcon(const QString &name, int group, int size=0, int state=KIcon::DefaultState) const;
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kinstance.h b/WebCore/kwq/kdecore/kinstance.h
deleted file mode 100644
index 9cd1360..0000000
--- a/WebCore/kwq/kdecore/kinstance.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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
- * 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 KINSTANCE_H_
-#define KINSTANCE_H_
-
-class KInstance { };
-
-#endif
diff --git a/WebCore/kwq/kdecore/klibloader.h b/WebCore/kwq/kdecore/klibloader.h
deleted file mode 100644
index f5e7453..0000000
--- a/WebCore/kwq/kdecore/klibloader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 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
- * 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.
- */
-
-#include <global.h>
-
-class KLibrary
-{
-public:
- void unload() { }
-};
diff --git a/WebCore/kwq/kdecore/klocale.h b/WebCore/kwq/kdecore/klocale.h
deleted file mode 100644
index 1cd7381..0000000
--- a/WebCore/kwq/kdecore/klocale.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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
- * 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 KLOCALE_H_
-#define KLOCALE_H_
-
-#include <qstringlist.h>
-
-QString inputElementAltText();
-QString resetButtonDefaultLabel();
-QString searchableIndexIntroduction();
-QString submitButtonDefaultLabel();
-
-class KLocale {
-public:
- static QString language();
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/ksimpleconfig.h b/WebCore/kwq/kdecore/ksimpleconfig.h
deleted file mode 100644
index c137bba..0000000
--- a/WebCore/kwq/kdecore/ksimpleconfig.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- * 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 KSIMPLECONFIG_H_
-#define KSIMPLECONFIG_H_
-
-#include <kconfig.h>
-#include <qstring.h>
-
-class KSimpleConfig : public KConfig {
-public:
- KSimpleConfig(const QString &, bool bReadOnly=false);
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kstandarddirs.h b/WebCore/kwq/kdecore/kstandarddirs.h
deleted file mode 100644
index 7bdc005..0000000
--- a/WebCore/kwq/kdecore/kstandarddirs.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include <kstddirs.h>
diff --git a/WebCore/kwq/kdecore/kstaticdeleter.h b/WebCore/kwq/kdecore/kstaticdeleter.h
deleted file mode 100644
index b81df6e..0000000
--- a/WebCore/kwq/kdecore/kstaticdeleter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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
- * 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 KSTATICDELETER_H_
-#define KSTATICDELETER_H_
-
-// We don't believe in freeing memory at exit time.
-// It just touches memory pages and slows down quitting.
-// All the users of this just free memory, so it's OK to not delete.
-
-template <class T> class KStaticDeleter {
-public:
- T *setObject(T *ptr, bool array = false) { return ptr; }
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kstddirs.h b/WebCore/kwq/kdecore/kstddirs.h
deleted file mode 100644
index da5cca7..0000000
--- a/WebCore/kwq/kdecore/kstddirs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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
- * 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 KSTDDIRS_H_
-#define KSTDDIRS_H_
-
-#include <qstring.h>
-#include <kglobal.h>
-
-QString locate(const char *type, const QString& filename,
- const KInstance* instance=KGlobal::instance());
-
-QString locateLocal(const char *type, const QString &filename,
- const KInstance *instance=KGlobal::instance());
-
-class KStandardDirs {
-public:
- static QString saveLocation(const char *, const QString &) { return 0; }
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kstringhandler.h b/WebCore/kwq/kdecore/kstringhandler.h
deleted file mode 100644
index 8c38334..0000000
--- a/WebCore/kwq/kdecore/kstringhandler.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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
- * 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 KSTRINGHANDLER_H_
-#define KSTRINGHANDLER_H_
-
-#include <qstring.h>
-
-class KStringHandler {
-public:
- static QString csqueeze(const QString &, uint maxlen = 40);
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kurl.h b/WebCore/kwq/kdecore/kurl.h
deleted file mode 100644
index 39f7b20..0000000
--- a/WebCore/kwq/kdecore/kurl.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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
- * 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 KURL_H_
-#define KURL_H_
-
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <KWQRefPtr.h>
-
-#ifdef __OBJC__
- at class NSURL;
-#else
-class NSURL;
-#endif
-
-class KURL {
-public:
- KURL();
- KURL(const char *, int encoding_hint=0);
- KURL(const KURL &, const QString &);
- KURL(const QString &, int encoding_hint=0);
-
- bool isEmpty() const { return urlString.isEmpty(); }
- bool isMalformed() const { return !m_isValid; }
- bool isValid() const { return m_isValid; }
- bool hasPath() const;
-
- QString canonicalURL() const;
- QString url() const { return urlString; }
- QString protocol() const;
- QString host() const;
- unsigned short int port() const;
- QString pass() const;
- QString user() const;
- QString ref() const;
- bool hasRef() const;
- QString query() const;
- QString path() const;
- QString htmlRef() const;
- QString encodedHtmlRef() const;
-
- void setProtocol(const QString &);
- void setHost(const QString &);
- void setPort(unsigned short int);
- void setRef(const QString &);
- void setQuery(const QString &, int encoding_hint=0);
- void setPath(const QString &);
-
- QString prettyURL(int trailing=0) const;
-
- NSURL *getNSURL() const;
-
- static QString decode_string(const QString &);
- static QString encode_string(const QString &);
-
- friend bool operator==(const KURL &, const KURL &);
-
-private:
- void parse(const char *url, const QString *originalString);
-
-#ifdef CONSTRUCT_CANONICAL_STRING
- QString _path() const;
- QString _user() const;
- QString _pass() const;
- QString _host() const;
-#endif
-
- QString urlString;
- bool m_isValid;
- int schemeEndPos;
- int userStartPos;
- int userEndPos;
- int passwordEndPos;
- int hostEndPos;
- int portEndPos;
- int pathEndPos;
- int queryEndPos;
- int fragmentEndPos;
-
- // True if both URLs are the same.
- friend bool urlcmp(const QString &URLA, const QString &URLB, bool ignoreTrailingSlash, bool ignoreRef);
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/kdecore/kwin.h
deleted file mode 100644
index c238d08..0000000
--- a/WebCore/kwq/kdecore/kwin.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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 KWIN_H_
-#define KWIN_H_
-
-#include <qrect.h>
-
-class KWin {
-public:
- struct Info {
- QRect geometry;
- };
-
- static Info info(long win);
-};
-
-#endif
diff --git a/WebCore/kwq/kdecore/kwinmodule.h b/WebCore/kwq/kdecore/kwinmodule.h
deleted file mode 100644
index 0e6d2e4..0000000
--- a/WebCore/kwq/kdecore/kwinmodule.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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
- * 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 KWINMODULE_H_
-#define KWINMODULE_H_
-
-#include <qobject.h>
-
-class KWinModule : public QObject {
-public:
- QRect workArea() const;
-};
-
-#endif
diff --git a/WebCore/kwq/kdeui/kaction.h b/WebCore/kwq/kdeui/kaction.h
deleted file mode 100644
index c2d4145..0000000
--- a/WebCore/kwq/kdeui/kaction.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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
- * 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 KACTION_H_
-#define KACTION_H_
-
-class KAction { };
-class KSelectAction { };
-
-#endif
diff --git a/WebCore/kwq/kdeui/kcombobox.h b/WebCore/kwq/kdeui/kcombobox.h
deleted file mode 100644
index df31902..0000000
--- a/WebCore/kwq/kdeui/kcombobox.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- * 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 KCOMBOBOX_H_
-#define KCOMBOBOX_H_
-
-#include <qcombobox.h>
-#include <KWQCompletion.h>
-
-class KComboBox : public QComboBox, public KCompletionBase {
-public:
- KComboBox(bool, QWidget *) { }
-};
-
-#endif
diff --git a/WebCore/kwq/kdeui/kcompletionbox.h b/WebCore/kwq/kdeui/kcompletionbox.h
deleted file mode 100644
index be9b58c..0000000
--- a/WebCore/kwq/kdeui/kcompletionbox.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 KCOMPLETIONBOX_H_
-#define KCOMPLETIONBOX_H_
-
-#include <klistbox.h>
-#include <kglobalsettings.h>
-
-class KCompletionBox : public KListBox {
-public:
- KCompletionBox(QWidget *parent) : KListBox(parent) { }
-};
-
-#endif
diff --git a/WebCore/kwq/kdeui/kcursor.h b/WebCore/kwq/kdeui/kcursor.h
deleted file mode 100644
index f81abfd..0000000
--- a/WebCore/kwq/kdeui/kcursor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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
- * 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 KCURSOR_H_
-#define KCURSOR_H_
-
-#include <qcursor.h>
-
-class KCursor {
-public:
-
- static void setAutoHideCursor(QWidget *w, bool enable);
-
- static QCursor arrowCursor();
- static QCursor crossCursor();
- static QCursor handCursor();
- static QCursor sizeAllCursor();
- static QCursor sizeHorCursor();
- static QCursor sizeVerCursor();
- static QCursor sizeBDiagCursor();
- static QCursor sizeFDiagCursor();
- static QCursor ibeamCursor();
- static QCursor waitCursor();
- static QCursor whatsThisCursor();
-
-};
-
-extern const QCursor &waitCursor;
-
-#endif
diff --git a/WebCore/kwq/kdeui/klineedit.h b/WebCore/kwq/kdeui/klineedit.h
deleted file mode 100644
index a198edf..0000000
--- a/WebCore/kwq/kdeui/klineedit.h
+++ /dev/null
@@ -1,43 +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 KLINEEDIT_H_
-#define KLINEEDIT_H_
-
-#include <qlineedit.h>
-#include <KWQCompletion.h>
-#include <kcompletionbox.h>
-
-class KLineEdit : public QLineEdit, public KCompletionBase {
-public:
- KLineEdit(QWidget *parent) { }
-
- void setContextMenuEnabled(bool showMenu) { }
- KCompletionBox *completionBox(bool create) { return 0; }
-
- int frameWidth() const { return 2; }
-};
-
-#endif
diff --git a/WebCore/kwq/kdeui/klistbox.h b/WebCore/kwq/kdeui/klistbox.h
deleted file mode 100644
index e7fd341..0000000
--- a/WebCore/kwq/kdeui/klistbox.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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
- * 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 KLISTBOX_H_
-#define KLISTBOX_H_
-
-#include <KWQListBox.h>
-
-class KListBox : public QListBox {
-public:
- KListBox(QWidget *parent) : QListBox(parent) { }
-};
-
-#endif
diff --git a/WebCore/kwq/kfile/kfiledialog.h b/WebCore/kwq/kfile/kfiledialog.h
deleted file mode 100644
index 101b15e..0000000
--- a/WebCore/kwq/kfile/kfiledialog.h
+++ /dev/null
@@ -1,39 +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 KFILEDIALOG_H_
-#define KFILEDIALOG_H_
-
-#include <qstring.h>
-#include <qwidget.h>
-
-class KFileDialog {
-public:
- static QString getOpenFileName(const QString &startDir=QString::null,
- const QString &filter=QString::null, QWidget *parent=0,
- const QString &caption=QString::null);
-};
-
-#endif
diff --git a/WebCore/kwq/khtml/java/kjavaappletcontext.h b/WebCore/kwq/khtml/java/kjavaappletcontext.h
deleted file mode 100644
index a12f02e..0000000
--- a/WebCore/kwq/khtml/java/kjavaappletcontext.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 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
- * 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 KJAVAAPPLETCONTEXT_H
-#define KJAVAAPPLETCONTEXT_H
-
-#include <qobject.h>
-#include "khtml_part.h"
-
-class DCOPObject;
-
-typedef enum { } JType;
-
-class KJavaAppletContext : public QObject
-{
-public:
- KJavaAppletContext(DCOPObject* = 0, KHTMLPart *p = 0) {m_part = p;}
- KHTMLPart *part(){ return m_part; };
-private:
- KHTMLPart *m_part;
-};
-
-#endif
diff --git a/WebCore/kwq/khtml/java/kjavaappletwidget.h b/WebCore/kwq/khtml/java/kjavaappletwidget.h
deleted file mode 100644
index 5cb12d8..0000000
--- a/WebCore/kwq/khtml/java/kjavaappletwidget.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 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
- * 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.
- */
-
-#include <qwidget.h>
-#include <qmap.h>
-#include <qstring.h>
-
-class KJavaAppletContext;
-class KJavaAppletWidget;
-
-#ifdef __OBJC__
- at class NSURL;
- at class NSMutableDictionary;
-#else
-class NSURL;
-class NSMutableDictionary;
-#endif
-
-class KJavaApplet
-{
-public:
- KJavaApplet(KJavaAppletWidget &widget) : m_widget(widget) { }
-
- void setAppletClass(const QString &) { }
- void setAppletName(const QString &) { }
- void setArchives(const QString &) { }
- void setBaseURL(const QString &);
- void setCodeBase(const QString &) { }
-
- void setParameter(const QString &, const QString &);
-
-private:
- KJavaAppletWidget &m_widget;
-};
-
-class KJavaAppletWidget : public QWidget
-{
-public:
- KJavaAppletWidget(KJavaAppletContext *, QWidget *);
- ~KJavaAppletWidget();
-
- void processArguments(const QMap<QString, QString>&);
-
- KJavaApplet *applet() { return &m_applet; }
-
- void setBaseURL(const QString &);
- void setParameter(const QString &, const QString &);
-
- void showApplet();
-
-private:
- KJavaApplet m_applet;
- KJavaAppletContext *m_context;
- NSURL *m_baseURL;
- NSMutableDictionary *m_parameters;
-};
-
-inline void KJavaApplet::setBaseURL(const QString &URL) { m_widget.setBaseURL(URL); }
-inline void KJavaApplet::setParameter(const QString &name, const QString &value) { m_widget.setParameter(name, value); }
diff --git a/WebCore/kwq/khtml/khtml_ext.h b/WebCore/kwq/khtml/khtml_ext.h
deleted file mode 100644
index 262b2ef..0000000
--- a/WebCore/kwq/khtml/khtml_ext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 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
- * 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.
- */
-
-#include <browserextension.h>
-
-class QWidget;
-class KHTMLPart;
-
-class KHTMLPartBrowserExtension : public KParts::BrowserExtension {
-public:
- KHTMLPartBrowserExtension(KHTMLPart *);
- void editableWidgetFocused(QWidget *) { }
- void editableWidgetBlurred(QWidget *) { }
- void setLocationBarURL(const QString &) { }
-
- virtual void openURLRequest(const KURL &,
- const KParts::URLArgs &args = KParts::URLArgs());
- virtual void openURLNotify();
-
- virtual void createNewWindow(const KURL &url,
- const KParts::URLArgs &urlArgs = KParts::URLArgs());
- virtual void createNewWindow(const KURL &url,
- const KParts::URLArgs &urlArgs,
- const KParts::WindowArgs &winArgs,
- KParts::ReadOnlyPart *&part);
-
- virtual void setIconURL(const KURL &url);
- virtual void setTypedIconURL(const KURL &url, const QString &type);
-
-private:
- void createNewWindow(const KURL &url,
- const KParts::URLArgs &urlArgs,
- const KParts::WindowArgs &winArgs,
- KParts::ReadOnlyPart **part);
-
- KHTMLPart *m_part;
-};
-
-class KHTMLPartBrowserHostExtension {
-public:
- KHTMLPartBrowserHostExtension(KHTMLPart *) { }
-};
-
-class KHTMLZoomFactorAction {
-public:
- void setEnabled(bool) { }
-};
diff --git a/WebCore/kwq/khtml/khtml_factory.h b/WebCore/kwq/khtml/khtml_factory.h
deleted file mode 100644
index 4e87beb..0000000
--- a/WebCore/kwq/khtml/khtml_factory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
- * 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 __khtml_factory_h__
-#define __khtml_factory_h__
-
-#include <khtml_part.h>
-#include <factory.h>
-#include <historyprovider.h>
-
-class KInstance;
-class KHTMLPart;
-class KHTMLSettings;
-
-class KHTMLFactory
-{
-public:
- static KInstance *instance();
-
- static KHTMLSettings *defaultHTMLSettings();
-
- // list of visited URLs
- static KParts::HistoryProvider *vLinks() {
- return KParts::HistoryProvider::self();
- }
-
- static void registerPart(KHTMLPart *) { }
- static void deregisterPart(KHTMLPart *) { }
-};
-
-#endif
diff --git a/WebCore/kwq/khtml/khtml_find.h b/WebCore/kwq/khtml/khtml_find.h
deleted file mode 100644
index a90715c..0000000
--- a/WebCore/kwq/khtml/khtml_find.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 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
- * 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.
- */
-
-class KHTMLFind;
diff --git a/WebCore/kwq/khtml/khtml_pagecache.h b/WebCore/kwq/khtml/khtml_pagecache.h
deleted file mode 100644
index 0c47b64..0000000
--- a/WebCore/kwq/khtml/khtml_pagecache.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 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
- * 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 KHTML_PAGECACHE_H_
-#define KHTML_PAGECACHE_H_
-
-#include <qcstring.h>
-
-class QObject;
-
-class KHTMLPageCache
-{
-public:
- static KHTMLPageCache *self() { return 0; }
-
- long createCacheEntry() { return 0; }
- void addData(long, const QByteArray &) { }
- void cancelEntry(long) { }
- void endData(long) { }
-
- bool isValid(long) { return false; }
-
- void fetchData(long, QObject *, const char *) { }
- void cancelFetch(QObject *) { }
-};
-
-#endif
diff --git a/WebCore/kwq/khtml/khtml_settings.h b/WebCore/kwq/khtml/khtml_settings.h
deleted file mode 100644
index 7b96a5d..0000000
--- a/WebCore/kwq/khtml/khtml_settings.h
+++ /dev/null
@@ -1,83 +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 KHTML_SETTINGS_H_
-#define KHTML_SETTINGS_H_
-
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfont.h>
-#include <qmap.h>
-
-class KHTMLSettings
-{
-public:
- enum KAnimationAdvice {
- KAnimationDisabled,
- KAnimationLoopOnce,
- KAnimationEnabled
- };
-
- void init() { }
-
- // Font settings
- QString stdFontName() const;
- QString fixedFontName() const;
- QString serifFontName() const;
- QString sansSerifFontName() const;
- QString cursiveFontName() const;
- QString fantasyFontName() const;
-
- void setStdFontName(const QString &) { }
- void setFixedFontName(const QString &) { }
-
- QString settingsToCSS() const;
-
- const QString &encoding() const;
-
- int minFontSize() const;
- int mediumFontSize() const;
- int mediumFixedFontSize() const;
-
- bool changeCursor() const;
-
- bool isFormCompletionEnabled() const;
- int maxFormCompletionItems() const;
-
- bool autoLoadImages() const;
- KAnimationAdvice showAnimations() const;
-
- bool isJavaScriptEnabled() const;
- bool isJavaScriptEnabled(const QString &host) const;
- bool isJavaScriptDebugEnabled() const;
- bool isJavaEnabled() const;
- bool isJavaEnabled(const QString &host) const;
- bool isPluginsEnabled() const;
- bool isPluginsEnabled(const QString &host) const;
-
- QString userStyleSheet() const;
-};
-
-#endif
diff --git a/WebCore/kwq/kio/global.h b/WebCore/kwq/kio/global.h
deleted file mode 100644
index 3bac1ba..0000000
--- a/WebCore/kwq/kio/global.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- * 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 KIO_GLOBAL_H_
-#define KIO_GLOBAL_H_
-
-#include <qstring.h>
-#include <qmap.h>
-
-namespace KIO {
-
- enum CacheControl
- {
- CC_Cache,
- CC_Verify,
- CC_Refresh,
- CC_Reload
- };
-
- typedef QMap<QString, QString> MetaData;
-
- inline QString getCacheControlString(CacheControl) { return QString::null; }
-
-}
-
-#endif /* KIO_GLOBAL_H_ */
diff --git a/WebCore/kwq/kio/job.h b/WebCore/kwq/kio/job.h
deleted file mode 100644
index 6960730..0000000
--- a/WebCore/kwq/kio/job.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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
- * 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 JOB_H_
-#define JOB_H_
-
-#include <kurl.h>
-#include <jobclasses.h>
-
-// for time_t
-#include <sys/types.h>
-
-namespace KIO {
-
-void http_update_cache(const KURL &, bool, time_t);
-
-inline TransferJob *get(const KURL &url, bool reload = false, bool showProgressInfo = true)
- { return new TransferJob(url, reload, showProgressInfo); }
-
-inline TransferJob *http_post(const KURL& url, const QByteArray &postData, bool showProgressInfo = true)
- { return new TransferJob(url, postData, showProgressInfo); }
-
-} // namespace KIO
-
-#endif
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
deleted file mode 100644
index 0c2cc22..0000000
--- a/WebCore/kwq/kio/jobclasses.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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
- * 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 JOBCLASSES_H_
-#define JOBCLASSES_H_
-
-#include <qmap.h>
-#include <qobject.h>
-#include <qstring.h>
-
-#include <kurl.h>
-
-#ifdef __OBJC__
- at protocol WebCoreResourceHandle;
-typedef id <WebCoreResourceHandle> WebCoreResourceHandlePtr;
-#else
-class WebCoreResourceHandle;
-typedef WebCoreResourceHandle *WebCoreResourceHandlePtr;
-#endif
-
-namespace KIO {
-
-class TransferJobPrivate;
-
-class Job : public QObject {
-public:
- virtual int error() const = 0;
- virtual QString errorText() const = 0;
- virtual void kill() = 0;
-};
-
-class TransferJob : public Job {
-public:
- TransferJob(const KURL &, bool reload = false, bool showProgressInfo = true);
- TransferJob(const KURL &, const QByteArray &postData, bool showProgressInfo = true);
- ~TransferJob();
-
- int error() const;
- void setError(int);
- QString errorText() const;
- bool isErrorPage() const;
- QString queryMetaData(const QString &key) const;
- void addMetaData(const QString &key, const QString &value);
- void addMetaData(const QMap<QString, QString> &value);
- void kill();
-
- void setHandle(WebCoreResourceHandlePtr);
- WebCoreResourceHandlePtr handle() const;
-
- KURL url() const;
-
-private:
- TransferJobPrivate *d;
-};
-
-} // namespace KIO
-
-#endif
diff --git a/WebCore/kwq/kio/kfileitem.h b/WebCore/kwq/kio/kfileitem.h
deleted file mode 100644
index 5661937..0000000
--- a/WebCore/kwq/kio/kfileitem.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- * 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 KFILEITEM_H_
-#define KFILEITEM_H_
-
-#include <netaccess.h>
-
-class KFileItem {
-public:
- KFileItem(const KIO::UDSEntry &, const KURL &, bool, bool);
- bool isDir() const;
-};
-
-#endif
diff --git a/WebCore/kwq/kio/kimageio.h b/WebCore/kwq/kio/kimageio.h
deleted file mode 100644
index 815a588..0000000
--- a/WebCore/kwq/kio/kimageio.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * 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 KIMAGEIO_H_
-#define KIMAGEIO_H_
-
-#include <qstringlist.h>
-
-class KImageIO {
-public:
- enum Mode { Reading };
-
- static void registerFormats() { }
- static QStringList mimeTypes(Mode) { return QStringList(); }
-};
-
-#endif
diff --git a/WebCore/kwq/kio/kmimetype.h b/WebCore/kwq/kio/kmimetype.h
deleted file mode 100644
index fc07e46..0000000
--- a/WebCore/kwq/kio/kmimetype.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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
- * 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 KMIMETYPE_H_
-#define KMIMETYPE_H_
-
-#include <kglobal.h>
-
-#include <kurl.h>
-#include <sys/types.h>
-#include <qstring.h>
-
-template<class T> class KSharedPtr {
-public:
- KSharedPtr() { object = 0; }
- T *operator->() { return object; }
-
-private:
- T *object;
-};
-
-class KMimeType {
-public:
- typedef KSharedPtr<KMimeType> Ptr;
-
- static Ptr findByURL(const KURL &, mode_t=0, bool=false, bool=false);
- static Ptr mimeType(QString serviceType);
- static QString defaultMimeType();
-
- ~KMimeType();
-
- QString name() const;
- QString comment() const;
-};
-
-#endif
diff --git a/WebCore/kwq/kio/kssl/ksslkeygen.h b/WebCore/kwq/kio/kssl/ksslkeygen.h
deleted file mode 100644
index a90b6cf..0000000
--- a/WebCore/kwq/kio/kssl/ksslkeygen.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 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
- * 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 KSSLKEYGEN_H_
-#define KSSLKEYGEN_H_
-
-#include <qstringlist.h>
-
-class QDialog
-{
-public:
- enum DialogCode { Accepted, Rejected };
-};
-
-class KSSLKeyGen
-{
-public:
- static QStringList supportedKeySizes() { return QStringList(); }
- KSSLKeyGen(QWidget *, const char *, bool) { }
- void setKeySize(int) { }
- int exec() { return QDialog::Rejected; }
-};
-
-#endif
diff --git a/WebCore/kwq/kio/netaccess.h b/WebCore/kwq/kio/netaccess.h
deleted file mode 100644
index abf2b49..0000000
--- a/WebCore/kwq/kio/netaccess.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- * 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 NETACCESS_H_
-#define NETACCESS_H_
-
-#include <qvaluelist.h>
-#include <kurl.h>
-
-namespace KIO {
-
-class UDSAtom { };
-
-typedef QValueList<UDSAtom> UDSEntry;
-
-class NetAccess {
-public:
- static bool stat(const KURL &, KIO::UDSEntry &);
- static QString lastErrorString();
- static bool download(const KURL &, QString &);
- static void removeTempFile(const QString &);
-};
-
-}
-
-#endif
diff --git a/WebCore/kwq/kparts/browserextension.h b/WebCore/kwq/kparts/browserextension.h
deleted file mode 100644
index ee29cad..0000000
--- a/WebCore/kwq/kparts/browserextension.h
+++ /dev/null
@@ -1,124 +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 BROWSEREXTENSION_H_
-#define BROWSEREXTENSION_H_
-
-#include <qevent.h>
-#include <qmap.h>
-#include <qpoint.h>
-
-#include <kurl.h>
-
-#include "part.h"
-#include "browserinterface.h"
-
-class KXMLGUIClient { };
-
-namespace KParts {
-
-struct URLArgs {
-
- QString frameName;
- QByteArray postData;
- bool reload;
- QString serviceType;
- int xOffset;
- int yOffset;
-
- URLArgs() : reload(false), xOffset(0), yOffset(0), m_doPost(false) { }
-
- QString contentType() const { return m_contentType; }
- void setContentType(const QString &t) { m_contentType = t; }
-
- bool doPost() const { return m_doPost; }
- void setDoPost(bool post) { m_doPost = post; }
-
- bool lockHistory() const { return m_lockHistory; }
- void setLockHistory(bool lock) { m_lockHistory = lock; }
-
- QMap<QString, QString> &metaData() { return m_metadata; }
- const QMap<QString, QString> &metaData() const { return m_metadata; }
-
-private:
- QString m_contentType;
- bool m_doPost;
- bool m_lockHistory;
- QMap<QString, QString> m_metadata;
-
-};
-
-struct WindowArgs {
-
- int x;
- int y;
- int width;
- int height;
- bool menuBarVisible;
- bool statusBarVisible;
- bool toolBarsVisible;
- bool scrollbarsVisible;
- bool resizable;
- bool fullscreen;
- bool xSet;
- bool ySet;
- bool widthSet;
- bool heightSet;
-
- WindowArgs() : x(0), y(0), width(0), height(0), menuBarVisible(false), statusBarVisible(true), toolBarsVisible(true), scrollbarsVisible(true), resizable(true), fullscreen(true), xSet(false), ySet(false), widthSet(false), heightSet(false) { }
-
-};
-
-class BrowserExtension : public QObject {
-public:
- BrowserExtension() { }
- BrowserInterface *browserInterface() const { return 0; }
-
- virtual void openURLRequest(const KURL &, const KParts::URLArgs &args = KParts::URLArgs()) = 0;
- virtual void openURLNotify() = 0;
-
- virtual void createNewWindow(const KURL &url,
- const KParts::URLArgs &urlArgs = KParts::URLArgs()) = 0;
-
- virtual void createNewWindow(const KURL &url,
- const KParts::URLArgs &urlArgs,
- const KParts::WindowArgs &winArgs,
- KParts::ReadOnlyPart *&part) = 0;
-
- virtual void setIconURL(const KURL &url) = 0;
- virtual void setTypedIconURL(const KURL &url, const QString &type) = 0;
-
- void setURLArgs(const KParts::URLArgs &args) { m_args = args; }
- KParts::URLArgs urlArgs() const { return m_args; }
-
-private:
- KParts::URLArgs m_args;
-};
-
-class BrowserHostExtension : public QObject { };
-
-} // namespace KParts
-
-#endif
diff --git a/WebCore/kwq/kparts/browserinterface.h b/WebCore/kwq/kparts/browserinterface.h
deleted file mode 100644
index 8746784..0000000
--- a/WebCore/kwq/kparts/browserinterface.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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
- * 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 BROWSERINTERFACE_H_
-#define BROWSERINTERFACE_H_
-
-#include <qobject.h>
-#include <qvariant.h>
-
-namespace KParts {
-
-class BrowserInterface : public QObject {
-public:
- void callMethod(const char *name, const QVariant &argument);
-};
-
-} // namespace KParts
-
-#endif
diff --git a/WebCore/kwq/kparts/event.h b/WebCore/kwq/kparts/event.h
deleted file mode 100644
index d4110e0..0000000
--- a/WebCore/kwq/kparts/event.h
+++ /dev/null
@@ -1,45 +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 EVENT_H_
-#define EVENT_H_
-
-#include <qevent.h>
-
-class QPainter;
-
-namespace KParts {
-
-class Event : public QCustomEvent {
-public:
- static bool test(const QEvent *);
- static bool test(const QEvent *, const char *);
-
- Event(const char *);
-};
-
-} // namespace KParts
-
-#endif
diff --git a/WebCore/kwq/kparts/factory.h b/WebCore/kwq/kparts/factory.h
deleted file mode 100644
index 5a85674..0000000
--- a/WebCore/kwq/kparts/factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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
- * 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 FACTORY_H_
-#define FACTORY_H_
-
-#include <part.h>
-
-namespace KParts {
- class Factory;
-}
-
-#endif
-
diff --git a/WebCore/kwq/kparts/historyprovider.h b/WebCore/kwq/kparts/historyprovider.h
deleted file mode 100644
index 799cd19..0000000
--- a/WebCore/kwq/kparts/historyprovider.h
+++ /dev/null
@@ -1,43 +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 HISTORYPROVIDER_H_
-#define HISTORYPROVIDER_H_
-
-#include <qobject.h>
-
-namespace KParts {
-
-class HistoryProvider : public QObject {
-public:
- static HistoryProvider *self();
-
- void insert(const QString &);
- bool contains(const QString &) const;
-};
-
-}
-
-#endif
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
deleted file mode 100644
index b19823b..0000000
--- a/WebCore/kwq/kparts/part.h
+++ /dev/null
@@ -1,91 +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 PART_H_
-#define PART_H_
-
-#include <kinstance.h>
-#include <kurl.h>
-#include <qobject.h>
-#include <qvariant.h>
-#include <qlist.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-
-class QWidget;
-
-namespace KIO {
- class Job;
-}
-
-namespace KParts {
-
-class Part : public QObject {
-public:
- Part() : _widget(0), _ref(1) { }
-
- QWidget *widget() const { return _widget; }
- void setWidget(QWidget *widget) { _widget = widget; }
-
- void ref() { ++_ref; }
- void deref() { if (!--_ref) delete this; }
-
- bool event(QEvent *event) { customEvent((QCustomEvent *)event); return true; }
- virtual void customEvent(QCustomEvent *) { }
-
-private:
- QWidget *_widget;
- unsigned int _ref;
-};
-
-class ReadOnlyPart : public Part {
-public:
- ReadOnlyPart(QObject *parent = 0, const char *name = 0) : _parent(parent), _name(name) { }
-
- KURL url() const { return m_url; }
- KURL m_url;
-
- void setParent(QObject *parent) { _parent = parent; }
- QObject *parent() const { return _parent; }
-
- void setName(const QString &name) { _name = name; }
- QString name() { return _name; }
-
- void setXMLFile(const char *) { }
- void setInstance(KInstance *, bool) { }
-
- virtual bool openURL(const KURL &) = 0;
- virtual bool closeURL() = 0;
-
-private:
- QObject *_parent;
- QString _name;
-};
-
-class GUIActivateEvent { };
-
-} // namespace KParts
-
-#endif
diff --git a/WebCore/kwq/kparts/partmanager.h b/WebCore/kwq/kparts/partmanager.h
deleted file mode 100644
index dff5a24..0000000
--- a/WebCore/kwq/kparts/partmanager.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 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
- * 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 KPARTS_PARTMANAGER_H
-#define KPARTS_PARTMANAGER_H
-
-#include <qguardedptr.h>
-#include <qtimer.h>
-#include <qdatetime.h>
-
-namespace KParts {
-
-class PartManager;
-
-}
-
-class DCOPObject { };
-
-#endif
diff --git a/WebCore/kwq/qt/qapplication.h b/WebCore/kwq/qt/qapplication.h
deleted file mode 100644
index 768ed8d..0000000
--- a/WebCore/kwq/qt/qapplication.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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
- * 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 QAPPLICATION_H_
-#define QAPPLICATION_H_
-
-#include <qobject.h>
-#include <qwidget.h>
-#include <qpalette.h>
-#include <qsize.h>
-
-class QDesktopWidget;
-
-class QApplication : public QObject {
-public:
- static QPalette palette(const QWidget *p=0);
- static QDesktopWidget *desktop() { return 0; }
- static int startDragDistance() { return 2; }
- static QSize globalStrut();
- static void setOverrideCursor(const QCursor &);
- static void restoreOverrideCursor();
- static bool sendEvent(QObject *o, QEvent *e) { return o->event(e); }
- static void sendPostedEvents(QObject *receiver, int event_type) { }
- static QStyle &style();
-};
-
-QApplication * const qApp = 0;
-
-class QDesktopWidget : public QWidget {
-public:
- static int screenNumber(QWidget *);
- static QRect screenGeometry(int screenNumber);
- static int width();
- static int height();
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
deleted file mode 100644
index 94aec5a..0000000
--- a/WebCore/kwq/qt/qarray.h
+++ /dev/null
@@ -1,83 +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 QARRAY_H_
-#define QARRAY_H_
-
-#include <KWQDef.h>
-#include <KWQArrayImpl.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
-template <class T> class QMemArray {
-public:
- QMemArray() : impl(sizeof(T)) { }
- QMemArray(int i) : impl(sizeof(T), i) { }
-
- bool isEmpty() { return impl.size() == 0; }
- T &at(uint u) { return *(T *)impl.at(u); }
- const T &at(uint u) const { return *(T *)impl.at(u); }
- T *data() { return (T *)impl.data(); }
- const T *data() const { return (T *)impl.data(); }
- uint size() const { return impl.size(); }
- uint count() const { return impl.size(); }
- bool resize(uint size) { return impl.resize(size); }
- QMemArray<T>& duplicate(const T *data, int size) { impl.duplicate(data, size); return *this; }
- void detach() { duplicate(data(), size()); }
- bool fill(const T &item, int size=-1) { return impl.fill(&item, size); }
- QMemArray<T>& assign(const QMemArray<T> &a) { return *this = a; }
-
- T &operator[](int i) { return *(T *)impl.at(i); }
- const T &operator[](int i) const { return *(T *)impl.at(i); }
- bool operator==(const QMemArray<T> &a) const { return impl == a.impl; }
- bool operator!=(const QMemArray<T> &a) const { return !(*this == a); }
- operator const T*() const { return data(); }
-
- private:
- KWQArrayImpl impl;
-};
-
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QMemArray<T>&a)
-{
- stream << "QMemArray: [size: " << a.size() << "; items: ";
- for (unsigned i = 0; i < a.size(); i++) {
- stream << a[i];
- if (i < a.size() - 1) {
- stream << ", ";
- }
- }
- stream << "]";
-
- return stream;
-}
-
-#endif
-
-#endif
diff --git a/WebCore/kwq/qt/qasyncio.h b/WebCore/kwq/qt/qasyncio.h
deleted file mode 100644
index ec810a5..0000000
--- a/WebCore/kwq/qt/qasyncio.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 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
- * 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.
- */
-
-class QDataSource;
diff --git a/WebCore/kwq/qt/qbrush.h b/WebCore/kwq/qt/qbrush.h
deleted file mode 100644
index b655967..0000000
--- a/WebCore/kwq/qt/qbrush.h
+++ /dev/null
@@ -1,50 +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 QBRUSH_H_
-#define QBRUSH_H_
-
-#include <qcolor.h>
-#include <qnamespace.h>
-
-class QBrush : public Qt {
-public:
- QBrush::QBrush(const QColor &c = black, BrushStyle style = SolidPattern)
- : brushColor(c), brushStyle(style) { }
-
- const QColor &color() const { return brushColor; }
- void setColor(const QColor &c) { brushColor = c; }
- BrushStyle style() const { return brushStyle; }
- void setStyle(BrushStyle s) { brushStyle = s; }
-
- bool operator==(const QBrush &b) const { return brushColor == b.brushColor && brushStyle == b.brushStyle; }
- bool operator!=(const QBrush &b) const { return !(*this == b); }
-
-private:
- QColor brushColor;
- BrushStyle brushStyle;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qbuffer.h b/WebCore/kwq/qt/qbuffer.h
deleted file mode 100644
index f506012..0000000
--- a/WebCore/kwq/qt/qbuffer.h
+++ /dev/null
@@ -1,52 +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 QBUFFER_H_
-#define QBUFFER_H_
-
-#include <KWQDef.h>
-
-#include <qarray.h>
-#include <qstring.h>
-#include <qiodevice.h>
-
-class QBuffer {
-public:
- QBuffer() : opened(false), pos(0) { }
-
- QByteArray buffer() const { return ba; }
- uint size() const { return ba.size(); }
- bool isOpen() const { return opened; }
- void open(int);
- void close() { opened = false; }
- int writeBlock(const char *, uint);
-
-private:
- bool opened;
- QByteArray ba;
- uint pos;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qbutton.h b/WebCore/kwq/qt/qbutton.h
deleted file mode 100644
index dba87da..0000000
--- a/WebCore/kwq/qt/qbutton.h
+++ /dev/null
@@ -1,54 +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 QBUTTON_H_
-#define QBUTTON_H_
-
-#include <qwidget.h>
-#include <qstring.h>
-#include <KWQSignal.h>
-
-#ifdef __OBJC__
- at class KWQButtonAdapter;
-#else
-class KWQButtonAdapter;
-#endif
-
-class QButton : public QWidget {
-public:
- QButton();
- ~QButton();
-
- virtual void setText(const QString &);
- QString text() const;
-
- virtual void clicked();
-
-private:
- KWQSignal m_clicked;
- KWQButtonAdapter *m_adapter;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qcheckbox.h
deleted file mode 100644
index c3ecdbb..0000000
--- a/WebCore/kwq/qt/qcheckbox.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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
- * 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 QCHECKBOX_H_
-#define QCHECKBOX_H_
-
-#include <qbutton.h>
-
-class QCheckBox : public QButton {
-public:
- QCheckBox(QWidget *);
-
- void setChecked(bool);
- bool isChecked();
-
- QSize sizeHint() const;
- int baselinePosition() const;
- QRect frameGeometry() const;
- void setFrameGeometry(const QRect &);
-
- virtual void clicked();
-
-private:
- KWQSignal m_stateChanged;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qcollection.h b/WebCore/kwq/qt/qcollection.h
deleted file mode 100644
index a1cb8ca..0000000
--- a/WebCore/kwq/qt/qcollection.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- * 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 QCOLLECTION_H
-#define QCOLLECTION_H
-
-#include <KWQDef.h>
-
-class QPtrCollection {
- public:
- typedef void *Item;
-
- bool autoDelete() { return del_item; }
- void setAutoDelete(bool autoDelete) { del_item = autoDelete; }
-
- QPtrCollection(const QPtrCollection &) : del_item(false) { }
- QPtrCollection &operator=(const QPtrCollection &) { return *this; }
-
- protected:
- QPtrCollection() : del_item(false) { }
- virtual ~QPtrCollection();
-
- bool del_item;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
deleted file mode 100644
index 8a73ca3..0000000
--- a/WebCore/kwq/qt/qcolor.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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
- * 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 QCOLOR_H_
-#define QCOLOR_H_
-
-#include <qstring.h>
-
-#ifdef __OBJC__
- at class NSColor;
-#else
-class NSColor;
-#endif
-
-typedef unsigned int QRgb; // RGB triplet
-
-QRgb qRgb(int r, int g, int b);
-QRgb qRgba(int r, int g, int b, int a);
-
-const QRgb KWQInvalidColor = 0x40000000;
-
-class QColor {
-public:
- QColor() : color(KWQInvalidColor) { }
- QColor(int r, int g, int b) : color(qRgb(r, g, b)) { }
- explicit QColor(const QString &);
- QColor(const char *); // can't be explicit because of helper.cpp
-
- QString name() const;
- void setNamedColor(const QString&);
-
- bool isValid() const { return color != KWQInvalidColor; }
-
- int red() const { return (color >> 16) & 0xFF; }
- int green() const { return (color >> 8) & 0xFF; }
- int blue() const { return color & 0xFF; }
- QRgb rgb() const { return color & 0xFFFFFF; }
- void setRgb(int r, int g, int b) { color = qRgb(r, g, b); }
- void setRgb(int rgb) { color = rgb; }
-
- void hsv(int *, int *, int *) const;
- void setHsv(int h, int s, int v);
-
- QColor light(int f = 150) const;
- QColor dark(int f = 200) const;
-
- friend bool operator==(const QColor &a, const QColor &b);
- friend bool operator!=(const QColor &a, const QColor &b);
-
- NSColor *getNSColor() const;
-
-private:
- QRgb color;
-};
-
-inline bool operator==(const QColor &a, const QColor &b)
-{
- return a.color == b.color;
-}
-
-inline bool operator!=(const QColor &a, const QColor &b)
-{
- return a.color != b.color;
-}
-
-#endif
diff --git a/WebCore/kwq/qt/qcombobox.h b/WebCore/kwq/qt/qcombobox.h
deleted file mode 100644
index 21a2160..0000000
--- a/WebCore/kwq/qt/qcombobox.h
+++ /dev/null
@@ -1,66 +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 QCOMBOBOX_H_
-#define QCOMBOBOX_H_
-
-#include <KWQListBox.h>
-#include <qwidget.h>
-
-#ifdef __OBJC__
- at class KWQComboBoxAdapter;
-#else
-class KWQComboBoxAdapter;
-#endif
-
-class QComboBox : public QWidget {
-public:
- QComboBox();
- ~QComboBox();
-
- void clear();
- void insertItem(const QString &text, int index=-1);
-
- int currentItem() const;
- void setCurrentItem(int);
-
- QListBox *listBox() const { return 0; }
- void popup() { }
-
- QSize sizeHint() const;
- QRect frameGeometry() const;
- void setFrameGeometry(const QRect &);
- int baselinePosition() const;
-
- bool eventFilter(QObject *object, QEvent *event) { return false; }
-
- void activated() { m_activated.call(currentItem()); }
-
-private:
- KWQSignal m_activated;
- KWQComboBoxAdapter *m_adapter;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
deleted file mode 100644
index 8fd0868..0000000
--- a/WebCore/kwq/qt/qcstring.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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
- * 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 QCSTRING_H_
-#define QCSTRING_H_
-
-#include <qarray.h>
-#include <string.h>
-
-typedef QMemArray<char> QByteArray;
-
-class QCString : public QByteArray {
-public:
- QCString();
- QCString(int);
- QCString(const char *);
- QCString(const char *, uint);
-
- bool isEmpty() const;
- bool isNull() const { return data() == 0; }
- int find(const char *, int index=0, bool cs=true) const;
- int contains(char, bool cs=true) const;
- uint length() const;
- bool truncate(uint);
- QCString lower() const;
- QCString upper() const;
- QCString left(uint) const;
- QCString right(uint) const;
- QCString mid(uint, uint len=0xffffffff) const;
-
- operator const char *() const { return data(); }
- QCString &operator=(const char *);
- QCString &operator+=(const char *);
- QCString &operator+=(char);
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QCString &);
-#endif
-
-private:
- bool resize(uint);
-};
-
-bool operator==(const QCString &s1, const char *s2);
-inline bool operator==(const char *s1, const QCString &s2) { return s2 == s1; }
-inline bool operator!=(const QCString &s1, const char *s2) { return !(s1 == s2); }
-inline bool operator!=(const char *s1, const QCString &s2) { return !(s1 == s2); }
-
-#endif
diff --git a/WebCore/kwq/qt/qcursor.h b/WebCore/kwq/qt/qcursor.h
deleted file mode 100644
index 03d1c4a..0000000
--- a/WebCore/kwq/qt/qcursor.h
+++ /dev/null
@@ -1,56 +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 QCURSOR_H
-#define QCURSOR_H
-
-#include <qpixmap.h>
-#include <qpoint.h>
-
-#ifdef __OBJC__
- at class NSCursor;
-#else
-class NSCursor;
-#endif
-
-class QCursor {
-public:
- static QPoint pos();
-
- QCursor();
- QCursor(const QPixmap &);
- QCursor(NSCursor *);
- QCursor(const QCursor &);
- ~QCursor();
-
- QCursor &operator=(const QCursor &);
-
- NSCursor *handle() const;
-
- private:
- NSCursor *cursor;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qdatetime.h b/WebCore/kwq/qt/qdatetime.h
deleted file mode 100644
index d6a5a76..0000000
--- a/WebCore/kwq/qt/qdatetime.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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
- * 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 QDATETIME_H_
-#define QDATETIME_H_
-
-#include <KWQDef.h>
-#include <CoreFoundation/CFDate.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <iosfwd>
-#endif
-
-class QTime {
-public:
- QTime() : timeInSeconds(0) { }
- explicit QTime(CFAbsoluteTime t) : timeInSeconds(t) { }
- QTime(int hours, int minutes);
-
- int msec() const;
- void start() { timeInSeconds = CFAbsoluteTimeGetCurrent(); }
- int elapsed();
- int restart();
-
-private:
- CFAbsoluteTime timeInSeconds;
-
- friend class QDateTime;
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<( std::ostream &, const QTime & );
-#endif
-};
-
-class QDate {
-public:
- QDate(int year, int month, int day);
-
-private:
- int year;
- int month;
- int day;
-
- friend class QDateTime;
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<( std::ostream &, const QDate & );
-#endif
-
-};
-
-class QDateTime {
-public:
- QDateTime() : dateInSeconds(0) { }
- explicit QDateTime(CFAbsoluteTime d) : dateInSeconds(d) { }
- QDateTime(const QDate &, const QTime &);
-
- QTime time() { return QTime(dateInSeconds); }
- int secsTo(const QDateTime &) const;
-
- static QDateTime currentDateTime() { return QDateTime(CFAbsoluteTimeGetCurrent()); }
-
-private:
- CFAbsoluteTime dateInSeconds;
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<( std::ostream &, const QDateTime & );
-#endif
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
deleted file mode 100644
index a53b817..0000000
--- a/WebCore/kwq/qt/qdict.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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
- * 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 QDICT_H_
-#define QDICT_H_
-
-#include <qcollection.h>
-#include <qstring.h>
-
-#include <KWQDictImpl.h>
-
-template<class T> class QDictIterator;
-
-template <class T> class QDict : public QPtrCollection {
-public:
- QDict(int size=17, bool caseSensitive=true) : impl(size, caseSensitive, QDict::deleteFunc) {}
- virtual ~QDict() { impl.clear(del_item); }
-
- virtual void clear() { impl.clear(del_item); }
- virtual uint count() const { return impl.count(); }
- void insert(const QString &key, const T *value) { impl.insert(key,(void *)value);}
- bool remove(const QString &key) { return impl.remove(key,del_item); }
- T *find(const QString &key) const { return (T *)impl.find(key); }
-
- QDict &operator=(const QDict &d) { impl.assign(d.impl, del_item); QPtrCollection::operator=(d); return *this;}
-
- private:
- static void deleteFunc(void *item) { delete (T *)item; }
-
- KWQDictImpl impl;
-
- friend class QDictIterator<T>;
-};
-
-
-template<class T> class QDictIterator {
-public:
- QDictIterator(const QDict<T> &d) : impl(d.impl) {}
-
- uint count() const { return impl.count(); }
- T *current() const { return (T *)impl.current(); }
- QString currentKey() const { return impl.currentStringKey(); }
- T *toFirst() { return (T *)impl.toFirst(); }
-
- T *operator++() { return (T *)++impl; }
-
-private:
- KWQDictIteratorImpl impl;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qdrawutil.h b/WebCore/kwq/qt/qdrawutil.h
deleted file mode 100644
index 3393e7c..0000000
--- a/WebCore/kwq/qt/qdrawutil.h
+++ /dev/null
@@ -1,36 +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 QDRAWUTIL_H_
-#define QDRAWUTIL_H_
-
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qbrush.h"
-
-void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
- sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
-
-#endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
deleted file mode 100644
index 2190d5a..0000000
--- a/WebCore/kwq/qt/qevent.h
+++ /dev/null
@@ -1,136 +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 QEVENT_H_
-#define QEVENT_H_
-
-#include <qnamespace.h>
-#include <qregion.h>
-#include <qpoint.h>
-#include <qstring.h>
-
-class QEvent : public Qt {
-public:
-
- enum Type {
- None,
- Enter,
- Leave,
- Timer,
- MouseButtonPress,
- MouseButtonRelease,
- MouseButtonDblClick,
- MouseMove,
- FocusIn,
- FocusOut,
- AccelAvailable,
- KeyPress,
- KeyRelease,
- Paint,
- };
-
- QEvent( Type t ) : _type(t) {}
- virtual ~QEvent();
-
- Type type() const { return _type; }
-
-private:
- QEvent(const QEvent &);
- QEvent &operator=(const QEvent &);
-
- Type _type;
-};
-
-class QMouseEvent : public QEvent {
-public:
- QMouseEvent(Type type, const QPoint &pos, int button, int state);
- QMouseEvent(Type type, const QPoint &pos, int button, int state, int clickCount);
- QMouseEvent(Type type, const QPoint &pos, const QPoint &global, int button, int state);
-
- int x() { return _position.x(); }
- int y() { return _position.y(); }
- int globalX() { return _position.x(); } // we never really return global X
- int globalY() { return _position.y(); } // we never really return global Y
- const QPoint &pos() const { return _position; }
- ButtonState button() { return _button; }
- ButtonState state() { return _state; }
- ButtonState stateAfter();
- int clickCount() { return _clickCount; }
-
-private:
- QPoint _position;
- ButtonState _button;
- ButtonState _state;
- int _clickCount;
-};
-
-class QTimerEvent : public QEvent {
-public:
- QTimerEvent(int timerId);
-
- int timerId() const { return _timerId; }
-
-private:
- int _timerId;
-};
-
-class QKeyEvent : public QEvent {
-public:
- QKeyEvent(Type type, int key, int ascii, int buttonState, const QString &textVal = QString::null, bool autoRepeat = FALSE, ushort countVal = 1);
-
- int key() const;
- ButtonState state() const;
- void accept();
- void ignore();
- bool isAutoRepeat() const;
- bool isAccepted() const;
- int count() const;
- QString text() const;
- int ascii() const;
-};
-
-class QFocusEvent {
-public:
- enum Reason { Popup, Other };
- static Reason reason() { return Other; }
-};
-
-class QHideEvent;
-class QResizeEvent;
-class QShowEvent;
-class QWheelEvent;
-class QContextMenuEvent;
-
-class QCustomEvent : public QEvent {
-public:
- QCustomEvent(Type type, void *data = 0) : QEvent(type), d(data) { }
- void *data() const { return d; }
- void setData(void *data) { d = data; }
-
-private:
- void *d;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qfile.h b/WebCore/kwq/qt/qfile.h
deleted file mode 100644
index 3fa5b6e..0000000
--- a/WebCore/kwq/qt/qfile.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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
- * 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 QFILE_H_
-#define QFILE_H_
-
-#include <KWQDef.h>
-
-#include <qstring.h>
-#include <qiodevice.h>
-
-class QFile
-{
-public:
- QFile(const QString &);
- ~QFile();
-
- bool exists() const;
- bool open(int);
- void close();
- int readBlock(char *, uint);
- uint size() const;
-
- static bool exists(const QString &path);
-
-private:
- QFile(const QFile &);
- QFile &operator=(const QFile &);
-
- char *name;
- int fd;
-};
-
-#endif // QFILE_H_
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
deleted file mode 100644
index e7dab03..0000000
--- a/WebCore/kwq/qt/qfont.h
+++ /dev/null
@@ -1,73 +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 QFONT_H_
-#define QFONT_H_
-
-class QString;
-
-#ifdef __OBJC__
- at class NSFont;
- at class NSString;
-#else
-class NSFont;
-class NSString;
-#endif
-
-class QFont {
-public:
- enum Weight { Normal = 50, Bold = 63 };
-
- QFont();
-
- void setFamily(const QString &);
- QString family() const;
-
- void setWeight(int);
- int weight() const;
- bool bold() const;
-
- void setItalic(bool);
- bool italic() const;
-
- void setPixelSize(float s) { _size = s; }
- int pixelSize() const { return (int)_size; }
-
- bool operator==(const QFont &x) const;
- bool operator!=(const QFont &x) const { return !(*this == x); }
-
- NSString *getNSFamily() const { return _family; }
- int getNSTraits() const { return _trait; }
- float getNSSize() const { return _size; }
-
- NSFont *getNSFont() const;
-
-private:
- NSString *_family;
- int _trait;
- float _size;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qfontinfo.h b/WebCore/kwq/qt/qfontinfo.h
deleted file mode 100644
index ed1bf2c..0000000
--- a/WebCore/kwq/qt/qfontinfo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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 QFONTINFO_H_
-#define QFONTINFO_H_
-
-#include <qfont.h>
-
-class QFontInfo {
-public:
- QFontInfo(const QFont &);
- bool fixedPitch() const;
-
-private:
- QFont font;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
deleted file mode 100644
index 064966d..0000000
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ /dev/null
@@ -1,74 +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 QFONTMETRICS_H_
-#define QFONTMETRICS_H_
-
-#include "qrect.h"
-#include "qsize.h"
-#include "qstring.h"
-#include "qfont.h"
-#include "qfontinfo.h"
-
-class QFontMetricsPrivate;
-
-class QFontMetrics {
-public:
- QFontMetrics(const QFont &);
- ~QFontMetrics();
-
- QFontMetrics(const QFontMetrics &);
- QFontMetrics &operator=(const QFontMetrics &);
-
- int ascent() const;
- int descent() const;
- int height() const;
- int lineSpacing() const;
- float xHeight() const;
-
- int width(QChar) const;
- int width(char) const;
- int width(const QString &, int len=-1) const;
- int charWidth(const QString &, int pos) const;
- int width(const QChar *, int len) const;
- float floatWidth(const QChar *, int slen, int pos, int len) const;
- float floatCharacterWidths(const QChar *, int slen, int pos, int len, int toAdd, float *buffer) const;
-
- QRect boundingRect(const QString &, int len=-1) const;
- QRect boundingRect(int, int, int, int, int, const QString &) const;
-
- QSize size(int, const QString &) const;
-
- int rightBearing(QChar) const;
- int leftBearing(QChar) const;
- int baselineOffset() const;
-
-private:
- KWQRefPtr<QFontMetricsPrivate> data;
-
-};
-
-#endif
-
diff --git a/WebCore/kwq/qt/qframe.h b/WebCore/kwq/qt/qframe.h
deleted file mode 100644
index d5be2f0..0000000
--- a/WebCore/kwq/qt/qframe.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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
- * 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 QFRAME_H_
-#define QFRAME_H_
-
-#include <qwidget.h>
-
-class QFrame : public QWidget {
-public:
- enum Shape { NoFrame = 1, Box = 2, StyledPanel = 4 };
- enum Shadow { Sunken = 8, Plain = 16 };
-
- QFrame() : _frameStyle(QFrame::NoFrame) { }
-
- virtual void setFrameStyle(int);
- int frameStyle();
- int frameWidth() const;
-
-private:
- int _frameStyle;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qguardedptr.h b/WebCore/kwq/qt/qguardedptr.h
deleted file mode 100644
index bd0962c..0000000
--- a/WebCore/kwq/qt/qguardedptr.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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
- * 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 QGUARDEDPTR_H_
-#define QGUARDEDPTR_H_
-
-#include "qptrlist.h"
-
-class QObject;
-
-class KWQGuardedPtrBase {
-public:
- KWQGuardedPtrBase(QObject* = 0);
-
- QObject* pointer() const { return iterator.current(); }
- bool isNull() const { return pointer() == 0; }
-
-private:
- QPtrListIterator<QObject> iterator;
-};
-
-template <class T> class QGuardedPtr : public KWQGuardedPtrBase {
-public:
- QGuardedPtr() { }
- QGuardedPtr(T* p) : KWQGuardedPtrBase(p) { }
-
- T& operator*() const { return *(T*)pointer(); }
- operator T*() const { return (T*)pointer(); }
- T* operator->() const { return (T*)pointer(); }
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qimage.h b/WebCore/kwq/qt/qimage.h
deleted file mode 100644
index 1c23b6a..0000000
--- a/WebCore/kwq/qt/qimage.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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
- * 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 QIMAGE_H_
-#define QIMAGE_H_
-
-class QImage { };
-
-#endif
diff --git a/WebCore/kwq/qt/qiodevice.h b/WebCore/kwq/qt/qiodevice.h
deleted file mode 100644
index 1a5bdc2..0000000
--- a/WebCore/kwq/qt/qiodevice.h
+++ /dev/null
@@ -1,32 +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 QIODEVICE_H_
-#define QIODEVICE_H_
-
-#define IO_WriteOnly 0x0002
-#define IO_ReadOnly 0x0001
-
-#endif
diff --git a/WebCore/kwq/qt/qlabel.h b/WebCore/kwq/qt/qlabel.h
deleted file mode 100644
index 9ca179a..0000000
--- a/WebCore/kwq/qt/qlabel.h
+++ /dev/null
@@ -1,41 +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 QLABEL_H_
-#define QLABEL_H_
-
-#include <qframe.h>
-#include <qwidget.h>
-#include <qstring.h>
-
-class QLabel : public QFrame {
-public:
- QLabel(const QString &, QWidget *);
-
- void setText(const QString &);
- void setAlignment(int);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qlineedit.h b/WebCore/kwq/qt/qlineedit.h
deleted file mode 100644
index a748ca2..0000000
--- a/WebCore/kwq/qt/qlineedit.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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
- * 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 QLINEEDIT_H_
-#define QLINEEDIT_H_
-
-#include <qwidget.h>
-#include <qevent.h>
-#include <qstring.h>
-#include <KWQSignal.h>
-
-class QLineEdit : public QWidget {
-public:
- enum EchoMode { Normal, Password };
-
- QLineEdit();
-
- virtual void setEchoMode(EchoMode);
- virtual void setCursorPosition(int);
- virtual void setText(const QString &);
- virtual QString text();
- virtual void setMaxLength(int);
-
- bool isReadOnly() const;
- void setReadOnly(bool);
- bool frame() const;
- int cursorPosition() const;
- int maxLength() const;
- void selectAll();
- bool edited() const;
- void setEdited(bool);
-
- void setFont(const QFont &font);
-
- QSize sizeForCharacterWidth(int numCharacters) const;
- int baselinePosition() const;
-
- void returnPressed() { m_returnPressed.call(); }
- void textChanged() { m_textChanged.call(text()); }
-
-private:
- KWQSignal m_returnPressed;
- KWQSignal m_textChanged;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
deleted file mode 100644
index 7b3457c..0000000
--- a/WebCore/kwq/qt/qlist.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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
- * 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 QLIST_H_
-#define QLIST_H_
-
-#include <KWQDef.h>
-#include <qcollection.h>
-#include <KWQListImpl.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
-template <class T> class QPtrListIterator;
-
-template <class T> class QPtrList : public QPtrCollection {
-public:
- QPtrList() : impl(deleteFunc) { }
- ~QPtrList() { impl.clear(del_item); }
-
- QPtrList& operator=(const QPtrList &l) { impl.assign(l.impl, del_item); return *this; }
-
- bool isEmpty() const { return impl.isEmpty(); }
- uint count() const { return impl.count(); }
- void clear() { impl.clear(del_item); }
- void sort() { impl.sort(compareFunc, this); }
-
- T *at(uint n) { return (T *)impl.at(n); }
-
- bool insert(uint n, const T *item) { return impl.insert(n, item); }
- bool remove() { return impl.remove(del_item); }
- bool remove(uint n) { return impl.remove(n, del_item); }
- bool remove(const T *item) { return impl.remove(item, del_item, compareFunc, this); }
- bool removeFirst() { return impl.removeFirst(del_item); }
- bool removeLast() { return impl.removeLast(del_item); }
- bool removeRef(const T *item) { return impl.removeRef(item, del_item); }
-
- T *getFirst() const { return (T *)impl.getFirst(); }
- T *getLast() const { return (T *)impl.getLast(); }
- T *current() const { return (T *)impl.current(); }
- T *first() { return (T *)impl.first(); }
- T *last() { return (T *)impl.last(); }
- T *next() { return (T *)impl.next(); }
- T *prev() { return (T *)impl.prev(); }
- T *take(uint n) { return (T *)impl.take(n); }
- T *take() { return (T *)impl.take(); }
-
- void append(const T *item) { impl.append(item); }
- void prepend(const T *item) { impl.prepend(item); }
-
- uint containsRef(const T *item) const { return impl.containsRef(item); }
-
- virtual int compareItems(void *a, void *b) { return a != b; }
-
- private:
- static void deleteFunc(void *item) { delete (T *)item; }
- static int compareFunc(void *a, void *b, void *data) { return ((QPtrList *)data)->compareItems(a, b); }
-
- friend class QPtrListIterator<T>;
-
- KWQListImpl impl;
-};
-
-template <class T> class QPtrListIterator {
-public:
- QPtrListIterator() { }
- QPtrListIterator(const QPtrList<T> &l) : impl(l.impl) { }
-
- uint count() const { return impl.count(); }
- T *toFirst() { return (T *)impl.toFirst(); }
- T *toLast() { return (T *)impl.toLast(); }
- T *current() const { return (T *)impl.current(); }
-
- operator T *() const { return (T *)impl.current(); }
- T *operator--() { return (T *)--impl; }
- T *operator++() { return (T *)++impl; }
-
-private:
- KWQListIteratorImpl impl;
-};
-
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QPtrList<T> &l)
-{
- QPtrListIterator<T> iter(l);
- unsigned count = l.count();
-
- stream << "QPtrList: [size: " << l.count() << "; items: ";
-
- // print first
- if (count != 0) {
- stream << *iter.current();
- ++iter;
- --count;
- }
-
- // print rest
- while (count != 0) {
- stream << ", " << *iter.current();
- ++iter;
- --count;
- }
-
- return stream << "]";
-}
-
-#endif
-
-#endif
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
deleted file mode 100644
index 6f91e42..0000000
--- a/WebCore/kwq/qt/qmap.h
+++ /dev/null
@@ -1,326 +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 QMAP_H_
-#define QMAP_H_
-
-#include <KWQDef.h>
-
-#include <KWQMapImpl.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
-template <class K, class V> class QMap;
-template <class K, class V> class QMapIterator;
-template <class K, class V> class QMapConstIterator;
-
-template <class K, class V> class QMapNode : private KWQMapNodeImpl
-{
- private:
- QMapNode(K k, V v) :
- key(k),
- value(v)
- {
- }
-
- // intentionally not defined
- QMapNode(const QMapNode&node);
- QMapNode& operator=(const QMapNode&);
-
- ~QMapNode()
- {
- delete (QMapNode *)left();
- delete (QMapNode *)right();
- }
-
- K key;
- V value;
-
- friend class QMap<K,V>;
- friend class QMapIterator<K,V>;
- friend class QMapConstIterator<K,V>;
-};
-
-template<class K, class V> class QMapIterator : private KWQMapIteratorImpl {
-public:
- QMapIterator() { }
-
- const K& key() const
- {
- return ((QMapNode<K,V> *)node)->key;
- }
-
- const V& data() const
- {
- return ((QMapNode<K,V> *)node)->value;
- }
-
- bool operator==(const QMapIterator<K,V> &iter) const
- {
- return node == iter.node;
- }
-
- bool operator!=(const QMapIterator<K,V> &iter) const
- {
- return node != iter.node;
- }
-
- V& operator*()
- {
- return ((QMapNode<K,V> *)node)->value;
- }
-
- const V& operator*() const
- {
- return ((QMapNode<K,V> *)node)->value;
- }
-
- QMapIterator<K,V>& operator++()
- {
- incrementInternal();
- return *this;
- }
-
-private:
- QMapIterator(QMapNode<K,V> *n)
- {
- node = n;
- }
-
- friend class QMap<K,V>;
- friend class QMapConstIterator<K,V>;
-};
-
-template<class K, class V> class QMapConstIterator : private KWQMapIteratorImpl {
-public:
- QMapConstIterator() { }
- QMapConstIterator(const QMapIterator<K,V> &iter) : KWQMapIteratorImpl(iter) { }
-
- const K& key() const
- {
- return ((QMapNode<K,V> *)node)->key;
- }
-
- const V& data() const
- {
- return ((QMapNode<K,V> *)node)->value;
- }
-
- bool operator==(const QMapConstIterator<K,V> &citer) const
- {
- return node == citer.node;
- }
-
- bool operator!=(const QMapConstIterator<K,V> &citer) const
- {
- return node != citer.node;
- }
-
- const V &operator*() const
- {
- return ((QMapNode<K,V> *)node)->value;
- }
-
- QMapConstIterator<K,V>& operator++()
- {
- incrementInternal();
- return *this;
- }
-
-private:
- QMapConstIterator(const QMapNode<K,V> *n)
- {
- node = (KWQMapNodeImpl *)n;
- }
-
- friend class QMap<K,V>;
-};
-
-template <class K, class V> class QMap : public KWQMapImpl {
-public:
- typedef QMapIterator<K,V> Iterator;
- typedef QMapConstIterator<K,V> ConstIterator;
-
- QMap() :
- KWQMapImpl(new QMapNode<K,V>(K(),V()), deleteNode)
- {
- }
-
- QMap(const QMap<K,V>& m) :
- KWQMapImpl(m)
- {
- }
-
- void clear() { clearInternal(); }
-
- uint count() const { return countInternal(); }
-
- Iterator begin() { return (QMapNode<K,V> *)beginInternal(); }
- Iterator end() { return (QMapNode<K,V> *)endInternal(); }
- ConstIterator begin() const { return (QMapNode<K,V> *)beginInternal(); }
- ConstIterator end() const { return ConstIterator((QMapNode<K,V> *)endInternal()); }
-
- Iterator insert(const K& key, const V& value)
- {
- QMapNode<K,V> tmp(key,value);
- return Iterator((QMapNode<K,V> *)insertInternal(&tmp, true));
- }
-
- void remove(const K& key)
- {
- QMapNode<K,V> tmp(key, V());
- removeEqualInternal(&tmp);
- }
-
- void remove(const QMapIterator<K,V> &iterator)
- {
- removeEqualInternal(iterator.node, true);
- }
-
- Iterator find (const K &key)
- {
- QMapNode<K,V> tmp(key, V());
- QMapNode<K,V> *result = (QMapNode<K,V> *)findInternal(&tmp);
-
- if (result != NULL) {
- return Iterator(result);
- } else {
- return Iterator(end());
- }
- }
-
- ConstIterator find (const K &key) const
- {
- QMapNode<K,V> tmp(key, V());
- QMapNode<K,V> *result = (QMapNode<K,V> *)findInternal(&tmp);
-
- if (result != NULL) {
- return ConstIterator(result);
- } else {
- return ConstIterator(end());
- }
- }
-
- bool contains(const K &key) const
- {
- QMapNode<K,V> tmp(key, V());
- return findInternal(&tmp);
- }
-
- QMap<K,V>& operator=(const QMap<K,V>&map)
- {
- QMap<K,V> tmp(map);
- swap(tmp);
- return *this;
- }
-
- V& operator[](const K& key)
- {
- QMapNode<K,V> tmp(key, V());
- return ((QMapNode<K,V> *)insertInternal(&tmp, false))->value;
- }
-
- V operator[](const K& key) const
- {
- QMapNode<K,V> tmp(key, V());
- QMapNode<K,V> *result = (QMapNode<K,V> *)findInternal(&tmp);
- return result ? result->value : V();
- }
-
-protected:
- virtual void copyNode(const KWQMapNodeImpl *isrc, KWQMapNodeImpl *idst) const
- {
- QMapNode<K,V> *src = (QMapNode<K,V> *)isrc;
- QMapNode<K,V> *dst = (QMapNode<K,V> *)idst;
- dst->key = src->key;
- dst->value = src->value;
- }
-
- virtual KWQMapNodeImpl *duplicateNode(const KWQMapNodeImpl *isrc) const
- {
- QMapNode<K,V> *src = (QMapNode<K,V> *)isrc;
- return new QMapNode<K,V>(src->key, src->value);
- }
-
- virtual CompareResult compareNodes(const KWQMapNodeImpl *ia, const KWQMapNodeImpl *ib) const
- {
- QMapNode<K,V> *a = (QMapNode<K,V> *)ia;
- QMapNode<K,V> *b = (QMapNode<K,V> *)ib;
-
- if (a->key == b->key) {
- return Equal;
- } else if (a->key < b->key) {
- return Less;
- } else {
- return Greater;
- }
- }
-
- virtual void swapNodes(KWQMapNodeImpl *ia, KWQMapNodeImpl *ib) const
- {
- QMapNode<K,V> *a = (QMapNode<K,V> *)ia;
- QMapNode<K,V> *b = (QMapNode<K,V> *)ib;
-
- K tmpKey = a->key;
- V tmpValue = a->value;
- a->key = b->key;
- a->value = b->value;
- b->key = tmpKey;
- b->value = tmpValue;
- }
-
- static void deleteNode(KWQMapNodeImpl *inode)
- {
- delete (QMapNode<K,V> *)inode;
- }
-
-};
-
-#ifdef _KWQ_IOSTREAM_
-
-template<class K, class V>
-inline std::ostream &operator<<(std::ostream &stream, const QMap<K,V> &m)
-{
- uint count = m.count();
- stream << "QMap: [size: " << count << "; items: ";
-
- QMapConstIterator<K,V> iter = m.begin();
-
- for (unsigned int i = 0; i < count; i++) {
- stream << "(" << iter.key() << "," << iter.data() << ")";
- if (i + 1 < count) {
- stream << ", ";
- }
- ++iter;
- }
-
- return stream << "]";
-}
-
-#endif
-
-#endif
diff --git a/WebCore/kwq/qt/qmemarray.h b/WebCore/kwq/qt/qmemarray.h
deleted file mode 100644
index 233853d..0000000
--- a/WebCore/kwq/qt/qmemarray.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include <qarray.h>
diff --git a/WebCore/kwq/qt/qmovie.h b/WebCore/kwq/qt/qmovie.h
deleted file mode 100644
index b383667..0000000
--- a/WebCore/kwq/qt/qmovie.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- * 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 QMOVIE_H_
-#define QMOVIE_H_
-
-#include <qobject.h>
-#include <qasyncio.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qrect.h>
-
-class QMovie {
-public:
- void unpause() { }
- void pause() { }
- void restart() { }
- bool finished() { return true; }
- bool running() { return false; }
- int frameNumber() const;
-
- const QRect& getValidRect() const;
- const QPixmap& framePixmap() const;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
deleted file mode 100644
index 2ee8ffa..0000000
--- a/WebCore/kwq/qt/qnamespace.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * 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
- * 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 QNAMESPACE_H_
-#define QNAMESPACE_H_
-
-#include <KWQDef.h>
-
-class QColor;
-class QCursor;
-
-typedef unsigned int QRgb;
-
-class Qt {
-public:
-
- enum ButtonState {
- NoButton = 0x0000,
- LeftButton = 0x0001,
- RightButton = 0x0002,
- MidButton = 0x0004,
- MouseButtonMask = 0x0007,
- ShiftButton = 0x0008,
- ControlButton = 0x0010,
- AltButton = 0x0020,
- MetaButton = 0x0040,
- KeyButtonMask = 0x0078,
- Keypad = 0x4000
- };
-
- enum AlignmentFlags {
- AlignAuto = 0x0000, // text alignment
- AlignLeft = 0x0001,
- AlignRight = 0x0002,
- AlignHCenter = 0x0004,
- AlignVCenter = 0x0020,
- AlignCenter = AlignVCenter | AlignHCenter,
-
- DontClip = 0x0080, // misc. flags
- ShowPrefix = 0x0200,
- WordBreak = 0x0400,
- };
-
- enum PenStyle {
- NoPen,
- SolidLine,
- DotLine,
- DashLine
- };
-
- enum BrushStyle {
- NoBrush,
- SolidPattern,
- };
-
- enum Key {
- Key_Escape = 0x1000,
- Key_Tab = 0x1001,
- Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
- Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
- Key_Return = 0x1004,
- Key_Enter = 0x1005,
- Key_Insert = 0x1006,
- Key_Delete = 0x1007,
- Key_Pause = 0x1008,
- Key_Print = 0x1009,
- Key_SysReq = 0x100a,
- Key_Home = 0x1010,
- Key_End = 0x1011,
- Key_Left = 0x1012,
- Key_Up = 0x1013,
- Key_Right = 0x1014,
- Key_Down = 0x1015,
- Key_Prior = 0x1016, Key_PageUp = Key_Prior,
- Key_Next = 0x1017, Key_PageDown = Key_Next,
- Key_Shift = 0x1020,
- Key_Control = 0x1021,
- Key_Meta = 0x1022,
- Key_Alt = 0x1023,
- Key_CapsLock = 0x1024,
- Key_NumLock = 0x1025,
- Key_ScrollLock = 0x1026,
- Key_F1 = 0x1030,
- Key_F2 = 0x1031,
- Key_F3 = 0x1032,
- Key_F4 = 0x1033,
- Key_F5 = 0x1034,
- Key_F6 = 0x1035,
- Key_F7 = 0x1036,
- Key_F8 = 0x1037,
- Key_F9 = 0x1038,
- Key_F10 = 0x1039,
- Key_F11 = 0x103a,
- Key_F12 = 0x103b,
- Key_F13 = 0x103c,
- Key_F14 = 0x103d,
- Key_F15 = 0x103e,
- Key_F16 = 0x103f,
- Key_F17 = 0x1040,
- Key_F18 = 0x1041,
- Key_F19 = 0x1042,
- Key_F20 = 0x1043,
- Key_F21 = 0x1044,
- Key_F22 = 0x1045,
- Key_F23 = 0x1046,
- Key_F24 = 0x1047,
- Key_F25 = 0x1048,
- Key_F26 = 0x1049,
- Key_F27 = 0x104a,
- Key_F28 = 0x104b,
- Key_F29 = 0x104c,
- Key_F30 = 0x104d,
- Key_F31 = 0x104e,
- Key_F32 = 0x104f,
- Key_F33 = 0x1050,
- Key_F34 = 0x1051,
- Key_F35 = 0x1052,
- Key_Super_L = 0x1053,
- Key_Super_R = 0x1054,
- Key_Menu = 0x1055,
- Key_Hyper_L = 0x1056,
- Key_Hyper_R = 0x1057,
- Key_Help = 0x1058,
- Key_Space = 0x20,
- Key_Any = Key_Space,
- Key_Exclam = 0x21,
- Key_QuoteDbl = 0x22,
- Key_NumberSign = 0x23,
- Key_Dollar = 0x24,
- Key_Percent = 0x25,
- Key_Ampersand = 0x26,
- Key_Apostrophe = 0x27,
- Key_ParenLeft = 0x28,
- Key_ParenRight = 0x29,
- Key_Asterisk = 0x2a,
- Key_Plus = 0x2b,
- Key_Comma = 0x2c,
- Key_Minus = 0x2d,
- Key_Period = 0x2e,
- Key_Slash = 0x2f,
- Key_0 = 0x30,
- Key_1 = 0x31,
- Key_2 = 0x32,
- Key_3 = 0x33,
- Key_4 = 0x34,
- Key_5 = 0x35,
- Key_6 = 0x36,
- Key_7 = 0x37,
- Key_8 = 0x38,
- Key_9 = 0x39,
- Key_Colon = 0x3a,
- Key_Semicolon = 0x3b,
- Key_Less = 0x3c,
- Key_Equal = 0x3d,
- Key_Greater = 0x3e,
- Key_Question = 0x3f,
- Key_At = 0x40,
- Key_A = 0x41,
- Key_B = 0x42,
- Key_C = 0x43,
- Key_D = 0x44,
- Key_E = 0x45,
- Key_F = 0x46,
- Key_G = 0x47,
- Key_H = 0x48,
- Key_I = 0x49,
- Key_J = 0x4a,
- Key_K = 0x4b,
- Key_L = 0x4c,
- Key_M = 0x4d,
- Key_N = 0x4e,
- Key_O = 0x4f,
- Key_P = 0x50,
- Key_Q = 0x51,
- Key_R = 0x52,
- Key_S = 0x53,
- Key_T = 0x54,
- Key_U = 0x55,
- Key_V = 0x56,
- Key_W = 0x57,
- Key_X = 0x58,
- Key_Y = 0x59,
- Key_Z = 0x5a,
- Key_BracketLeft = 0x5b,
- Key_Backslash = 0x5c,
- Key_BracketRight = 0x5d,
- Key_AsciiCircum = 0x5e,
- Key_Underscore = 0x5f,
- Key_QuoteLeft = 0x60,
- Key_BraceLeft = 0x7b,
- Key_Bar = 0x7c,
- Key_BraceRight = 0x7d,
- Key_AsciiTilde = 0x7e,
- };
-
- enum RasterOp { // raster op mode
- CopyROP,
- OrROP,
- XorROP,
- };
-
- static const QColor black;
- static const QColor white;
- static const QColor darkGray;
- static const QColor gray;
- static const QColor lightGray;
- static const QColor red;
- static const QColor green;
- static const QColor blue;
- static const QColor cyan;
- static const QColor magenta;
- static const QColor yellow;
-
- static const QCursor sizeAllCursor;
- static const QCursor splitHCursor;
- static const QCursor splitVCursor;
- static const QCursor sizeHorCursor;
- static const QCursor sizeVerCursor;
-
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
deleted file mode 100644
index 123ff2d..0000000
--- a/WebCore/kwq/qt/qobject.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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
- * 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 QOBJECT_H_
-#define QOBJECT_H_
-
-#include <KWQDef.h>
-#include <KWQSignal.h>
-
-#include "qnamespace.h"
-#include "qstring.h"
-#include "qevent.h"
-#include "qstringlist.h"
-#include "qptrlist.h"
-
-#define slots : public
-#define SLOT(x) "SLOT:" #x
-#define signals protected
-#define SIGNAL(x) "SIGNAL:" #x
-#define emit
-#define Q_OBJECT
-#define Q_PROPERTY(text)
-
-class QEvent;
-class QPaintDevice;
-class QPaintDeviceMetrics;
-class QWidget;
-class QColor;
-class QColorGroup;
-class QPalette;
-class QPainter;
-class QRegion;
-class QSize;
-class QSizePolicy;
-class QRect;
-class QFont;
-class QFontMetrics;
-class QBrush;
-class QBitmap;
-class QMovie;
-class QTimer;
-class QImage;
-class QVariant;
-
-class KWQGuardedPtrBase;
-class KWQSignal;
-
-class QObject : public Qt {
-public:
- QObject(QObject *parent = 0, const char *name = 0);
- virtual ~QObject();
-
- static void connect(const QObject *sender, const char *signal, const QObject *receiver, const char *member);
- static void disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *member);
- void connect(const QObject *sender, const char *signal, const char *member) const
- { connect(sender, signal, this, member); }
-
- bool inherits(const char *className) const;
-
- int startTimer(int);
- void killTimer(int);
- void killTimers();
- virtual void timerEvent(QTimerEvent *);
-
- void installEventFilter(const QObject *o) { _eventFilterObject = o; }
- void removeEventFilter(const QObject *) { _eventFilterObject = 0; }
- const QObject *eventFilterObject() const { return _eventFilterObject; }
-
- void blockSignals(bool b) { _signalsBlocked = b; }
-
- virtual bool event(QEvent *);
-
- static const QObject *sender() { return _sender; }
-
-private:
- // no copying or assignment
- QObject(const QObject &);
- QObject &operator=(const QObject &);
-
- KWQSignal *findSignal(const char *signalName) const;
-
- QPtrList<QObject> _guardedPtrDummyList;
-
- mutable KWQSignal *_signalListHead;
- bool _signalsBlocked;
- static const QObject *_sender;
-
- KWQSignal _destroyed;
-
- const QObject *_eventFilterObject;
-
- friend class KWQGuardedPtrBase;
- friend class KWQSignal;
- friend class KWQObjectSenderScope;
-};
-
-class KWQObjectSenderScope
-{
-public:
- KWQObjectSenderScope(const QObject *);
- ~KWQObjectSenderScope();
-
-private:
- const QObject *_savedSender;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpaintdevice.h b/WebCore/kwq/qt/qpaintdevice.h
deleted file mode 100644
index 368f9be..0000000
--- a/WebCore/kwq/qt/qpaintdevice.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * 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 QPAINTDEVICE_H_
-#define QPAINTDEVICE_H_
-
-class QPaintDeviceMetrics;
-
-struct QInternal {
- enum DeviceType { NotPrinter, Printer };
-};
-
-class QPaintDevice {
-public:
- static QInternal::DeviceType devType() { return QInternal::NotPrinter; }
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpaintdevicemetrics.h b/WebCore/kwq/qt/qpaintdevicemetrics.h
deleted file mode 100644
index 01f7ef8..0000000
--- a/WebCore/kwq/qt/qpaintdevicemetrics.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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
- * 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 QPAINTDEVICEMETRICS_H_
-#define QPAINTDEVICEMETRICS_H_
-
-class QPaintDevice;
-
-class QPaintDeviceMetrics {
-public:
- QPaintDeviceMetrics(const QPaintDevice *);
-
- int logicalDpiY() const;
- int depth() const;
- int width() const;
- int height() const;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
deleted file mode 100644
index 1067a44..0000000
--- a/WebCore/kwq/qt/qpainter.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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
- * 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 QPAINTER_H_
-#define QPAINTER_H_
-
-#include <qnamespace.h>
-#include <qpaintdevice.h>
-#include <qcolor.h>
-#include <qpen.h>
-#include <qbrush.h>
-#include <qrect.h>
-#include <qregion.h>
-#include <qpoint.h>
-#include <qstring.h>
-#include <qfontmetrics.h>
-
-class QFont;
-class QPixmap;
-class QWidget;
-class QPainterPrivate;
-
-class QPainter : public Qt {
-public:
- typedef enum { RTL, LTR } TextDirection;
-
- QPainter();
- ~QPainter();
-
- QPaintDevice *device() const { return 0; }
-
- const QFont &font() const;
- void setFont(const QFont &);
- QFontMetrics fontMetrics() const;
-
- const QPen &pen() const;
- void setPen(const QPen &);
- void setPen(PenStyle);
-
- const QBrush &QPainter::brush() const;
- void setBrush(const QBrush &);
- void setBrush(BrushStyle);
-
- QRect xForm(const QRect &) const;
-
- void save();
- void restore();
-
- void drawRect(int, int, int, int);
- void drawLine(int, int, int, int);
- void drawLineSegments(const QPointArray &, int index=0, int nlines=-1);
- void drawEllipse(int, int, int, int);
- void drawArc(int, int, int, int, int, int);
- void drawPolyline(const QPointArray &, int index=0, int npoints=-1);
- void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
- void drawConvexPolygon(const QPointArray &);
-
- void fillRect(int, int, int, int, const QBrush &);
-
- void drawPixmap(const QPoint &, const QPixmap &);
- void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawPixmap( int x, int y, const QPixmap &,
- int sx=0, int sy=0, int sw=-1, int sh=-1 );
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx=0, int sy=0);
-
- void addClip(const QRect &);
-
- RasterOp rasterOp() const;
- void setRasterOp(RasterOp);
-
- void drawText(int x, int y, int, int, int alignmentFlags, const QString &);
- void drawText(int x, int y, const QChar *, int length, int from, int to, int toAdd, const QColor& backgroundColor, QPainter::TextDirection d);
- void drawUnderlineForText(int x, int y, const QChar *, int length);
- static QColor selectedTextBackgroundColor();
-
- bool paintingDisabled() const;
- void setPaintingDisabled(bool);
-
-private:
- // no copying or assignment
- QPainter(const QPainter &);
- QPainter &operator=(const QPainter &);
-
- void _setColorFromBrush();
- void _setColorFromPen();
-
- void _drawPoints(const QPointArray &_points, bool winding, int index, int _npoints, bool fill);
-
- QPainterPrivate *data;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpalette.h b/WebCore/kwq/qt/qpalette.h
deleted file mode 100644
index 737c9d5..0000000
--- a/WebCore/kwq/qt/qpalette.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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
- * 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 QPALETTE_H_
-#define QPALETTE_H_
-
-#include <qcolor.h>
-#include <qbrush.h>
-
-class QColorGroupPrivate;
-class QPalettePrivate;
-
-class QColorGroup {
-public:
- enum ColorRole {
- Foreground,
- Shadow,
- Light,
- Midlight,
- Mid,
- Dark,
- Base,
- ButtonText,
- Button,
- Background,
- Text,
- Highlight,
- HighlightedText,
- NColorRoles
- };
-
- QColorGroup();
-
- const QBrush &brush(ColorRole) const;
-
- const QColor &color(ColorRole) const;
- void setColor(ColorRole, const QColor &);
-
- const QColor &foreground() const;
- const QColor &shadow() const;
- const QColor &light() const;
- const QColor &midlight() const;
- const QColor &dark() const;
- const QColor &base() const;
- const QColor &buttonText() const;
- const QColor &button() const;
- const QColor &text() const;
- const QColor &background() const;
- const QColor &highlight() const;
- const QColor &highlightedText() const;
-
- bool operator==(const QColorGroup &) const;
-
-private:
- QBrush brushes[NColorRoles];
-};
-
-
-class QPalette {
-public:
- enum ColorGroup {
- Active,
- Inactive,
- Disabled,
- NColorGroups
- };
-
- const QColor &color(ColorGroup, QColorGroup::ColorRole) const;
- void setColor(ColorGroup, QColorGroup::ColorRole, const QColor &);
-
- const QColorGroup &active() const { return m_active; }
- const QColorGroup &inactive() const { return m_inactive; }
- const QColorGroup &disabled() const { return m_disabled; }
- const QColorGroup &normal() const { return m_active; }
-
- bool operator==(const QPalette &) const;
-
-private:
- QColorGroup m_active;
- QColorGroup m_inactive;
- QColorGroup m_disabled;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpen.h b/WebCore/kwq/qt/qpen.h
deleted file mode 100644
index aab7507..0000000
--- a/WebCore/kwq/qt/qpen.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
- * 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 QPEN_H_
-#define QPEN_H_
-
-#include <qnamespace.h>
-#include <qcolor.h>
-
-class QPen : public Qt {
-public:
- QPen(const QColor &c = Qt::black, uint w = 0, PenStyle ps = SolidLine);
-
- const QColor &color() const;
- uint width() const;
- PenStyle style() const;
-
- void setColor(const QColor &);
- void setWidth(uint);
- void setStyle(PenStyle);
-
- bool operator==(const QPen &) const;
- bool operator!=(const QPen &) const;
-
-private:
- PenStyle penStyle;
- uint penWidth;
- QColor penColor;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
deleted file mode 100644
index 2d5ade2..0000000
--- a/WebCore/kwq/qt/qpixmap.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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
- * 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 QPIXMAP_H_
-#define QPIXMAP_H_
-
-#include "qpaintdevice.h"
-#include "qcolor.h"
-#include "qstring.h"
-#include "qnamespace.h"
-#include "qimage.h"
-#include "qsize.h"
-#include "qrect.h"
-#include "qpainter.h"
-
-#ifdef __OBJC__
- at protocol WebCoreImageRenderer;
-typedef id <WebCoreImageRenderer> WebCoreImageRendererPtr;
-#else
-class WebCoreImageRenderer;
-typedef WebCoreImageRenderer *WebCoreImageRendererPtr;
-#endif
-
-class QWMatrix;
-
-class QPixmap : public QPaintDevice, public Qt {
-public:
- QPixmap();
- QPixmap(const QSize&);
- QPixmap(const QByteArray&);
- QPixmap(int, int);
- QPixmap(const QPixmap &);
- ~QPixmap();
-
- bool isNull() const;
-
- QSize size() const;
- QRect rect() const;
- int width() const;
- int height() const;
- void resize(const QSize &);
- void resize(int, int);
-
- QPixmap xForm(const QWMatrix &) const;
- QImage convertToImage() const { return QImage(); }
-
- bool mask() const;
-
- QPixmap &operator=(const QPixmap &);
-
- bool receivedData(const QByteArray &bytes, bool isComplete);
- void stopAnimations();
-
- WebCoreImageRendererPtr image() { return imageRenderer; };
-private:
-
- WebCoreImageRendererPtr imageRenderer;
-
- mutable bool needCopyOnWrite;
-
- friend class QPainter;
-
-};
-
-class QWMatrix {
-public:
- QWMatrix() { }
- QWMatrix &scale(double, double) { return *this; }
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
deleted file mode 100644
index 191679c..0000000
--- a/WebCore/kwq/qt/qpoint.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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
- * 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 QPOINT_H_
-#define QPOINT_H_
-
-#include <KWQDef.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <iosfwd>
-#endif
-
-#include "qarray.h"
-
-typedef struct _NSPoint NSPoint;
-
-class QPoint {
-public:
- QPoint();
- QPoint(int, int);
- explicit QPoint(const NSPoint &); // don't do this implicitly since it's lossy
-
- int x() const { return xCoord; }
- int y() const { return yCoord; }
-
- int manhattanLength() const;
-
- friend QPoint operator+(const QPoint &, const QPoint &);
- friend QPoint operator-(const QPoint &, const QPoint &);
-
- operator NSPoint() const;
-
-private:
- int xCoord;
- int yCoord;
-};
-
-class QPointArray : public QMemArray<QPoint> {
-public:
- QPointArray() { }
- QPointArray(int size) : QMemArray<QPoint>(size) { }
-
- QPointArray(int, const int *);
-
- void setPoint(uint, int, int);
-#if 0
- // FIXME: Workaround for Radar 2921061.
- bool setPoints(int, int, int, ...);
-#else
- bool setPoints(int, int, int, int, int, int, int, int, int);
-#endif
- bool setPoints( int nPoints, const int *points );
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QPoint &);
-#endif
-
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qpointarray.h b/WebCore/kwq/qt/qpointarray.h
deleted file mode 100644
index 6a5e778..0000000
--- a/WebCore/kwq/qt/qpointarray.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include <qpoint.h>
diff --git a/WebCore/kwq/qt/qprinter.h b/WebCore/kwq/qt/qprinter.h
deleted file mode 100644
index 0eac63b..0000000
--- a/WebCore/kwq/qt/qprinter.h
+++ /dev/null
@@ -1,38 +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 QPRINTER_H_
-#define QPRINTER_H_
-
-class QPrinter {
- public:
- typedef enum {
- PrinterResolution,
- ScreenResolution
- } PrinterMode;
-};
-
-#endif /* QPRINTER_H_ */
-
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
deleted file mode 100644
index 5cf99cf..0000000
--- a/WebCore/kwq/qt/qptrdict.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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
- * 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 QPTRDICT_H_
-#define QPTRDICT_H_
-
-#include <KWQDef.h>
-#include <qcollection.h>
-
-#include <KWQPtrDictImpl.h>
-
-template <class T> class QPtrDictIterator;
-
-template <class T> class QPtrDict : public QPtrCollection {
-public:
- QPtrDict(int size=17) : impl(size, deleteFunc) {}
- virtual ~QPtrDict() { impl.clear(del_item); }
-
- virtual void clear() { impl.clear(del_item); }
- virtual uint count() const { return impl.count(); }
-
- T *take(void *key) { return (T *)impl.take(key); }
- void insert(void *key, T *value) { impl.insert(key, value); }
- bool remove(void *key) { return impl.remove(key, del_item); }
-
- QPtrDict<T> &operator=(const QPtrDict<T> &pd) { impl.assign(pd.impl,del_item); QPtrCollection::operator=(pd); return *this; }
- T *operator[](void *key) const { return (T *)impl.find(key); }
-
- private:
- static void deleteFunc(void *item) { delete (T *)item; }
-
- KWQPtrDictImpl impl;
-
- friend class QPtrDictIterator<T>;
-};
-
-template<class T> class QPtrDictIterator {
-public:
- QPtrDictIterator(const QPtrDict<T> &pd) : impl(pd.impl) { }
- uint count() { return impl.count(); }
- T *current() const { return (T *)impl.current(); }
- void *currentKey() const { return impl.currentKey(); }
-
- T *operator++() { return (T *)++impl; }
-
-private:
- KWQPtrDictIteratorImpl impl;
-
- QPtrDictIterator(const QPtrDictIterator &);
- QPtrDictIterator &operator=(const QPtrDictIterator &);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qptrlist.h b/WebCore/kwq/qt/qptrlist.h
deleted file mode 100644
index 8b8c885..0000000
--- a/WebCore/kwq/qt/qptrlist.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include <qlist.h>
-
diff --git a/WebCore/kwq/qt/qptrqueue.h b/WebCore/kwq/qt/qptrqueue.h
deleted file mode 100644
index 55f1090..0000000
--- a/WebCore/kwq/qt/qptrqueue.h
+++ /dev/null
@@ -1,46 +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 QPTRQUEUE_H_
-#define QPTRQUEUE_H_
-
-#include <qptrlist.h>
-
-
-template<class T> class QPtrQueue
-{
-public:
- bool isEmpty() const { return list.isEmpty(); }
- T *dequeue() { T *tmp = list.getFirst(); list.removeFirst(); return tmp; }
- void enqueue(const T *item) { list.append (item); }
- uint count() const { return list.count(); }
- T *head() const { return list.getFirst(); }
- QPtrQueue<T> &operator=(const QPtrQueue<T> &q) { list = q.list; return *this; }
-
- private:
- QPtrList<T> list;
-};
-
-#endif /* QPTRQUEUE_H_ */
diff --git a/WebCore/kwq/qt/qptrstack.h b/WebCore/kwq/qt/qptrstack.h
deleted file mode 100644
index d252703..0000000
--- a/WebCore/kwq/qt/qptrstack.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include <qstack.h>
diff --git a/WebCore/kwq/qt/qptrvector.h b/WebCore/kwq/qt/qptrvector.h
deleted file mode 100644
index 251974c..0000000
--- a/WebCore/kwq/qt/qptrvector.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <qvector.h>
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
deleted file mode 100644
index 48808cd..0000000
--- a/WebCore/kwq/qt/qpushbutton.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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
- * 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 QPUSHBUTTON_H_
-#define QPUSHBUTTON_H_
-
-#include <qbutton.h>
-
-class QPushButton : public QButton {
-public:
- QPushButton(QWidget *parent);
- QPushButton(const QString &text, QWidget *parent);
-
- QSize sizeHint() const;
- QRect frameGeometry() const;
- void setFrameGeometry(const QRect &);
- int baselinePosition() const;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qradiobutton.h b/WebCore/kwq/qt/qradiobutton.h
deleted file mode 100644
index 41039d1..0000000
--- a/WebCore/kwq/qt/qradiobutton.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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
- * 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 QRADIOBUTTON_H_
-#define QRADIOBUTTON_H_
-
-#include <qbutton.h>
-
-class QRadioButton : public QButton {
-public:
- QRadioButton(QWidget *);
-
- void setChecked(bool);
- bool isChecked() const;
-
- QSize sizeHint() const;
- int baselinePosition() const;
- QRect frameGeometry() const;
- void setFrameGeometry(const QRect &);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
deleted file mode 100644
index 60b8287..0000000
--- a/WebCore/kwq/qt/qrect.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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
- * 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 QRECT_H_
-#define QRECT_H_
-
-#include <qsize.h>
-#include <qpoint.h>
-
-typedef struct _NSRect NSRect;
-
-class QRect {
-public:
- QRect();
- QRect(QPoint p, QSize s);
- QRect(int, int, int, int);
- explicit QRect(const NSRect &); // don't do this implicitly since it's lossy
-
- bool isNull() const;
- bool isValid() const;
- bool isEmpty() const;
-
- int x() const { return xp; }
- int y() const { return yp; }
- int left() const { return xp; }
- int top() const { return yp; }
- int right() const;
- int bottom() const;
- int width() const { return w; }
- int height() const { return h; }
-
- QPoint topLeft() const;
- QSize size() const;
- void setX(int x) { xp = x; }
- void setY(int y) { yp = y; }
- void setWidth(int width) { w = width; }
- void setHeight(int height) { h = height; }
- QRect intersect(const QRect &) const;
- bool intersects(const QRect &) const;
- QRect unite(const QRect &) const;
-
- bool contains(int x, int y, bool proper = false) {
- if (proper)
- return x > xp && (x < (xp + w - 1)) && y > yp && y < (yp + h - 1);
- return x >= xp && x < (xp + w) && y >= yp && y < (yp + h);
- }
-
- inline QRect operator&(const QRect &r) const { return intersect(r); }
-
- operator NSRect() const;
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QRect &);
-#endif
-
-private:
- int xp;
- int yp;
- int w;
- int h;
-
- friend bool operator==(const QRect &, const QRect &);
- friend bool operator!=(const QRect &, const QRect &);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qregexp.h b/WebCore/kwq/qt/qregexp.h
deleted file mode 100644
index 2857973..0000000
--- a/WebCore/kwq/qt/qregexp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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
- * 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 QREGEXP_H_
-#define QREGEXP_H_
-
-#include <qstring.h>
-
-#include <KWQRefPtr.h>
-
-class QRegExp {
-public:
- QRegExp();
- QRegExp(const QString &, bool caseSensitive = false, bool glob = false);
- QRegExp(const char *);
- ~QRegExp();
-
- QRegExp(const QRegExp &);
- QRegExp &operator=(const QRegExp &);
-
- QString pattern() const;
- int match(const QString &, int startFrom = 0, int *matchLength = 0, bool treatStartAsStartOfInput = true) const;
-
-private:
- class KWQRegExpPrivate;
- KWQRefPtr<KWQRegExpPrivate> d;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
deleted file mode 100644
index 53f0cdb..0000000
--- a/WebCore/kwq/qt/qregion.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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
- * 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 QREGION_H_
-#define QREGION_H_
-
-#include <qpoint.h>
-#include <qimage.h>
-#include <qrect.h>
-
-#ifdef __OBJC__
- at class NSBezierPath;
-#else
-class NSBezierPath;
-#endif
-
-class QRegion {
-public:
- enum RegionType { Ellipse, Rectangle };
-
- QRegion() : path(0) { }
- QRegion(const QRect &);
- QRegion(int, int, int, int, RegionType = Rectangle);
- QRegion(const QPointArray &);
- ~QRegion();
-
- QRegion(const QRegion &);
- QRegion &operator=(const QRegion &);
-
- bool contains(const QPoint &) const;
- QRect boundingRect() const;
-
- void translate(int deltaX, int deltaY);
-
-private:
- NSBezierPath *path;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
deleted file mode 100644
index 0aefa6e..0000000
--- a/WebCore/kwq/qt/qscrollview.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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
- * 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 QSCROLLVIEW_H_
-#define QSCROLLVIEW_H_
-
-#include <qframe.h>
-
-#ifdef __OBJC__
- at class NSView;
-#else
-class NSView;
-#endif
-
-class QScrollView : public QFrame {
-public:
- enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
-
- QScrollView(QWidget *parent = 0, const char *name = 0, int flags = 0) { }
-
- QWidget *viewport() const;
- int visibleWidth() const;
- int visibleHeight() const;
- int contentsWidth() const;
- int contentsHeight() const;
- int contentsX() const;
- int contentsY() const;
- void scrollBy(int dx, int dy);
-
- void setContentsPos(int x, int y);
-
- virtual void setVScrollBarMode(ScrollBarMode);
- virtual void setHScrollBarMode(ScrollBarMode);
-
- void addChild(QWidget *child, int x = 0, int y = 0);
- void removeChild(QWidget *child);
- int childX(QWidget *child);
- int childY(QWidget *child);
-
- virtual void resizeContents(int w, int h);
- void updateContents(int x, int y, int w, int h, bool now=false);
- void updateContents(const QRect &r, bool now=false);
- void repaintContents(int x, int y, int w, int h, bool erase = true);
- QPoint contentsToViewport(const QPoint &);
- void contentsToViewport(int x, int y, int& vx, int& vy);
- void viewportToContents(int vx, int vy, int& x, int& y);
-
- QWidget *clipper() const { return 0; }
- void enableClipper(bool) { }
-
- void setStaticBackground(bool);
-
- void resizeEvent(QResizeEvent *);
-
- void ensureVisible(int,int);
- void ensureVisible(int,int,int,int);
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qsize.h b/WebCore/kwq/qt/qsize.h
deleted file mode 100644
index adae534..0000000
--- a/WebCore/kwq/qt/qsize.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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
- * 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 QSIZE_H_
-#define QSIZE_H_
-
-#include <KWQDef.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <iosfwd>
-#endif
-
-typedef struct _NSSize NSSize;
-
-class QSize {
-public:
- QSize();
- QSize(int,int);
- explicit QSize(const NSSize &);
-
- bool isValid() const;
- int width() const { return w; }
- int height() const { return h; }
- void setWidth(int width) { w = width; }
- void setHeight(int height) { h = height; }
- QSize expandedTo(const QSize &) const;
-
- operator NSSize() const;
-
- friend QSize operator+(const QSize &, const QSize &);
- friend bool operator==(const QSize &, const QSize &);
- friend bool operator!=(const QSize &, const QSize &);
-
-#ifdef _KWQ_IOSTREAM_
- friend std::ostream &operator<<(std::ostream &, const QSize &);
-#endif
-
-private:
- int w;
- int h;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qsortedlist.h b/WebCore/kwq/qt/qsortedlist.h
deleted file mode 100644
index 34ca5d8..0000000
--- a/WebCore/kwq/qt/qsortedlist.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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
- * 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 QSORTEDLIST_H_
-#define QSORTEDLIST_H_
-
-#include <qptrlist.h>
-
-template<class T> class QSortedList : public QPtrList<T> {
-public:
- virtual int compareItems(void *a, void *b)
- {
- T *ta = (T *)a;
- T *tb = (T *)b;
- if (*ta == *tb) {
- return 0;
- } else if (*ta < *tb) {
- return -1;
- } else {
- return 1;
- }
- }
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qstack.h b/WebCore/kwq/qt/qstack.h
deleted file mode 100644
index 730a85e..0000000
--- a/WebCore/kwq/qt/qstack.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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
- * 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 QSTACK_H_
-#define QSTACK_H_
-
-#include <qlist.h>
-
-template<class T> class QPtrStack {
-public:
- QPtrStack() { }
-
- bool isEmpty() const { return list.isEmpty(); }
- void push(const T *item) { list.append (item); }
- T *pop() { T *tmp = list.getLast(); list.removeLast(); return tmp; }
- uint count() const { return list.count(); }
-
- private:
- QPtrList<T> list;
-
-};
-
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QPtrStack<T>&s)
-{
- stream << "QPtrStack: [size: " << s.count() << "; items: ";
-
- QPtrStack<T> tmp(s);
-
- while (!tmp.isEmpty()) {
- stream << *tmp.pop();
- if (tmp.count() > 0) {
- stream << ", ";
- }
- }
-
- stream << "]";
-
- return stream;
-}
-
-#endif
-
-#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
deleted file mode 100644
index a7cf720..0000000
--- a/WebCore/kwq/qt/qstring.h
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * 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
- * 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 QSTRING_H_
-#define QSTRING_H_
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <qcstring.h>
-
-// Make htmltokenizer.cpp happy
-#define QT_VERSION 300
-
-class QRegExp;
-
-#ifdef __OBJC__
- at class NSString;
-#else
-class NSString;
-#endif
-
-class QChar {
-public:
- enum Direction {
- // NOTE: alphabetical order
- //DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
- //DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
- //
- // Until we understand the implications better, I say we go with the qt
- // ordering here
- DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
- DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
- };
-
- static const QChar null;
-
- QChar();
- QChar(char);
- QChar(uchar);
- QChar(short);
- QChar(ushort);
- QChar(int);
- QChar(uint);
-
- ushort unicode() const;
- uchar cell() const;
- uchar row() const;
- char latin1() const;
- bool isNull() const;
- bool isSpace() const;
- bool isDigit() const;
- bool isLetter() const;
- bool isNumber() const;
- bool isLetterOrNumber() const;
- bool isPunct() const;
- int digitValue() const;
- QChar lower() const;
- QChar upper() const;
- Direction direction() const;
- bool mirrored() const;
- QChar mirroredChar() const;
-
- operator char() const;
-
- friend bool operator==(QChar, QChar);
- friend bool operator==(QChar, char);
- friend bool operator==(char, QChar);
-
- friend bool operator!=(QChar, QChar);
- friend bool operator!=(QChar, char);
- friend bool operator!=(char, QChar);
-
- friend bool operator>(QChar, QChar);
- friend bool operator>(QChar, char);
- friend bool operator>(char, QChar);
-
- friend bool operator>=(QChar, QChar);
- friend bool operator>=(QChar, char);
- friend bool operator>=(char, QChar);
-
- friend bool operator<(QChar, QChar);
- friend bool operator<(QChar, char);
- friend bool operator<(char, QChar);
-
- friend bool operator<=(QChar, QChar);
- friend bool operator<=(QChar, char);
- friend bool operator<=(char, QChar);
-
-private:
- UniChar c;
-
- friend class QString;
- friend class QConstString;
-
-};
-
-inline QChar::QChar() : c(0)
-{
-}
-
-inline QChar::QChar(char ch) : c((uchar) ch)
-{
-}
-
-inline QChar::QChar(uchar uch) : c(uch)
-{
-}
-
-inline QChar::QChar(short n) : c(n)
-{
-}
-
-inline QChar::QChar(ushort n) : c(n)
-{
-}
-
-inline QChar::QChar(uint n) : c(n)
-{
-}
-
-inline QChar::QChar(int n) : c(n)
-{
-}
-
-inline ushort QChar::unicode() const
-{
- return c;
-}
-
-inline uchar QChar::cell() const
-{
- return c;
-}
-
-inline bool QChar::isNull() const
-{
- return c == 0;
-}
-
-inline uchar QChar::row() const
-{
- return c >> 8;
-}
-
-inline char QChar::latin1() const
-{
- return c > 0xff ? 0 : c;
-}
-
-inline QChar::operator char() const
-{
- return c > 0xff ? 0 : c;
-}
-
-inline bool operator==(QChar qc1, QChar qc2)
-{
- return qc1.c == qc2.c;
-}
-
-inline bool operator==(QChar qc, char ch)
-{
- return qc.c == (uchar) ch;
-}
-
-inline bool operator==(char ch, QChar qc)
-{
- return (uchar) ch == qc.c;
-}
-
-inline bool operator!=(QChar qc1, QChar qc2)
-{
- return qc1.c != qc2.c;
-}
-
-inline bool operator!=(QChar qc, char ch)
-{
- return qc.c != (uchar) ch;
-}
-
-inline bool operator!=(char ch, QChar qc)
-{
- return (uchar) ch != qc.c;
-}
-
-inline bool operator>=(QChar qc1, QChar qc2)
-{
- return qc1.c >= qc2.c;
-}
-
-inline bool operator>=(QChar qc, char ch)
-{
- return qc.c >= (uchar) ch;
-}
-
-inline bool operator>=(char ch, QChar qc)
-{
- return (uchar) ch >= qc.c;
-}
-
-inline bool operator>(QChar qc1, QChar qc2)
-{
- return qc1.c > qc2.c;
-}
-
-inline bool operator>(QChar qc, char ch)
-{
- return qc.c > (uchar) ch;
-}
-
-inline bool operator>(char ch, QChar qc)
-{
- return (uchar) ch > qc.c;
-}
-
-inline bool operator<=(QChar qc1, QChar qc2)
-{
- return qc1.c <= qc2.c;
-}
-
-inline bool operator<=(QChar qc, char ch)
-{
- return qc.c <= (uchar) ch;
-}
-
-inline bool operator<=(char ch, QChar qc)
-{
- return (uchar) ch <= qc.c;
-}
-
-inline bool operator<(QChar qc1, QChar qc2)
-{
- return qc1.c < qc2.c;
-}
-
-inline bool operator<(QChar qc, char ch)
-{
- return qc.c < (uchar) ch;
-}
-
-inline bool operator<(char ch, QChar qc)
-{
- return (uchar) ch < qc.c;
-}
-
-// Keep this struct to <= 46 bytes, that's what the system will allocate.
-// Will be rounded up to a multiple of 4, so we're stuck at 44.
-
-#define QS_INTERNAL_BUFFER_SIZE 20
-#define QS_INTERNAL_BUFFER_CHARS QS_INTERNAL_BUFFER_SIZE-1
-#define QS_INTERNAL_BUFFER_UCHARS QS_INTERNAL_BUFFER_SIZE/2
-
-struct QStringData {
- // Uses shared null data.
- QStringData();
- void initialize();
-
- // No copy.
- QStringData(QChar *u, uint l, uint m);
- void initialize(QChar *u, uint l, uint m);
-
- // Copy bytes;
- QStringData(const QChar *u, uint l);
- void initialize(const QChar *u, uint l);
-
- // Copy bytes;
- QStringData(const char *u, uint l);
- void initialize(const char *u, uint l);
-
- ~QStringData();
-
-#ifdef QSTRING_DEBUG_ALLOCATIONS
- void* operator new(size_t s);
- void operator delete(void*p);
-#endif
-
- inline void ref() { refCount++; }
- inline void deref() { if (--refCount == 0 && _isHeapAllocated) delete this; }
-
- char *ascii();
- char *makeAscii();
- void increaseAsciiSize(uint size);
-
- QChar *unicode();
- QChar *makeUnicode();
- void increaseUnicodeSize(uint size);
-
- uint refCount;
- uint _length;
- mutable QChar *_unicode;
- mutable char *_ascii;
- uint _maxUnicode:29;
- uint _isUnicodeInternal:1;
- uint _isUnicodeValid:1;
- uint _isHeapAllocated:1; // Fragile, but the only way we can be sure the instance was
- // created with 'new'.
- uint _maxAscii:30;
- uint _isAsciiInternal:1;
- uint _isAsciiValid:1;
- char _internalBuffer[QS_INTERNAL_BUFFER_SIZE]; // Pad out to a (((size + 1) & ~15) + 14) size
-};
-
-class QString {
-public:
- static const QString null;
-
- QString();
- QString(QChar);
- QString(const QByteArray &);
- QString(const QChar *, uint);
- QString(const char *);
- QString(const char *, int len);
-
- QString(const QString &);
- QString &operator=(const QString &);
-
- ~QString();
-
- static QString fromLatin1(const char *);
- static QString fromLatin1(const char *, int len);
- static QString fromStringWithEncoding(const char *, int, CFStringEncoding);
- static QString fromCFString(CFStringRef);
- static QString fromNSString(NSString *);
-
- QString &operator=(char);
- QString &operator=(QChar);
- QString &operator=(const char *);
- QString &operator=(const QCString &);
-
- uint length() const;
-
- const QChar *unicode() const;
- const char *latin1() const;
- const char *ascii() const;
- QCString utf8() const;
- QCString local8Bit() const;
-
- bool isNull() const;
- bool isEmpty() const;
-
- QChar at(uint) const;
-
- int compare(const QString &) const;
- int compare(const char *) const;
-
- bool startsWith(const QString &) const;
-
- int find(char, int index = 0) const;
- int find(QChar, int index = 0) const;
- int find(const char *, int index = 0, bool cs = true) const;
- int find(const QString &, int index = 0, bool cs = true) const;
- int find(const QRegExp &, int index = 0) const;
-
- int findRev(char, int index = -1) const;
- int findRev(const QString& str, int index, bool cs = true) const;
- int findRev(const char *, int index = -1) const;
-
- int contains(char) const;
- int contains(const char *, bool cs = true) const;
- int contains(const QString &, bool cs = true) const;
- int contains(QChar c, bool cs = true) const;
-
- bool endsWith(const QString &) const;
-
- // NOTE: toXXXXX integer functions only support base 10 and base 16
- // NOTE: toShort, toUShort, toULong, and toDouble are NOT used but are kept
- // for completeness
- short toShort(bool *ok=NULL, int base=10) const;
- // NOTE: ok and base NOT used for toUShort
- ushort toUShort(bool *ok=NULL, int base=10) const;
- int toInt(bool *ok=NULL, int base=10) const;
- // NOTE: base NOT used for toUInt
- uint toUInt(bool *ok=NULL, int base=10) const;
- long toLong(bool *ok=NULL, int base=10) const;
- ulong toULong(bool *ok=NULL, int base=10) const;
- float toFloat(bool *ok=NULL) const;
- double toDouble(bool *ok=NULL) const;
-
- static QString number(int);
- static QString number(uint);
- static QString number(long);
- static QString number(ulong);
- static QString number(double);
-
- bool findArg(int& pos, int& len) const;
-
- QString arg(const QString &, int width=0) const;
- QString arg(short, int width=0) const;
- QString arg(ushort, int width=0) const;
- QString arg(int, int width=0) const;
- QString arg(uint, int width=0) const;
- QString arg(long, int width=0) const;
- QString arg(ulong, int width=0) const;
- QString arg(double, int width=0) const;
-
- QString left(uint) const;
- QString right(uint) const;
- QString mid(uint, uint len=0xffffffff) const;
-
- QString copy() const;
-
- QString lower() const;
- QString stripWhiteSpace() const;
- QString simplifyWhiteSpace() const;
-
- QString &setUnicode(const QChar *, uint);
- QString &setLatin1(const char *, int len=-1);
-
- QString &setNum(short);
- QString &setNum(ushort);
- QString &setNum(int);
- QString &setNum(uint);
- QString &setNum(long);
- QString &setNum(ulong);
- QString &setNum(double);
-
- QString &sprintf(const char *, ...) __attribute__ ((format (printf, 2, 3)));
-
- QString &prepend(const QString &);
- QString &append(const QString &);
- QString &insert(uint, const QString &);
- QString &insert(uint, QChar);
- QString &insert(uint, char);
- QString &insert(uint index, const char *insertChars, uint insertLength);
- QString &remove(uint, uint);
- QString &replace( uint index, uint len, const QString &s );
- //QString &replace( uint index, uint len, const QChar* s, uint slen );
- QString &replace(const QRegExp &, const QString &);
-
- void truncate(uint);
- void fill(QChar, int len=-1);
-
- void compose();
- QString visual();
-
- CFStringRef getCFString() const;
- NSString *getNSString() const;
-
- bool operator!() const;
-
- const QChar operator[](int) const;
-
- QString &operator+=(const QString &);
- QString &operator+=(QChar);
- QString &operator+=(char);
-
- void setBufferFromCFString(CFStringRef);
-
-private:
- // Used by QConstString.
- QString(QStringData *constData, bool /*dummy*/);
- void detach();
- void detachInternal();
- void deref();
- QChar *forceUnicode();
- void setLength(uint);
-
- QStringData *data() const;
-
- QCString convertToQCString(CFStringEncoding) const;
-
- QStringData **dataHandle;
- QStringData internalData;
-
- static QStringData* shared_null;
- static QStringData* makeSharedNull();
- static QStringData**shared_null_handle;
- static QStringData**makeSharedNullHandle();
-
- friend bool operator==(const QString &, const QString &);
- friend bool operator==(const QString &, const char *);
-
- friend class QConstString;
- friend class QGDict;
- friend struct QStringData;
-};
-
-QString operator+(const QString &, const QString &);
-QString operator+(const QString &, const char *);
-QString operator+(const QString &, QChar);
-QString operator+(const QString &, char);
-QString operator+(const char *, const QString &);
-QString operator+(QChar, const QString &);
-QString operator+(char, const QString &);
-
-inline QStringData *QString::data() const { return *dataHandle; }
-
-inline uint QString::length() const
-{
- return data()->_length;
-}
-
-inline bool QString::isEmpty() const
-{
- return length() == 0;
-}
-
-inline QString QString::fromLatin1(const char *chs)
-{
- return chs;
-}
-
-inline QString QString::fromLatin1(const char *chs, int length)
-{
- return QString(chs, length);
-}
-
-inline const char *QString::ascii() const
-{
- return latin1();
-}
-
-inline float QString::toFloat(bool *ok) const
-{
- return toDouble(ok);
-}
-
-inline bool QString::operator!() const
-{
- return isNull();
-}
-
-inline const QChar QString::operator[](int index) const
-{
- return at(index);
-}
-
-inline bool operator==(const char *chs, const QString &qs)
-{
- return qs == chs;
-}
-
-inline bool operator!=(const QString &qs1, const QString &qs2)
-{
- return !(qs1 == qs2);
-}
-
-inline bool operator!=(const QString &qs, const char *chs)
-{
- return !(qs == chs);
-}
-
-inline bool operator!=(const char *chs, const QString &qs)
-{
- return !(qs == chs);
-}
-
-inline bool operator<(const QString &qs1, const QString &qs2)
-{
- return qs1.compare(qs2) < 0;
-}
-
-inline bool operator<(const QString &qs, const char *chs)
-{
- return qs.compare(chs) < 0;
-}
-
-inline bool operator<(const char *chs, const QString &qs)
-{
- return qs.compare(chs) > 0;
-}
-
-inline bool operator<=(const QString &qs1, const QString &qs2)
-{
- return qs1.compare(qs2) <= 0;
-}
-
-inline bool operator<=(const QString &qs, const char *chs)
-{
- return qs.compare(chs) <= 0;
-}
-
-inline bool operator<=(const char *chs, const QString &qs)
-{
- return qs.compare(chs) >= 0;
-}
-
-inline bool operator>(const QString &qs1, const QString &qs2)
-{
- return qs1.compare(qs2) > 0;
-}
-
-inline bool operator>(const QString &qs, const char *chs)
-{
- return qs.compare(chs) > 0;
-}
-
-inline bool operator>(const char *chs, const QString &qs)
-{
- return qs.compare(chs) < 0;
-}
-
-inline bool operator>=(const QString &qs1, const QString &qs2)
-{
- return qs1.compare(qs2) >= 0;
-}
-
-inline bool operator>=(const QString &qs, const char *chs)
-{
- return qs.compare(chs) >= 0;
-}
-
-inline bool operator>=(const char *chs, const QString &qs)
-{
- return qs.compare(chs) <= 0;
-}
-
-class QConstString : private QString {
-public:
- QConstString(const QChar *, uint);
- ~QConstString();
- const QString &string() const { return *this; }
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qstringlist.h b/WebCore/kwq/qt/qstringlist.h
deleted file mode 100644
index fab8beb..0000000
--- a/WebCore/kwq/qt/qstringlist.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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
- * 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 QSTRINGLIST_H_
-#define QSTRINGLIST_H_
-
-#include <qstring.h>
-#include <qvaluelist.h>
-
-class QStringList : public QValueList<QString> {
-public:
- static QStringList split(const QString &, const QString &, bool allowEmptyEntries = false);
- static QStringList split(const QChar &, const QString &, bool allowEmptyEntries = false);
-
- QString join(const QString &) const;
-
- QString pop_front();
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qstyle.h b/WebCore/kwq/qt/qstyle.h
deleted file mode 100644
index fdb5cf5..0000000
--- a/WebCore/kwq/qt/qstyle.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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
- * 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 KWQSTYLE_H_
-#define KWQSTYLE_H_
-
-#include <qobject.h>
-#include <qsize.h>
-
-class QWidget;
-
-class QStyle : public QObject {
-public:
- enum PixelMetric {
- PM_IndicatorWidth,
- PM_IndicatorHeight,
- PM_ExclusiveIndicatorWidth,
- PM_ExclusiveIndicatorHeight,
- PM_DefaultFrameWidth,
- PM_ButtonMargin
- };
-
- enum ContentType {
- CT_PushButton
- };
-
- int pixelMetric(PixelMetric metric, QWidget * = 0) const {
- switch (metric) {
- case PM_IndicatorWidth:
- case PM_IndicatorHeight:
- case PM_ExclusiveIndicatorWidth:
- case PM_ExclusiveIndicatorHeight:
- case PM_DefaultFrameWidth:
- return 22; // FIXME! Shouldn't be hardcoded. Perhaps shouldn't all be same.
- case PM_ButtonMargin:
- return 0;
- }
- return 0;
- }
-
- QSize sizeFromContents(ContentType, QWidget *, const QSize &) const;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qstylesheet.h b/WebCore/kwq/qt/qstylesheet.h
deleted file mode 100644
index f0d1f25..0000000
--- a/WebCore/kwq/qt/qstylesheet.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- * 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 QSTYLESHEET_H
-#define QSTYLESHEET_H
-
-#include <qstring.h>
-
-class QStyleSheet
-{
- public:
- static QString convertFromPlainText(const QString &s) { return s; }
-};
-
-#endif /* QSTYLESHEET_H */
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
deleted file mode 100644
index 812bfdf..0000000
--- a/WebCore/kwq/qt/qtextcodec.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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
- * 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 QTEXTCODEC_H_
-#define QTEXTCODEC_H_
-
-#include <qstring.h>
-#include <qcstring.h>
-
-class QTextDecoder;
-
-class QTextCodec {
-public:
- static QTextCodec *codecForMib(int);
- static QTextCodec *codecForName(const char *);
- static QTextCodec *codecForLocale();
-
- QTextCodec(CFStringEncoding e) : encoding(e) { }
-
- const char* name() const;
- int mibEnum() const;
-
- QTextDecoder *makeDecoder() const;
-
- QCString fromUnicode(const QString &) const;
-
- QString toUnicode(const char *, int) const;
- QString toUnicode(const QByteArray &, int) const;
- QString toUnicode(const char *) const;
-
-private:
- CFStringEncoding encoding;
-};
-
-class QTextDecoder {
-public:
- QTextDecoder(const QTextCodec *c) : textCodec(*c) { }
- QString toUnicode(const char *chs, int len) { return textCodec.toUnicode(chs, len); }
-private:
- QTextCodec textCodec;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qtextedit.h b/WebCore/kwq/qt/qtextedit.h
deleted file mode 100644
index 6a3096e..0000000
--- a/WebCore/kwq/qt/qtextedit.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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
- * 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 QTEXTEDIT_H_
-#define QTEXTEDIT_H_
-
-#include <qscrollview.h>
-
-#include <KWQSignal.h>
-
-class QTextEdit : public QScrollView
-{
- public:
- typedef enum {
- NoWrap,
- WidgetWidth
- } WrapStyle;
-
- typedef enum {
- PlainText,
- } TextFormat;
-
- QTextEdit(QWidget *parent);
-
- void setText(const QString &);
- QString text(int);
- QString text();
-
- int paragraphs() const;
- int paragraphLength(int) const;
- int lineOfChar(int, int);
-
- WrapStyle wordWrap() const;
- void setWordWrap(WrapStyle);
- void setTextFormat(TextFormat);
- void setTabStopWidth(int);
- bool isReadOnly () const;
- void setReadOnly (bool);
- void getCursorPosition(int *, int *) const;
- void setCursorPosition(int, int);
-
- void selectAll();
-
- int verticalScrollBarWidth() const;
- int horizontalScrollBarHeight() const;
-
- void textChanged() { m_textChanged.call(); }
-
- FocusPolicy focusPolicy() const;
-
- void setFont(const QFont &);
-
- private:
- KWQSignal m_textChanged;
-};
-
-#endif /* QTEXTEDIT_H_ */
diff --git a/WebCore/kwq/qt/qtextstream.h b/WebCore/kwq/qt/qtextstream.h
deleted file mode 100644
index fe679d6..0000000
--- a/WebCore/kwq/qt/qtextstream.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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
- * 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 QTEXTSTREAM_H_
-#define QTEXTSTREAM_H_
-
-#include "qstring.h"
-
-class QTextStream;
-
-typedef QTextStream &(*QTextStreamManipulator)(QTextStream &);
-
-QTextStream &endl(QTextStream& stream);
-
-class QTextStream {
-public:
- QTextStream();
- QTextStream(QByteArray, int);
- QTextStream(QString *, int);
- virtual ~QTextStream();
-
- QTextStream &operator<<(char);
- QTextStream &operator<<(const char *);
- QTextStream &operator<<(const QCString &);
- QTextStream &operator<<(const QString &);
- QTextStream &operator<<(const QTextStreamManipulator &);
- QTextStream &operator<<(const void *);
-
-private:
- QTextStream(const QTextStream &);
- QTextStream &operator=(const QTextStream &);
-
-};
-
-class QTextIStream : public QTextStream {
-public:
-
- QTextIStream(QString *);
-
- QString readLine();
-
-};
-
-class QTextOStream : public QTextStream {
-public:
-
- QTextOStream(QString *);
- QTextOStream(QByteArray);
-
- QString readLine();
-
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qtimer.h b/WebCore/kwq/qt/qtimer.h
deleted file mode 100644
index fbc4e87..0000000
--- a/WebCore/kwq/qt/qtimer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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
- * 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 QTIMER_H_
-#define QTIMER_H_
-
-#include <qobject.h>
-#include <KWQSignal.h>
-
-#ifdef __OBJC__
- at class NSTimer;
-#else
-class NSTimer;
-#endif
-
-class QTimer : public QObject {
-public:
- QTimer();
- ~QTimer() { stop(); }
-
- bool isActive() const;
- void start(int msec, bool singleShot = false);
- void stop();
- void fire();
-
- static void singleShot(int msec, QObject *receiver, const char *member);
-
- // This is just a hack used by KWQKHTMLPartImpl. The monitor function
- // gets called when the timer starts and when it is stopped before firing,
- // but not when the timer fires.
- void setMonitor(void (*monitorFunction)(void *context), void *context);
- NSTimer *getNSTimer() { return m_timer; }
-
-private:
- NSTimer *m_timer;
- void (*m_monitorFunction)(void *context);
- void *m_monitorFunctionContext;
- KWQSignal m_timeoutSignal;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qtooltip.h b/WebCore/kwq/qt/qtooltip.h
deleted file mode 100644
index e0a678c..0000000
--- a/WebCore/kwq/qt/qtooltip.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * 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 QTOOLTIP_H_
-#define QTOOLTIP_H_
-
-#include <qpalette.h>
-
-class QToolTip {
-public:
- QToolTip(QWidget *) { }
- void tip(const QRect &r, const QString &s) { }
-
- static QPalette palette() { return QPalette(); }
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
deleted file mode 100644
index ebdabfa..0000000
--- a/WebCore/kwq/qt/qvaluelist.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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
- * 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 QVALUELIST_H_
-#define QVALUELIST_H_
-
-#include <KWQDef.h>
-#include <KWQValueListImpl.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
-template <class T> class QValueList;
-template <class T> class QValueListConstIterator;
-
-template<class T> class QValueListNode : private KWQValueListNodeImpl {
-public:
- QValueListNode(const T &val) : value(val) { }
- T value;
- friend class QValueList<T>;
-};
-
-template<class T> class QValueListIterator {
-public:
- QValueListIterator() { }
-
- T& operator*() const { return ((QValueListNode<T> *)impl.node())->value; }
-
- QValueListIterator &operator++() { ++impl; return *this; }
- QValueListIterator &operator--() { --impl; return *this; }
- QValueListIterator operator++(int) { return impl++; }
-
- bool operator==(const QValueListIterator &other) { return impl == other.impl; }
- bool operator!=(const QValueListIterator &other) { return impl != other.impl; }
-
-private:
- QValueListIterator(const KWQValueListIteratorImpl &pImp) : impl(pImp) { }
-
- KWQValueListIteratorImpl impl;
-
- friend class QValueList<T>;
- friend class QValueListConstIterator<T>;
-};
-
-template<class T> class QValueListConstIterator {
-public:
- QValueListConstIterator() { }
- QValueListConstIterator(const QValueListIterator<T> &it) : impl(it.impl) { }
-
- const T& operator*() const { return ((const QValueListNode<T> *)impl.node())->value; }
-
- QValueListConstIterator &operator++() { ++impl; return *this; }
- QValueListConstIterator &operator--() { --impl; return *this; }
- QValueListConstIterator operator++(int) { return impl++; }
-
- bool operator==(const QValueListConstIterator &other) { return impl == other.impl; }
- bool operator!=(const QValueListConstIterator &other) { return impl != other.impl; }
-
-private:
- QValueListConstIterator(const KWQValueListIteratorImpl &pImp) : impl(pImp) { }
-
- KWQValueListIteratorImpl impl;
-
- friend class QValueList<T>;
-};
-
-template<class T> bool operator==(const QValueList<T> &a, const QValueList<T> &b);
-
-template <class T> class QValueList {
-public:
- typedef QValueListIterator<T> Iterator;
- typedef QValueListConstIterator<T> ConstIterator;
-
- QValueList() : impl(deleteNode, copyNode) { }
-
- void clear() { impl.clear(); }
- uint count() const { return impl.count(); }
- bool isEmpty() const { return impl.isEmpty(); }
-
- Iterator append(const T &val) { return impl.appendNode(new QValueListNode<T>(val)); }
- Iterator prepend(const T &val) { return impl.prependNode(new QValueListNode<T>(val)); }
- void remove(const T &val) { QValueListNode<T> node(val); impl.removeEqualNodes(&node, nodesEqual); }
- uint contains(const T &val) const { QValueListNode<T> node(val); return impl.containsEqualNodes(&node, nodesEqual); }
-
- Iterator remove(Iterator iter) { return impl.removeIterator(iter.impl); }
- Iterator fromLast() { return impl.fromLast(); }
-
- const T& first() const { return ((QValueListNode<T> *)impl.firstNode())->value; }
- const T& last() const { return ((QValueListNode<T> *)impl.lastNode())->value; }
-
- Iterator begin() { return impl.begin(); }
- Iterator end() { return impl.end(); }
-
- ConstIterator begin() const { return impl.begin(); }
- ConstIterator end() const { return impl.end(); }
-
- T& operator[] (uint index) { return ((QValueListNode<T> *)impl.nodeAt(index))->value; }
- const T& operator[] (uint index) const { return ((const QValueListNode<T> *)impl.nodeAt(index))->value; }
- QValueList &operator+=(const T &value) { impl.appendNode(new QValueListNode<T>(value)); return *this; }
- QValueList &operator<<(const T &value) { impl.appendNode(new QValueListNode<T>(value)); return *this; }
-
- friend bool operator==<>(const QValueList<T> &, const QValueList<T> &);
-
-private:
- KWQValueListImpl impl;
-
- static void deleteNode(KWQValueListNodeImpl *node) { delete (QValueListNode<T> *)node; }
- static bool nodesEqual(const KWQValueListNodeImpl *a, const KWQValueListNodeImpl *b)
- { return ((QValueListNode<T> *)a)->value == ((QValueListNode<T> *)b)->value; }
- static KWQValueListNodeImpl *copyNode(KWQValueListNodeImpl *node)
- { return new QValueListNode<T>(((QValueListNode<T> *)node)->value); }
-};
-
-template<class T>
-inline bool operator==(const QValueList<T> &a, const QValueList<T> &b)
-{
- return a.impl.isEqual(b.impl, QValueList<T>::nodesEqual);
-}
-
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &o, const QValueList<T>&p)
-{
- o <<
- "QValueList: [size: " <<
- (Q_UINT32)p.count() <<
- "; items: ";
- QValueListConstIterator<T> it = p.begin();
- while (it != p.end()) {
- o << *it;
- if (++it != p.end()) {
- o << ", ";
- }
- }
- o << "]";
- return o;
-}
-
-#endif
-
-#endif
diff --git a/WebCore/kwq/qt/qvariant.h b/WebCore/kwq/qt/qvariant.h
deleted file mode 100644
index 340da07..0000000
--- a/WebCore/kwq/qt/qvariant.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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
- * 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 QVARIANT_H_
-#define QVARIANT_H_
-
-#include <KWQDef.h>
-#include <KWQRefPtr.h>
-
-class QString;
-
-class QVariant {
-public:
-
- enum Type {
- Invalid,
- String,
- UInt,
- Double,
- Bool
- };
-
- QVariant();
- QVariant(bool, int);
- QVariant(double);
- QVariant(const QString &);
- ~QVariant();
-
- QVariant(const QVariant &);
- QVariant& operator=(const QVariant &);
-
- Type type() const;
-
- bool toBool() const;
- uint toUInt() const;
-
- QString asString() const;
-
-private:
- class QVariantPrivate;
-
- KWQRefPtr<QVariantPrivate> d;
-
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
deleted file mode 100644
index 00c0f18..0000000
--- a/WebCore/kwq/qt/qvector.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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
- * 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 QVECTOR_H_
-#define QVECTOR_H_
-
-#include <KWQDef.h>
-#include <qcollection.h>
-
-#include <KWQVectorImpl.h>
-
-#ifdef _KWQ_IOSTREAM_
-#include <ostream>
-#endif
-
-class QGVector : public QPtrCollection
-{
-public:
- virtual int compareItems(void *a, void *b) = 0;
-};
-
-// class QPtrVector ===============================================================
-template<class T> class QPtrVector : public QGVector {
-public:
- QPtrVector() : impl(deleteFunc) {}
- QPtrVector(uint size) : impl(size, deleteFunc) {}
- ~QPtrVector() { if (del_item) { impl.clear(del_item); } }
-
- void clear() { impl.clear(del_item); }
- bool isEmpty() const { return impl.isEmpty(); }
- uint count() const { return impl.count(); }
- uint size() const { return impl.size(); }
- bool remove(uint n) { return impl.remove(n, del_item); }
- bool resize(uint size) { return impl.resize(size, del_item); }
- bool insert(uint n, T *item) {return impl.insert(n, item, del_item); }
- T *at(int n) const {return (T *)impl.at(n); }
- T **data() {return (T **)impl.data(); }
-
- virtual int compareItems(void *a, void *b) { return a != b; }
-
- T *operator[](uint n) const {return (T *)impl.at(n); }
- QPtrVector &operator=(const QPtrVector &v)
- { impl.assign(v.impl,del_item); QPtrCollection::operator=(v); return *this; }
-
- private:
- static void deleteFunc(void *item) { delete (T *)item; }
-
- KWQVectorImpl impl;
-};
-
-#ifdef _KWQ_IOSTREAM_
-
-template<class T>
-inline std::ostream &operator<<(std::ostream &stream, const QPtrVector<T> &v)
-{
- uint i = 0;
- uint count = v.count();
-
- stream << "QPtrVector: [size: " << count << "; items: ";
-
- while(i < count ) {
- stream << *v[i] << ", ";
- ++i;
- }
-
- return stream << "]";
-}
-
-#endif
-
-#endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
deleted file mode 100644
index 71e62c5..0000000
--- a/WebCore/kwq/qt/qwidget.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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
- * 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 QWIDGET_H_
-#define QWIDGET_H_
-
-#include <qobject.h>
-#include <qpaintdevice.h>
-#include <qpainter.h>
-#include <qpoint.h>
-#include <qsize.h>
-#include <qpalette.h>
-#include <qfont.h>
-#include <qcursor.h>
-#include <qevent.h>
-#include <qstyle.h>
-
-#ifdef __OBJC__
- at class NSView;
-#else
-class NSView;
-#endif
-
-class QWidgetPrivate;
-
-class QWidget : public QObject, public QPaintDevice {
-public:
-
- enum WidgetFlags {
- WResizeNoErase = 1,
- WRepaintNoErase = 1 << 1,
- WPaintUnclipped = 1 << 2
- };
-
- enum FocusPolicy {
- NoFocus = 0,
- TabFocus = 0x1,
- ClickFocus = 0x2,
- StrongFocus = 0x3,
- WheelFocus = 0x7
- };
-
- QWidget();
- QWidget(NSView *view);
- virtual ~QWidget();
-
- virtual QSize sizeHint() const;
-
- virtual void setEnabled(bool);
-
- void setActiveWindow();
-
- void setAutoMask(bool) { }
- void setMouseTracking(bool) { }
-
- long winId() const;
- int x() const;
- int y() const;
- int width() const;
- int height() const;
- QSize size() const;
- void resize(int,int);
- void resize(const QSize &);
- QPoint pos() const;
- void move(int, int);
- void move(const QPoint &);
-
- virtual void paint(QPainter *, const QRect &);
-
- virtual QRect frameGeometry() const;
- virtual void setFrameGeometry(const QRect &);
-
- virtual int baselinePosition() const; // relative to the top of the widget
-
- virtual QWidget *topLevelWidget() const;
-
- virtual QPoint mapToGlobal(const QPoint &) const;
- virtual QPoint mapFromGlobal(const QPoint &) const;
-
- virtual void setFocus();
- virtual void clearFocus();
-
- virtual FocusPolicy focusPolicy() const;
- virtual void setFocusPolicy(FocusPolicy);
-
- virtual void setFocusProxy(QWidget *);
-
- const QPalette& palette() const;
- virtual void setPalette(const QPalette &);
- void unsetPalette();
-
- QStyle &style() const;
- void setStyle(QStyle *);
-
- QFont font() const;
- virtual void setFont(const QFont &);
-
- void constPolish() const;
- bool isVisible() const;
- void setCursor(const QCursor &);
- QCursor cursor();
- void unsetCursor();
- bool event(QEvent *);
- bool focusNextPrevChild(bool);
- bool hasMouseTracking() const;
-
- void show() { }
- void hide() { }
-
- void showEvent(QShowEvent *) { }
- void hideEvent(QHideEvent *) { }
- void wheelEvent(QWheelEvent *) { }
- void keyPressEvent(QKeyEvent *) { }
- void keyReleaseEvent(QKeyEvent *) { }
- void focusOutEvent(QFocusEvent *) { }
-
- enum BackgroundMode { NoBackground };
- void setBackgroundMode(BackgroundMode) { }
-
- void setAcceptDrops(bool) { }
-
- NSView *getView() const;
- void setView(NSView *aView);
-
- void displayRect(int x, int y, int w, int h);
- void lockDrawingFocus();
- void unlockDrawingFocus();
- void enableFlushDrawing();
- void disableFlushDrawing();
- void setDrawingAlpha(float alpha);
-
-private:
- QWidgetPrivate *data;
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qxml.h b/WebCore/kwq/qt/qxml.h
deleted file mode 100644
index ee8b969..0000000
--- a/WebCore/kwq/qt/qxml.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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
- * 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 QXML_H_
-#define QXML_H_
-
-class QString;
-
-class QXmlInputSource {
-public:
- void setData(const QString &);
-};
-
-class QXmlParseException {
-public:
- QString message() const;
- int columnNumber() const;
- int lineNumber() const;
-};
-
-class QXmlAttributes {
-public:
- QString value(const QString &) const;
- int length() const;
- QString localName(int index) const;
- QString value(int index) const;
- QString uri(int index) const;
-};
-
-class QXmlContentHandler {
-public:
- virtual bool startDocument() = 0;
- virtual bool endDocument() = 0;
- virtual bool startPrefixMapping(const QString &prefix, const QString &URI) = 0;
- virtual bool endPrefixMapping(const QString &prefix) = 0;
- virtual bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &attributes) = 0;
- virtual bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName) = 0;
- virtual bool characters(const QString &characters) = 0;
- virtual bool ignorableWhitespace(const QString &characters) = 0;
- virtual bool processingInstruction(const QString &target, const QString &data) = 0;
- virtual bool skippedEntity(const QString &name) = 0;
- virtual QString errorString() = 0;
-};
-
-class QXmlLexicalHandler {
-public:
- virtual bool startDTD(const QString &name, const QString &publicId, const QString &systemId) = 0;
- virtual bool endDTD() = 0;
- virtual bool startEntity(const QString &name) = 0;
- virtual bool endEntity(const QString &name) = 0;
- virtual bool startCDATA() = 0;
- virtual bool endCDATA() = 0;
- virtual bool comment(const QString &characters) = 0;
- virtual QString errorString() = 0;
-};
-
-class QXmlErrorHandler {
-public:
- virtual bool warning(const QXmlParseException &exception) = 0;
- virtual bool error(const QXmlParseException &exception) = 0;
- virtual bool fatalError(const QXmlParseException &exception) = 0;
- virtual QString errorString() = 0;
-};
-
-class QXmlDeclHandler {
-public:
- virtual bool attributeDecl(const QString &entityName, const QString &attributeName, const QString &type, const QString &valueDefault, const QString &value) = 0;
- virtual bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) = 0;
- virtual bool internalEntityDecl(const QString &name, const QString &value) = 0;
-};
-
-class QXmlDTDHandler {
-public:
- virtual bool notationDecl(const QString& name, const QString& publicId, const QString& systemId) = 0;
- virtual bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName) = 0;
- virtual QString errorString() = 0;
-};
-
-class QXmlDefaultHandler :
- public QXmlContentHandler,
- public QXmlLexicalHandler,
- public QXmlErrorHandler,
- public QXmlDeclHandler,
- public QXmlDTDHandler
-{
- virtual bool startDocument();
- virtual bool endDocument();
- virtual bool startPrefixMapping(const QString &prefix, const QString &URI);
- virtual bool endPrefixMapping(const QString &prefix);
- virtual bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &attributes);
- virtual bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName);
- virtual bool characters(const QString &characters);
- virtual bool ignorableWhitespace(const QString &characters);
- virtual bool processingInstruction(const QString &target, const QString &data);
- virtual bool skippedEntity(const QString &name);
-
- virtual bool startDTD(const QString &name, const QString &publicId, const QString &systemId);
- virtual bool endDTD();
- virtual bool startEntity(const QString &name);
- virtual bool endEntity(const QString &name);
- virtual bool startCDATA();
- virtual bool endCDATA();
- virtual bool comment(const QString &characters);
-
- virtual bool warning(const QXmlParseException &exception);
- virtual bool error(const QXmlParseException &exception);
- virtual bool fatalError(const QXmlParseException &exception);
-
- virtual bool attributeDecl(const QString &entityName, const QString &attributeName, const QString &type, const QString &valueDefault, const QString &value);
- virtual bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId);
- virtual bool internalEntityDecl(const QString &name, const QString &value);
-
- virtual bool notationDecl(const QString& name, const QString& publicId, const QString& systemId);
- virtual bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName);
-
- virtual QString errorString();
-};
-
-class QXmlSimpleReader {
-public:
- void setContentHandler(QXmlContentHandler *handler);
- void setLexicalHandler(QXmlLexicalHandler *handler);
- void setDTDHandler(QXmlDTDHandler *handler);
- void setDeclHandler(QXmlDeclHandler *handler);
- void setErrorHandler(QXmlErrorHandler *handler);
-
- bool parse(const QXmlInputSource &input);
-};
-
-#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list