Commit f255143b authored by darin's avatar darin

* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.

	* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
	* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.

	* kwq/WCLoadProgress.h: Removed.
	* kwq/WCWebDataSource.h: Removed.
	* kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.

	* *.mm: Changed all includes to imports using a perl script.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1adfcc05
2002-06-15 Darin Adler <darin@apple.com>
* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
* kwq/WCLoadProgress.h: Removed.
* kwq/WCWebDataSource.h: Removed.
* kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
* *.mm: Changed all includes to imports using a perl script.
2002-06-15 Darin Adler <darin@apple.com>
- fixed 2942808 -- remove all calls to WebKit from WebCore
......
2002-06-15 Darin Adler <darin@apple.com>
* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
* kwq/WCLoadProgress.h: Removed.
* kwq/WCWebDataSource.h: Removed.
* kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
* *.mm: Changed all includes to imports using a perl script.
2002-06-15 Darin Adler <darin@apple.com>
- fixed 2942808 -- remove all calls to WebKit from WebCore
......
2002-06-15 Darin Adler <darin@apple.com>
* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
* kwq/WCLoadProgress.h: Removed.
* kwq/WCWebDataSource.h: Removed.
* kwq/KWQKHTMLPart.mm: Removed import of WCWebDataSource.h.
* *.mm: Changed all includes to imports using a perl script.
2002-06-15 Darin Adler <darin@apple.com>
- fixed 2942808 -- remove all calls to WebKit from WebCore
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qapplication.h>
#include <kwqdebug.h>
#import <qapplication.h>
#import <kwqdebug.h>
QPalette QApplication::palette(const QWidget *p)
{
......
......@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <KWQArrayImpl.h>
#import <KWQArrayImpl.h>
#include <new>
#include <string.h>
#import <new>
#import <string.h>
#define MIN(a,b) (((a)<(b))?(a):(b))
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qbuffer.h>
#import <qbuffer.h>
void QBuffer::open(int)
{
......
......@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qbutton.h>
#import <qbutton.h>
#include <KWQView.h>
#include <kwqdebug.h>
#import <KWQView.h>
#import <kwqdebug.h>
QButton::QButton(QWidget *parent)
{
......
......@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qcstring.h>
#import <qcstring.h>
#include <ctype.h>
#import <ctype.h>
QCString::QCString() : QByteArray(0)
{
......
......@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <Foundation/Foundation.h>
#include <qstring.h>
#import <kwqdebug.h>
#import <Foundation/Foundation.h>
#import <qstring.h>
#ifndef USING_BORROWED_QSTRING
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "KWQCharsets.h"
#include <CoreFoundation/CoreFoundation.h>
#import "KWQCharsets.h"
#import <CoreFoundation/CoreFoundation.h>
typedef struct CharsetEntry {
const char *name;
......@@ -34,7 +34,7 @@ typedef struct CharsetEntry {
/* The following autogenerated file includes the charset data. */
#include "KWQCharsetData.c"
#import "KWQCharsetData.c"
static CFMutableDictionaryRef nameToEncoding = NULL;
static CFMutableDictionaryRef mibToEncoding = NULL;
......
......@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qcheckbox.h>
#import <qcheckbox.h>
#include <KWQView.h>
#import <KWQView.h>
#include <kwqdebug.h>
#import <kwqdebug.h>
QCheckBox::QCheckBox(QWidget *w) : QButton (w)
{
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qcollection.h>
#import <qcollection.h>
QPtrCollection::~QPtrCollection()
{
......
......@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qcolor.h>
#import <qcolor.h>
#include <qnamespace.h>
#include <qstring.h>
#include <kwqdebug.h>
#import <qnamespace.h>
#import <qstring.h>
#import <kwqdebug.h>
static void createStaticConstructorAutoreleasePool()
{
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qpalette.h>
#import <qpalette.h>
QColorGroup::QColorGroup()
{
......
......@@ -22,11 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qcombobox.h>
#import <qcombobox.h>
#include <KWQView.h>
#import <KWQView.h>
#include <kwqdebug.h>
#import <kwqdebug.h>
QComboBox::QComboBox(QWidget *parent, const char *name)
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <KWQCompletion.h>
#include <kwqdebug.h>
#import <KWQCompletion.h>
#import <kwqdebug.h>
void KCompletion::setItems(const QStringList &)
{
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qcursor.h>
#include <kwqdebug.h>
#import <qcursor.h>
#import <kwqdebug.h>
const QCursor Qt::sizeAllCursor;
const QCursor Qt::splitHCursor;
......
......@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <Foundation/Foundation.h>
#include <qdatetime.h>
#include <time.h>
#import <Foundation/Foundation.h>
#import <qdatetime.h>
#import <time.h>
// QTime class ===============================================================
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <KWQDictImpl.h>
#include <CoreFoundation/CoreFoundation.h>
#import <KWQDictImpl.h>
#import <CoreFoundation/CoreFoundation.h>
KWQDictImpl::KWQDictImpl(int size, bool caseSensitive, void (*deleteFunc)(void *)) :
KWQPtrDictImpl(size, deleteFunc, &kCFCopyStringDictionaryKeyCallBacks)
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <qdrawutil.h>
#import <kwqdebug.h>
#import <qdrawutil.h>
void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, const QColorGroup &g, bool
sunken, int lineWidth, const QBrush *fill)
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <qevent.h>
#import <kwqdebug.h>
#import <qevent.h>
// class QEvent ================================================================
......
......@@ -23,20 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qfile.h>
#import <qfile.h>
#ifndef USING_BORROWED_QFILE
#include <kwqdebug.h>
#import <kwqdebug.h>
#import <Foundation/Foundation.h>
#include <sys/param.h>
#include <qstring.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <qiodevice.h>
#import <sys/param.h>
#import <qstring.h>
#import <unistd.h>
#import <sys/types.h>
#import <sys/stat.h>
#import <fcntl.h>
#import <qiodevice.h>
class QFile::KWQFilePrivate
{
......
......@@ -26,7 +26,7 @@
#import <qfont.h>
#import <qstring.h>
#include <Cocoa/Cocoa.h>
#import <Cocoa/Cocoa.h>
QFont::QFont()
: _family([@"" retain])
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qfontinfo.h>
#include <kwqdebug.h>
#import <qfontinfo.h>
#import <kwqdebug.h>
QFontInfo::QFontInfo(const QFont &f)
: font(f)
......
......@@ -25,7 +25,7 @@
#import <qfontmetrics.h>
#include <Cocoa/Cocoa.h>
#import <Cocoa/Cocoa.h>
#import <qfont.h>
#import <WebCoreTextRendererFactory.h>
......
......@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qframe.h>
#import <qframe.h>
#include <kwqdebug.h>
#import <kwqdebug.h>
QFrame::QFrame(QWidget *parent)
: QWidget(parent)
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qguardedptr.h>
#import <qguardedptr.h>
KWQGuardedPtrBase::KWQGuardedPtrBase(QObject *o)
{
......
......@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qhbox.h>
#import <qhbox.h>
#include <kwqdebug.h>
#include <KWQView.h>
#import <kwqdebug.h>
#import <KWQView.h>
// This class is ONLY used by FORM <input type=file> elements. It's used
// to stretch a LineEditWidget. We probably don't need it at all.
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qinputdialog.h>
#include <kwqdebug.h>
#import <qinputdialog.h>
#import <kwqdebug.h>
QString QInputDialog::getText(const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *)
{
......
......@@ -25,9 +25,9 @@
// FIXME: obviously many functions here can be made inline
#include <kcharsets.h>
#include <qtextcodec.h>
#include <kwqdebug.h>
#import <kcharsets.h>
#import <qtextcodec.h>
#import <kwqdebug.h>
// constructors, copy constructors, and destructors ----------------------------
......
......@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <kcombobox.h>
#import <kwqdebug.h>
#import <kcombobox.h>
#include <KWQView.h>
#import <KWQView.h>
KComboBox::KComboBox(QWidget *parent, const char *name)
{
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kcursor.h>
#import <kcursor.h>
@interface NSCursor (_WebCoreCursorAdditions)
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kdebug.h>
#import <kdebug.h>
kdbgstream::kdbgstream(unsigned int area, unsigned int level, bool print)
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kfiledialog.h>
#include <kwqdebug.h>
#import <kfiledialog.h>
#import <kwqdebug.h>
QString KFileDialog::getOpenFileName(const QString &startDir,
const QString &filter, QWidget *parent, const QString &caption)
......
......@@ -23,9 +23,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kfileitem.h>
#import <kfileitem.h>
#include <kwqdebug.h>
#import <kwqdebug.h>
KFileItem::KFileItem(const KIO::UDSEntry &, const KURL &, bool, bool)
{
......
......@@ -22,16 +22,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#import <kwqdebug.h>
#include <kglobal.h>
#include <kconfig.h>
#include <kcharsets.h>
#include <klocale.h>
#import <kglobal.h>
#import <kconfig.h>
#import <kcharsets.h>
#import <klocale.h>
#include <qdict.h>
#import <qdict.h>
#include <Cocoa/Cocoa.h>
#import <Cocoa/Cocoa.h>
KWQStaticStringDict *KGlobal::_stringDict = 0;
KInstance *KGlobal::_instance = 0;
......
......@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qfont.h>
#import <qfont.h>
#include <kglobalsettings.h>
#import <kglobalsettings.h>
#include <kwqdebug.h>
#import <kwqdebug.h>
QFont KGlobalSettings::generalFont()
{
......
......@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <khtml_factory.h>
#import <khtml_factory.h>
#include <kinstance.h>
#include <khtml_settings.h>
#import <kinstance.h>
#import <khtml_settings.h>
KInstance *KHTMLFactory::instance()
{
......
......@@ -37,7 +37,6 @@
#import <WebCoreViewFactory.h>
#import <WebCoreBridge.h>
#import <WCWebDataSource.h>
#import <kwqdebug.h>
......
......@@ -37,7 +37,6 @@
#import <WebCoreViewFactory.h>
#import <WebCoreBridge.h>
#import <WCWebDataSource.h>
#import <kwqdebug.h>
......
......@@ -22,8 +22,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <khtml_settings.h>
#import <kwqdebug.h>
#import <khtml_settings.h>
KHTMLSettings::KHTMLSettings()
{
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <khtmlview.h>
#import <khtmlview.h>
/*
Currently this files just extends the kde implementation.
......
......@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <historyprovider.h>
#import <historyprovider.h>
namespace KParts {
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <netaccess.h>
#import <kwqdebug.h>
#import <netaccess.h>
//FIX ME:
static QString *tempQString;
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
#include <kiconloader.h>
#import <kwqdebug.h>
#import <kiconloader.h>
QPixmap KIconLoader::loadIcon(const QString &name, int group, int size, int state) const
{
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kimageio.h>
#include <kwqdebug.h>
#import <kimageio.h>
#import <kwqdebug.h>
QStringList KImageIO::mimeTypes(Mode)
{
......
......@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <job.h>
#include <kwqdebug.h>
#import <job.h>
#import <kwqdebug.h>
namespace KIO {