[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:24:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f6706a309d2d671e4e30f47029de4e5436a59961
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jul 14 03:55:49 2002 +0000
top level:
* embed.am: Removed.
Tools:
* Scripts/embed-in-alex: Added. Replaces the rules in embed.am as
the way to make our frameworks embed themselves in Alex so we can
rebuild a framework and re-run Alex with the changes without building
Alex too.
* Scripts/create-forwarding-header: Added. Mainly useful for the
one-time job of making forwarding headers for WebCore, but saving
for possible use in the future.
* Scripts/commit-log-editor: Make Tools log show up after top level,
but before things like JavaScriptCore.
JavaScriptCore:
* Makefile.am: Don't use embed.am any more.
* JavaScriptCore.pbproj/project.pbxproj: Use embed-into-alex instead
of make embed.
WebFoundation:
* Makefile.am: Remove include of embed.am.
* WebFoundation.pbproj/project.pbxproj: Remove unneeded ApplicationServices
framework search path. Use embed-into-alex instead of make embed.
WebCore:
* ForwardingHeaders/*: Added. New approach to headers to try to
make Project Builder's header dependency support work even for
includes like #include <render/render_object.h>.
* kwq/kjs/*: Removed. Now part of ForwardingHeaders.
* Makefile.am: Remove embed.am support.
* WebCore.pbproj/project.pbxproj: Remove other search paths, and
add ForwardingHeaders directory as a search path. Add qucomextra_p.h.
* khtml/ecma/kjs_navigator.cpp: Made gratuitous changes to touch this
file to make things build without requiring clean rebuild.
* khtml/rendering/render_form.cpp: Removed many unneeded QObject::
qualifiers from inside APPLE_CHANGES to touch this file to make things
build without requiring clean rebuild.
* kwq/KWQButton.mm: (QButton::setText), (QButton::text):
* kwq/KWQColor.mm: (QColor::setNamedColor):
* kwq/KWQKConfigBase.mm: (KConfig::readEntry):
* kwq/KWQKHTMLSettings.mm: (KHTMLSettings::stdFontName), (KHTMLSettings::fixedFontName):
(KHTMLSettings::serifFontName), (KHTMLSettings::sansSerifFontName),
(KHTMLSettings::cursiveFontName), (KHTMLSettings::fantasyFontName), (KHTMLSettings::encoding):
* kwq/KWQKLocale.mm: (i18n):
* kwq/KWQKMessageBox.mm: (KMessageBox::error), (KMessageBox::warningYesNo):
(KMessageBox::questionYesNo), (KMessageBox::sorry):
* kwq/KWQListBox.mm: (-[KWQBrowserDelegate browser:willDisplayCell:atRow:column:]):
* kwq/WebCoreBridge.mm: (-[WebCoreBridge selectedText]):
Wean from QSTRING_TO_NSSTRING and NSSTRING_TO_QSTRING.
* kwq/KWQComboBox.mm:
(QComboBox::insertItem): Wean from QSTRING_TO_NSSTRING. Note that this
now stores a copy of the string in the array. The old version was unsafe
if anyone later modified the QString that was passed in.
* kwq/KWQFontMetrics.mm: (QFontMetrics::width):
* kwq/KWQPainter.mm: (QPainter::drawUnderlineForText), (QPainter::drawText):
Wean from QSTRING_TO_NSSTRING_LENGTH and _FAST_QSTRING_TO_NSSTRING. We still have
speed as high as before, in the "length" case slightly faster.
* kwq/qt/qstring.h: Remove QSTRING_TO_NSSTRING family of macros.
* kwq/KWQInvisibleButton.mm:
* kwq/KWQKHTMLPart.mm:
* kwq/KWQKHTMLPartBrowserExtension.mm:
* kwq/KWQKJavaAppletWidget.mm:
* kwq/KWQKloader.mm:
* kwq/KWQView.mm:
* kwq/KWQsignals.mm:
* kwq/WebCoreBridge.mm:
* kwq/kdecore/kconfig.h:
* kwq/kdecore/klibloader.h:
* kwq/kdecore/klocale.h:
* kwq/khtml/khtml_ext.h:
* kwq/khtml/khtml_factory.h:
* kwq/kio/kmimetype.h:
Remove subdirectory prefix from imports to match Project Builder include scheme.
* kwq/KWQKCursor.mm: (+[NSCursor _WebCore_linkCursor]):
* kwq/KWQKLocale.mm: (i18n):
* kwq/KWQKstddirs.mm: (locate):
Use bundleForClass instead of bundleWithIdentifier to avoid any potential problems
with multiple versions of the framework installed on the same system.
* kwq/KWQKLineEdit.mm:
(KLineEdit::completionBox): Remove _logNotYetImplemented, since this is implemented
well enough for our needs now, and if we need to implement it later, it will become
clear from the application behavior. This should be the destiny of most of these.
* kwq/kdecore/kglobal.h: Simplify.
* kwq/KWQKGlobal.mm: Simplify.
* kwq/qt/qlineedit.h: Simplify.
* kwq/KWQLineEdit.mm: Simplify.
* kwq/KWQPaintDeviceMetrics.mm: Remove unneeded import.
* kwq/qt/qbutton.h: Remove unneeded destructor.
WebKit:
* History.subproj/IFURIEntry.m: (-[IFURIEntry image]):
Use [IFURIEntry class] instead of [self class] so we get the
icon from the WebKit bundle even if someone subclasses IFURIEntry.
* Plugins.subproj/IFNullPluginView.mm:
(-[IFNullPluginView initWithFrame:mimeType:arguments:]): Use
bundleForClass instead of bundleWithIdentifier so things work even
if we have two copies of WebKit installed on the same machine.
* Makefile.am: Remove include of embed.am.
* WebKit.pbproj/project.pbxproj: Use embed-into-alex instead of make embed.
Also change bundle identifier to com.apple.WebKit instead of com.apple.webkit
to match standard used by our other frameworks. (Checked that we no longer have
any hard-coding of the bundle identifier anywhere in our code.)
WebBrowser:
* WebBrowser.pbproj/project.pbxproj: Remove unneeded build phase.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1551 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6d7c2d0..8e4b40c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * Makefile.am: Don't use embed.am any more.
+ * JavaScriptCore.pbproj/project.pbxproj: Use embed-into-alex instead
+ of make embed.
+
2002-07-12 Darin Adler <darin at apple.com>
* kjs/ustring.h: Since <sys/types.h> includes ushort and uint now, had
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 6d7c2d0..8e4b40c 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * Makefile.am: Don't use embed.am any more.
+ * JavaScriptCore.pbproj/project.pbxproj: Use embed-into-alex instead
+ of make embed.
+
2002-07-12 Darin Adler <darin at apple.com>
* kjs/ustring.h: Since <sys/types.h> includes ushort and uint now, had
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 6d7c2d0..8e4b40c 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * Makefile.am: Don't use embed.am any more.
+ * JavaScriptCore.pbproj/project.pbxproj: Use embed-into-alex instead
+ of make embed.
+
2002-07-12 Darin Adler <darin at apple.com>
* kjs/ustring.h: Since <sys/types.h> includes ushort and uint now, had
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 474f827..b8e7d1d 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -109,7 +109,6 @@
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
- 0867D6A2FE84028FC02AAC07,
F692A8D8025563E401FF60F7,
);
buildSettings = {
@@ -120,8 +119,9 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_VERSION = A;
+ GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = /System/Library/PrivateFrameworks;
+ INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
@@ -138,7 +138,7 @@
);
isa = PBXFrameworkTarget;
name = JavaScriptCore;
- productInstallPath = /System/Library/PrivateFrameworks;
+ productInstallPath = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
productName = JavaScriptCore;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -224,7 +224,6 @@
buildActionMask = 2147483647;
files = (
089C1668FE841158C02AAC07,
- F692A8900255597D01FF60F7,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -271,13 +270,6 @@
isa = PBXFrameworksBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
};
- 0867D6A2FE84028FC02AAC07 = {
- buildActionMask = 2147483647;
- files = (
- );
- isa = PBXRezBuildPhase;
- runOnlyForDeploymentPostprocessing = 0;
- };
0867D6A5FE840307C02AAC07 = {
isa = PBXFrameworkReference;
name = AppKit.framework;
@@ -895,12 +887,6 @@
);
};
};
- F692A8900255597D01FF60F7 = {
- fileRef = F692A8540255597D01FF60F7;
- isa = PBXBuildFile;
- settings = {
- };
- };
F692A8910255597D01FF60F7 = {
fileRef = F692A8550255597D01FF60F7;
isa = PBXBuildFile;
@@ -1293,7 +1279,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ -f ../configure.in ]; then make embed; fi";
+ shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
};
};
rootObject = 0867D690FE84028FC02AAC07;
diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index cfb0e32..0edaf51 100644
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -14,6 +14,3 @@ JavaScriptCore-stamp: kjs/*.cpp kjs/*.h
clean-am:
pbxbuild clean
CLEANFILES = JavaScriptCore-stamp
-
-FRAMEWORK_NAME = JavaScriptCore
-include $(top_srcdir)/embed.am
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3e4bef4..3a2cf6d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,82 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * ForwardingHeaders/*: Added. New approach to headers to try to
+ make Project Builder's header dependency support work even for
+ includes like #include <render/render_object.h>.
+ * kwq/kjs/*: Removed. Now part of ForwardingHeaders.
+
+ * Makefile.am: Remove embed.am support.
+
+ * WebCore.pbproj/project.pbxproj: Remove other search paths, and
+ add ForwardingHeaders directory as a search path. Add qucomextra_p.h.
+
+ * khtml/ecma/kjs_navigator.cpp: Made gratuitous changes to touch this
+ file to make things build without requiring clean rebuild.
+
+ * khtml/rendering/render_form.cpp: Removed many unneeded QObject::
+ qualifiers from inside APPLE_CHANGES to touch this file to make things
+ build without requiring clean rebuild.
+
+ * kwq/KWQButton.mm: (QButton::setText), (QButton::text):
+ * kwq/KWQColor.mm: (QColor::setNamedColor):
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry):
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::stdFontName), (KHTMLSettings::fixedFontName):
+ (KHTMLSettings::serifFontName), (KHTMLSettings::sansSerifFontName),
+ (KHTMLSettings::cursiveFontName), (KHTMLSettings::fantasyFontName), (KHTMLSettings::encoding):
+ * kwq/KWQKLocale.mm: (i18n):
+ * kwq/KWQKMessageBox.mm: (KMessageBox::error), (KMessageBox::warningYesNo):
+ (KMessageBox::questionYesNo), (KMessageBox::sorry):
+ * kwq/KWQListBox.mm: (-[KWQBrowserDelegate browser:willDisplayCell:atRow:column:]):
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge selectedText]):
+ Wean from QSTRING_TO_NSSTRING and NSSTRING_TO_QSTRING.
+
+ * kwq/KWQComboBox.mm:
+ (QComboBox::insertItem): Wean from QSTRING_TO_NSSTRING. Note that this
+ now stores a copy of the string in the array. The old version was unsafe
+ if anyone later modified the QString that was passed in.
+
+ * kwq/KWQFontMetrics.mm: (QFontMetrics::width):
+ * kwq/KWQPainter.mm: (QPainter::drawUnderlineForText), (QPainter::drawText):
+ Wean from QSTRING_TO_NSSTRING_LENGTH and _FAST_QSTRING_TO_NSSTRING. We still have
+ speed as high as before, in the "length" case slightly faster.
+
+ * kwq/qt/qstring.h: Remove QSTRING_TO_NSSTRING family of macros.
+
+ * kwq/KWQInvisibleButton.mm:
+ * kwq/KWQKHTMLPart.mm:
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ * kwq/KWQKJavaAppletWidget.mm:
+ * kwq/KWQKloader.mm:
+ * kwq/KWQView.mm:
+ * kwq/KWQsignals.mm:
+ * kwq/WebCoreBridge.mm:
+ * kwq/kdecore/kconfig.h:
+ * kwq/kdecore/klibloader.h:
+ * kwq/kdecore/klocale.h:
+ * kwq/khtml/khtml_ext.h:
+ * kwq/khtml/khtml_factory.h:
+ * kwq/kio/kmimetype.h:
+ Remove subdirectory prefix from imports to match Project Builder include scheme.
+
+ * kwq/KWQKCursor.mm: (+[NSCursor _WebCore_linkCursor]):
+ * kwq/KWQKLocale.mm: (i18n):
+ * kwq/KWQKstddirs.mm: (locate):
+ Use bundleForClass instead of bundleWithIdentifier to avoid any potential problems
+ with multiple versions of the framework installed on the same system.
+
+ * kwq/KWQKLineEdit.mm:
+ (KLineEdit::completionBox): Remove _logNotYetImplemented, since this is implemented
+ well enough for our needs now, and if we need to implement it later, it will become
+ clear from the application behavior. This should be the destiny of most of these.
+
+ * kwq/kdecore/kglobal.h: Simplify.
+ * kwq/KWQKGlobal.mm: Simplify.
+ * kwq/qt/qlineedit.h: Simplify.
+ * kwq/KWQLineEdit.mm: Simplify.
+
+ * kwq/KWQPaintDeviceMetrics.mm: Remove unneeded import.
+ * kwq/qt/qbutton.h: Remove unneeded destructor.
+
2002-07-13 Richard Williamson (Home) <rjw at apple.com>
* kwq/KWQPainter.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3e4bef4..3a2cf6d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,82 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * ForwardingHeaders/*: Added. New approach to headers to try to
+ make Project Builder's header dependency support work even for
+ includes like #include <render/render_object.h>.
+ * kwq/kjs/*: Removed. Now part of ForwardingHeaders.
+
+ * Makefile.am: Remove embed.am support.
+
+ * WebCore.pbproj/project.pbxproj: Remove other search paths, and
+ add ForwardingHeaders directory as a search path. Add qucomextra_p.h.
+
+ * khtml/ecma/kjs_navigator.cpp: Made gratuitous changes to touch this
+ file to make things build without requiring clean rebuild.
+
+ * khtml/rendering/render_form.cpp: Removed many unneeded QObject::
+ qualifiers from inside APPLE_CHANGES to touch this file to make things
+ build without requiring clean rebuild.
+
+ * kwq/KWQButton.mm: (QButton::setText), (QButton::text):
+ * kwq/KWQColor.mm: (QColor::setNamedColor):
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry):
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::stdFontName), (KHTMLSettings::fixedFontName):
+ (KHTMLSettings::serifFontName), (KHTMLSettings::sansSerifFontName),
+ (KHTMLSettings::cursiveFontName), (KHTMLSettings::fantasyFontName), (KHTMLSettings::encoding):
+ * kwq/KWQKLocale.mm: (i18n):
+ * kwq/KWQKMessageBox.mm: (KMessageBox::error), (KMessageBox::warningYesNo):
+ (KMessageBox::questionYesNo), (KMessageBox::sorry):
+ * kwq/KWQListBox.mm: (-[KWQBrowserDelegate browser:willDisplayCell:atRow:column:]):
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge selectedText]):
+ Wean from QSTRING_TO_NSSTRING and NSSTRING_TO_QSTRING.
+
+ * kwq/KWQComboBox.mm:
+ (QComboBox::insertItem): Wean from QSTRING_TO_NSSTRING. Note that this
+ now stores a copy of the string in the array. The old version was unsafe
+ if anyone later modified the QString that was passed in.
+
+ * kwq/KWQFontMetrics.mm: (QFontMetrics::width):
+ * kwq/KWQPainter.mm: (QPainter::drawUnderlineForText), (QPainter::drawText):
+ Wean from QSTRING_TO_NSSTRING_LENGTH and _FAST_QSTRING_TO_NSSTRING. We still have
+ speed as high as before, in the "length" case slightly faster.
+
+ * kwq/qt/qstring.h: Remove QSTRING_TO_NSSTRING family of macros.
+
+ * kwq/KWQInvisibleButton.mm:
+ * kwq/KWQKHTMLPart.mm:
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ * kwq/KWQKJavaAppletWidget.mm:
+ * kwq/KWQKloader.mm:
+ * kwq/KWQView.mm:
+ * kwq/KWQsignals.mm:
+ * kwq/WebCoreBridge.mm:
+ * kwq/kdecore/kconfig.h:
+ * kwq/kdecore/klibloader.h:
+ * kwq/kdecore/klocale.h:
+ * kwq/khtml/khtml_ext.h:
+ * kwq/khtml/khtml_factory.h:
+ * kwq/kio/kmimetype.h:
+ Remove subdirectory prefix from imports to match Project Builder include scheme.
+
+ * kwq/KWQKCursor.mm: (+[NSCursor _WebCore_linkCursor]):
+ * kwq/KWQKLocale.mm: (i18n):
+ * kwq/KWQKstddirs.mm: (locate):
+ Use bundleForClass instead of bundleWithIdentifier to avoid any potential problems
+ with multiple versions of the framework installed on the same system.
+
+ * kwq/KWQKLineEdit.mm:
+ (KLineEdit::completionBox): Remove _logNotYetImplemented, since this is implemented
+ well enough for our needs now, and if we need to implement it later, it will become
+ clear from the application behavior. This should be the destiny of most of these.
+
+ * kwq/kdecore/kglobal.h: Simplify.
+ * kwq/KWQKGlobal.mm: Simplify.
+ * kwq/qt/qlineedit.h: Simplify.
+ * kwq/KWQLineEdit.mm: Simplify.
+
+ * kwq/KWQPaintDeviceMetrics.mm: Remove unneeded import.
+ * kwq/qt/qbutton.h: Remove unneeded destructor.
+
2002-07-13 Richard Williamson (Home) <rjw at apple.com>
* kwq/KWQPainter.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3e4bef4..3a2cf6d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,82 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * ForwardingHeaders/*: Added. New approach to headers to try to
+ make Project Builder's header dependency support work even for
+ includes like #include <render/render_object.h>.
+ * kwq/kjs/*: Removed. Now part of ForwardingHeaders.
+
+ * Makefile.am: Remove embed.am support.
+
+ * WebCore.pbproj/project.pbxproj: Remove other search paths, and
+ add ForwardingHeaders directory as a search path. Add qucomextra_p.h.
+
+ * khtml/ecma/kjs_navigator.cpp: Made gratuitous changes to touch this
+ file to make things build without requiring clean rebuild.
+
+ * khtml/rendering/render_form.cpp: Removed many unneeded QObject::
+ qualifiers from inside APPLE_CHANGES to touch this file to make things
+ build without requiring clean rebuild.
+
+ * kwq/KWQButton.mm: (QButton::setText), (QButton::text):
+ * kwq/KWQColor.mm: (QColor::setNamedColor):
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry):
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::stdFontName), (KHTMLSettings::fixedFontName):
+ (KHTMLSettings::serifFontName), (KHTMLSettings::sansSerifFontName),
+ (KHTMLSettings::cursiveFontName), (KHTMLSettings::fantasyFontName), (KHTMLSettings::encoding):
+ * kwq/KWQKLocale.mm: (i18n):
+ * kwq/KWQKMessageBox.mm: (KMessageBox::error), (KMessageBox::warningYesNo):
+ (KMessageBox::questionYesNo), (KMessageBox::sorry):
+ * kwq/KWQListBox.mm: (-[KWQBrowserDelegate browser:willDisplayCell:atRow:column:]):
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge selectedText]):
+ Wean from QSTRING_TO_NSSTRING and NSSTRING_TO_QSTRING.
+
+ * kwq/KWQComboBox.mm:
+ (QComboBox::insertItem): Wean from QSTRING_TO_NSSTRING. Note that this
+ now stores a copy of the string in the array. The old version was unsafe
+ if anyone later modified the QString that was passed in.
+
+ * kwq/KWQFontMetrics.mm: (QFontMetrics::width):
+ * kwq/KWQPainter.mm: (QPainter::drawUnderlineForText), (QPainter::drawText):
+ Wean from QSTRING_TO_NSSTRING_LENGTH and _FAST_QSTRING_TO_NSSTRING. We still have
+ speed as high as before, in the "length" case slightly faster.
+
+ * kwq/qt/qstring.h: Remove QSTRING_TO_NSSTRING family of macros.
+
+ * kwq/KWQInvisibleButton.mm:
+ * kwq/KWQKHTMLPart.mm:
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ * kwq/KWQKJavaAppletWidget.mm:
+ * kwq/KWQKloader.mm:
+ * kwq/KWQView.mm:
+ * kwq/KWQsignals.mm:
+ * kwq/WebCoreBridge.mm:
+ * kwq/kdecore/kconfig.h:
+ * kwq/kdecore/klibloader.h:
+ * kwq/kdecore/klocale.h:
+ * kwq/khtml/khtml_ext.h:
+ * kwq/khtml/khtml_factory.h:
+ * kwq/kio/kmimetype.h:
+ Remove subdirectory prefix from imports to match Project Builder include scheme.
+
+ * kwq/KWQKCursor.mm: (+[NSCursor _WebCore_linkCursor]):
+ * kwq/KWQKLocale.mm: (i18n):
+ * kwq/KWQKstddirs.mm: (locate):
+ Use bundleForClass instead of bundleWithIdentifier to avoid any potential problems
+ with multiple versions of the framework installed on the same system.
+
+ * kwq/KWQKLineEdit.mm:
+ (KLineEdit::completionBox): Remove _logNotYetImplemented, since this is implemented
+ well enough for our needs now, and if we need to implement it later, it will become
+ clear from the application behavior. This should be the destiny of most of these.
+
+ * kwq/kdecore/kglobal.h: Simplify.
+ * kwq/KWQKGlobal.mm: Simplify.
+ * kwq/qt/qlineedit.h: Simplify.
+ * kwq/KWQLineEdit.mm: Simplify.
+
+ * kwq/KWQPaintDeviceMetrics.mm: Remove unneeded import.
+ * kwq/qt/qbutton.h: Remove unneeded destructor.
+
2002-07-13 Richard Williamson (Home) <rjw at apple.com>
* kwq/KWQPainter.mm:
diff --git a/WebCore/ForwardingHeaders/config.h b/WebCore/ForwardingHeaders/config.h
new file mode 100644
index 0000000..a5568e4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/config.h
@@ -0,0 +1 @@
+#include "../../config.h"
diff --git a/WebCore/ForwardingHeaders/css/css_ruleimpl.h b/WebCore/ForwardingHeaders/css/css_ruleimpl.h
new file mode 100644
index 0000000..d8a954f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/css_ruleimpl.h
@@ -0,0 +1 @@
+#include <css_ruleimpl.h>
diff --git a/WebCore/ForwardingHeaders/css/css_stylesheetimpl.h b/WebCore/ForwardingHeaders/css/css_stylesheetimpl.h
new file mode 100644
index 0000000..18028cd
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/css_stylesheetimpl.h
@@ -0,0 +1 @@
+#include <css_stylesheetimpl.h>
diff --git a/WebCore/ForwardingHeaders/css/css_valueimpl.h b/WebCore/ForwardingHeaders/css/css_valueimpl.h
new file mode 100644
index 0000000..0152c2f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/css_valueimpl.h
@@ -0,0 +1 @@
+#include <css_valueimpl.h>
diff --git a/WebCore/ForwardingHeaders/css/csshelper.h b/WebCore/ForwardingHeaders/css/csshelper.h
new file mode 100644
index 0000000..5a1d4d2
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/csshelper.h
@@ -0,0 +1 @@
+#include <csshelper.h>
diff --git a/WebCore/ForwardingHeaders/css/cssparser.h b/WebCore/ForwardingHeaders/css/cssparser.h
new file mode 100644
index 0000000..3a71ff2
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/cssparser.h
@@ -0,0 +1 @@
+#include <cssparser.h>
diff --git a/WebCore/ForwardingHeaders/css/cssproperties.h b/WebCore/ForwardingHeaders/css/cssproperties.h
new file mode 100644
index 0000000..1caff40
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/cssproperties.h
@@ -0,0 +1 @@
+#include <cssproperties.h>
diff --git a/WebCore/ForwardingHeaders/css/cssstyleselector.h b/WebCore/ForwardingHeaders/css/cssstyleselector.h
new file mode 100644
index 0000000..52c4a0e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/cssstyleselector.h
@@ -0,0 +1 @@
+#include <cssstyleselector.h>
diff --git a/WebCore/ForwardingHeaders/css/cssvalues.h b/WebCore/ForwardingHeaders/css/cssvalues.h
new file mode 100644
index 0000000..bf3f8de
--- /dev/null
+++ b/WebCore/ForwardingHeaders/css/cssvalues.h
@@ -0,0 +1 @@
+#include <cssvalues.h>
diff --git a/WebCore/ForwardingHeaders/dom/css_rule.h b/WebCore/ForwardingHeaders/dom/css_rule.h
new file mode 100644
index 0000000..44f352a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/css_rule.h
@@ -0,0 +1 @@
+#include <css_rule.h>
diff --git a/WebCore/ForwardingHeaders/dom/css_stylesheet.h b/WebCore/ForwardingHeaders/dom/css_stylesheet.h
new file mode 100644
index 0000000..bbbdc2d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/css_stylesheet.h
@@ -0,0 +1 @@
+#include <css_stylesheet.h>
diff --git a/WebCore/ForwardingHeaders/dom/css_value.h b/WebCore/ForwardingHeaders/dom/css_value.h
new file mode 100644
index 0000000..4617c44
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/css_value.h
@@ -0,0 +1 @@
+#include <css_value.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom2_events.h b/WebCore/ForwardingHeaders/dom/dom2_events.h
new file mode 100644
index 0000000..9dcab03
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom2_events.h
@@ -0,0 +1 @@
+#include <dom2_events.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom2_range.h b/WebCore/ForwardingHeaders/dom/dom2_range.h
new file mode 100644
index 0000000..4bb0868
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom2_range.h
@@ -0,0 +1 @@
+#include <dom2_range.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom2_traversal.h b/WebCore/ForwardingHeaders/dom/dom2_traversal.h
new file mode 100644
index 0000000..dba00c9
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom2_traversal.h
@@ -0,0 +1 @@
+#include <dom2_traversal.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom2_views.h b/WebCore/ForwardingHeaders/dom/dom2_views.h
new file mode 100644
index 0000000..8e2d4b7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom2_views.h
@@ -0,0 +1 @@
+#include <dom2_views.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_core.h b/WebCore/ForwardingHeaders/dom/dom_core.h
new file mode 100644
index 0000000..257c6f1
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_core.h
@@ -0,0 +1 @@
+#include <dom_core.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_doc.h b/WebCore/ForwardingHeaders/dom/dom_doc.h
new file mode 100644
index 0000000..35009a4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_doc.h
@@ -0,0 +1 @@
+#include <dom_doc.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_element.h b/WebCore/ForwardingHeaders/dom/dom_element.h
new file mode 100644
index 0000000..ccf0782
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_element.h
@@ -0,0 +1 @@
+#include <dom_element.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_exception.h b/WebCore/ForwardingHeaders/dom/dom_exception.h
new file mode 100644
index 0000000..ed3f58b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_exception.h
@@ -0,0 +1 @@
+#include <dom_exception.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_misc.h b/WebCore/ForwardingHeaders/dom/dom_misc.h
new file mode 100644
index 0000000..39e3e80
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_misc.h
@@ -0,0 +1 @@
+#include <dom_misc.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_node.h b/WebCore/ForwardingHeaders/dom/dom_node.h
new file mode 100644
index 0000000..cda94cb
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_node.h
@@ -0,0 +1 @@
+#include <dom_node.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_string.h b/WebCore/ForwardingHeaders/dom/dom_string.h
new file mode 100644
index 0000000..a31648a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_string.h
@@ -0,0 +1 @@
+#include <dom_string.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_text.h b/WebCore/ForwardingHeaders/dom/dom_text.h
new file mode 100644
index 0000000..e2aad5c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_text.h
@@ -0,0 +1 @@
+#include <dom_text.h>
diff --git a/WebCore/ForwardingHeaders/dom/dom_xml.h b/WebCore/ForwardingHeaders/dom/dom_xml.h
new file mode 100644
index 0000000..b11a762
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/dom_xml.h
@@ -0,0 +1 @@
+#include <dom_xml.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_base.h b/WebCore/ForwardingHeaders/dom/html_base.h
new file mode 100644
index 0000000..ee57fbd
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_base.h
@@ -0,0 +1 @@
+#include <html_base.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_block.h b/WebCore/ForwardingHeaders/dom/html_block.h
new file mode 100644
index 0000000..cabcd77
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_block.h
@@ -0,0 +1 @@
+#include <html_block.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_document.h b/WebCore/ForwardingHeaders/dom/html_document.h
new file mode 100644
index 0000000..fa13c2b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_document.h
@@ -0,0 +1 @@
+#include <html_document.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_element.h b/WebCore/ForwardingHeaders/dom/html_element.h
new file mode 100644
index 0000000..306237f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_element.h
@@ -0,0 +1 @@
+#include <html_element.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_form.h b/WebCore/ForwardingHeaders/dom/html_form.h
new file mode 100644
index 0000000..8ce0803
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_form.h
@@ -0,0 +1 @@
+#include <html_form.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_head.h b/WebCore/ForwardingHeaders/dom/html_head.h
new file mode 100644
index 0000000..5133d9a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_head.h
@@ -0,0 +1 @@
+#include <html_head.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_image.h b/WebCore/ForwardingHeaders/dom/html_image.h
new file mode 100644
index 0000000..2373147
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_image.h
@@ -0,0 +1 @@
+#include <html_image.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_inline.h b/WebCore/ForwardingHeaders/dom/html_inline.h
new file mode 100644
index 0000000..7eee88f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_inline.h
@@ -0,0 +1 @@
+#include <html_inline.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_list.h b/WebCore/ForwardingHeaders/dom/html_list.h
new file mode 100644
index 0000000..76d14c5
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_list.h
@@ -0,0 +1 @@
+#include <html_list.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_misc.h b/WebCore/ForwardingHeaders/dom/html_misc.h
new file mode 100644
index 0000000..d013a3f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_misc.h
@@ -0,0 +1 @@
+#include <html_misc.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_object.h b/WebCore/ForwardingHeaders/dom/html_object.h
new file mode 100644
index 0000000..62daa52
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_object.h
@@ -0,0 +1 @@
+#include <html_object.h>
diff --git a/WebCore/ForwardingHeaders/dom/html_table.h b/WebCore/ForwardingHeaders/dom/html_table.h
new file mode 100644
index 0000000..80548ae
--- /dev/null
+++ b/WebCore/ForwardingHeaders/dom/html_table.h
@@ -0,0 +1 @@
+#include <html_table.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_binding.h b/WebCore/ForwardingHeaders/ecma/kjs_binding.h
new file mode 100644
index 0000000..924f425
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_binding.h
@@ -0,0 +1 @@
+#include <kjs_binding.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_css.h b/WebCore/ForwardingHeaders/ecma/kjs_css.h
new file mode 100644
index 0000000..202ccae
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_css.h
@@ -0,0 +1 @@
+#include <kjs_css.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_dom.h b/WebCore/ForwardingHeaders/ecma/kjs_dom.h
new file mode 100644
index 0000000..d40c2d7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_dom.h
@@ -0,0 +1 @@
+#include <kjs_dom.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_html.h b/WebCore/ForwardingHeaders/ecma/kjs_html.h
new file mode 100644
index 0000000..2c75d52
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_html.h
@@ -0,0 +1 @@
+#include <kjs_html.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_html.lut.h b/WebCore/ForwardingHeaders/ecma/kjs_html.lut.h
new file mode 100644
index 0000000..6a3609d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_html.lut.h
@@ -0,0 +1 @@
+#include <kjs_html.lut.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_proxy.h b/WebCore/ForwardingHeaders/ecma/kjs_proxy.h
new file mode 100644
index 0000000..40b68ef
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_proxy.h
@@ -0,0 +1 @@
+#include <kjs_proxy.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_views.h b/WebCore/ForwardingHeaders/ecma/kjs_views.h
new file mode 100644
index 0000000..9c55fff
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_views.h
@@ -0,0 +1 @@
+#include <kjs_views.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_views.lut.h b/WebCore/ForwardingHeaders/ecma/kjs_views.lut.h
new file mode 100644
index 0000000..a639bfa
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_views.lut.h
@@ -0,0 +1 @@
+#include <kjs_views.lut.h>
diff --git a/WebCore/ForwardingHeaders/ecma/kjs_window.h b/WebCore/ForwardingHeaders/ecma/kjs_window.h
new file mode 100644
index 0000000..e061e4a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/ecma/kjs_window.h
@@ -0,0 +1 @@
+#include <kjs_window.h>
diff --git a/WebCore/ForwardingHeaders/html/dtd.h b/WebCore/ForwardingHeaders/html/dtd.h
new file mode 100644
index 0000000..899d8a4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/dtd.h
@@ -0,0 +1 @@
+#include <dtd.h>
diff --git a/WebCore/ForwardingHeaders/html/html_baseimpl.h b/WebCore/ForwardingHeaders/html/html_baseimpl.h
new file mode 100644
index 0000000..b8c3b3b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_baseimpl.h
@@ -0,0 +1 @@
+#include <html_baseimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_blockimpl.h b/WebCore/ForwardingHeaders/html/html_blockimpl.h
new file mode 100644
index 0000000..a58aeb0
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_blockimpl.h
@@ -0,0 +1 @@
+#include <html_blockimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_documentimpl.h b/WebCore/ForwardingHeaders/html/html_documentimpl.h
new file mode 100644
index 0000000..ea9f329
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_documentimpl.h
@@ -0,0 +1 @@
+#include <html_documentimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_elementimpl.h b/WebCore/ForwardingHeaders/html/html_elementimpl.h
new file mode 100644
index 0000000..7df20bb
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_elementimpl.h
@@ -0,0 +1 @@
+#include <html_elementimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_formimpl.h b/WebCore/ForwardingHeaders/html/html_formimpl.h
new file mode 100644
index 0000000..1b3c72d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_formimpl.h
@@ -0,0 +1 @@
+#include <html_formimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_headimpl.h b/WebCore/ForwardingHeaders/html/html_headimpl.h
new file mode 100644
index 0000000..cb1ce80
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_headimpl.h
@@ -0,0 +1 @@
+#include <html_headimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_imageimpl.h b/WebCore/ForwardingHeaders/html/html_imageimpl.h
new file mode 100644
index 0000000..00d0172
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_imageimpl.h
@@ -0,0 +1 @@
+#include <html_imageimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_inlineimpl.h b/WebCore/ForwardingHeaders/html/html_inlineimpl.h
new file mode 100644
index 0000000..c85612b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_inlineimpl.h
@@ -0,0 +1 @@
+#include <html_inlineimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_listimpl.h b/WebCore/ForwardingHeaders/html/html_listimpl.h
new file mode 100644
index 0000000..4baadff
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_listimpl.h
@@ -0,0 +1 @@
+#include <html_listimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_miscimpl.h b/WebCore/ForwardingHeaders/html/html_miscimpl.h
new file mode 100644
index 0000000..4de7c5b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_miscimpl.h
@@ -0,0 +1 @@
+#include <html_miscimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_objectimpl.h b/WebCore/ForwardingHeaders/html/html_objectimpl.h
new file mode 100644
index 0000000..2eb86a1
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_objectimpl.h
@@ -0,0 +1 @@
+#include <html_objectimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/html_tableimpl.h b/WebCore/ForwardingHeaders/html/html_tableimpl.h
new file mode 100644
index 0000000..43be01a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/html_tableimpl.h
@@ -0,0 +1 @@
+#include <html_tableimpl.h>
diff --git a/WebCore/ForwardingHeaders/html/htmlparser.h b/WebCore/ForwardingHeaders/html/htmlparser.h
new file mode 100644
index 0000000..10a9200
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/htmlparser.h
@@ -0,0 +1 @@
+#include <htmlparser.h>
diff --git a/WebCore/ForwardingHeaders/html/htmltokenizer.h b/WebCore/ForwardingHeaders/html/htmltokenizer.h
new file mode 100644
index 0000000..b401aca
--- /dev/null
+++ b/WebCore/ForwardingHeaders/html/htmltokenizer.h
@@ -0,0 +1 @@
+#include <htmltokenizer.h>
diff --git a/WebCore/ForwardingHeaders/java/kjavaappletcontext.h b/WebCore/ForwardingHeaders/java/kjavaappletcontext.h
new file mode 100644
index 0000000..8208b48
--- /dev/null
+++ b/WebCore/ForwardingHeaders/java/kjavaappletcontext.h
@@ -0,0 +1 @@
+#include <kjavaappletcontext.h>
diff --git a/WebCore/ForwardingHeaders/java/kjavaappletwidget.h b/WebCore/ForwardingHeaders/java/kjavaappletwidget.h
new file mode 100644
index 0000000..fbf3112
--- /dev/null
+++ b/WebCore/ForwardingHeaders/java/kjavaappletwidget.h
@@ -0,0 +1 @@
+#include <kjavaappletwidget.h>
diff --git a/WebCore/ForwardingHeaders/kio/global.h b/WebCore/ForwardingHeaders/kio/global.h
new file mode 100644
index 0000000..88e15e0
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kio/global.h
@@ -0,0 +1 @@
+#include <global.h>
diff --git a/WebCore/ForwardingHeaders/kio/job.h b/WebCore/ForwardingHeaders/kio/job.h
new file mode 100644
index 0000000..bda81c8
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kio/job.h
@@ -0,0 +1 @@
+#include <job.h>
diff --git a/WebCore/ForwardingHeaders/kio/jobclasses.h b/WebCore/ForwardingHeaders/kio/jobclasses.h
new file mode 100644
index 0000000..f52b97e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kio/jobclasses.h
@@ -0,0 +1 @@
+#include <jobclasses.h>
diff --git a/WebCore/ForwardingHeaders/kio/kprotocolmanager.h b/WebCore/ForwardingHeaders/kio/kprotocolmanager.h
new file mode 100644
index 0000000..aacb24c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kio/kprotocolmanager.h
@@ -0,0 +1 @@
+#include <kprotocolmanager.h>
diff --git a/WebCore/kwq/kjs/collector.h b/WebCore/ForwardingHeaders/kjs/collector.h
similarity index 100%
rename from WebCore/kwq/kjs/collector.h
rename to WebCore/ForwardingHeaders/kjs/collector.h
diff --git a/WebCore/kwq/kjs/internal.h b/WebCore/ForwardingHeaders/kjs/internal.h
similarity index 100%
rename from WebCore/kwq/kjs/internal.h
rename to WebCore/ForwardingHeaders/kjs/internal.h
diff --git a/WebCore/kwq/kjs/interpreter.h b/WebCore/ForwardingHeaders/kjs/interpreter.h
similarity index 100%
rename from WebCore/kwq/kjs/interpreter.h
rename to WebCore/ForwardingHeaders/kjs/interpreter.h
diff --git a/WebCore/kwq/kjs/lookup.h b/WebCore/ForwardingHeaders/kjs/lookup.h
similarity index 100%
rename from WebCore/kwq/kjs/lookup.h
rename to WebCore/ForwardingHeaders/kjs/lookup.h
diff --git a/WebCore/kwq/kjs/object.h b/WebCore/ForwardingHeaders/kjs/object.h
similarity index 100%
rename from WebCore/kwq/kjs/object.h
rename to WebCore/ForwardingHeaders/kjs/object.h
diff --git a/WebCore/ForwardingHeaders/kparts/browserextension.h b/WebCore/ForwardingHeaders/kparts/browserextension.h
new file mode 100644
index 0000000..4144293
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/browserextension.h
@@ -0,0 +1 @@
+#include <browserextension.h>
diff --git a/WebCore/ForwardingHeaders/kparts/browserinterface.h b/WebCore/ForwardingHeaders/kparts/browserinterface.h
new file mode 100644
index 0000000..8744192
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/browserinterface.h
@@ -0,0 +1 @@
+#include <browserinterface.h>
diff --git a/WebCore/ForwardingHeaders/kparts/event.h b/WebCore/ForwardingHeaders/kparts/event.h
new file mode 100644
index 0000000..3efc1e9
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/event.h
@@ -0,0 +1 @@
+#include <event.h>
diff --git a/WebCore/ForwardingHeaders/kparts/part.h b/WebCore/ForwardingHeaders/kparts/part.h
new file mode 100644
index 0000000..360ef09
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/part.h
@@ -0,0 +1 @@
+#include <part.h>
diff --git a/WebCore/ForwardingHeaders/kparts/partmanager.h b/WebCore/ForwardingHeaders/kparts/partmanager.h
new file mode 100644
index 0000000..de8a375
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kparts/partmanager.h
@@ -0,0 +1 @@
+#include <partmanager.h>
diff --git a/WebCore/ForwardingHeaders/misc/decoder.h b/WebCore/ForwardingHeaders/misc/decoder.h
new file mode 100644
index 0000000..7fdd42d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/decoder.h
@@ -0,0 +1 @@
+#include <decoder.h>
diff --git a/WebCore/ForwardingHeaders/misc/helper.h b/WebCore/ForwardingHeaders/misc/helper.h
new file mode 100644
index 0000000..bf29814
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/helper.h
@@ -0,0 +1 @@
+#include <helper.h>
diff --git a/WebCore/ForwardingHeaders/misc/htmlattrs.h b/WebCore/ForwardingHeaders/misc/htmlattrs.h
new file mode 100644
index 0000000..e563298
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/htmlattrs.h
@@ -0,0 +1 @@
+#include <htmlattrs.h>
diff --git a/WebCore/ForwardingHeaders/misc/htmlhashes.h b/WebCore/ForwardingHeaders/misc/htmlhashes.h
new file mode 100644
index 0000000..ecbad96
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/htmlhashes.h
@@ -0,0 +1 @@
+#include <htmlhashes.h>
diff --git a/WebCore/ForwardingHeaders/misc/htmltags.h b/WebCore/ForwardingHeaders/misc/htmltags.h
new file mode 100644
index 0000000..510778c
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/htmltags.h
@@ -0,0 +1 @@
+#include <htmltags.h>
diff --git a/WebCore/ForwardingHeaders/misc/khtmllayout.h b/WebCore/ForwardingHeaders/misc/khtmllayout.h
new file mode 100644
index 0000000..98a8766
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/khtmllayout.h
@@ -0,0 +1 @@
+#include <khtmllayout.h>
diff --git a/WebCore/ForwardingHeaders/misc/loader.h b/WebCore/ForwardingHeaders/misc/loader.h
new file mode 100644
index 0000000..c935b75
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/loader.h
@@ -0,0 +1 @@
+#include <loader.h>
diff --git a/WebCore/ForwardingHeaders/misc/loader_client.h b/WebCore/ForwardingHeaders/misc/loader_client.h
new file mode 100644
index 0000000..e13dfea
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/loader_client.h
@@ -0,0 +1 @@
+#include <loader_client.h>
diff --git a/WebCore/ForwardingHeaders/misc/shared.h b/WebCore/ForwardingHeaders/misc/shared.h
new file mode 100644
index 0000000..5a7d060
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/shared.h
@@ -0,0 +1 @@
+#include <shared.h>
diff --git a/WebCore/ForwardingHeaders/misc/stringit.h b/WebCore/ForwardingHeaders/misc/stringit.h
new file mode 100644
index 0000000..9d60854
--- /dev/null
+++ b/WebCore/ForwardingHeaders/misc/stringit.h
@@ -0,0 +1 @@
+#include <stringit.h>
diff --git a/WebCore/ForwardingHeaders/private/qucomextra_p.h b/WebCore/ForwardingHeaders/private/qucomextra_p.h
new file mode 100644
index 0000000..a10f682
--- /dev/null
+++ b/WebCore/ForwardingHeaders/private/qucomextra_p.h
@@ -0,0 +1 @@
+#include <qucomextra_p.h>
diff --git a/WebCore/ForwardingHeaders/rendering/break_lines.h b/WebCore/ForwardingHeaders/rendering/break_lines.h
new file mode 100644
index 0000000..4901e22
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/break_lines.h
@@ -0,0 +1 @@
+#include <break_lines.h>
diff --git a/WebCore/ForwardingHeaders/rendering/font.h b/WebCore/ForwardingHeaders/rendering/font.h
new file mode 100644
index 0000000..fb41b38
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/font.h
@@ -0,0 +1 @@
+#include <font.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_applet.h b/WebCore/ForwardingHeaders/rendering/render_applet.h
new file mode 100644
index 0000000..ff92f16
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_applet.h
@@ -0,0 +1 @@
+#include <render_applet.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_body.h b/WebCore/ForwardingHeaders/rendering/render_body.h
new file mode 100644
index 0000000..43df74d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_body.h
@@ -0,0 +1 @@
+#include <render_body.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_box.h b/WebCore/ForwardingHeaders/rendering/render_box.h
new file mode 100644
index 0000000..861b845
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_box.h
@@ -0,0 +1 @@
+#include <render_box.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_br.h b/WebCore/ForwardingHeaders/rendering/render_br.h
new file mode 100644
index 0000000..480a0f4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_br.h
@@ -0,0 +1 @@
+#include <render_br.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_flow.h b/WebCore/ForwardingHeaders/rendering/render_flow.h
new file mode 100644
index 0000000..c6fad4d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_flow.h
@@ -0,0 +1 @@
+#include <render_flow.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_form.h b/WebCore/ForwardingHeaders/rendering/render_form.h
new file mode 100644
index 0000000..86cdee0
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_form.h
@@ -0,0 +1 @@
+#include <render_form.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_frames.h b/WebCore/ForwardingHeaders/rendering/render_frames.h
new file mode 100644
index 0000000..3d24745
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_frames.h
@@ -0,0 +1 @@
+#include <render_frames.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_html.h b/WebCore/ForwardingHeaders/rendering/render_html.h
new file mode 100644
index 0000000..db730cb
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_html.h
@@ -0,0 +1 @@
+#include <render_html.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_image.h b/WebCore/ForwardingHeaders/rendering/render_image.h
new file mode 100644
index 0000000..c9def72
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_image.h
@@ -0,0 +1 @@
+#include <render_image.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_list.h b/WebCore/ForwardingHeaders/rendering/render_list.h
new file mode 100644
index 0000000..c8d458e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_list.h
@@ -0,0 +1 @@
+#include <render_list.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_object.h b/WebCore/ForwardingHeaders/rendering/render_object.h
new file mode 100644
index 0000000..64e282a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_object.h
@@ -0,0 +1 @@
+#include <render_object.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_replaced.h b/WebCore/ForwardingHeaders/rendering/render_replaced.h
new file mode 100644
index 0000000..7d8553b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_replaced.h
@@ -0,0 +1 @@
+#include <render_replaced.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_root.h b/WebCore/ForwardingHeaders/rendering/render_root.h
new file mode 100644
index 0000000..9051d39
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_root.h
@@ -0,0 +1 @@
+#include <render_root.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_style.h b/WebCore/ForwardingHeaders/rendering/render_style.h
new file mode 100644
index 0000000..50246b7
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_style.h
@@ -0,0 +1 @@
+#include <render_style.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_table.h b/WebCore/ForwardingHeaders/rendering/render_table.h
new file mode 100644
index 0000000..62139cc
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_table.h
@@ -0,0 +1 @@
+#include <render_table.h>
diff --git a/WebCore/ForwardingHeaders/rendering/render_text.h b/WebCore/ForwardingHeaders/rendering/render_text.h
new file mode 100644
index 0000000..45629d4
--- /dev/null
+++ b/WebCore/ForwardingHeaders/rendering/render_text.h
@@ -0,0 +1 @@
+#include <render_text.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom2_eventsimpl.h b/WebCore/ForwardingHeaders/xml/dom2_eventsimpl.h
new file mode 100644
index 0000000..fdee267
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom2_eventsimpl.h
@@ -0,0 +1 @@
+#include <dom2_eventsimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom2_rangeimpl.h b/WebCore/ForwardingHeaders/xml/dom2_rangeimpl.h
new file mode 100644
index 0000000..8329000
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom2_rangeimpl.h
@@ -0,0 +1 @@
+#include <dom2_rangeimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom2_traversalimpl.h b/WebCore/ForwardingHeaders/xml/dom2_traversalimpl.h
new file mode 100644
index 0000000..2b28f05
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom2_traversalimpl.h
@@ -0,0 +1 @@
+#include <dom2_traversalimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom2_viewsimpl.h b/WebCore/ForwardingHeaders/xml/dom2_viewsimpl.h
new file mode 100644
index 0000000..764f69d
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom2_viewsimpl.h
@@ -0,0 +1 @@
+#include <dom2_viewsimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_docimpl.h b/WebCore/ForwardingHeaders/xml/dom_docimpl.h
new file mode 100644
index 0000000..9112717
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_docimpl.h
@@ -0,0 +1 @@
+#include <dom_docimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_elementimpl.h b/WebCore/ForwardingHeaders/xml/dom_elementimpl.h
new file mode 100644
index 0000000..e1a5c09
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_elementimpl.h
@@ -0,0 +1 @@
+#include <dom_elementimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_nodeimpl.h b/WebCore/ForwardingHeaders/xml/dom_nodeimpl.h
new file mode 100644
index 0000000..970b33e
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_nodeimpl.h
@@ -0,0 +1 @@
+#include <dom_nodeimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_stringimpl.h b/WebCore/ForwardingHeaders/xml/dom_stringimpl.h
new file mode 100644
index 0000000..d9f16ab
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_stringimpl.h
@@ -0,0 +1 @@
+#include <dom_stringimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_textimpl.h b/WebCore/ForwardingHeaders/xml/dom_textimpl.h
new file mode 100644
index 0000000..312213f
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_textimpl.h
@@ -0,0 +1 @@
+#include <dom_textimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_xmlimpl.h b/WebCore/ForwardingHeaders/xml/dom_xmlimpl.h
new file mode 100644
index 0000000..dc24442
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_xmlimpl.h
@@ -0,0 +1 @@
+#include <dom_xmlimpl.h>
diff --git a/WebCore/ForwardingHeaders/xml/xml_tokenizer.h b/WebCore/ForwardingHeaders/xml/xml_tokenizer.h
new file mode 100644
index 0000000..4c8b348
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/xml_tokenizer.h
@@ -0,0 +1 @@
+#include <xml_tokenizer.h>
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index b1bba7a..73e1749 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -11,6 +11,3 @@ WebCore-combined.exp: WebCore.exp WebCore-tests.exp
noinst_DATA = WebCore-combined.exp
BUILT_SOURCES = $(noinst_DATA)
CLEANFILES = $(BUILT_SOURCES)
-
-FRAMEWORK_NAME = WebCore
-include $(top_srcdir)/embed.am
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 37138f4..cce86a4 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -131,8 +131,8 @@
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
- HEADER_SEARCH_PATHS = "kwq kwq/khtml kwq/qt khtml ..";
- INSTALL_PATH = "";
+ HEADER_SEARCH_PATHS = ForwardingHeaders;
+ INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
@@ -151,7 +151,7 @@
);
isa = PBXFrameworkTarget;
name = WebCore;
- productInstallPath = "";
+ productInstallPath = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
productName = WebKit;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -484,6 +484,7 @@
F523D31E02DE4476018635CA,
F523D32002DE4476018635CA,
F523D32202DE4476018635CA,
+ F505847602E0934D018635CE,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -775,7 +776,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "make embed";
+ shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
};
//250
//251
@@ -787,6 +788,26 @@
//F52
//F53
//F54
+ F505847502E0934D018635CE = {
+ isa = PBXFileReference;
+ name = qucomextra_p.h;
+ path = kwq/qt/private/qucomextra_p.h;
+ refType = 4;
+ };
+ F505847602E0934D018635CE = {
+ fileRef = F505847502E0934D018635CE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F505847702E09351018635CE = {
+ children = (
+ F505847502E0934D018635CE,
+ );
+ isa = PBXGroup;
+ name = private;
+ refType = 4;
+ };
F523D15002DE4271018635CA = {
children = (
F58784D802DE375901EA4122,
@@ -7470,6 +7491,7 @@
};
F587871802DE3B8801EA4122 = {
children = (
+ F505847702E09351018635CE,
F587867602DE3B8601EA4122,
F587867702DE3B8601EA4122,
F58784C502DE375801EA4122,
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index 00bb802..cf22476 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -102,8 +102,7 @@ namespace KJS {
Plugin( ExecState *exec, PluginBase::PluginInfo *info )
: ObjectImp(exec->interpreter()->builtinObjectPrototype() )
{ m_info = info; PluginBase::ref(); };
- virtual ~Plugin()
- { PluginBase::unref(); }
+ virtual ~Plugin() { PluginBase::unref(); }
#else
Plugin( ExecState *exec, PluginBase::PluginInfo *info )
: ObjectImp(exec->interpreter()->builtinObjectPrototype() )
@@ -124,8 +123,7 @@ namespace KJS {
MimeType( ExecState *exec, PluginBase::MimeClassInfo *info )
: ObjectImp(exec->interpreter()->builtinObjectPrototype() )
{ m_info = info; PluginBase::ref(); };
- virtual ~MimeType()
- { PluginBase::unref(); }
+ virtual ~MimeType() { PluginBase::unref(); }
#else
MimeType( ExecState *exec, PluginBase::MimeClassInfo *info )
: ObjectImp(exec->interpreter()->builtinObjectPrototype() )
@@ -333,6 +331,7 @@ PluginBase::~PluginBase()
}
#ifdef APPLE_CHANGES
+
void PluginBase::ref()
{
m_refCount++;
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index f2e5464..0364310 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -181,12 +181,12 @@ void RenderFormElement::layout()
}
#ifdef APPLE_CHANGES
-void RenderFormElement::performAction(QObject::Actions action)
+void RenderFormElement::performAction(Actions action)
{
if (m_widget)
m_widget->endEditing();
- if (action == QObject::ACTION_BUTTON_CLICKED)
+ if (action == ACTION_BUTTON_CLICKED)
slotClicked();
}
#endif /* APPLE_CHANGES */
@@ -248,11 +248,11 @@ void RenderCheckBox::updateFromElement()
}
#ifdef APPLE_CHANGES
-void RenderCheckBox::performAction(QObject::Actions action)
+void RenderCheckBox::performAction(Actions action)
{
QCheckBox* cb = static_cast<QCheckBox*>( m_widget );
- if (action == QObject::ACTION_CHECKBOX_CLICKED)
+ if (action == ACTION_CHECKBOX_CLICKED)
slotStateChanged(cb->isChecked() ? 2 : 0);
}
#endif /* APPLE_CHANGES */
@@ -317,9 +317,9 @@ RenderSubmitButton::RenderSubmitButton(HTMLInputElementImpl *element)
connect(p, SIGNAL(clicked()), this, SLOT(slotClicked()));
#ifdef APPLE_CHANGES
// Need to store a reference to this object and then invoke slotClicked on it.
- //p->setAction (&RenderFormElement::slotClicked);
- //p->setRenderObject (this);
- p->setTarget (this);
+ //p->setAction(&RenderFormElement::slotClicked);
+ //p->setRenderObject(this);
+ p->setTarget(this);
#endif
}
@@ -576,13 +576,13 @@ void RenderLineEdit::updateFromElement()
}
#ifdef APPLE_CHANGES
-void RenderLineEdit::performAction(QObject::Actions action)
+void RenderLineEdit::performAction(Actions action)
{
KLineEdit *edit = static_cast<KLineEdit*>(m_widget);
- if (action == QObject::ACTION_TEXT_FIELD_END_EDITING)
+ if (action == ACTION_TEXT_FIELD_END_EDITING)
slotTextChanged(edit->text());
- else if (action == QObject::ACTION_TEXT_FIELD)
+ else if (action == ACTION_TEXT_FIELD)
slotReturnPressed();
}
#endif /* APPLE_CHANGES */
@@ -1024,11 +1024,11 @@ void RenderSelect::slotSelected(int index)
#ifdef APPLE_CHANGES
-void RenderSelect::performAction(QObject::Actions action)
+void RenderSelect::performAction(Actions action)
{
- if (action == QObject::ACTION_LISTBOX_CLICKED)
+ if (action == ACTION_LISTBOX_CLICKED)
slotSelectionChanged();
- else if (action == QObject::ACTION_COMBOBOX_CLICKED){
+ else if (action == ACTION_COMBOBOX_CLICKED){
ComboBoxWidget *combo = static_cast<ComboBoxWidget*>(m_widget);
slotSelected(combo->indexOfCurrentItem());
@@ -1265,9 +1265,9 @@ QString RenderTextArea::text()
}
#ifdef APPLE_CHANGES
-void RenderTextArea::performAction(QObject::Actions action)
+void RenderTextArea::performAction(Actions action)
{
- if (action == QObject::ACTION_TEXT_AREA_END_EDITING)
+ if (action == ACTION_TEXT_AREA_END_EDITING)
slotTextChanged();
}
#endif /* APPLE_CHANGES */
diff --git a/WebCore/kwq/KWQButton.h b/WebCore/kwq/KWQButton.h
index cf47346..347e2a7 100644
--- a/WebCore/kwq/KWQButton.h
+++ b/WebCore/kwq/KWQButton.h
@@ -32,11 +32,9 @@
class QButton : public QWidget {
public:
QButton(QWidget *parent = 0);
- ~QButton();
virtual void setText(const QString &);
QString text() const;
-
};
#endif
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index ff93500..8c48dbf 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,28 +26,18 @@
#import <qbutton.h>
#import <KWQView.h>
-#import <kwqdebug.h>
QButton::QButton(QWidget *parent)
{
setView ([[[KWQNSButton alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: this] autorelease]);
}
-
-QButton::~QButton()
-{
-}
-
-
void QButton::setText(const QString &s)
{
- KWQNSButton *button = (KWQNSButton *)getView();
- [button setTitle: QSTRING_TO_NSSTRING (s)];
+ [(KWQNSButton *)getView() setTitle:s.getNSString()];
}
-
QString QButton::text() const
{
- KWQNSButton *button = (KWQNSButton *)getView();
- return NSSTRING_TO_QSTRING([button title]);
+ return QString::fromNSString([(KWQNSButton *)getView() title]);
}
diff --git a/WebCore/kwq/KWQColor.mm b/WebCore/kwq/KWQColor.mm
index c185aed..10f5ecc 100644
--- a/WebCore/kwq/KWQColor.mm
+++ b/WebCore/kwq/KWQColor.mm
@@ -340,9 +340,9 @@ void QColor::setNamedColor(const QString &name)
else {
NSString *hexString;
- hexString = [getNamedColors() objectForKey:[QSTRING_TO_NSSTRING(name) lowercaseString]];
+ hexString = [getNamedColors() objectForKey:[name.getNSString() lowercaseString]];
- if (hexString && decodeColorFromHexColorString(NSSTRING_TO_QSTRING(hexString), &r, &g, &b)) {
+ if (hexString && decodeColorFromHexColorString(QString::fromNSString(hexString), &r, &g, &b)) {
setRgb(r, g, b);
}
else {
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 91f0c3a..4d80239 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -90,16 +90,20 @@ bool QComboBox::eventFilter(QObject *object, QEvent *event)
void QComboBox::insertItem(const QString &text, int index)
{
+ NSString *string;
int numItems = [items count];
- if (index < 0 || index == numItems)
- [items addObject:QSTRING_TO_NSSTRING(text)];
- else {
+
+ string = [text.getNSString() copy];
+ if (index < 0 || index == numItems) {
+ [items addObject:string];
+ } else {
while (index >= numItems) {
[items addObject: @""];
++numItems;
}
- [items replaceObjectAtIndex:index withObject:QSTRING_TO_NSSTRING(text)];
+ [items replaceObjectAtIndex:index withObject:string];
}
+ [string release];
}
diff --git a/WebCore/kwq/KWQFont.mm b/WebCore/kwq/KWQFont.mm
index e42c278..63bebef 100644
--- a/WebCore/kwq/KWQFont.mm
+++ b/WebCore/kwq/KWQFont.mm
@@ -58,7 +58,7 @@ QString QFont::family() const
void QFont::setFamily(const QString &qfamilyName)
{
- // Uset an immutable copy of the name, but keep a set of
+ // Use an immutable copy of the name, but keep a set of
// all family names so we don't end up with too many objects.
static NSMutableSet *families;
if (families == nil) {
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 6bbd2eb..e6a2865 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -131,10 +131,9 @@ int QFontMetrics::width(const QString &qstring, int len) const
{
NSString *string;
+ string = qstring.getNSString();
if (len != -1)
- string = QSTRING_TO_NSSTRING_LENGTH (qstring, len);
- else
- string = _FAST_QSTRING_TO_NSSTRING (qstring);
+ string = [string substringToIndex:len];
return [data->getRenderer() widthForString:string];
}
diff --git a/WebCore/kwq/KWQInvisibleButton.mm b/WebCore/kwq/KWQInvisibleButton.mm
index e8666b7..ea4283e 100644
--- a/WebCore/kwq/KWQInvisibleButton.mm
+++ b/WebCore/kwq/KWQInvisibleButton.mm
@@ -28,8 +28,8 @@
#import <kwqdebug.h>
#import <qevent.h>
#import <khtmlview.h>
-#import <rendering/render_form.h>
-#import <xml/dom2_eventsimpl.h>
+#import <render_form.h>
+#import <dom2_eventsimpl.h>
@interface InvisibleButtonView : NSView
{
diff --git a/WebCore/kwq/KWQKConfigBase.h b/WebCore/kwq/KWQKConfigBase.h
index 7313738..531c93e 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -26,7 +26,7 @@
#ifndef KCONFIG_H_
#define KCONFIG_H_
-#include <qt/qstring.h>
+#include <qstring.h>
class QColor;
class QStringList;
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index 2b86fa2..e25e492 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -74,11 +74,11 @@ QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
plugin = [[[WebCoreViewFactory sharedFactory] pluginsInfo] objectAtIndex:impl->pluginIndex];
if (strcmp(pKey, "name") == 0) {
- return NSSTRING_TO_QSTRING([plugin name]);
+ return QString::fromNSString([plugin name]);
} else if (strcmp(pKey, "file") == 0) {
- return NSSTRING_TO_QSTRING([plugin filename]);
+ return QString::fromNSString([plugin filename]);
} else if (strcmp(pKey, "description") == 0) {
- return NSSTRING_TO_QSTRING([plugin pluginDescription]);
+ return QString::fromNSString([plugin pluginDescription]);
} else if (strcmp(pKey, "mime") == 0) {
mimeTypes = [plugin mimeTypes];
bigMimeString = [NSMutableString string];
@@ -90,7 +90,7 @@ QString KConfig::readEntry(const char *pKey, const QString& aDefault) const
[bigMimeString appendString:[[mimeTypes objectAtIndex:i] objectAtIndex:2]]; // mime's description
[bigMimeString appendString:@";"];
}
- return NSSTRING_TO_QSTRING(bigMimeString);
+ return QString::fromNSString(bigMimeString);
}
}
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index 79d0d24..08bd3fd 100644
--- a/WebCore/kwq/KWQKCursor.mm
+++ b/WebCore/kwq/KWQKCursor.mm
@@ -25,12 +25,16 @@
#import <kcursor.h>
+ at interface KWQKCursorBundleDummy : NSObject { }
+ at end
+ at implementation KWQKCursorBundleDummy
+ at end
- at interface NSCursor (_WebCoreCursorAdditions)
+ at interface NSCursor (WebCoreCursorAdditions)
+ (NSCursor *)_WebCore_linkCursor;
@end
- at implementation NSCursor (_WebCoreCursorAdditions)
+ at implementation NSCursor (WebCoreCursorAdditions)
+ (NSCursor *)_WebCore_linkCursor
{
@@ -38,7 +42,8 @@
if (linkCursor == nil) {
NSImage *linkCursorImage = [[NSImage alloc] initWithContentsOfFile:
- [[NSBundle bundleWithIdentifier:@"com.apple.WebCore"] pathForResource:@"linkCursor" ofType:@"tiff"]];
+ [[NSBundle bundleForClass:[KWQKCursorBundleDummy class]]
+ pathForResource:@"linkCursor" ofType:@"tiff"]];
linkCursor = [[NSCursor alloc] initWithImage:linkCursorImage hotSpot:NSMakePoint(6.0,1.0)];
[linkCursorImage release];
}
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index f85d833..d87b506 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -33,28 +33,21 @@ class KCharsets;
class KLocale;
class KStandardDirs;
class KConfig;
-class KWQStaticStringDict;
#define kMin(a, b) ((a) < (b) ? (a) : (b))
#define kMax(a, b) ((a) > (b) ? (a) : (b))
class KGlobal {
public:
- static KWQStaticStringDict *staticStringDict;
-
- static KInstance *instance();
- static KCharsets *charsets();
- static KLocale *locale();
- static KStandardDirs *dirs();
+ 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:
- static KWQStaticStringDict *_stringDict;
- static KInstance *_instance;
- static KLocale *_locale;
- static KCharsets *_charsets;
};
#endif
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index 3a4f542..6edcca1 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -22,86 +22,25 @@
* (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 <kwqdebug.h>
#import <kglobal.h>
-#import <kconfig.h>
-#import <kcharsets.h>
-#import <klocale.h>
+#import <kconfig.h>
#import <qdict.h>
-#import <Cocoa/Cocoa.h>
-
-KWQStaticStringDict *KGlobal::_stringDict = 0;
-KInstance *KGlobal::_instance = 0;
-KLocale *KGlobal::_locale = 0;
-KCharsets *KGlobal::_charsets = 0;
-
-class KWQStaticStringDict : public QDict<QString>
-{
-public:
- KWQStaticStringDict() : QDict<QString>() { };
-};
-
-KInstance *KGlobal::instance()
-{
- _logNotYetImplemented();
- return 0;
-}
-
-
-KCharsets *KGlobal::charsets()
-{
- if (_charsets == 0) {
- _charsets = new KCharsets();
- }
- return _charsets;
-}
-
-
-KLocale *KGlobal::locale()
-{
- if (_locale == 0) {
- _locale = new KLocale;
- }
- return _locale;
-}
-
-
-KStandardDirs *KGlobal::dirs()
-{
- _logNotYetImplemented();
- return 0;
-}
-
-
KConfig *KGlobal::config()
{
- _logNotYetImplemented();
- static KConfig c("foo");
+ static KConfig c("");
return &c;
}
const QString &KGlobal::staticQString(const QString &str)
{
- if (!_stringDict) {
- _stringDict = new KWQStaticStringDict;
- }
- QString *result = _stringDict->find(str);
- if (!result)
- {
+ static QDict<QString> stringDict;
+ QString *result = stringDict.find(str);
+ if (!result) {
result = new QString(str);
- _stringDict->insert(str, result);
+ stringDict.insert(str, result);
}
return *result;
}
-
-KLocale::KLocale()
-{
-}
-
-QStringList KLocale::languageList() const
-{
- return QStringList::split(",", "us");
-}
diff --git a/WebCore/kwq/KWQKHTMLFactory.h b/WebCore/kwq/KWQKHTMLFactory.h
index b955144..4e87beb 100644
--- a/WebCore/kwq/KWQKHTMLFactory.h
+++ b/WebCore/kwq/KWQKHTMLFactory.h
@@ -27,8 +27,8 @@
#define __khtml_factory_h__
#include <khtml_part.h>
-#include <kparts/factory.h>
-#include <kparts/historyprovider.h>
+#include <factory.h>
+#include <historyprovider.h>
class KInstance;
class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1150271..1381af0 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -25,9 +25,9 @@
#import <KWQKHTMLPartImpl.h>
-#import <html/htmltokenizer.h>
-#import <html/html_documentimpl.h>
-#import <rendering/render_frames.h>
+#import <htmltokenizer.h>
+#import <html_documentimpl.h>
+#import <render_frames.h>
#import <khtmlpart_p.h>
#import <khtmlview.h>
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.h b/WebCore/kwq/KWQKHTMLPartBrowserExtension.h
index 7878213..380ada4 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 <kparts/browserextension.h>
+#include <browserextension.h>
class QWidget;
class KHTMLPart;
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index 4db7347..dbc09e2 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <khtml/khtml_ext.h>
+#import <khtml_ext.h>
#import <khtml_part.h>
#import <WebCoreBridge.h>
#import <KWQKHTMLPartImpl.h>
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 1150271..1381af0 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -25,9 +25,9 @@
#import <KWQKHTMLPartImpl.h>
-#import <html/htmltokenizer.h>
-#import <html/html_documentimpl.h>
-#import <rendering/render_frames.h>
+#import <htmltokenizer.h>
+#import <html_documentimpl.h>
+#import <render_frames.h>
#import <khtmlpart_p.h>
#import <khtmlview.h>
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index bc04ea1..e3ad79c 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -32,37 +32,37 @@ KHTMLSettings::KHTMLSettings()
QString KHTMLSettings::stdFontName() const
{
- return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitStandardFont"]);
+ return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitStandardFont"]);
}
QString KHTMLSettings::fixedFontName() const
{
- return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFixedFont"]);
+ return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFixedFont"]);
}
QString KHTMLSettings::serifFontName() const
{
- return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSerifFont"]);
+ return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSerifFont"]);
}
QString KHTMLSettings::sansSerifFontName() const
{
- return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSansSerifFont"]);
+ return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitSansSerifFont"]);
}
QString KHTMLSettings::cursiveFontName() const
{
- return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitCursiveFont"]);
+ return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitCursiveFont"]);
}
QString KHTMLSettings::fantasyFontName() const
{
- return NSSTRING_TO_QSTRING([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFantasyFont"]);
+ return QString::fromNSString([[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFantasyFont"]);
}
@@ -78,7 +78,7 @@ const QString &KHTMLSettings::encoding() const
static const QString *DEFAULT_ENCODING = NULL;
_logNotYetImplemented();
if (DEFAULT_ENCODING == NULL) {
- DEFAULT_ENCODING = new QString(NSSTRING_TO_QSTRING(@"NSISOLatin1StringEncoding"));
+ DEFAULT_ENCODING = new QString(QString::fromNSString(@"NSISOLatin1StringEncoding"));
}
return *DEFAULT_ENCODING;
}
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 5203304..4b604ba 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <java/kjavaappletwidget.h>
+#import <kjavaappletwidget.h>
#import <WebCoreViewFactory.h>
#import <WebFoundation/IFNSURLExtensions.h>
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index 157e067..f8c19d2 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -101,6 +101,8 @@ QString TransferJob::queryMetaData(const QString &key) const
void TransferJob::addMetaData(const QString &key, const QString &value)
{
+ // When putting strings into dictionaries, we should use an immutable copy.
+ // That's not necessary for keys, because they are copied.
NSString *immutableValue = [value.getNSString() copy];
[d->metaData setObject:immutableValue forKey:key.getNSString()];
[immutableValue release];
diff --git a/WebCore/kwq/KWQKLibrary.h b/WebCore/kwq/KWQKLibrary.h
index 5751177..f5e7453 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 <kio/global.h>
+#include <global.h>
class KLibrary
{
diff --git a/WebCore/kwq/KWQKLineEdit.mm b/WebCore/kwq/KWQKLineEdit.mm
index 85f8db2..332268c 100644
--- a/WebCore/kwq/KWQKLineEdit.mm
+++ b/WebCore/kwq/KWQKLineEdit.mm
@@ -25,8 +25,6 @@
#import <klineedit.h>
-#import <kwqdebug.h>
-
KLineEdit::KLineEdit(QWidget *parent)
: QLineEdit(parent)
{
@@ -38,6 +36,5 @@ void KLineEdit::setContextMenuEnabled(bool showMenu)
KCompletionBox *KLineEdit::completionBox(bool create)
{
- _logNotYetImplemented();
return 0;
}
diff --git a/WebCore/kwq/KWQKLocale.h b/WebCore/kwq/KWQKLocale.h
index b70e61a..33879ba 100644
--- a/WebCore/kwq/KWQKLocale.h
+++ b/WebCore/kwq/KWQKLocale.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,46 +26,14 @@
#ifndef KLOCALE_H_
#define KLOCALE_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qt/qstringlist.h>
+#include <qstringlist.h>
QString i18n(const char* text);
-// class KLocale ===============================================================
-
class KLocale {
public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
- KLocale();
- ~KLocale();
-
- // member functions --------------------------------------------------------
-
QString language() const;
QStringList languageList() const;
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- KLocale(const KLocale &);
- KLocale &operator=(const KLocale &);
-
-}; // class KLocale ============================================================
+};
#endif
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index 1368ed2..ebddf8d 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -22,21 +22,31 @@
* (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 <klocale.h>
#import <kwqdebug.h>
#import <qstring.h>
-#import <klocale.h>
-QString i18n(const char* text)
+ at interface KWQKLocaleBundleDummy : NSObject { }
+ at end
+ at implementation KWQKLocaleBundleDummy
+ at end
+
+QString i18n(const char *text)
{
- NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebCore"];
+ NSBundle *bundle = [NSBundle bundleForClass:[KWQKLocaleBundleDummy class]];
NSString *locString = [bundle localizedStringForKey:[NSString stringWithCString:text] value:nil table:nil];
- return NSSTRING_TO_QSTRING(locString);
+ return QString::fromNSString(locString);
}
QString KLocale::language() const
{
_logNotYetImplemented();
- static QString language("en_US");
- return language;
+ return "en_US";
}
+QStringList KLocale::languageList() const
+{
+ _logNotYetImplemented();
+ return QStringList::split(",", "us");
+}
diff --git a/WebCore/kwq/KWQKMessageBox.mm b/WebCore/kwq/KWQKMessageBox.mm
index d802381..bb987fb 100644
--- a/WebCore/kwq/KWQKMessageBox.mm
+++ b/WebCore/kwq/KWQKMessageBox.mm
@@ -30,12 +30,11 @@ void KMessageBox::error(QWidget *, const QString &message,
const QString &caption, bool notify)
{
if (caption.isNull())
- NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), nil, nil, nil);
+ NSRunAlertPanel(nil, message.getNSString(), nil, nil, nil);
else
- NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), nil, nil, nil);
+ NSRunAlertPanel(caption.getNSString(), message.getNSString(), nil, nil, nil);
}
-
int KMessageBox::warningYesNo(QWidget *, const QString &message,
const QString &caption,
const QString &buttonYes,
@@ -47,16 +46,15 @@ int KMessageBox::warningYesNo(QWidget *, const QString &message,
int result;
if (caption.isNull())
- result = NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), yes, no, nil);
+ result = NSRunAlertPanel(nil, message.getNSString(), yes, no, nil);
else
- result = NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), yes, no, nil);
+ result = NSRunAlertPanel(caption.getNSString(), message.getNSString(), yes, no, nil);
if (result == NSAlertDefaultReturn)
return 1;
return 0;
}
-
int KMessageBox::questionYesNo(QWidget *, const QString &message,
const QString &caption,
const QString &buttonYes,
@@ -67,25 +65,20 @@ int KMessageBox::questionYesNo(QWidget *, const QString &message,
int result;
if (caption.isNull())
- result = NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), yes, no, nil);
+ result = NSRunAlertPanel(nil, message.getNSString(), yes, no, nil);
else
- result = NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), yes, no, nil);
+ result = NSRunAlertPanel(caption.getNSString(), message.getNSString(), yes, no, nil);
if (result == NSAlertDefaultReturn)
return 1;
return 0;
}
-
void KMessageBox::sorry(QWidget *, const QString &message,
const QString &caption, bool notify)
{
if (caption.isNull())
- NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), nil, nil, nil);
+ NSRunAlertPanel(nil, message.getNSString(), nil, nil, nil);
else
- NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), nil, nil, nil);
+ NSRunAlertPanel(caption.getNSString(), message.getNSString(), nil, nil, nil);
}
-
-
-
-
diff --git a/WebCore/kwq/KWQKMimeType.h b/WebCore/kwq/KWQKMimeType.h
index 031c474..fc07e46 100644
--- a/WebCore/kwq/KWQKMimeType.h
+++ b/WebCore/kwq/KWQKMimeType.h
@@ -26,9 +26,9 @@
#ifndef KMIMETYPE_H_
#define KMIMETYPE_H_
-#include <kdecore/kglobal.h>
+#include <kglobal.h>
-#include <kdecore/kurl.h>
+#include <kurl.h>
#include <sys/types.h>
#include <qstring.h>
diff --git a/WebCore/kwq/KWQKStandardDirs.mm b/WebCore/kwq/KWQKStandardDirs.mm
index 83ca584..88aff60 100644
--- a/WebCore/kwq/KWQKStandardDirs.mm
+++ b/WebCore/kwq/KWQKStandardDirs.mm
@@ -25,9 +25,14 @@
#import <kstandarddirs.h>
-QString locate(const char *type, const QString& filename, const KInstance* instance)
+ 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 bundleWithIdentifier:@"com.apple.WebCore"];
+ NSBundle *bundle = [NSBundle bundleForClass:[KWQKStandardDirsBundleDummy class]];
return QString::fromNSString([bundle pathForResource:@"html4" ofType:@"css"]);
}
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 258e7aa..19341a9 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -25,8 +25,8 @@
#import <KWQLoaderImpl.h>
-#import <kio/jobclasses.h>
-#import <misc/loader.h>
+#import <jobclasses.h>
+#import <loader.h>
#import <KWQKHTMLPartImpl.h>
diff --git a/WebCore/kwq/KWQKstddirs.mm b/WebCore/kwq/KWQKstddirs.mm
index 83ca584..88aff60 100644
--- a/WebCore/kwq/KWQKstddirs.mm
+++ b/WebCore/kwq/KWQKstddirs.mm
@@ -25,9 +25,14 @@
#import <kstandarddirs.h>
-QString locate(const char *type, const QString& filename, const KInstance* instance)
+ 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 bundleWithIdentifier:@"com.apple.WebCore"];
+ NSBundle *bundle = [NSBundle bundleForClass:[KWQKStandardDirsBundleDummy class]];
return QString::fromNSString([bundle pathForResource:@"html4" ofType:@"css"]);
}
diff --git a/WebCore/kwq/KWQLineEdit.h b/WebCore/kwq/KWQLineEdit.h
index 9ff356c..dc7586c 100644
--- a/WebCore/kwq/KWQLineEdit.h
+++ b/WebCore/kwq/KWQLineEdit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,34 +26,15 @@
#ifndef QLINEEDIT_H_
#define QLINEEDIT_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "qwidget.h"
-#include "qevent.h"
-#include "qstring.h"
-
-// class QLineEdit =============================================================
+#include <qwidget.h>
+#include <qevent.h>
+#include <qstring.h>
class QLineEdit : public QWidget {
public:
+ enum EchoMode { Normal, Password };
- // typedefs ----------------------------------------------------------------
-
- // enums -------------------------------------------------------------------
-
- enum EchoMode { Normal, NoEcho, Password };
-
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
- // constructors, copy constructors, and destructors ------------------------
-
- QLineEdit(QWidget *parent=0, const char *name=0);
-
- virtual ~QLineEdit();
-
- // member functions --------------------------------------------------------
+ QLineEdit(QWidget *parent);
virtual void setEchoMode(EchoMode);
virtual void setCursorPosition(int);
@@ -63,26 +44,12 @@ public:
bool isReadOnly() const;
void setReadOnly(bool);
- bool event(QEvent *);
bool frame() const;
int cursorPosition() const;
int maxLength() const;
void selectAll();
bool edited() const;
void setEdited(bool);
-
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QLineEdit(const QLineEdit &);
- QLineEdit &operator=(const QLineEdit &);
-
-}; // class QLineEdit ==========================================================
+};
#endif
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index 2ccadf0..7dad899 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -22,29 +22,22 @@
* (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 <qlineedit.h>
#import <KWQNSTextField.h>
-
#import <kwqdebug.h>
-QLineEdit::QLineEdit(QWidget *parent, const char *name)
+QLineEdit::QLineEdit(QWidget *parent)
{
- setView ([[[KWQNSTextField alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: this] autorelease]);
+ NSView *view = [[KWQNSTextField alloc] initWithFrame:NSMakeRect(0,0,0,0) widget:this];
+ setView(view);
+ [view release];
}
-QLineEdit::~QLineEdit()
-{
-}
-
void QLineEdit::setEchoMode(EchoMode mode)
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- if (mode == QLineEdit::Password)
- [field setPasswordMode: YES];
- else
- [field setPasswordMode: NO];
+ [(KWQNSTextField *)getView() setPasswordMode:mode == Password];
}
void QLineEdit::setCursorPosition(int)
@@ -52,95 +45,59 @@ void QLineEdit::setCursorPosition(int)
// Don't do anything here.
}
-
int QLineEdit::cursorPosition() const
{
// Not needed. We ignore setCursorPosition().
return 0;
}
-
void QLineEdit::setText(const QString &s)
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- [field setStringValue: QSTRING_TO_NSSTRING(s)];
+ [(KWQNSTextField *)getView() setStringValue:s.getNSString()];
}
-
QString QLineEdit::text()
{
- KWQNSTextField *textView = (KWQNSTextField *)getView();
-
- return NSSTRING_TO_QSTRING ([textView stringValue]);
+ return QString::fromNSString([(KWQNSTextField *)getView() stringValue]);
}
-
void QLineEdit::setMaxLength(int len)
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- [field setMaximumLength: len];
+ [(KWQNSTextField *)getView() setMaximumLength:len];
}
-
bool QLineEdit::isReadOnly() const
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- return [field isEditable];
+ return ![(KWQNSTextField *)getView() isEditable];
}
-
void QLineEdit::setReadOnly(bool flag)
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- return [field setEditable: flag?NO:YES];
+ return [(KWQNSTextField *)getView() setEditable:!flag];
}
-
-bool QLineEdit::event(QEvent *)
-{
- _logNotYetImplemented();
- return FALSE;
-}
-
-
bool QLineEdit::frame() const
{
_logNotYetImplemented();
return FALSE;
}
-
int QLineEdit::maxLength() const
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- return [field maximumLength];
+ return [(KWQNSTextField *)getView() maximumLength];
}
-
void QLineEdit::selectAll()
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- return [field selectText: field];
+ return [(KWQNSTextField *)getView() selectText:nil];
}
-
bool QLineEdit::edited() const
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- return [field edited];
+ return [(KWQNSTextField *)getView() edited];
}
-
void QLineEdit::setEdited(bool flag)
{
- KWQNSTextField *field = (KWQNSTextField *)getView();
-
- return [field setEdited:flag];
+ return [(KWQNSTextField *)getView() setEdited:flag];
}
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 5457d6e..a8b7a59 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -66,7 +66,7 @@
else
[cell setEnabled: YES];
[cell setLeaf: YES];
- [cell setStringValue: QSTRING_TO_NSSTRING(item->text)];
+ [cell setStringValue: item->text.getNSString()];
return;
}
item = item->nextItem;
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 258e7aa..19341a9 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -25,8 +25,8 @@
#import <KWQLoaderImpl.h>
-#import <kio/jobclasses.h>
-#import <misc/loader.h>
+#import <jobclasses.h>
+#import <loader.h>
#import <KWQKHTMLPartImpl.h>
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 258e7aa..19341a9 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -25,8 +25,8 @@
#import <KWQLoaderImpl.h>
-#import <kio/jobclasses.h>
-#import <misc/loader.h>
+#import <jobclasses.h>
+#import <loader.h>
#import <KWQKHTMLPartImpl.h>
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.mm b/WebCore/kwq/KWQPaintDeviceMetrics.mm
index 82a159f..3c93bfb 100644
--- a/WebCore/kwq/KWQPaintDeviceMetrics.mm
+++ b/WebCore/kwq/KWQPaintDeviceMetrics.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,37 +27,29 @@
#import <kwqdebug.h>
-#import <ApplicationServices/ApplicationServices.h>
-
-
QPaintDeviceMetrics::QPaintDeviceMetrics(const QPaintDevice *)
{
}
-
int QPaintDeviceMetrics::logicalDpiY() const
{
//_logPartiallyImplemented();
return 96;
}
-
int QPaintDeviceMetrics::depth() const
{
return CGDisplayBitsPerPixel(kCGDirectMainDisplay);
}
-
int QPaintDeviceMetrics::width() const
{
_logPartiallyImplemented();
return 800;
}
-
int QPaintDeviceMetrics::height() const
{
_logPartiallyImplemented();
return 800;
}
-
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 66657a2..6dd00eb 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -500,10 +500,10 @@ void QPainter::drawUnderlineForText(int x, int y, const QString &qstring, int le
_lockFocus();
- if (len == -1)
- string = QSTRING_TO_NSSTRING(qstring);
- else
- string = QSTRING_TO_NSSTRING_LENGTH(qstring,len);
+ string = qstring.getNSString();
+ if (len != -1) {
+ string = [string substringToIndex:len];
+ }
[[[WebCoreTextRendererFactory sharedFactory]
rendererWithFamily:data->state.font.getNSFamily() traits:data->state.font.getNSTraits() size:data->state.font.getNSSize()]
@@ -522,28 +522,27 @@ void QPainter::drawText(int x, int y, int w, int h, int flags, const QString &qs
NSString *string;
NSMutableParagraphStyle *style = [[[NSMutableParagraphStyle alloc] init] autorelease];
- _lockFocus();
-
- if (len == -1)
- string = QSTRING_TO_NSSTRING(qstring);
- else
- string = QSTRING_TO_NSSTRING_LENGTH(qstring,len);
+ string = qstring.getNSString();
+ if (len != -1) {
+ string = [string substringToIndex:len];
+ }
- if (flags & Qt::WordBreak){
+ if (flags & Qt::WordBreak) {
[style setLineBreakMode: NSLineBreakByWordWrapping];
- }
- else {
+ } else {
[style setLineBreakMode: NSLineBreakByClipping];
}
- if (flags & Qt::AlignRight){
+ if (flags & Qt::AlignRight) {
[style setAlignment: NSRightTextAlignment];
}
- if (flags & Qt::AlignLeft){
+ if (flags & Qt::AlignLeft) {
[style setAlignment: NSLeftTextAlignment];
}
+ _lockFocus();
+
[[[WebCoreTextRendererFactory sharedFactory]
rendererWithFamily:data->state.font.getNSFamily() traits:data->state.font.getNSTraits() size:data->state.font.getNSSize()]
drawString:string inRect:NSMakeRect(x, y, w, h) withColor:data->state.pen.color().getNSColor() paragraphStyle:style];
diff --git a/WebCore/kwq/KWQSignalStubs.mm b/WebCore/kwq/KWQSignalStubs.mm
index 4e3e1b8..fb3fbe6 100644
--- a/WebCore/kwq/KWQSignalStubs.mm
+++ b/WebCore/kwq/KWQSignalStubs.mm
@@ -24,7 +24,7 @@
*/
#import <khtmlview.h>
-#import <misc/loader.h>
+#import <loader.h>
void KHTMLView::cleared()
{
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index b0cd378..69f91f2 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -33,12 +33,6 @@
// Make htmltokenizer.cpp happy
#define QT_VERSION 300
-#define _FAST_QSTRING_TO_NSSTRING(aString) (aString).getNSString()
-#define QSTRING_TO_NSSTRING(aString) [[(aString).getNSString() retain] autorelease]
-#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
- [[[(aString).getNSString() substringToIndex: l] retain] autorelease]
-#define NSSTRING_TO_QSTRING(aString) QString::fromNSString(aString)
-
class QRegExp;
#ifdef __OBJC__
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index 0bb838e..ceadf50 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -31,7 +31,7 @@
#import <qwidget.h>
#import <qpainter.h>
#import <qevent.h>
-#import <html/html_documentimpl.h>
+#import <html_documentimpl.h>
diff --git a/WebCore/kwq/KWQsignals.mm b/WebCore/kwq/KWQsignals.mm
index 4e3e1b8..fb3fbe6 100644
--- a/WebCore/kwq/KWQsignals.mm
+++ b/WebCore/kwq/KWQsignals.mm
@@ -24,7 +24,7 @@
*/
#import <khtmlview.h>
-#import <misc/loader.h>
+#import <loader.h>
void KHTMLView::cleared()
{
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index fac9496..de212a5 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -27,7 +27,7 @@
#import <KWQKHTMLPartImpl.h>
#import <khtmlview.h>
-#import <xml/dom_docimpl.h>
+#import <dom_docimpl.h>
#import <render_object.h>
@implementation WebCoreBridge
@@ -117,8 +117,7 @@
- (NSString *)selectedText
{
- QString st = part->selectedText();
- return QSTRING_TO_NSSTRING(st);
+ return [[part->selectedText().getNSString() copy] autorelease];
}
- (void)selectAll
diff --git a/WebCore/kwq/kdecore/kconfig.h b/WebCore/kwq/kdecore/kconfig.h
index 7313738..531c93e 100644
--- a/WebCore/kwq/kdecore/kconfig.h
+++ b/WebCore/kwq/kdecore/kconfig.h
@@ -26,7 +26,7 @@
#ifndef KCONFIG_H_
#define KCONFIG_H_
-#include <qt/qstring.h>
+#include <qstring.h>
class QColor;
class QStringList;
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
index f85d833..d87b506 100644
--- a/WebCore/kwq/kdecore/kglobal.h
+++ b/WebCore/kwq/kdecore/kglobal.h
@@ -33,28 +33,21 @@ class KCharsets;
class KLocale;
class KStandardDirs;
class KConfig;
-class KWQStaticStringDict;
#define kMin(a, b) ((a) < (b) ? (a) : (b))
#define kMax(a, b) ((a) > (b) ? (a) : (b))
class KGlobal {
public:
- static KWQStaticStringDict *staticStringDict;
-
- static KInstance *instance();
- static KCharsets *charsets();
- static KLocale *locale();
- static KStandardDirs *dirs();
+ 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:
- static KWQStaticStringDict *_stringDict;
- static KInstance *_instance;
- static KLocale *_locale;
- static KCharsets *_charsets;
};
#endif
diff --git a/WebCore/kwq/kdecore/klibloader.h b/WebCore/kwq/kdecore/klibloader.h
index 5751177..f5e7453 100644
--- a/WebCore/kwq/kdecore/klibloader.h
+++ b/WebCore/kwq/kdecore/klibloader.h
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kio/global.h>
+#include <global.h>
class KLibrary
{
diff --git a/WebCore/kwq/kdecore/klocale.h b/WebCore/kwq/kdecore/klocale.h
index b70e61a..33879ba 100644
--- a/WebCore/kwq/kdecore/klocale.h
+++ b/WebCore/kwq/kdecore/klocale.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,46 +26,14 @@
#ifndef KLOCALE_H_
#define KLOCALE_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qt/qstringlist.h>
+#include <qstringlist.h>
QString i18n(const char* text);
-// class KLocale ===============================================================
-
class KLocale {
public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
- KLocale();
- ~KLocale();
-
- // member functions --------------------------------------------------------
-
QString language() const;
QStringList languageList() const;
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- KLocale(const KLocale &);
- KLocale &operator=(const KLocale &);
-
-}; // class KLocale ============================================================
+};
#endif
diff --git a/WebCore/kwq/khtml/khtml_ext.h b/WebCore/kwq/khtml/khtml_ext.h
index 7878213..380ada4 100644
--- a/WebCore/kwq/khtml/khtml_ext.h
+++ b/WebCore/kwq/khtml/khtml_ext.h
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kparts/browserextension.h>
+#include <browserextension.h>
class QWidget;
class KHTMLPart;
diff --git a/WebCore/kwq/khtml/khtml_factory.h b/WebCore/kwq/khtml/khtml_factory.h
index b955144..4e87beb 100644
--- a/WebCore/kwq/khtml/khtml_factory.h
+++ b/WebCore/kwq/khtml/khtml_factory.h
@@ -27,8 +27,8 @@
#define __khtml_factory_h__
#include <khtml_part.h>
-#include <kparts/factory.h>
-#include <kparts/historyprovider.h>
+#include <factory.h>
+#include <historyprovider.h>
class KInstance;
class KHTMLPart;
diff --git a/WebCore/kwq/kio/kmimetype.h b/WebCore/kwq/kio/kmimetype.h
index 031c474..fc07e46 100644
--- a/WebCore/kwq/kio/kmimetype.h
+++ b/WebCore/kwq/kio/kmimetype.h
@@ -26,9 +26,9 @@
#ifndef KMIMETYPE_H_
#define KMIMETYPE_H_
-#include <kdecore/kglobal.h>
+#include <kglobal.h>
-#include <kdecore/kurl.h>
+#include <kurl.h>
#include <sys/types.h>
#include <qstring.h>
diff --git a/WebCore/kwq/qt/qbutton.h b/WebCore/kwq/qt/qbutton.h
index cf47346..347e2a7 100644
--- a/WebCore/kwq/qt/qbutton.h
+++ b/WebCore/kwq/qt/qbutton.h
@@ -32,11 +32,9 @@
class QButton : public QWidget {
public:
QButton(QWidget *parent = 0);
- ~QButton();
virtual void setText(const QString &);
QString text() const;
-
};
#endif
diff --git a/WebCore/kwq/qt/qlineedit.h b/WebCore/kwq/qt/qlineedit.h
index 9ff356c..dc7586c 100644
--- a/WebCore/kwq/qt/qlineedit.h
+++ b/WebCore/kwq/qt/qlineedit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,34 +26,15 @@
#ifndef QLINEEDIT_H_
#define QLINEEDIT_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "qwidget.h"
-#include "qevent.h"
-#include "qstring.h"
-
-// class QLineEdit =============================================================
+#include <qwidget.h>
+#include <qevent.h>
+#include <qstring.h>
class QLineEdit : public QWidget {
public:
+ enum EchoMode { Normal, Password };
- // typedefs ----------------------------------------------------------------
-
- // enums -------------------------------------------------------------------
-
- enum EchoMode { Normal, NoEcho, Password };
-
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
- // constructors, copy constructors, and destructors ------------------------
-
- QLineEdit(QWidget *parent=0, const char *name=0);
-
- virtual ~QLineEdit();
-
- // member functions --------------------------------------------------------
+ QLineEdit(QWidget *parent);
virtual void setEchoMode(EchoMode);
virtual void setCursorPosition(int);
@@ -63,26 +44,12 @@ public:
bool isReadOnly() const;
void setReadOnly(bool);
- bool event(QEvent *);
bool frame() const;
int cursorPosition() const;
int maxLength() const;
void selectAll();
bool edited() const;
void setEdited(bool);
-
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QLineEdit(const QLineEdit &);
- QLineEdit &operator=(const QLineEdit &);
-
-}; // class QLineEdit ==========================================================
+};
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index b0cd378..69f91f2 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -33,12 +33,6 @@
// Make htmltokenizer.cpp happy
#define QT_VERSION 300
-#define _FAST_QSTRING_TO_NSSTRING(aString) (aString).getNSString()
-#define QSTRING_TO_NSSTRING(aString) [[(aString).getNSString() retain] autorelease]
-#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
- [[[(aString).getNSString() substringToIndex: l] retain] autorelease]
-#define NSSTRING_TO_QSTRING(aString) QString::fromNSString(aString)
-
class QRegExp;
#ifdef __OBJC__
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 82888ca..0e2f47a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * History.subproj/IFURIEntry.m: (-[IFURIEntry image]):
+ Use [IFURIEntry class] instead of [self class] so we get the
+ icon from the WebKit bundle even if someone subclasses IFURIEntry.
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView initWithFrame:mimeType:arguments:]): Use
+ bundleForClass instead of bundleWithIdentifier so things work even
+ if we have two copies of WebKit installed on the same machine.
+
+ * Makefile.am: Remove include of embed.am.
+
+ * WebKit.pbproj/project.pbxproj: Use embed-into-alex instead of make embed.
+ Also change bundle identifier to com.apple.WebKit instead of com.apple.webkit
+ to match standard used by our other frameworks. (Checked that we no longer have
+ any hard-coding of the bundle identifier anywhere in our code.)
+
2002-07-13 Richard Williamson (Home) <rjw at apple.com>
Fixed 2981849 - frames don't always draw correctly.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 82888ca..0e2f47a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-07-13 Darin Adler <darin at apple.com>
+
+ * History.subproj/IFURIEntry.m: (-[IFURIEntry image]):
+ Use [IFURIEntry class] instead of [self class] so we get the
+ icon from the WebKit bundle even if someone subclasses IFURIEntry.
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView initWithFrame:mimeType:arguments:]): Use
+ bundleForClass instead of bundleWithIdentifier so things work even
+ if we have two copies of WebKit installed on the same machine.
+
+ * Makefile.am: Remove include of embed.am.
+
+ * WebKit.pbproj/project.pbxproj: Use embed-into-alex instead of make embed.
+ Also change bundle identifier to com.apple.WebKit instead of com.apple.webkit
+ to match standard used by our other frameworks. (Checked that we no longer have
+ any hard-coding of the bundle identifier anywhere in our code.)
+
2002-07-13 Richard Williamson (Home) <rjw at apple.com>
Fixed 2981849 - frames don't always draw correctly.
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index 30ccf7b..2747aaa 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -77,7 +77,7 @@
// trying and failing to find it.
if (!loadedDefaultImage) {
NSString *pathForDefaultImage =
- [[NSBundle bundleForClass:[self class]] pathForResource:@"url_icon" ofType:@"tiff"];
+ [[NSBundle bundleForClass:[IFURIEntry class]] pathForResource:@"url_icon" ofType:@"tiff"];
if (pathForDefaultImage != nil) {
defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
}
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 30ccf7b..2747aaa 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -77,7 +77,7 @@
// trying and failing to find it.
if (!loadedDefaultImage) {
NSString *pathForDefaultImage =
- [[NSBundle bundleForClass:[self class]] pathForResource:@"url_icon" ofType:@"tiff"];
+ [[NSBundle bundleForClass:[IFURIEntry class]] pathForResource:@"url_icon" ofType:@"tiff"];
if (pathForDefaultImage != nil) {
defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
}
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index c144429..32b315d 100644
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -5,6 +5,3 @@ clean-am:
previous-clean-timestamp: force-clean-timestamp
make clean && touch $@
-
-FRAMEWORK_NAME = WebKit
-include $(top_srcdir)/embed.am
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index 4d4890a..d7d3ad1 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -24,7 +24,7 @@ static NSImage *image = nil;
if (self) {
// Set the view's image to the null plugin icon
if (!image) {
- bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
+ bundle = [NSBundle bundleForClass:[IFNullPluginView class]];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
image = [[NSImage alloc] initWithContentsOfFile:imagePath];
}
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 4d4890a..d7d3ad1 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -24,7 +24,7 @@ static NSImage *image = nil;
if (self) {
// Set the view's image to the null plugin icon
if (!image) {
- bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
+ bundle = [NSBundle bundleForClass:[IFNullPluginView class]];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
image = [[NSImage alloc] initWithContentsOfFile:imagePath];
}
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index be13e2b..2ba0faa 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -136,7 +136,7 @@
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = ".. ../JavaScriptCore ../WebCore/khtml ../WebCore/kwq ../WebCore/kwq/kdecore ../WebCore/kwq/khtml ../WebCore/kwq/kparts ../WebCore/kwq/qt";
- INSTALL_PATH = "";
+ INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
@@ -155,7 +155,7 @@
);
isa = PBXFrameworkTarget;
name = WebKit;
- productInstallPath = "";
+ productInstallPath = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
productName = WebKit;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -169,7 +169,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.apple.webkit</string>
+ <string>com.apple.WebKit</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
@@ -432,7 +432,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "make embed";
+ shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
};
2568C72C0174912D0ECA149E = {
isa = PBXFileReference;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list