TDE
/
bibletime
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename kiobuffer and KHTML

Browse Source
r14.0.x
Timothy Pearson 12 years ago
parent e6a54e0905
commit 508d4b5b70
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

4
acinclude.m4
Unescape View File

@ -2071,7 +2071,7 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@ -2091,7 +2091,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

2
bibletime/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ $(LIB_TDECORE) \
$(LIB_TDEUI) \
-ltdeprint \
$(LIB_KFILE) \
$(LIB_KHTML) \
$(LIB_TDEHTML) \
$(LIB_X11) \
$(LIB_SWORD) \
$(LIB_CLUCENE) \

4
bibletime/frontend/cbtconfig.cpp
Unescape View File

@ -295,9 +295,9 @@ const TQFont& CBTConfig::getDefault( const CLanguageMgr::Language* const) {
static KStaticDeleter<TQFont> sd;
//TODO: We need a better way to get the KDE konqueror KHTML settings
//TODO: We need a better way to get the KDE konqueror TDEHTML settings
TDEConfig conf("konquerorrc");
KHTMLSettings settings;
TDEHTMLSettings settings;
settings.init(&conf);
const TQString fontName = settings.stdFontName();

2
bibletime/frontend/coptionsdialog.cpp
Unescape View File

@ -186,7 +186,7 @@ void COptionsDialog::initDisplay() {
hboxlayout->addStretch();
layout->addLayout( hboxlayout );
m_settings.displayStyle.stylePreview = new KHTMLPart(page);
m_settings.displayStyle.stylePreview = new TDEHTMLPart(page);
layout->addWidget(
new TQLabel(
m_settings.displayStyle.stylePreview->view(),

4
bibletime/frontend/coptionsdialog.h
Unescape View File

@ -43,7 +43,7 @@ class TQWidgetStack;
class KListBox;
class KKeyChooser;
class KTabCtl;
class KHTMLPart;
class TDEHTMLPart;
class KActionCollection;
/**
@ -130,7 +130,7 @@ private:
struct DisplayStyleSettings {
TQComboBox* styleChooser;
KHTMLPart* stylePreview;
TDEHTMLPart* stylePreview;
}
displayStyle;

2
bibletime/frontend/cprinter.cpp
Unescape View File

@ -26,7 +26,7 @@ namespace Printing {
CPrinter::CPrinter(TQObject *, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions)
: TQObject(0),
CDisplayRendering(displayOptions, filterOptions),
m_htmlPart(new KHTMLPart(0, 0, this)) {
m_htmlPart(new TDEHTMLPart(0, 0, this)) {
//override the filteroptions set in the c-tor of CDisplayRendering
m_filterOptions.footnotes = false;

4
bibletime/frontend/cprinter.h
Unescape View File

@ -22,7 +22,7 @@
//TQt includes
#include <tqobject.h>
class KHTMLPart;
class TDEHTMLPart;
namespace Printing {
@ -49,7 +49,7 @@ protected:
virtual const TQString finishText(const TQString& arg1, KeyTree& tree);
private:
KHTMLPart* m_htmlPart;
TDEHTMLPart* m_htmlPart;
};
}

24
bibletime/frontend/display/chtmlreaddisplay.cpp
Unescape View File

@ -53,7 +53,7 @@
using namespace InfoDisplay;
CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* parentWidget)
: KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), TQT_TQOBJECT(readWindow ? readWindow : parentWidget)),
: TDEHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), TQT_TQOBJECT(readWindow ? readWindow : parentWidget)),
CReadDisplay(readWindow),
m_currentAnchorCache(TQString()) {
setDNDEnabled(false);
@ -187,17 +187,17 @@ void CHTMLReadDisplay::setText( const TQString& newText ) {
/** No descriptions */
const bool CHTMLReadDisplay::hasSelection() {
return KHTMLPart::hasSelection();
return TDEHTMLPart::hasSelection();
}
/** Reimplementation. */
TQScrollView* CHTMLReadDisplay::view() {
return KHTMLPart::view();
return TDEHTMLPart::view();
}
void CHTMLReadDisplay::selectAll() {
KHTMLPart::selectAll();
TDEHTMLPart::selectAll();
}
/** No descriptions */
@ -212,7 +212,7 @@ void CHTMLReadDisplay::moveToAnchor( const TQString& anchor ) {
}
void CHTMLReadDisplay::urlSelected( const TQString& url, int button, int state, const TQString& _target, KParts::URLArgs args) {
KHTMLPart::urlSelected(url, button, state, _target, args);
TDEHTMLPart::urlSelected(url, button, state, _target, args);
m_urlWorkaroundData.doWorkaround = false;
// tqWarning("clicked: %s", url.latin1());
if (!url.isEmpty() && CReferenceManager::isHyperlink(url)) {
@ -246,7 +246,7 @@ void CHTMLReadDisplay::urlSelected( const TQString& url, int button, int state,
/** Reimplementation. */
void CHTMLReadDisplay::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent* event ) {
KHTMLPart::tdehtmlMouseReleaseEvent(event);
TDEHTMLPart::tdehtmlMouseReleaseEvent(event);
m_dndData.mousePressed = false;
m_dndData.isDragging = false;
@ -300,7 +300,7 @@ void CHTMLReadDisplay::tdehtmlMousePressEvent( tdehtml::MousePressEvent* event )
}
}
KHTMLPart::tdehtmlMousePressEvent(event);
TDEHTMLPart::tdehtmlMousePressEvent(event);
}
/** Reimplementation for our drag&drop system. Also needed for the mouse tracking */
@ -324,13 +324,13 @@ void CHTMLReadDisplay::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent* e ) {
CDragDropMgr::ItemList dndItems;
//no description!
dndItems.append( CDragDropMgr::Item(module, key, TQString()) );
d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
d = CDragDropMgr::dragObject(dndItems, TDEHTMLPart::view()->viewport());
}
else if ((m_dndData.dragType == DNDData::Text) && !m_dndData.selection.isEmpty()) {
// create a new plain text drag!
CDragDropMgr::ItemList dndItems;
dndItems.append( CDragDropMgr::Item(m_dndData.selection) ); //no description!
d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
d = CDragDropMgr::dragObject(dndItems, TDEHTMLPart::view()->viewport());
}
if (d) {
@ -362,7 +362,7 @@ void CHTMLReadDisplay::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent* e ) {
}
}
KHTMLPart::tdehtmlMouseMoveEvent(e);
TDEHTMLPart::tdehtmlMouseMoveEvent(e);
}
/** The Mag window update happens here if the mouse has not moved to another node after starting the timer.*/
@ -422,7 +422,7 @@ void CHTMLReadDisplay::timerEvent( TQTimerEvent *e ) {
// ---------------------
CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) {
CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* parent) : TDEHTMLView(displayWidget, parent), m_display(displayWidget) {
viewport()->setAcceptDrops(true);
setMarginWidth(4);
setMarginHeight(4);
@ -441,7 +441,7 @@ void CHTMLReadDisplayView::popupMenu( const TQString& url, const TQPoint& pos) {
/** Reimplementation from TQScrollView. Sets the right slots */
void CHTMLReadDisplayView::polish() {
KHTMLView::polish();
TDEHTMLView::polish();
connect( part(), TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
this, TQT_SLOT(popupMenu(const TQString&, const TQPoint&)));
}

4
bibletime/frontend/display/chtmlreaddisplay.h
Unescape View File

@ -30,7 +30,7 @@ class CHTMLReadDisplayView;
/** The implementation for the HTML read display.
* @author The BibleTime team
*/
class CHTMLReadDisplay : public KHTMLPart, public CReadDisplay {
class CHTMLReadDisplay : public TDEHTMLPart, public CReadDisplay {
Q_OBJECT
public:
@ -112,7 +112,7 @@ protected slots:
void slotGoToAnchor();
};
class CHTMLReadDisplayView : public KHTMLView, public CPointers {
class CHTMLReadDisplayView : public TDEHTMLView, public CPointers {
Q_OBJECT
protected: // Protected methods

2
bibletime/frontend/display/creaddisplay.h
Unescape View File

@ -18,7 +18,7 @@
class TQPopupMenu;
class TQWidget;
/**The base class for all read-only widgets like KHTMLView.
/**The base class for all read-only widgets like TDEHTMLView.
*@author The BibleTime team
*/

4
bibletime/frontend/displaywindow/cbiblereadwindow.cpp
Unescape View File

@ -416,12 +416,12 @@ bool CBibleReadWindow::eventFilter( TQObject* o, TQEvent* e) {
// tqWarning("class: %s", o->className());
if (e && (e->type() == TQEvent::FocusIn)) { //sync other windows to this active
/* This is a hack to work around a KHTML problem (similair to the Drag&Drop problem we had):
/* This is a hack to work around a TDEHTML problem (similair to the Drag&Drop problem we had):
* If new HTML content is loaded from inside a kHTML event handler
* the widget's state will be confused, i.e. it's scrolling without having
* the mousebutton clicked.
*
* This is not really in a KHTML event handler but works anyway.
* This is not really in a TDEHTML event handler but works anyway.
* Sometime KDE/TQt is hard to use ...
*/
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(syncWindows()));

2
cmake

@ -1 +1 @@
Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
Write Preview
Loading…
Cancel
Save