summaryrefslogtreecommitdiffstats
path: root/tdehtml/tdehtmlview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/tdehtmlview.cpp')
-rw-r--r--tdehtml/tdehtmlview.cpp136
1 files changed, 66 insertions, 70 deletions
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index b3679c6cc..d9f5e69a7 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -70,8 +70,8 @@
#include <tdelocale.h>
#include <knotifyclient.h>
#include <kprinter.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
#include <tdestdaccel.h>
#include <kstringhandler.h>
#include <kurldrag.h>
@@ -94,7 +94,7 @@
//#define DEBUG_PIXEL
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <X11/Xlib.h>
#include <fixx11h.h>
#endif
@@ -347,7 +347,7 @@ public:
bool ignoreWheelEvents:1;
int borderX, borderY;
- KSimpleConfig *formCompletions;
+ TDESimpleConfig *formCompletions;
bool paged;
@@ -493,13 +493,13 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
d = new TDEHTMLViewPrivate;
TQScrollView::setVScrollBarMode(d->vmode);
TQScrollView::setHScrollBarMode(d->hmode);
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
- connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved()));
+ connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
+ connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved()));
// initialize QScrollView
enableClipper(true);
// hack to get unclipped painting on the viewport.
- static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped);
+ static_cast<TDEHTMLView *>(viewport())->setWFlags(WPaintUnclipped);
setResizePolicy(Manual);
viewport()->setMouseTracking(true);
@@ -512,7 +512,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
#endif
#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
- connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout()));
+ connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(findTimeout()));
#endif // TDEHTML_NO_TYPE_AHEAD_FIND
init();
@@ -520,7 +520,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
viewport()->show();
#ifndef NO_SMOOTH_SCROLL_HACK
#define timer timer2
- connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick()));
+ connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick()));
#undef timer
#endif
}
@@ -546,7 +546,7 @@ void TDEHTMLView::init()
d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT);
if(!d->tp) d->tp = new TQPainter();
- setFocusPolicy(TQ_StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
viewport()->setFocusProxy(this);
_marginWidth = -1; // undefined
@@ -579,7 +579,7 @@ void TDEHTMLView::clear()
if ( d->cursor_icon_widget )
d->cursor_icon_widget->hide();
d->reset();
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
emit cleared();
TQScrollView::setHScrollBarMode(d->hmode);
@@ -897,7 +897,7 @@ void TDEHTMLView::layout()
void TDEHTMLView::closeChildDialogs()
{
- TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING);
+ TQObjectList *dlgs = queryList("TQDialog");
for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next())
{
KDialogBase* dlgbase = dynamic_cast<KDialogBase *>( dlg );
@@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs()
}
else
{
- kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl;
- TQT_TQWIDGET(dlg)->hide();
+ kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl;
+ static_cast<TQWidget*>(dlg)->hide();
}
}
delete dlgs;
@@ -941,7 +941,7 @@ void TDEHTMLView::closeEvent( TQCloseEvent* ev )
void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
{
if (!m_part->xmlDocImpl()) return;
- if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton)
+ if (d->possibleTripleClick && ( _mouse->button() & TQt::MouseButtonMask ) == TQt::LeftButton)
{
viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too
return;
@@ -958,7 +958,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
//kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl;
- if ( (_mouse->button() == Qt::MidButton) &&
+ if ( (_mouse->button() == TQt::MidButton) &&
!m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer &&
mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) {
TQPoint point = mapFromGlobal( _mouse->globalPos() );
@@ -967,7 +967,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
d->m_mouseScroll_byY = 0;
d->m_mouseScrollTimer = new TQTimer( this );
- connect( d->m_mouseScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMouseScrollTimer()) );
+ connect( d->m_mouseScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMouseScrollTimer()) );
if ( !d->m_mouseScrollIndicator ) {
TQPixmap pixmap, icon;
@@ -1095,7 +1095,7 @@ void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
}
d->possibleTripleClick=true;
- TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
+ TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout()));
}
void TDEHTMLView::tripleClickTimeout()
@@ -1112,11 +1112,11 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent
TQPoint p(x-absx, y-absy);
TQMouseEvent fw(me->type(), p, me->button(), me->state());
TQWidget* w = r->widget();
- TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w);
- if (sc && !::tqqt_cast<TQListBox*>(w))
- static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
+ TQScrollView* sc = ::tqt_cast<TQScrollView*>(w);
+ if (sc && !::tqt_cast<TQListBox*>(w))
+ static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(static_cast<TQEvent*>(&fw));
else if(w)
- static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
+ static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(static_cast<TQEvent*>(&fw));
}
@@ -1168,7 +1168,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseMove );
// Do not modify :hover/:active state while mouse is pressed.
- m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & Qt::MouseButtonMask /*readonly ?*/, xm, ym, &mev );
+ m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & TQt::MouseButtonMask /*readonly ?*/, xm, ym, &mev );
// kdDebug(6000) << "mouse move: " << _mouse->pos()
// << " button " << _mouse->button()
@@ -1268,7 +1268,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
}
if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true );
if (d->cursor_icon_widget) {
@@ -1341,7 +1341,7 @@ void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
if (fn && fn != mev.innerNode.handle() &&
fn->renderer() && fn->renderer()->isWidget() &&
- _mouse->button() != Qt::MidButton) {
+ _mouse->button() != TQt::MidButton) {
forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
}
@@ -1895,27 +1895,27 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
TQWidget *view = viewport();
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(view)) {
+ if (o == view) {
// we need to install an event filter on all children of the viewport to
// be able to get correct stacking of children within the document.
if(e->type() == TQEvent::ChildInserted) {
- TQObject *c = TQT_TQOBJECT(TQT_TQCHILDEVENT(e)->child());
+ TQObject *c = static_cast<TQChildEvent*>(e)->child();
if (c->isWidgetType()) {
- TQWidget *w = TQT_TQWIDGET(c);
+ TQWidget *w = static_cast<TQWidget*>(c);
// don't install the event filter on toplevels
if (w->parentWidget(true) == view) {
if (!strcmp(w->name(), "__tdehtml")) {
w->installEventFilter(this);
w->unsetCursor();
- if (!::tqqt_cast<TQFrame*>(w))
+ if (!::tqt_cast<TQFrame*>(w))
w->setBackgroundMode( TQWidget::NoBackground );
static_cast<HackWidget *>(w)->setNoErase();
if (!w->childrenListObject().isEmpty()) {
TQObjectListIterator it(w->childrenListObject());
for (; it.current(); ++it) {
- TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current());
+ TQWidget *widget = ::tqt_cast<TQWidget *>(it.current());
if (widget && !widget->isTopLevel()) {
- if (!::tqqt_cast<TQFrame*>(w))
+ if (!::tqt_cast<TQFrame*>(w))
widget->setBackgroundMode( TQWidget::NoBackground );
static_cast<HackWidget *>(widget)->setNoErase();
widget->installEventFilter(this);
@@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
}
}
} else if (o->isWidgetType()) {
- TQWidget *v = TQT_TQWIDGET(o);
+ TQWidget *v = static_cast<TQWidget*>(o);
TQWidget *c = v;
while (v && v != view) {
c = v;
@@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
if (v && !strcmp(c->name(), "__tdehtml")) {
bool block = false;
- TQWidget *w = TQT_TQWIDGET(o);
+ TQWidget *w = static_cast<TQWidget*>(o);
switch(e->type()) {
case TQEvent::Paint:
if (!allowWidgetPaintEvents) {
@@ -1951,8 +1951,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
v = v->parentWidget();
}
viewportToContents( x, y, x, y );
- TQPaintEvent *pe = TQT_TQPAINTEVENT(e);
- bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c);
+ TQPaintEvent *pe = static_cast<TQPaintEvent*>(e);
+ bool asap = !d->contentsMoving && ::tqt_cast<TQScrollView *>(c);
// TQScrollView needs fast repaints
if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() &&
@@ -1969,8 +1969,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonRelease:
case TQEvent::MouseButtonDblClick: {
- if ( (w->parentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) {
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+ if ( (w->parentWidget() == view || ::tqt_cast<TQScrollView*>(c)) && !::tqt_cast<TQScrollBar *>(w)) {
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
TQPoint pt = w->mapTo( view, me->pos());
TQMouseEvent me2(me->type(), pt, me->button(), me->state());
@@ -1988,8 +1988,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
}
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
- if (w->parentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) {
- TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+ if (w->parentWidget() == view && !::tqt_cast<TQScrollBar *>(w)) {
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
if (e->type() == TQEvent::KeyPress)
keyPressEvent(ke);
else
@@ -2283,8 +2283,8 @@ void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview,
if( !accesskey.isNull()) {
TQRect rec=en->getRect();
TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
- connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
- connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint()));
+ connect( origview, TQ_SIGNAL(hideAccessKeys()), lab, TQ_SLOT(close()) );
+ connect( this, TQ_SIGNAL(repaintAccessKeys()), lab, TQ_SLOT(repaint()));
lab->setPalette(TQToolTip::palette());
lab->setLineWidth(2);
lab->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@@ -2409,13 +2409,9 @@ bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller )
guard = node;
}
// Set focus node on the document
-#ifdef USE_QT4
- m_part->xmlDocImpl()->setFocusNode(node);
-#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Shortcut );
m_part->xmlDocImpl()->setFocusNode(node);
TQFocusEvent::resetReason();
-#endif // USE_QT4
if( node != NULL && node->hasOneRef()) // deleted, only held by guard
return true;
emit m_part->nodeActivated(Node(node));
@@ -2785,10 +2781,10 @@ void TDEHTMLView::print(bool quick)
if ( !docname.isEmpty() )
docname = KStringHandler::csqueeze(docname, 80);
if(quick || printer->setup(this, i18n("Print %1").arg(docname))) {
- viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs
+ viewport()->setCursor( TQt::waitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs
// set up KPrinter
printer->setFullPage(false);
- printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE));
+ printer->setCreator(TQString("TDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE));
printer->setDocName(docname);
TQPainter *p = new TQPainter;
@@ -2888,15 +2884,15 @@ void TDEHTMLView::print(bool quick)
if (printHeader)
{
int available_width = metrics.width() - 10 -
- 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerLeft).width(),
- p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerRight).width());
+ 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerLeft).width(),
+ p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerRight).width());
if (available_width < 150)
available_width = 150;
int mid_width;
int squeeze = 120;
do {
headerMid = KStringHandler::csqueeze(docname, squeeze);
- mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerMid).width();
+ mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerMid).width();
squeeze -= 10;
} while (mid_width > available_width);
}
@@ -2910,14 +2906,14 @@ void TDEHTMLView::print(bool quick)
if (printHeader)
{
int dy = p->fontMetrics().lineSpacing();
- p->setPen(Qt::black);
+ p->setPen(TQt::black);
p->setFont(headerFont);
headerRight = TQString("#%1").arg(page);
- p->drawText(0, 0, metrics.width(), dy, Qt::AlignLeft, headerLeft);
- p->drawText(0, 0, metrics.width(), dy, Qt::AlignHCenter, headerMid);
- p->drawText(0, 0, metrics.width(), dy, Qt::AlignRight, headerRight);
+ p->drawText(0, 0, metrics.width(), dy, TQt::AlignLeft, headerLeft);
+ p->drawText(0, 0, metrics.width(), dy, TQt::AlignHCenter, headerMid);
+ p->drawText(0, 0, metrics.width(), dy, TQt::AlignRight, headerRight);
}
@@ -2955,7 +2951,7 @@ void TDEHTMLView::print(bool quick)
d->paged = false;
tdehtml::setPrintPainter( 0 );
setMediaType( oldMediaType );
- m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
+ m_part->xmlDocImpl()->setPaintDevice( this );
m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor());
m_part->xmlDocImpl()->updateStyleSelector();
viewport()->unsetCursor();
@@ -3006,7 +3002,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
root->setPagedMode(false);
root->setStaticMode(false);
- m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
+ m_part->xmlDocImpl()->setPaintDevice( this );
}
@@ -3051,7 +3047,7 @@ TQStringList TDEHTMLView::formCompletionItems(const TQString &name) const
if (!m_part->settings()->isFormCompletionEnabled())
return TQStringList();
if (!d->formCompletions)
- d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
+ d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
return d->formCompletions->readListEntry(name);
}
@@ -3059,7 +3055,7 @@ void TDEHTMLView::clearCompletionHistory(const TQString& name)
{
if (!d->formCompletions)
{
- d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
+ d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
}
d->formCompletions->writeEntry(name, "");
d->formCompletions->sync();
@@ -3105,7 +3101,7 @@ void TDEHTMLView::removeFormCompletionItem(const TQString &name, const TQString
void TDEHTMLView::addNonPasswordStorableSite(const TQString& host)
{
if (!d->formCompletions) {
- d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
+ d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
}
d->formCompletions->setGroup("NonPasswordStorableSites");
@@ -3119,7 +3115,7 @@ void TDEHTMLView::addNonPasswordStorableSite(const TQString& host)
bool TDEHTMLView::nonPasswordStorableSite(const TQString& host) const
{
if (!d->formCompletions) {
- d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
+ d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
}
d->formCompletions->setGroup("NonPasswordStorableSites");
TQStringList sites = d->formCompletions->readListEntry("Sites");
@@ -3160,13 +3156,13 @@ bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
int screenY = _mouse->globalY();
int button = -1;
switch (_mouse->button()) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
button = 0;
break;
- case Qt::MidButton:
+ case TQt::MidButton:
button = 1;
break;
- case Qt::RightButton:
+ case TQt::RightButton:
button = 2;
break;
default:
@@ -3282,12 +3278,12 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
{
e->accept();
}
- else if( ( (e->orientation() == Qt::Vertical &&
+ else if( ( (e->orientation() == TQt::Vertical &&
((d->ignoreWheelEvents && !verticalScrollBar()->isVisible())
|| e->delta() > 0 && contentsY() <= 0
|| e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight()))
||
- (e->orientation() == Qt::Horizontal &&
+ (e->orientation() == TQt::Horizontal &&
((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible())
|| e->delta() > 0 && contentsX() <=0
|| e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth())))
@@ -3306,7 +3302,7 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
TQScrollView::viewportWheelEvent( e );
#endif
- TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), Qt::NoButton, e->state() );
+ TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), TQt::NoButton, e->state() );
emit viewportMouseMoveEvent ( tempEvent );
delete tempEvent;
}
@@ -4578,12 +4574,12 @@ void TDEHTMLView::scrollTick() {
d->dy -= ddy;
// TQScrollView::setContentsPos( contentsX() + ddx, contentsY() + ddy);
- kapp->syncX();
+ tdeApp->syncX();
TQScrollView::scrollBy(ddx, ddy);
// Unaccelerated X can get seriously overloaded by scrolling and for some reason
// will send KeyPress events only infrequently. This should help to reduce
// the load.
- kapp->syncX();
+ tdeApp->syncX();
}
void TDEHTMLView::startScrolling()
@@ -4608,9 +4604,9 @@ void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e )
if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) )
step = pageStep;
- if(e->orientation() == Qt::Horizontal)
+ if(e->orientation() == TQt::Horizontal)
scrollBy(-((e->delta()*step)/120), 0);
- else if(e->orientation() == Qt::Vertical)
+ else if(e->orientation() == TQt::Vertical)
scrollBy(0,-((e->delta()*step)/120));
e->accept();