From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:21 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdehtml/tdehtml_run.cpp | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 tdehtml/tdehtml_run.cpp (limited to 'tdehtml/tdehtml_run.cpp') diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp new file mode 100644 index 000000000..e1c34915a --- /dev/null +++ b/tdehtml/tdehtml_run.cpp @@ -0,0 +1,92 @@ +/* This file is part of the KDE project + * + * Copyright (C) 1998, 1999 Torben Weis + * 1999 Lars Knoll + * 1999 Antti Koivisto + * 2000 Simon Hausmann + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#include "tdehtmlpart_p.h" +#include "tdehtml_run.h" +#include +#include +#include +#include "tdehtml_ext.h" +#include + +KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, + const KParts::URLArgs &args, bool hideErrorDialog ) + : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, + false, false, hideErrorDialog ), + m_child( child ) +{ + // Don't use an external browser for parts of a webpage we are rendering. (iframes at least are one example) + setEnableExternalBrowser(false); + + // get the wheel to start spinning + part->started(0L); +} + +//KHTMLPart *KHTMLRun::htmlPart() const +//{ return static_cast(m_part); } + +void KHTMLRun::foundMimeType( const TQString &_type ) +{ + Q_ASSERT(!m_bFinished); + TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again + if ( static_cast(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) ) + m_bFinished = true; + else { + if ( m_bFinished ) // abort was called (this happens with the activex fallback for instance) + return; + // Couldn't embed -> call BrowserRun::handleNonEmbeddable() + KParts::BrowserRun::NonEmbeddableResult res = handleNonEmbeddable( mimeType ); + if ( res == KParts::BrowserRun::Delayed ) + return; + m_bFinished = ( res == KParts::BrowserRun::Handled ); + if ( m_bFinished ) { // saved or canceled -> flag completed + m_child->m_bCompleted = true; + static_cast(m_part)->checkCompleted(); + } + } + + if ( m_bFinished ) + { + m_timer.start( 0, true ); + return; + } + + //kdDebug(6050) << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl; + KRun::foundMimeType( mimeType ); + + // "open" is finished -> flag completed + m_child->m_bCompleted = true; + static_cast(m_part)->checkCompleted(); +} + +void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename ) +{ + KHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename ); +} + +// KDE4: remove +void KHTMLRun::handleError( TDEIO::Job *job ) +{ + KParts::BrowserRun::handleError( job ); +} + +#include "tdehtml_run.moc" -- cgit v1.2.1 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdehtml/tdehtml_run.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdehtml/tdehtml_run.cpp') diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp index e1c34915a..6ae958d67 100644 --- a/tdehtml/tdehtml_run.cpp +++ b/tdehtml/tdehtml_run.cpp @@ -22,7 +22,7 @@ */ #include "tdehtmlpart_p.h" #include "tdehtml_run.h" -#include +#include #include #include #include "tdehtml_ext.h" -- cgit v1.2.1 From 7427e438358d44c37e3c8b0a9cfbb225ffd60e79 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 15:54:26 -0600 Subject: Rename KHTML and kiobuffer --- tdehtml/tdehtml_run.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tdehtml/tdehtml_run.cpp') diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp index 6ae958d67..2a5fd1861 100644 --- a/tdehtml/tdehtml_run.cpp +++ b/tdehtml/tdehtml_run.cpp @@ -28,7 +28,7 @@ #include "tdehtml_ext.h" #include -KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, +TDEHTMLRun::TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ) : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, false, false, hideErrorDialog ), @@ -41,14 +41,14 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url part->started(0L); } -//KHTMLPart *KHTMLRun::htmlPart() const -//{ return static_cast(m_part); } +//TDEHTMLPart *TDEHTMLRun::htmlPart() const +//{ return static_cast(m_part); } -void KHTMLRun::foundMimeType( const TQString &_type ) +void TDEHTMLRun::foundMimeType( const TQString &_type ) { Q_ASSERT(!m_bFinished); TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again - if ( static_cast(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) ) + if ( static_cast(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) ) m_bFinished = true; else { if ( m_bFinished ) // abort was called (this happens with the activex fallback for instance) @@ -60,7 +60,7 @@ void KHTMLRun::foundMimeType( const TQString &_type ) m_bFinished = ( res == KParts::BrowserRun::Handled ); if ( m_bFinished ) { // saved or canceled -> flag completed m_child->m_bCompleted = true; - static_cast(m_part)->checkCompleted(); + static_cast(m_part)->checkCompleted(); } } @@ -70,21 +70,21 @@ void KHTMLRun::foundMimeType( const TQString &_type ) return; } - //kdDebug(6050) << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl; + //kdDebug(6050) << "TDEHTMLRun::foundMimeType " << _type << " couldn't open" << endl; KRun::foundMimeType( mimeType ); // "open" is finished -> flag completed m_child->m_bCompleted = true; - static_cast(m_part)->checkCompleted(); + static_cast(m_part)->checkCompleted(); } -void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename ) +void TDEHTMLRun::save( const KURL & url, const TQString & suggestedFilename ) { - KHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename ); + TDEHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename ); } // KDE4: remove -void KHTMLRun::handleError( TDEIO::Job *job ) +void TDEHTMLRun::handleError( TDEIO::Job *job ) { KParts::BrowserRun::handleError( job ); } -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdehtml/tdehtml_run.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdehtml/tdehtml_run.cpp') diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp index 2a5fd1861..499616cce 100644 --- a/tdehtml/tdehtml_run.cpp +++ b/tdehtml/tdehtml_run.cpp @@ -24,7 +24,7 @@ #include "tdehtml_run.h" #include #include -#include +#include #include "tdehtml_ext.h" #include -- cgit v1.2.1