Rename kiobuffer and KHTML

pull/1/head
Timothy Pearson 12 years ago
parent 44c26994c9
commit 4140fee92e

@ -12,7 +12,7 @@ tdeinit_LTLIBRARIES = kdict.la
AM_CPPFLAGS = $(all_includes)
kdict_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN)
kdict_la_LIBADD = $(LIB_KFILE) $(LIB_KHTML) $(LIBPTHREAD) $(LIBRESOLV)
kdict_la_LIBADD = $(LIB_KFILE) $(LIB_TDEHTML) $(LIBPTHREAD) $(LIBRESOLV)
kdict_la_SOURCES = dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp \
queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp

@ -110,7 +110,7 @@ BrowseData::BrowseData(const TQString &Nhtml, const TQString &NqueryText)
//********* DictHTMLPart ******************************************
DictHTMLPart::DictHTMLPart(TQWidget *parentWidget, const char *widgetname)
: KHTMLPart(parentWidget,widgetname)
: TDEHTMLPart(parentWidget,widgetname)
{}
@ -123,7 +123,7 @@ void DictHTMLPart::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event)
if (event->qmouseEvent()->button()==Qt::MidButton)
emit(middleButtonClicked());
else
KHTMLPart::tdehtmlMouseReleaseEvent(event);
TDEHTMLPart::tdehtmlMouseReleaseEvent(event);
}

