diff --git a/kio/DESIGN.metadata b/kio/DESIGN.metadata index 5d2e88ad..f8b6357c 100644 --- a/kio/DESIGN.metadata +++ b/kio/DESIGN.metadata @@ -51,9 +51,6 @@ Languages string Language(s) send in the "Accept-Language:" HTTP request-id number Sequence number to identify requests in a MultiGet command. -errorPage bool Flag that indicates that an errorPage() is preferred over an - error(). (default:true) - no-auth bool Flag that indicates that no authentication (neither WWW nor proxy) attempts should be made. no-www-auth bool Flag that indicates that no HTTP WWW authentication attempts should diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index e046b01e..39c272d4 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -1162,11 +1162,6 @@ bool TransferJob::doResume() return true; } -bool TransferJob::isErrorPage() const -{ - return d_func()->m_errorPage; -} - void TransferJobPrivate::start(Slave *slave) { Q_Q(TransferJob); @@ -1188,9 +1183,6 @@ void TransferJobPrivate::start(Slave *slave) q->connect( slave, SIGNAL(mimeType(QString)), SLOT(slotMimetype(QString)) ); - q->connect( slave, SIGNAL(errorPage()), - SLOT(slotErrorPage()) ); - q->connect( slave, SIGNAL(needSubUrlData()), SLOT(slotNeedSubUrlData()) ); @@ -1235,11 +1227,6 @@ void TransferJob::slotMetaData( const KIO::MetaData &_metaData) storeSSLSessionFromJob(d->m_redirectionURL); } -void TransferJobPrivate::slotErrorPage() -{ - m_errorPage = true; -} - void TransferJobPrivate::slotCanResume( KIO::filesize_t offset ) { Q_Q(TransferJob); @@ -1922,7 +1909,6 @@ void FileCopyJobPrivate::slotCanResume( KIO::Job* job, KIO::filesize_t offset ) { m_getJob = KIO::get( m_src, NoReload, HideProgressInfo /* no GUI */ ); //kDebug(7007) << "m_getJob=" << m_getJob << m_src; - m_getJob->addMetaData( "errorPage", "false" ); m_getJob->addMetaData( "AllowCompressedPage", "false" ); // Set size in subjob. This helps if the slave doesn't emit totalSize. if ( m_sourceSize != (KIO::filesize_t)-1 ) diff --git a/kio/kio/job_p.h b/kio/kio/job_p.h index e64e460e..abf706e8 100644 --- a/kio/kio/job_p.h +++ b/kio/kio/job_p.h @@ -252,20 +252,19 @@ namespace KIO { inline TransferJobPrivate(const KUrl& url, int command, const QByteArray &packedArgs, const QByteArray &_staticData) : SimpleJobPrivate(url, command, packedArgs), - m_internalSuspended(false), m_errorPage(false), + m_internalSuspended(false), staticData(_staticData), m_isMimetypeEmitted(false), m_subJob(0) { } inline TransferJobPrivate(const KUrl& url, int command, const QByteArray &packedArgs, QIODevice* ioDevice) : SimpleJobPrivate(url, command, packedArgs), - m_internalSuspended(false), m_errorPage(false), + m_internalSuspended(false), m_isMimetypeEmitted(false), m_subJob(0), m_outgoingDataSource(ioDevice) { } bool m_internalSuspended; - bool m_errorPage; QByteArray staticData; KUrl m_redirectionURL; KUrl::List m_redirectionList; @@ -297,7 +296,6 @@ namespace KIO { */ virtual void slotDataReqFromDevice(); - void slotErrorPage(); void slotCanResume( KIO::filesize_t offset ); void slotNeedSubUrlData(); void slotSubUrlData(KIO::Job*, const QByteArray &); diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 7dcf90c6..e71acec5 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -534,15 +534,6 @@ namespace KIO { */ void setModificationTime( const QDateTime& mtime ); - /** - * Checks whether we got an error page. This currently only happens - * with HTTP urls. Call this from your slot connected to result(). - * - * @return true if we got an (HTML) error page from the server - * instead of what we asked for. - */ - bool isErrorPage() const; - /** * Enable the async data mode. * When async data is enabled, data should be provided to the job by @@ -646,7 +637,6 @@ namespace KIO { protected: TransferJob(TransferJobPrivate &dd); private: - Q_PRIVATE_SLOT(d_func(), void slotErrorPage()) Q_PRIVATE_SLOT(d_func(), void slotCanResume( KIO::filesize_t offset )) Q_PRIVATE_SLOT(d_func(), void slotNeedSubUrlData()) Q_PRIVATE_SLOT(d_func(), void slotSubUrlData(KIO::Job*, const QByteArray &)) diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index 4a7a50f4..274143d3 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -593,11 +593,6 @@ void SlaveBase::redirection( const KUrl& _url ) send( INF_REDIRECTION, data ); } -void SlaveBase::errorPage() -{ - send( INF_ERROR_PAGE ); -} - static bool isSubCommand(int cmd) { return ( (cmd == CMD_REPARSECONFIGURATION) || diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index 3b204186..f866675c 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -205,13 +205,6 @@ public: */ void redirection( const KUrl &_url ); - /** - * Tell that we will only get an error page here. - * This means: the data you'll get isn't the data you requested, - * but an error page (usually HTML) that describes an error. - */ - void errorPage(); - /** * Call this in mimetype() and in get(), when you know the mimetype. * See mimetype about other ways to implement it. diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp index cf3ecd0c..1a51890b 100644 --- a/kio/kio/slaveinterface.cpp +++ b/kio/kio/slaveinterface.cpp @@ -249,9 +249,6 @@ bool SlaveInterface::dispatch(int _cmd, const QByteArray &rawdata) d->speed_timer.stop(); emit speed( ul ); break; - case INF_ERROR_PAGE: - emit errorPage(); - break; case INF_REDIRECTION: { KUrl url; stream >> url; diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index 04ede831..28842d9d 100644 --- a/kio/kio/slaveinterface.h +++ b/kio/kio/slaveinterface.h @@ -49,7 +49,6 @@ class SlaveInterfacePrivate; INF_SPEED, INF_REDIRECTION = 20, INF_MIME_TYPE = 21, - INF_ERROR_PAGE = 22, INF_WARNING = 23, INF_INFOMESSAGE, INF_META_DATA, @@ -165,7 +164,6 @@ Q_SIGNALS: void position( KIO::filesize_t ); void speed( unsigned long ); - void errorPage(); void mimeType( const QString & ); void warning( const QString & ); void infoMessage( const QString & );