[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:15:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ad130f2b97938b61f4b1e65051ae7eba7447bef4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 31 18:33:55 2002 +0000
* kwq/kio/jobclasses.h: Removed SimpleJob and made Job just enough for
TransferJob to inherit from it. Removed unused stuff and made url() return
an NSURL rather than a KURL.
* kwq/KWQKjobclasses.mm: Removed much of the code, and reworked what
remains to simplify it.
* kwq/KWQKloader.mm: Update users of TransferJob::url since it now returns
an NSURL rather than a KURL.
* kwq/kio/job.h: Simplify.
* kwq/KWQKJob.mm: Simplify.
* kwq/kio/scheduler.h: Emptied this file out.
* kwq/KWQKScheduler.mm: Removed.
* kwq/Makefile.am: Removed KWQKScheduler.mm.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1246 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 056f062..6c8cb30 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
2002-05-31 Darin Adler <darin at apple.com>
+ * kwq/kio/jobclasses.h: Removed SimpleJob and made Job just enough for
+ TransferJob to inherit from it. Removed unused stuff and made url() return
+ an NSURL rather than a KURL.
+ * kwq/KWQKjobclasses.mm: Removed much of the code, and reworked what
+ remains to simplify it.
+ * kwq/KWQKloader.mm: Update users of TransferJob::url since it now returns
+ an NSURL rather than a KURL.
+
+ * kwq/kio/job.h: Simplify.
+ * kwq/KWQKJob.mm: Simplify.
+
+ * kwq/kio/scheduler.h: Emptied this file out.
+ * kwq/KWQKScheduler.mm: Removed.
+ * kwq/Makefile.am: Removed KWQKScheduler.mm.
+
+2002-05-31 Darin Adler <darin at apple.com>
+
Remove some unused stuff; total of 1000s of lines.
* Makefile.am: Removed some strange uses of "./" and
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 056f062..6c8cb30 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,22 @@
2002-05-31 Darin Adler <darin at apple.com>
+ * kwq/kio/jobclasses.h: Removed SimpleJob and made Job just enough for
+ TransferJob to inherit from it. Removed unused stuff and made url() return
+ an NSURL rather than a KURL.
+ * kwq/KWQKjobclasses.mm: Removed much of the code, and reworked what
+ remains to simplify it.
+ * kwq/KWQKloader.mm: Update users of TransferJob::url since it now returns
+ an NSURL rather than a KURL.
+
+ * kwq/kio/job.h: Simplify.
+ * kwq/KWQKJob.mm: Simplify.
+
+ * kwq/kio/scheduler.h: Emptied this file out.
+ * kwq/KWQKScheduler.mm: Removed.
+ * kwq/Makefile.am: Removed KWQKScheduler.mm.
+
+2002-05-31 Darin Adler <darin at apple.com>
+
Remove some unused stuff; total of 1000s of lines.
* Makefile.am: Removed some strange uses of "./" and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 056f062..6c8cb30 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,22 @@
2002-05-31 Darin Adler <darin at apple.com>
+ * kwq/kio/jobclasses.h: Removed SimpleJob and made Job just enough for
+ TransferJob to inherit from it. Removed unused stuff and made url() return
+ an NSURL rather than a KURL.
+ * kwq/KWQKjobclasses.mm: Removed much of the code, and reworked what
+ remains to simplify it.
+ * kwq/KWQKloader.mm: Update users of TransferJob::url since it now returns
+ an NSURL rather than a KURL.
+
+ * kwq/kio/job.h: Simplify.
+ * kwq/KWQKJob.mm: Simplify.
+
+ * kwq/kio/scheduler.h: Emptied this file out.
+ * kwq/KWQKScheduler.mm: Removed.
+ * kwq/Makefile.am: Removed KWQKScheduler.mm.
+
+2002-05-31 Darin Adler <darin at apple.com>
+
Remove some unused stuff; total of 1000s of lines.
* Makefile.am: Removed some strange uses of "./" and
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/kwq/KWQKJob.h
index 8fbe161..4890ff9 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/kwq/KWQKJob.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,23 +26,18 @@
#ifndef JOB_H_
#define JOB_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <kurl.h>
-#include "jobclasses.h"
+#include <jobclasses.h>
// for time_t
#include <sys/types.h>
-// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
-SimpleJob *http_update_cache(const KURL &, bool, time_t);
+void http_update_cache(const KURL &, bool, time_t);
-TransferJob *get(const KURL &url, bool reload=false,
- bool showProgressInfo=true);
+inline TransferJob *get(const KURL &url, bool reload = false, bool showProgressInfo = true)
+ { return new TransferJob(url, reload, showProgressInfo); }
} // namespace KIO
diff --git a/WebCore/kwq/KWQKJob.mm b/WebCore/kwq/KWQKJob.mm
index d19966e..5bea6d3 100644
--- a/WebCore/kwq/KWQKJob.mm
+++ b/WebCore/kwq/KWQKJob.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
@@ -23,25 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kwqdebug.h>
#include <job.h>
+#include <kwqdebug.h>
namespace KIO {
-SimpleJob *http_update_cache(const KURL &, bool, time_t)
+void http_update_cache(const KURL &, bool, time_t)
{
_logNotYetImplemented();
- return 0L;
-}
-
-TransferJob *get(const KURL &url, bool reload=false, bool showProgressInfo=true)
-{
- TransferJob *result;
-
- result = new TransferJob(url, reload, showProgressInfo);
-
- return result;
}
} // namespace KIO
-
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 99af382..225588f 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -26,187 +26,48 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <kurl.h>
#include <qobject.h>
#include <qstring.h>
-#ifdef _KWQ_
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#ifdef __OBJC__
#import <WebFoundation/WebFoundation.h>
#endif
-#endif
-
namespace KIO {
class TransferJobPrivate;
-// class Job ===================================================================
-
class Job : public QObject {
public:
+ virtual int error() const = 0;
+ virtual const QString & errorText() const = 0;
+ virtual void kill() = 0;
+};
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
- // constructors, copy constructors, and destructors ------------------------
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- Job() {}
-#endif
-
- virtual ~Job();
-
- // member functions --------------------------------------------------------
-
- virtual int error();
- const QString & errorText();
- QString errorString();
- virtual void kill(bool quietly=TRUE);
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- Job(const Job &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- Job &operator=(const Job &);
-#endif
-
-}; // class Job ================================================================
-
-
-// class SimpleJob =============================================================
-
-class SimpleJob : public KIO::Job {
+class TransferJob : public Job {
public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- SimpleJob() {}
-#endif
-
- ~SimpleJob();
-
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- SimpleJob(const SimpleJob &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- SimpleJob &operator=(const SimpleJob &);
-#endif
-
-}; // class SimpleJob ==========================================================
-
-
-// class TransferJob ===========================================================
-
-class TransferJob : public SimpleJob {
-public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
- TransferJob(const KURL &, bool reload=false, bool showProgressInfo=true);
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- TransferJob() {}
-#endif
-
+ TransferJob(const KURL &, bool reload = false, bool showProgressInfo = true);
~TransferJob();
- // member functions --------------------------------------------------------
-
- int error();
+ int error() const;
void setError(int);
+ const QString &errorText() const;
bool isErrorPage() const;
- QString queryMetaData(const QString &key);
+ QString queryMetaData(const QString &key) const;
void addMetaData(const QString &key, const QString &value);
- void kill(bool quietly=TRUE);
+ void kill();
-#ifdef _KWQ_
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#ifdef __OBJC__
void begin(id <IFURLHandleClient> client, void *userData);
- id handle();
-#else
- void begin(void *requestor, void *userData);
- void *handle();
-#endif
- KURL url() { return _url; }
-#endif
-
+ IFURLHandle *handle() const;
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
+ NSURL *url() const;
+#endif
-#ifdef _KWQ_
private:
- KURL _url;
- bool _reload;
- bool _showProgressInfo;
- int _status;
TransferJobPrivate *d;
-#endif
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- TransferJob(const TransferJob &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- TransferJob &operator=(const TransferJob &);
-#endif
-
-}; // class TransferJob ========================================================
-
+};
} // namespace KIO
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index b5c2760..de4c7b1 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -32,98 +32,37 @@
#include <WebFoundation/IFURLHandleClient.h>
-static const QString *DEFAULT_ERROR_TEXT = NULL;
-
namespace KIO {
-// class Job ===================================================================
-
-Job::~Job()
-{
-}
-
-
-int Job::error()
-{
- _logNeverImplemented();
- return 0;
-}
-
-
-const QString &Job::errorText()
-{
- _logNotYetImplemented();
- if (DEFAULT_ERROR_TEXT == NULL) {
- DEFAULT_ERROR_TEXT = new QString("DEFAULT_ERROR_TEXT");
- }
-
- return *DEFAULT_ERROR_TEXT;
-}
-
-
-QString Job::errorString()
-{
- _logNotYetImplemented();
- return QString();
-}
-
-
-void Job::kill(bool quietly)
-{
- _logNotYetImplemented();
-}
-
-
-// class SimpleJob =============================================================
-
-SimpleJob::~SimpleJob()
-{
- _logNotYetImplemented();
-}
-
-
-// class TransferJobPrivate ====================================================
-
class TransferJobPrivate
{
-friend class TransferJob;
public:
-
- TransferJobPrivate(TransferJob *parent, KURL &kurl)
+ TransferJobPrivate(const KURL &kurl)
{
+ status = 0;
metaData = [[NSMutableDictionary alloc] initWithCapacity:17];
- url = [kurl.getNSURL() retain];
+ url = [kurl.getNSURL() copy];
handle = nil;
}
~TransferJobPrivate()
{
- [metaData autorelease];
- [url autorelease];
- [handle autorelease];
+ [metaData release];
+ [url release];
+ [handle release];
}
-private:
- TransferJob *parent;
+ int status;
NSMutableDictionary *metaData;
NSURL *url;
- id handle;
- id <IFURLHandleClient> client;
+ IFURLHandle *handle;
};
-// class TransferJob ===========================================================
-
-TransferJob::TransferJob(const KURL &url, bool reload=false, bool showProgressInfo=true)
+TransferJob::TransferJob(const KURL &url, bool reload, bool showProgressInfo)
{
- _url = url;
- _reload = reload;
- _showProgressInfo = showProgressInfo;
- _status = 0;
-
- d = new TransferJobPrivate(this, _url);
+ d = new TransferJobPrivate(url);
}
-
TransferJob::~TransferJob()
{
delete d;
@@ -131,42 +70,42 @@ TransferJob::~TransferJob()
bool TransferJob::isErrorPage() const
{
- return (_status != 0);
+ return d->status != 0;
}
-int TransferJob::error()
+int TransferJob::error() const
{
- return _status;
+ return d->status;
}
void TransferJob::setError(int e)
{
- _status = e;
+ d->status = e;
}
-QString TransferJob::queryMetaData(const QString &key)
+const QString &TransferJob::errorText() const
{
- NSString *_key;
- NSString *_value;
+ _logNotYetImplemented();
+ static QString text("DEFAULT_ERROR_TEXT");
+ return text;
+}
+
+QString TransferJob::queryMetaData(const QString &key) const
+{
+ NSString *value;
- _key = QSTRING_TO_NSSTRING(key);
- _value = [d->metaData objectForKey:_key];
- if (!_value) {
- return QString::null;
- }
- else {
- return NSSTRING_TO_QSTRING(_value);
- }
+ value = [d->metaData objectForKey:key.getNSString()];
+ return value ? QString::fromNSString(value) : QString::null;
}
void TransferJob::addMetaData(const QString &key, const QString &value)
{
- NSString *_key = QSTRING_TO_NSSTRING(key);
- NSString *_value = QSTRING_TO_NSSTRING(value);
- [d->metaData setObject:_value forKey:_key];
+ NSString *immutableValue = [value.getNSString() copy];
+ [d->metaData setObject:immutableValue forKey:key.getNSString()];
+ [immutableValue release];
}
-void TransferJob::kill(bool quietly)
+void TransferJob::kill()
{
[d->handle cancelLoadInBackground];
}
@@ -175,16 +114,20 @@ void TransferJob::begin(id <IFURLHandleClient> client, void *userData)
{
NSDictionary *attributes;
- d->client = client;
attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:userData] forKey:IFURLHandleUserData];
d->handle = [[IFURLHandle alloc] initWithURL:d->url attributes:attributes flags:0];
[d->handle addClient:client];
[d->handle loadInBackground];
}
-id TransferJob::handle() { return d->handle; }
+IFURLHandle *TransferJob::handle() const
+{
+ return d->handle;
+}
+NSURL *TransferJob::url() const
+{
+ return [[d->url retain] autorelease];
+}
} // namespace KIO
-
-
diff --git a/WebCore/kwq/KWQKScheduler.mm b/WebCore/kwq/KWQKScheduler.mm
deleted file mode 100644
index e6d7042..0000000
--- a/WebCore/kwq/KWQKScheduler.mm
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <kwqdebug.h>
-#include <scheduler.h>
-
-namespace KIO {
-
-
-void Scheduler::scheduleJob(SimpleJob *job)
-{
- _logNeverImplemented();
-}
-
-
-Scheduler::~Scheduler()
-{
- _logNeverImplemented();
-}
-
-
-} // namespace KIO
-
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 6bd63ca..c583164 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -74,19 +74,16 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
- KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(
- [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, DEBUG_OBJECT(job->url()));
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = contentLength;
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
- [controller _didStartLoading:job->url().getNSURL()];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _didStartLoading:job->url()];
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -97,11 +94,10 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, DEBUG_OBJECT(job->url()));
job->setError(1);
m_loader->slotFinished(job);
@@ -111,9 +107,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = -1;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
- [controller _didStopLoading:job->url().getNSURL()];
+ [controller _didStopLoading:job->url()];
delete job;
}
@@ -126,11 +122,10 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, DEBUG_OBJECT(job->url()), data, [data length]);
m_loader->slotFinished(job);
@@ -139,9 +134,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = [data length];
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
- [controller _didStopLoading:job->url().getNSURL()];
+ [controller _didStopLoading:job->url()];
delete job;
}
@@ -155,9 +150,8 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, DEBUG_OBJECT(job->url()), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -175,14 +169,14 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, DEBUG_OBJECT([result errorDescription]), DEBUG_OBJECT(job->url()));
[m_dataSource _removeURLHandle: job->handle()];
@@ -195,9 +189,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
job->setError(1);
m_loader->slotFinished(job);
- [(IFBaseWebController *)controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [(IFBaseWebController *)controller _receivedError: result forResource: [job->url() absoluteString] partialProgress: loadProgress fromDataSource: m_dataSource];
- [(IFBaseWebController *)controller _didStopLoading:job->url().getNSURL()];
+ [(IFBaseWebController *)controller _didStopLoading:job->url()];
delete job;
}
@@ -206,9 +200,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
{
void *userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- NSURL *oldURL = job->url().getNSURL();
+ NSURL *oldURL = job->url();
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "url = %s\n", DEBUG_OBJECT(url));
[m_dataSource _part]->impl->setBaseURL([[url absoluteString] cString]);
[m_dataSource _setFinalURL: url];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 6bd63ca..c583164 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -74,19 +74,16 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
- KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(
- [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, DEBUG_OBJECT(job->url()));
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = contentLength;
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
- [controller _didStartLoading:job->url().getNSURL()];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _didStartLoading:job->url()];
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -97,11 +94,10 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, DEBUG_OBJECT(job->url()));
job->setError(1);
m_loader->slotFinished(job);
@@ -111,9 +107,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = -1;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
- [controller _didStopLoading:job->url().getNSURL()];
+ [controller _didStopLoading:job->url()];
delete job;
}
@@ -126,11 +122,10 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, DEBUG_OBJECT(job->url()), data, [data length]);
m_loader->slotFinished(job);
@@ -139,9 +134,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = [data length];
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
- [controller _didStopLoading:job->url().getNSURL()];
+ [controller _didStopLoading:job->url()];
delete job;
}
@@ -155,9 +150,8 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, DEBUG_OBJECT(job->url()), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -175,14 +169,14 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, DEBUG_OBJECT([result errorDescription]), DEBUG_OBJECT(job->url()));
[m_dataSource _removeURLHandle: job->handle()];
@@ -195,9 +189,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
job->setError(1);
m_loader->slotFinished(job);
- [(IFBaseWebController *)controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [(IFBaseWebController *)controller _receivedError: result forResource: [job->url() absoluteString] partialProgress: loadProgress fromDataSource: m_dataSource];
- [(IFBaseWebController *)controller _didStopLoading:job->url().getNSURL()];
+ [(IFBaseWebController *)controller _didStopLoading:job->url()];
delete job;
}
@@ -206,9 +200,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
{
void *userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- NSURL *oldURL = job->url().getNSURL();
+ NSURL *oldURL = job->url();
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "url = %s\n", DEBUG_OBJECT(url));
[m_dataSource _part]->impl->setBaseURL([[url absoluteString] cString]);
[m_dataSource _setFinalURL: url];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 6bd63ca..c583164 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -74,19 +74,16 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
- KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(
- [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, DEBUG_OBJECT(job->url()));
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = contentLength;
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
- [controller _didStartLoading:job->url().getNSURL()];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _didStartLoading:job->url()];
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -97,11 +94,10 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, DEBUG_OBJECT(job->url()));
job->setError(1);
m_loader->slotFinished(job);
@@ -111,9 +107,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = -1;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
- [controller _didStopLoading:job->url().getNSURL()];
+ [controller _didStopLoading:job->url()];
delete job;
}
@@ -126,11 +122,10 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, DEBUG_OBJECT(job->url()), data, [data length]);
m_loader->slotFinished(job);
@@ -139,9 +134,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = [data length];
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
- [controller _didStopLoading:job->url().getNSURL()];
+ [controller _didStopLoading:job->url()];
delete job;
}
@@ -155,9 +150,8 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- QString urlString = job->url().url();
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, DEBUG_OBJECT(job->url()), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -175,14 +169,14 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, DEBUG_OBJECT([result errorDescription]), DEBUG_OBJECT(job->url()));
[m_dataSource _removeURLHandle: job->handle()];
@@ -195,9 +189,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
job->setError(1);
m_loader->slotFinished(job);
- [(IFBaseWebController *)controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [(IFBaseWebController *)controller _receivedError: result forResource: [job->url() absoluteString] partialProgress: loadProgress fromDataSource: m_dataSource];
- [(IFBaseWebController *)controller _didStopLoading:job->url().getNSURL()];
+ [(IFBaseWebController *)controller _didStopLoading:job->url()];
delete job;
}
@@ -206,9 +200,9 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
{
void *userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- NSURL *oldURL = job->url().getNSURL();
+ NSURL *oldURL = job->url();
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "url = %s\n", DEBUG_OBJECT(url));
[m_dataSource _part]->impl->setBaseURL([[url absoluteString] cString]);
[m_dataSource _setFinalURL: url];
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index eb2d3eb..fe84511 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -68,7 +68,6 @@ libkwq_o_SOURCES = \
KWQKPrinter.mm \
KWQKProcess.mm \
KWQKProtocolManager.mm \
- KWQKScheduler.mm \
KWQKSimpleConfig.mm \
KWQKStringHandler.mm \
KWQKURL.mm \
diff --git a/WebCore/kwq/kio/job.h b/WebCore/kwq/kio/job.h
index 8fbe161..4890ff9 100644
--- a/WebCore/kwq/kio/job.h
+++ b/WebCore/kwq/kio/job.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,23 +26,18 @@
#ifndef JOB_H_
#define JOB_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <kurl.h>
-#include "jobclasses.h"
+#include <jobclasses.h>
// for time_t
#include <sys/types.h>
-// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
-SimpleJob *http_update_cache(const KURL &, bool, time_t);
+void http_update_cache(const KURL &, bool, time_t);
-TransferJob *get(const KURL &url, bool reload=false,
- bool showProgressInfo=true);
+inline TransferJob *get(const KURL &url, bool reload = false, bool showProgressInfo = true)
+ { return new TransferJob(url, reload, showProgressInfo); }
} // namespace KIO
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 99af382..225588f 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -26,187 +26,48 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <kurl.h>
#include <qobject.h>
#include <qstring.h>
-#ifdef _KWQ_
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#ifdef __OBJC__
#import <WebFoundation/WebFoundation.h>
#endif
-#endif
-
namespace KIO {
class TransferJobPrivate;
-// class Job ===================================================================
-
class Job : public QObject {
public:
+ virtual int error() const = 0;
+ virtual const QString & errorText() const = 0;
+ virtual void kill() = 0;
+};
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
- // constructors, copy constructors, and destructors ------------------------
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- Job() {}
-#endif
-
- virtual ~Job();
-
- // member functions --------------------------------------------------------
-
- virtual int error();
- const QString & errorText();
- QString errorString();
- virtual void kill(bool quietly=TRUE);
-
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- Job(const Job &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- Job &operator=(const Job &);
-#endif
-
-}; // class Job ================================================================
-
-
-// class SimpleJob =============================================================
-
-class SimpleJob : public KIO::Job {
+class TransferJob : public Job {
public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- SimpleJob() {}
-#endif
-
- ~SimpleJob();
-
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- SimpleJob(const SimpleJob &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- SimpleJob &operator=(const SimpleJob &);
-#endif
-
-}; // class SimpleJob ==========================================================
-
-
-// class TransferJob ===========================================================
-
-class TransferJob : public SimpleJob {
-public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
- TransferJob(const KURL &, bool reload=false, bool showProgressInfo=true);
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- TransferJob() {}
-#endif
-
+ TransferJob(const KURL &, bool reload = false, bool showProgressInfo = true);
~TransferJob();
- // member functions --------------------------------------------------------
-
- int error();
+ int error() const;
void setError(int);
+ const QString &errorText() const;
bool isErrorPage() const;
- QString queryMetaData(const QString &key);
+ QString queryMetaData(const QString &key) const;
void addMetaData(const QString &key, const QString &value);
- void kill(bool quietly=TRUE);
+ void kill();
-#ifdef _KWQ_
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#ifdef __OBJC__
void begin(id <IFURLHandleClient> client, void *userData);
- id handle();
-#else
- void begin(void *requestor, void *userData);
- void *handle();
-#endif
- KURL url() { return _url; }
-#endif
-
+ IFURLHandle *handle() const;
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
+ NSURL *url() const;
+#endif
-#ifdef _KWQ_
private:
- KURL _url;
- bool _reload;
- bool _showProgressInfo;
- int _status;
TransferJobPrivate *d;
-#endif
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- TransferJob(const TransferJob &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- TransferJob &operator=(const TransferJob &);
-#endif
-
-}; // class TransferJob ========================================================
-
+};
} // namespace KIO
diff --git a/WebCore/kwq/kio/scheduler.h b/WebCore/kwq/kio/scheduler.h
index ef05fbb..e69de29 100644
--- a/WebCore/kwq/kio/scheduler.h
+++ b/WebCore/kwq/kio/scheduler.h
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SCHEDULER_H_
-#define SCHEDULER_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qobject.h>
-#include <qtimer.h>
-
-#include "job.h"
-#include "jobclasses.h"
-
-namespace KIO {
-
-// class Scheduler =============================================================
-
-class Scheduler : public QObject {
-public:
-
- // structs -----------------------------------------------------------------
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
-
- // static member functions -------------------------------------------------
-
- static void scheduleJob(SimpleJob *job);
-
- // constructors, copy constructors, and destructors ------------------------
-
-// add no-arg constructor
-#ifdef _KWQ_PEDANTIC_
- Scheduler() {}
-#endif
-
- ~Scheduler();
-
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
-
-// add copy constructor
-// this private declaration prevents copying
-#ifdef _KWQ_PEDANTIC_
- Scheduler(const Scheduler &);
-#endif
-
-// add assignment operator
-// this private declaration prevents assignment
-#ifdef _KWQ_PEDANTIC_
- Scheduler &operator=(const Scheduler &);
-#endif
-
-}; // class Scheduler ==========================================================
-
-
-} // namespace KIO
-
-#endif
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list