@ -74,7 +74,7 @@ public:
//********* DictHTMLPart ***************************************
class DictHTMLPart : public KHTMLPart
class DictHTMLPart : public TDEHTMLPart
{
Q_OBJECT

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdehtml_kget.la
tdehtml_kget_la_METASOURCES = AUTO
tdehtml_kget_la_SOURCES = kget_plug_in.cpp kget_linkview.cpp links.cpp
tdehtml_kget_la_LIBADD = $(LIB_KHTML)
tdehtml_kget_la_LIBADD = $(LIB_TDEHTML)
tdehtml_kget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
KDE_ICON = AUTO

@ -104,16 +104,16 @@ void KGet_plug_in::slotShowDrop()
void KGet_plug_in::slotShowLinks()
{
if ( !parent() || !parent()->inherits( "KHTMLPart" ) )
if ( !parent() || !parent()->inherits( "TDEHTMLPart" ) )
return;
KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() );
TDEHTMLPart *htmlPart = static_cast<TDEHTMLPart*>( parent() );
KParts::Part *activePart = 0L;
if ( htmlPart->partManager() )
{
activePart = htmlPart->partManager()->activePart();
if ( activePart && activePart->inherits( "KHTMLPart" ) )
htmlPart = static_cast<KHTMLPart*>( activePart );
if ( activePart && activePart->inherits( "TDEHTMLPart" ) )
htmlPart = static_cast<TDEHTMLPart*>( activePart );
}
DOM::HTMLDocument doc = htmlPart->htmlDocument();

@ -36,7 +36,7 @@
#include <tqtimer.h>
#include <tqstylesheet.h>
// KHTML::DOM includes
// TDEHTML::DOM includes
#include <dom/dom_doc.h>
#include <dom/dom_text.h>
#include <dom/dom_element.h>
@ -214,7 +214,7 @@ private:
};
ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, const char *name)
: KHTMLPart( parent, name ), d( new Private )
: TDEHTMLPart( parent, name ), d( new Private )
{
d->manager = mgr;
@ -228,7 +228,7 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co
setMetaRefreshEnabled( false );
setOnlyLocalReferences( true );
// Write the template to KHTMLPart
// Write the template to TDEHTMLPart
writeTemplate();
view()->setFocusPolicy( TQ_NoFocus );
@ -834,7 +834,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
long startOffset, endOffset;
selection( startNode, startOffset, endNode, endOffset );
//BEGIN: copied from KHTMLPart::selectedText
//BEGIN: copied from TDEHTMLPart::selectedText
bool hasNewLine = true;
DOM::Node n = startNode;
@ -858,7 +858,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
unsigned short id = n.elementId();
switch(id)
{
case ID_IMG: //here is the main difference with KHTMLView::selectedText
case ID_IMG: //here is the main difference with TDEHTMLView::selectedText
{
DOM::HTMLElement e = n;
if( !e.isNull() && e.hasAttribute( "title" ) )
@ -936,7 +936,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
text=text.mid(start, end-start);
//END: copied from KHTMLPart::selectedText
//END: copied from TDEHTMLPart::selectedText
#endif
if(text.isEmpty()) return;
@ -974,7 +974,7 @@ void ChatMessagePart::print()
void ChatMessagePart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * event) //virtual
{
KHTMLPart::tdehtmlDrawContentsEvent(event);
TDEHTMLPart::tdehtmlDrawContentsEvent(event);
//copy(true /*selection only*/); not needed anymore.
}
void ChatMessagePart::slotCloseView( bool force )

@ -36,7 +36,7 @@ class ChatWindowStyle;
/**
* @author Richard Smith
*/
class ChatMessagePart : public KHTMLPart
class ChatMessagePart : public TDEHTMLPart
{
Q_OBJECT
@ -233,7 +233,7 @@ private:
TQString formatMessageBody( const Kopete::Message &message );
/**
* Write the template file to KHTMLPart
* Write the template file to TDEHTMLPart
*/
void writeTemplate();

@ -88,7 +88,7 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
//FIXME: don't widgets start off hidden anyway?
hide();
//Create the view dock widget (KHTML Part), and set it to no docking (lock it in place)
//Create the view dock widget (TDEHTML Part), and set it to no docking (lock it in place)
viewDock = createDockWidget(TQString::fromLatin1( "viewDock" ), TQPixmap(),
0L,TQString::fromLatin1("viewDock"), TQString::fromLatin1(" "));
m_messagePart = new ChatMessagePart( mgr, viewDock, "m_messagePart" );

@ -238,7 +238,7 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const
d->preview->setJavaEnabled(false);
d->preview->setPluginsEnabled(false);
d->preview->setMetaRefreshEnabled(false);
KHTMLView *htmlWidget = d->preview->view();
TDEHTMLView *htmlWidget = d->preview->view();
htmlWidget->setMarginWidth(4);
htmlWidget->setMarginHeight(4);
htmlWidget->setFocusPolicy(TQ_NoFocus);

@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libkopete_mock.la
libkopete_mock_la_SOURCES = kopetemessage_mock.cpp kopeteaccount_mock.cpp kopetecontact_mock.cpp kopetemetacontact_mock.cpp kopeteprotocol_mock.cpp
libkopete_mock_la_LDFLAGS = $(all_libraries) -lkabc
libkopete_mock_la_LIBADD = ../../libkopete.la ../../private/libkopeteprivate.la $(LIB_KHTML)
libkopete_mock_la_LIBADD = ../../libkopete.la ../../private/libkopeteprivate.la $(LIB_TDEHTML)
noinst_HEADERS = kopetemessage_mock.h kopetecontact_mock.h kopetemetacontact_mock.h kopeteaccount_mock.h kopeteprotocol_mock.h

@ -15,7 +15,7 @@ libkopeteui_la_SOURCES = kopetecontactaction.cpp addcontactpage.cpp \
addressbooklinkwidget.cpp
libkopeteui_la_LDFLAGS = $(all_libraries) -lkabc
libkopeteui_la_LIBADD = ../private/libkopeteprivate.la $(LIB_KHTML)
libkopeteui_la_LIBADD = ../private/libkopeteprivate.la $(LIB_TDEHTML)
kopeteincludedir = $(includedir)/kopete/ui
kopeteinclude_HEADERS = accountselector.h fileconfirmbase.h \

@ -45,7 +45,7 @@ struct UserInfoDialog::UserInfoDialogPrivate {
TQVBoxLayout *topLayout;
TQWidget *page;
DialogStyle style;
KHTMLPart *htmlPart;
TDEHTMLPart *htmlPart;
KLineEdit *nameEdit;
KLineEdit *idEdit;
@ -146,7 +146,7 @@ TQHBox* UserInfoDialog::addLabelEdit( const TQString& label, const TQString& tex
void UserInfoDialog::fillHTML()
{
d->htmlPart = new KHTMLPart( this );
d->htmlPart = new TDEHTMLPart( this );
TQString text;
/*

@ -38,7 +38,7 @@ namespace Kopete {
/**
* Specifies the look of this dialog. If set to HTML only
* KHTMLPart will be in the dialog and it's look can be customized
* TDEHTMLPart will be in the dialog and it's look can be customized
* through setStyleSheet
* @see setStyleSheet
*/

@ -7,11 +7,11 @@ kde_module_LTLIBRARIES = kopete_history.la kcm_kopete_history.la
kopete_history_la_SOURCES = historyplugin.cpp historydialog.cpp historyviewer.ui\
historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc
kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) $(LIB_KUTILS)
kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_KUTILS)
kopete_history_la_LIBADD = ../../libkopete/libkopete.la
kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp historyconfig.kcfgc
kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) $(LIB_KUTILS)
kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_KUTILS)
kcm_kopete_history_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_history.desktop

@ -135,7 +135,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
// Initializing HTML Part
mMainWidget->htmlFrame->setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
TQVBoxLayout *l = new TQVBoxLayout(mMainWidget->htmlFrame);
mHtmlPart = new KHTMLPart(mMainWidget->htmlFrame, "htmlHistoryView");
mHtmlPart = new TDEHTMLPart(mMainWidget->htmlFrame, "htmlHistoryView");
//Security settings, we don't need this stuff
mHtmlPart->setJScriptEnabled(false);

@ -33,8 +33,8 @@ class HistoryViewer;
namespace Kopete { class MetaContact; }
namespace Kopete { class XSLT; }
class HistoryLogger;
class KHTMLView;
class KHTMLPart;
class TDEHTMLView;
class TDEHTMLPart;
class KURL;
namespace KParts { struct URLArgs; class Part; }
@ -127,8 +127,8 @@ class HistoryDialog : public KDialogBase
TQPtrList<Kopete::MetaContact> mMetaContactList;
// History View
KHTMLView *mHtmlView;
KHTMLPart *mHtmlPart;
TDEHTMLView *mHtmlView;
TDEHTMLPart *mHtmlPart;
HistoryViewer *mMainWidget;
Kopete::XSLT *mXsltParser;

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la
kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML)
kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML)
kopete_statistics_la_LIBADD = ../../libkopete/libkopete.la -lsqlite3
service_DATA = kopete_statistics.desktop

@ -53,7 +53,7 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db,
TQHBox *hbox = new TQHBox(this);
generalHTMLPart = new KHTMLPart(hbox);
generalHTMLPart = new TDEHTMLPart(hbox);
generalHTMLPart->setOnlyLocalReferences(true);
connect ( generalHTMLPart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );

@ -29,7 +29,7 @@ class StatisticsPlugin;
class StatisticsDB;
class StatisticsContact;
class KHTMLPart;
class TDEHTMLPart;
class KURL;
namespace KParts
{
@ -49,7 +49,7 @@ class StatisticsDialog : public KDialogBase
TQString stringFromSeconds(const int seconds);
StatisticsWidget *mainWidget;
KHTMLPart *generalHTMLPart;
TDEHTMLPart *generalHTMLPart;
/// Database from which we get the statistics
StatisticsDB *m_db;

@ -22,7 +22,7 @@ kopete_irc_la_SOURCES = \
kcodecaction.cpp \
ksparser.cpp
kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML)
kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML)
kopete_irc_la_LIBADD = ../../libkopete/libkopete.la \
./ui/libkopeteircui.la \
./libkirc/libkirc.la \

Loading…
Cancel
Save