summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/dom/dom2_events.h4
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp22
-rw-r--r--tdehtml/html/html_formimpl.cpp16
-rw-r--r--tdehtml/html/html_inlineimpl.cpp8
-rw-r--r--tdehtml/java/kjavaappletwidget.cpp2
-rw-r--r--tdehtml/rendering/render_block.cpp4
-rw-r--r--tdehtml/rendering/render_box.cpp4
-rw-r--r--tdehtml/rendering/render_form.cpp12
-rw-r--r--tdehtml/rendering/render_form.h2
-rw-r--r--tdehtml/rendering/render_frames.cpp14
-rw-r--r--tdehtml/rendering/render_frames.h4
-rw-r--r--tdehtml/rendering/render_generated.cpp4
-rw-r--r--tdehtml/rendering/render_image.cpp10
-rw-r--r--tdehtml/rendering/render_inline.cpp2
-rw-r--r--tdehtml/rendering/render_layer.cpp14
-rw-r--r--tdehtml/rendering/render_layer.h2
-rw-r--r--tdehtml/rendering/render_list.cpp22
-rw-r--r--tdehtml/rendering/render_object.cpp18
-rw-r--r--tdehtml/rendering/render_replaced.cpp12
-rw-r--r--tdehtml/rendering/render_style.h2
-rw-r--r--tdehtml/rendering/render_table.cpp4
-rw-r--r--tdehtml/rendering/render_text.cpp2
-rw-r--r--tdehtml/tdehtml_iface.cpp2
-rw-r--r--tdehtml/tdehtml_part.cpp24
-rw-r--r--tdehtml/tdehtmlview.cpp38
-rw-r--r--tdehtml/test_regression.cpp2
-rw-r--r--tdehtml/testtdehtml.cpp4
-rw-r--r--tdehtml/xml/dom2_eventsimpl.cpp92
-rw-r--r--tdehtml/xml/dom_docimpl.cpp2
-rw-r--r--tdehtml/xml/dom_nodeimpl.cpp6
30 files changed, 177 insertions, 177 deletions
diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h
index 3b68eafaa..79bd26385 100644
--- a/tdehtml/dom/dom2_events.h
+++ b/tdehtml/dom/dom2_events.h
@@ -624,7 +624,7 @@ public:
* keys below represents the allowable modifier parameters for this
* method (note: this was not documented properly in earlier versions):
*
- * Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton
+ * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton
*
* Parameters:
*
@@ -709,7 +709,7 @@ public:
* return false. The list of keys below represents the allowable
* modifier parameters for this method (warning: this was not documented
* properly in earlier versions):
- * Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton
+ * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton
*
* Parameters:
*
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index fdcfe98ca..4e2328d52 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -210,7 +210,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());
p->setPen(palette().active().text());
- p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);
+ p->drawText(0,height*lineno,linenoWidth,height,TQt::AlignRight,linenoStr);
TQColor bgColor;
TQColor textColor;
@@ -232,7 +232,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
p->setPen(textColor);
p->drawText(linenoWidth+4,height*lineno,contentsWidth()-linenoWidth-4,height,
- Qt::AlignLeft,m_lines[lineno]);
+ TQt::AlignLeft,m_lines[lineno]);
}
int remainingTop = height*(lastLine+1);
@@ -333,7 +333,7 @@ EvalMultiLineEdit::EvalMultiLineEdit(TQWidget *parent)
void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
{
- if (e->key() == Qt::Key_Return) {
+ if (e->key() == TQt::Key_Return) {
if (hasSelectedText()) {
m_code = selectedText();
} else {
@@ -374,7 +374,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
TQVBoxLayout *vl = new TQVBoxLayout(mainWidget,5);
// frame list & code
- TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget);
+ TQSplitter *hsplitter = new TQSplitter(TQt::Vertical,mainWidget);
TQSplitter *vsplitter = new TQSplitter(hsplitter);
TQFont font(TDEGlobalSettings::fixedFont());
@@ -443,20 +443,20 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
m_actionCollection->setInstance(this);
// Venkman use F12, KDevelop F10
- TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12)));
- scNext.append(KKeySequence(KKey(Qt::Key_F10)));
+ TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12)));
+ scNext.append(KKeySequence(KKey(TQt::Key_F10)));
m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
m_actionCollection,"next");
- m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+ m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
m_actionCollection,"step");
// Venkman use F5, Kdevelop F9
- TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5)));
- scCont.append(KKeySequence(KKey(Qt::Key_F9)));
+ TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
+ scCont.append(KKeySequence(KKey(TQt::Key_F9)));
m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
m_actionCollection,"cont");
- m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+ m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
m_actionCollection,"stop");
- m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+ m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext");
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 6fb13b75b..f87260ffe 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -1018,12 +1018,12 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
// handle tabbing out, either from a single or repeated key event.
if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) {
TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
+ if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
- TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
+ TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
if (widget)
static_cast<FocusHandleWidget *>(widget)
- ->focusNextPrev(k->key() == Qt::Key_Tab);
+ ->focusNextPrev(k->key() == TQt::Key_Tab);
TQFocusEvent::resetReason();
evt->setDefaultHandled();
}
@@ -1119,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt)
bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+ if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true;
}
if (act)
@@ -1143,7 +1143,7 @@ void HTMLButtonElementImpl::activate()
void HTMLButtonElementImpl::click()
{
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
}
@@ -1359,7 +1359,7 @@ void HTMLInputElementImpl::select( )
void HTMLInputElementImpl::click()
{
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,0, 1);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
}
@@ -1801,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+ if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true;
}
if (act)
@@ -1917,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt)
else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT ||
evt->id() == EventImpl::KEYPRESS_EVENT ) ) {
TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
- if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+ if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
act = true;
}
diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index f403a2385..1416ca3f4 100644
--- a/tdehtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -132,11 +132,11 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
state |= TQt::MetaButton;
if ( e->button() == 0 )
- button = Qt::LeftButton;
+ button = TQt::LeftButton;
else if ( e->button() == 1 )
- button = Qt::MidButton;
+ button = TQt::MidButton;
else if ( e->button() == 2 )
- button = Qt::RightButton;
+ button = TQt::RightButton;
}
else if ( k )
{
@@ -166,7 +166,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
void HTMLAnchorElementImpl::click()
{
- TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+ TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
}
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index a1f5b8f11..2537abed7 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
d->tmplabel = new TQLabel( this );
d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
- d->tmplabel->setAlignment( Qt::AlignCenter | TQt::WordBreak );
+ d->tmplabel->setAlignment( TQt::AlignCenter | TQt::WordBreak );
d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->tmplabel->show();
diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index 053e51b95..414947e1e 100644
--- a/tdehtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -695,9 +695,9 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
if (scrollsOverflow() && m_layer) {
// For overflow:scroll blocks, ensure we have both scrollbars in place always.
if (style()->overflowX() == OSCROLL)
- m_layer->showScrollbar( Qt::Horizontal, true );
+ m_layer->showScrollbar( TQt::Horizontal, true );
if (style()->overflowY() == OSCROLL)
- m_layer->showScrollbar( Qt::Vertical, true );
+ m_layer->showScrollbar( TQt::Vertical, true );
}
setContainsPageBreak(false);
diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index d804094ef..7dc07090d 100644
--- a/tdehtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -644,8 +644,8 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
void RenderBox::outlineBox(TQPainter *p, int _tx, int _ty, const char *color)
{
- p->setPen(TQPen(TQColor(color), 1, Qt::DotLine));
- p->setBrush( Qt::NoBrush );
+ p->setPen(TQPen(TQColor(color), 1, TQt::DotLine));
+ p->setBrush( TQt::NoBrush );
p->drawRect(_tx, _ty, m_width, m_height);
}
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 33f045553..f28706bd3 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -99,25 +99,25 @@ void RenderFormElement::layout()
setNeedsLayout(false);
}
-Qt::AlignmentFlags RenderFormElement::textAlignment() const
+TQt::AlignmentFlags RenderFormElement::textAlignment() const
{
switch (style()->textAlign()) {
case LEFT:
case TDEHTML_LEFT:
- return Qt::AlignLeft;
+ return TQt::AlignLeft;
case RIGHT:
case TDEHTML_RIGHT:
- return Qt::AlignRight;
+ return TQt::AlignRight;
case CENTER:
case TDEHTML_CENTER:
- return Qt::AlignHCenter;
+ return TQt::AlignHCenter;
case JUSTIFY:
// Just fall into the auto code for justify.
case TAAUTO:
- return style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft;
+ return style()->direction() == RTL ? TQt::AlignRight : TQt::AlignLeft;
}
assert(false); // Should never be reached.
- return Qt::AlignLeft;
+ return TQt::AlignLeft;
}
// -------------------------------------------------------------------------
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index 8fa2099f8..9c46346a7 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -95,7 +95,7 @@ public:
protected:
virtual bool isRenderButton() const { return false; }
virtual bool isEditable() const { return false; }
- Qt::AlignmentFlags textAlignment() const;
+ TQt::AlignmentFlags textAlignment() const;
TQPoint m_mousePos;
int m_state;
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index f92d0b281..70bb4fc17 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -66,7 +66,7 @@ RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet)
m_resizing = m_clientresizing= false;
- m_cursor = Qt::ArrowCursor;
+ m_cursor = TQt::ArrowCursor;
m_hSplit = -1;
m_vSplit = -1;
@@ -498,13 +498,13 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
}
- m_cursor = Qt::ArrowCursor;
+ m_cursor = TQt::ArrowCursor;
if(m_hSplit != -1 && m_vSplit != -1)
- m_cursor = Qt::SizeAllCursor;
+ m_cursor = TQt::SizeAllCursor;
else if( m_vSplit != -1 )
- m_cursor = Qt::SizeHorCursor;
+ m_cursor = TQt::SizeHorCursor;
else if( m_hSplit != -1 )
- m_cursor = Qt::SizeVerCursor;
+ m_cursor = TQt::SizeVerCursor;
if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT)
{
@@ -548,8 +548,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
TDEHTMLView *view = canvas()->view();
if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) {
TQPainter paint( view );
- paint.setPen( Qt::gray );
- paint.setBrush( Qt::gray );
+ paint.setPen( TQt::gray );
+ paint.setBrush( TQt::gray );
paint.setRasterOp( TQt::XorROP );
TQRect r(xPos(), yPos(), width(), height());
const int rBord = 3;
diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 578dabaab..a6e0640f3 100644
--- a/tdehtml/rendering/render_frames.h
+++ b/tdehtml/rendering/render_frames.h
@@ -61,7 +61,7 @@ public:
bool canResize( int _x, int _y);
void setResizing(bool e);
- Qt::CursorShape cursorShape() const { return m_cursor; }
+ TQt::CursorShape cursorShape() const { return m_cursor; }
bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside);
@@ -73,7 +73,7 @@ public:
#endif
private:
- Qt::CursorShape m_cursor;
+ TQt::CursorShape m_cursor;
int m_oldpos;
int m_gridLen[2];
int* m_gridDelta[2];
diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index 3f8d6e8f0..cf945145f 100644
--- a/tdehtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -358,7 +358,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawEllipse( marker );
return;
case LCIRCLE:
- p->setBrush( Qt::NoBrush );
+ p->setBrush( TQt::NoBrush );
p->drawEllipse( marker );
return;
case LSQUARE:
@@ -366,7 +366,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawRect( marker );
return;
case LBOX:
- p->setBrush( Qt::NoBrush );
+ p->setBrush( TQt::NoBrush );
p->drawRect( marker );
return;
case LDIAMOND: {
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index ad8f18bb3..bfe5781ac 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -243,10 +243,10 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) {
static TQPixmap *loadingIcon;
TQColor bg = tdehtml::retrieveBackgroundColor(this);
- TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray :
- (hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black);
+ TQColor fg = tdehtml::hasSufficientContrast(TQt::gray, bg) ? TQt::gray :
+ (hasSufficientContrast(TQt::white, bg) ? TQt::white : TQt::black);
paintInfo.p->setPen(TQPen(fg, 1));
- paintInfo.p->setBrush( Qt::NoBrush );
+ paintInfo.p->setBrush( TQt::NoBrush );
paintInfo.p->drawRect(_tx, _ty, m_width, m_height);
if (!(m_width <= 5 || m_height <= 5)) {
if (!loadingIcon) {
@@ -289,7 +289,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
}
else if (i && !i->isTransparent())
{
- paintInfo.p->setPen( Qt::black ); // used for bitmaps
+ paintInfo.p->setPen( TQt::black ); // used for bitmaps
const TQPixmap& pix = i->pixmap();
if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) &&
pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
@@ -371,7 +371,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
paintInfo.p->setBrushOrigin(_tx, _ty - paintInfo.r.y());
paintInfo.p->fillRect(_tx, _ty, width(), height(),
TQBrush(style()->palette().active().highlight(),
- Qt::Dense4Pattern));
+ TQt::Dense4Pattern));
}
}
}
diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index 15bc1b0df..5439a5310 100644
--- a/tdehtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -678,7 +678,7 @@ static void paintOutlineSegment(RenderObject *o, TQPainter *p, int tx, int ty,
}
// kdDebug(6040) << "segment(" << x1 << "," << y1 << ") - (" << x2 << "," << y2 << ")" << endl;
-/* p->setPen(Qt::gray);
+/* p->setPen(TQt::gray);
p->drawLine(x1,y1,x2,y2);*/
switch (curBS) {
case RenderObject::BSLeft:
diff --git a/tdehtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp
index 2b6bbf027..24e00ebe8 100644
--- a/tdehtml/rendering/render_layer.cpp
+++ b/tdehtml/rendering/render_layer.cpp
@@ -604,9 +604,9 @@ void RenderLayer::updateScrollPositionFromScrollbars()
}
void
-RenderLayer::showScrollbar(Qt::Orientation o, bool show)
+RenderLayer::showScrollbar(TQt::Orientation o, bool show)
{
- TQScrollBar *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar;
+ TQScrollBar *sb = (o == TQt::Horizontal) ? m_hBar : m_vBar;
if (show && !sb) {
TQScrollView* scrollView = m_object->document()->view();
@@ -623,7 +623,7 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show)
sb = 0;
}
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
m_hBar = sb;
else
m_vBar = sb;
@@ -749,12 +749,12 @@ void RenderLayer::checkScrollbarsAfterLayout()
|| (hasOvf && m_object->style()->overflowY() == OAUTO && haveVerticalBar != needVerticalBar);
if (scrollbarsChanged) {
if (m_object->style()->overflowX() == OAUTO) {
- showScrollbar(Qt::Horizontal, needHorizontalBar);
+ showScrollbar(TQt::Horizontal, needHorizontalBar);
if (m_hBar)
m_hBar->setEnabled(true);
}
if (m_object->style()->overflowY() == OAUTO) {
- showScrollbar(Qt::Vertical, needVerticalBar);
+ showScrollbar(TQt::Vertical, needVerticalBar);
if (m_vBar)
m_vBar->setEnabled(true);
}
@@ -956,8 +956,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
int ax=0;
int ay=0;
renderer()->absolutePosition( ax, ay );
- p->setPen(TQPen(TQColor("yellow"), 1, Qt::DotLine));
- p->setBrush( Qt::NoBrush );
+ p->setPen(TQPen(TQColor("yellow"), 1, TQt::DotLine));
+ p->setBrush( TQt::NoBrush );
p->drawRect(ax, ay, width(), height());
}
#endif
diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index a71549cc5..9c73eb0bb 100644
--- a/tdehtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -193,7 +193,7 @@ public:
void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
- void showScrollbar(Qt::Orientation, bool);
+ void showScrollbar(TQt::Orientation, bool);
TQScrollBar* horizontalScrollbar() { return m_hBar; }
TQScrollBar* verticalScrollbar() { return m_vBar; }
int verticalScrollbarWidth();
diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index cc9ba4e5b..17caa26ae 100644
--- a/tdehtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -299,7 +299,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
}
#ifdef BOX_DEBUG
- p->setPen( Qt::red );
+ p->setPen( TQt::red );
p->drawRect( _tx + xoff, _ty + yoff, offset, offset );
#endif
@@ -312,7 +312,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return;
case LCIRCLE:
- p->setBrush( Qt::NoBrush );
+ p->setBrush( TQt::NoBrush );
p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return;
case LSQUARE:
@@ -320,7 +320,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return;
case LBOX:
- p->setBrush( Qt::NoBrush );
+ p->setBrush( TQt::NoBrush );
p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
return;
case LDIAMOND: {
@@ -342,25 +342,25 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
if (!m_item.isEmpty()) {
if(listPositionInside()) {
if( style()->direction() == LTR) {
- p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
- p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip,
+ p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
+ p->drawText(_tx + fm.width(m_item), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip,
TQString::fromLatin1(". "));
}
else {
const TQString& punct(TQString::fromLatin1(" ."));
- p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
- p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
+ p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct);
+ p->drawText(_tx + fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
}
} else {
if (style()->direction() == LTR) {
const TQString& punct(TQString::fromLatin1(". "));
- p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct);
- p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item);
+ p->drawText(_tx-offset/2, _ty, 0, 0, TQt::AlignRight|TQt::DontClip, punct);
+ p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, TQt::AlignRight|TQt::DontClip, m_item);
}
else {
const TQString& punct(TQString::fromLatin1(" ."));
- p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
- p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
+ p->drawText(_tx+offset/2, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct);
+ p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
}
}
}
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index eacbb4d16..b1a9bdffc 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -722,7 +722,7 @@ static void calc3DColor(TQColor &color, bool darken)
int g = gb - (f0 * gb / 100);
int b = bb - (f0 * bb / 100);
if ((r == rb) && (g == gb) && (b == bb))
- color = (color == Qt::black) ? DARK_GRAY : Qt::black;
+ color = (color == TQt::black) ? DARK_GRAY : TQt::black;
else
color.setRgb(r, g, b);
} else {
@@ -730,7 +730,7 @@ static void calc3DColor(TQColor &color, bool darken)
int g = kMin(gb + (f1 * (MAX_COLOR - gb) / 100), 255);
int b = kMin(bb + (f1 * (MAX_COLOR - bb) / 100), 255);
if ((r == rb) && (g == gb) && (b == bb))
- color = (color == Qt::white) ? LIGHT_GRAY : Qt::white;
+ color = (color == TQt::white) ? LIGHT_GRAY : TQt::white;
else
color.setRgb(r, g, b);
}
@@ -749,12 +749,12 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
if(invalidisInvert)
{
p->setRasterOp(TQt::XorROP);
- c = Qt::white;
+ c = TQt::white;
}
else {
if(style == INSET || style == OUTSET || style == RIDGE || style ==
GROOVE)
- c = Qt::white;
+ c = TQt::white;
else
c = textcolor;
}
@@ -773,7 +773,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
case DOTTED:
if ( width == 1 ) {
// workaround Qt brokenness
- p->setPen(TQPen(c, width, Qt::SolidLine));
+ p->setPen(TQPen(c, width, TQt::SolidLine));
switch(s) {
case BSBottom:
case BSTop:
@@ -788,11 +788,11 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
break;
}
- p->setPen(TQPen(c, width, Qt::DotLine));
+ p->setPen(TQPen(c, width, TQt::DotLine));
/* nobreak; */
case DASHED:
if(style == DASHED)
- p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? Qt::DotLine : Qt::DashLine));
+ p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? TQt::DotLine : TQt::DashLine));
if (width > 0)
switch(s) {
@@ -813,7 +813,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
if (adjbw1 == 0 && adjbw2 == 0)
{
- p->setPen(Qt::NoPen);
+ p->setPen(TQt::NoPen);
p->setBrush(c);
switch(s)
{
@@ -921,7 +921,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
(style == INSET && ( s == BSTop || s == BSLeft ) ) );
/* nobreak; */
case SOLID:
- p->setPen(Qt::NoPen);
+ p->setPen(TQt::NoPen);
p->setBrush(c);
Q_ASSERT(x2>=x1);
Q_ASSERT(y2>=y1);
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 925f800fd..09931c3de 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -316,12 +316,12 @@ void RenderWidget::updateFromElement()
if (v > 128)
// dark bg, light fg - need a darker disabled fg
disfg = disfg.dark(lowlightVal);
- else if (disfg != Qt::black)
+ else if (disfg != TQt::black)
// light bg, dark fg - need a lighter disabled fg - but only if !black
disfg = disfg.light(highlightVal);
else
// black fg - use darkgray disabled fg
- disfg = Qt::darkGray;
+ disfg = TQt::darkGray;
pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg);
}
@@ -784,13 +784,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
}
switch (me.button()) {
case 0:
- button = Qt::LeftButton;
+ button = TQt::LeftButton;
break;
case 1:
- button = Qt::MidButton;
+ button = TQt::MidButton;
break;
case 2:
- button = Qt::RightButton;
+ button = TQt::RightButton;
break;
default:
break;
@@ -847,7 +847,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
// DOM: Down Press | Press | Up
// Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release
//
- // Qt::KeyPress is sent for DOM keypress and not DOM keydown to allow
+ // TQt::KeyPress is sent for DOM keypress and not DOM keydown to allow
// sites to block a key with onkeypress, #99749
TQKeyEvent* const ke = domKeyEv.qKeyEvent();
diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 28b6b999d..90aef33df 100644
--- a/tdehtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -1450,7 +1450,7 @@ public:
static short initialBorderHorizontalSpacing() { return 0; }
static short initialBorderVerticalSpacing() { return 0; }
static ECursor initialCursor() { return CURSOR_AUTO; }
- static TQColor initialColor() { return Qt::black; }
+ static TQColor initialColor() { return TQt::black; }
static CachedImage* initialBackgroundImage() { return 0; }
static CachedImage* initialListStyleImage() { return 0; }
static unsigned short initialBorderWidth() { return 3; }
diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index ab0573048..bd4002a37 100644
--- a/tdehtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -2699,8 +2699,8 @@ int RenderTableCell::borderBottom() const
static void outlineBox(TQPainter *p, int _tx, int _ty, int w, int h)
{
- p->setPen(TQPen(TQColor("yellow"), 3, Qt::DotLine));
- p->setBrush( Qt::NoBrush );
+ p->setPen(TQPen(TQColor("yellow"), 3, TQt::DotLine));
+ p->setBrush( TQt::NoBrush );
p->drawRect(_tx, _ty, w, h );
}
#endif
diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index 5361027d1..c2bf27af5 100644
--- a/tdehtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -398,7 +398,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
}
}
- pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::PreferDither);
+ pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::PreferDither);
}
// Paint next shadow effect
if (shadow->next) paintShadow(pt, f, _tx, _ty, shadow->next);
diff --git a/tdehtml/tdehtml_iface.cpp b/tdehtml/tdehtml_iface.cpp
index 4bb4afd89..197a1020e 100644
--- a/tdehtml/tdehtml_iface.cpp
+++ b/tdehtml/tdehtml_iface.cpp
@@ -150,7 +150,7 @@ void TDEHTMLPartIface::activateNode()
{
KParts::ReadOnlyPart* p = part->currentFrame();
if ( p && p->widget() ) {
- TQKeyEvent ev( TQKeyEvent::KeyPress, Qt::Key_Return, '\n', 0, "\n" );
+ TQKeyEvent ev( TQKeyEvent::KeyPress, TQt::Key_Return, '\n', 0, "\n" );
TQApplication::sendEvent( p->widget(), &ev );
}
}
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 31b2fd478..47f48bfb6 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -3933,7 +3933,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state,
return true;
}
- if ( button == Qt::LeftButton && ( state & ShiftButton ) )
+ if ( button == TQt::LeftButton && ( state & ShiftButton ) )
{
TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
@@ -3972,7 +3972,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state,
args.metaData()["referrer"] = d->m_referrer;
- if ( button == Qt::NoButton && (state & ShiftButton) && (state & ControlButton) )
+ if ( button == TQt::NoButton && (state & ShiftButton) && (state & ControlButton) )
{
emit d->m_extension->createNewWindow( cURL, args );
return true;
@@ -5839,7 +5839,7 @@ TQString TDEHTMLPart::lastModified() const
// Done on demand to save time when this isn't needed - but can lead
// to slightly wrong results if updating the file on disk w/o reloading.
TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified();
- d->m_lastModified = lastModif.toString( Qt::LocalDate );
+ d->m_lastModified = lastModif.toString( TQt::LocalDate );
}
//kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl;
return d->m_lastModified;
@@ -6062,13 +6062,13 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
else
d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
- if ( _mouse->button() == Qt::LeftButton ||
- _mouse->button() == Qt::MidButton )
+ if ( _mouse->button() == TQt::LeftButton ||
+ _mouse->button() == TQt::MidButton )
{
d->m_bMousePressed = true;
#ifndef TDEHTML_NO_SELECTION
- if ( _mouse->button() == Qt::LeftButton )
+ if ( _mouse->button() == TQt::LeftButton )
{
if ( (!d->m_strSelectedURL.isNull() && !isEditable())
|| (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) )
@@ -6116,10 +6116,10 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
#endif
}
- if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
+ if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
{
d->m_bRightMousePressed = true;
- } else if ( _mouse->button() == Qt::RightButton )
+ } else if ( _mouse->button() == TQt::RightButton )
{
popupMenu( d->m_strSelectedURL );
// might be deleted, don't touch "this"
@@ -6129,7 +6129,7 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event )
{
TQMouseEvent *_mouse = event->qmouseEvent();
- if ( _mouse->button() == Qt::LeftButton )
+ if ( _mouse->button() == TQt::LeftButton )
{
d->m_bMousePressed = true;
DOM::Node innerNode = event->innerNode();
@@ -6498,7 +6498,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
#ifndef TDEHTML_NO_SELECTION
// selection stuff
if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() &&
- ( (_mouse->state() & Qt::LeftButton) != 0 )) {
+ ( (_mouse->state() & TQt::LeftButton) != 0 )) {
extendSelectionTo(event->x(), event->y(),
event->absX(), event->absY(), innerNode);
#else
@@ -6530,7 +6530,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
d->m_bMousePressed = false;
TQMouseEvent *_mouse = event->qmouseEvent();
- if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
+ if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
{
d->m_bRightMousePressed = false;
KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface();
@@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
}
}
#ifndef TQT_NO_CLIPBOARD
- if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
+ if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == TQt::MidButton) && (event->url().isNull())) {
kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
<< d->m_bOpenMiddleClick << endl;
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 28a81a91f..324119805 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -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() );
@@ -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()
@@ -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);
}
@@ -2884,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);
}
@@ -2906,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);
}
@@ -3156,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:
@@ -3278,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())))
@@ -3302,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;
}
@@ -4604,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();
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 674abdf4c..6e8ba9a3d 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -965,7 +965,7 @@ TQImage RegressionTest::renderToImage()
TQPainter* tp = new TQPainter;
tp->begin( m_paintBuffer );
tp->translate( -px, -py );
- tp->fillRect(px, py, 512, 128, Qt::magenta);
+ tp->fillRect(px, py, 512, 128, TQt::magenta);
m_part->document().handle()->renderer()->layer()->paint( tp, TQRect( px, py, 512, 128 ) );
tp->end();
delete tp;
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index bb8a948a7..40a28621e 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
e.setAttribute( "name", "print" );
toolBar.insertBefore( e, toolBar.firstChild() );
- (void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
+ (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
(void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
kprint->setEnabled(true);
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
doc->setJScriptEnabled(true);
doc->setJavaEnabled(true);
doc->setPluginsEnabled( true );
- doc->setURLCursor(TQCursor(Qt::PointingHandCursor));
+ doc->setURLCursor(TQCursor(TQt::PointingHandCursor));
a.setTopWidget(doc->widget());
TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)),
doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp
index e6af64184..1ee36c82d 100644
--- a/tdehtml/xml/dom2_eventsimpl.cpp
+++ b/tdehtml/xml/dom2_eventsimpl.cpp
@@ -526,52 +526,52 @@ private:
/* Mapping between special Qt keycodes and virtual DOM codes */
IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
{
- {KeyEventBaseImpl::DOM_VK_BACK_SPACE, Qt::Key_Backspace},
- {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Enter},
- {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Return},
- {KeyEventBaseImpl::DOM_VK_NUM_LOCK, Qt::Key_NumLock},
- {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, Qt::Key_Alt},
- {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, Qt::Key_Control},
- {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, Qt::Key_Shift},
- {KeyEventBaseImpl::DOM_VK_META, Qt::Key_Meta},
- {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, Qt::Key_CapsLock},
- {KeyEventBaseImpl::DOM_VK_DELETE, Qt::Key_Delete},
- {KeyEventBaseImpl::DOM_VK_END, Qt::Key_End},
- {KeyEventBaseImpl::DOM_VK_ESCAPE, Qt::Key_Escape},
- {KeyEventBaseImpl::DOM_VK_HOME, Qt::Key_Home},
- {KeyEventBaseImpl::DOM_VK_PAUSE, Qt::Key_Pause},
- {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, Qt::Key_Print},
- {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, Qt::Key_ScrollLock},
- {KeyEventBaseImpl::DOM_VK_LEFT, Qt::Key_Left},
- {KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right},
- {KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up},
- {KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down},
+ {KeyEventBaseImpl::DOM_VK_BACK_SPACE, TQt::Key_Backspace},
+ {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Enter},
+ {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Return},
+ {KeyEventBaseImpl::DOM_VK_NUM_LOCK, TQt::Key_NumLock},
+ {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, TQt::Key_Alt},
+ {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, TQt::Key_Control},
+ {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, TQt::Key_Shift},
+ {KeyEventBaseImpl::DOM_VK_META, TQt::Key_Meta},
+ {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, TQt::Key_CapsLock},
+ {KeyEventBaseImpl::DOM_VK_DELETE, TQt::Key_Delete},
+ {KeyEventBaseImpl::DOM_VK_END, TQt::Key_End},
+ {KeyEventBaseImpl::DOM_VK_ESCAPE, TQt::Key_Escape},
+ {KeyEventBaseImpl::DOM_VK_HOME, TQt::Key_Home},
+ {KeyEventBaseImpl::DOM_VK_PAUSE, TQt::Key_Pause},
+ {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, TQt::Key_Print},
+ {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, TQt::Key_ScrollLock},
+ {KeyEventBaseImpl::DOM_VK_LEFT, TQt::Key_Left},
+ {KeyEventBaseImpl::DOM_VK_RIGHT, TQt::Key_Right},
+ {KeyEventBaseImpl::DOM_VK_UP, TQt::Key_Up},
+ {KeyEventBaseImpl::DOM_VK_DOWN, TQt::Key_Down},
{KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next},
{KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior},
- {KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1},
- {KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2},
- {KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3},
- {KeyEventBaseImpl::DOM_VK_F4, Qt::Key_F4},
- {KeyEventBaseImpl::DOM_VK_F5, Qt::Key_F5},
- {KeyEventBaseImpl::DOM_VK_F6, Qt::Key_F6},
- {KeyEventBaseImpl::DOM_VK_F7, Qt::Key_F7},
- {KeyEventBaseImpl::DOM_VK_F8, Qt::Key_F8},
- {KeyEventBaseImpl::DOM_VK_F9, Qt::Key_F9},
- {KeyEventBaseImpl::DOM_VK_F10, Qt::Key_F10},
- {KeyEventBaseImpl::DOM_VK_F11, Qt::Key_F11},
- {KeyEventBaseImpl::DOM_VK_F12, Qt::Key_F12},
- {KeyEventBaseImpl::DOM_VK_F13, Qt::Key_F13},
- {KeyEventBaseImpl::DOM_VK_F14, Qt::Key_F14},
- {KeyEventBaseImpl::DOM_VK_F15, Qt::Key_F15},
- {KeyEventBaseImpl::DOM_VK_F16, Qt::Key_F16},
- {KeyEventBaseImpl::DOM_VK_F17, Qt::Key_F17},
- {KeyEventBaseImpl::DOM_VK_F18, Qt::Key_F18},
- {KeyEventBaseImpl::DOM_VK_F19, Qt::Key_F19},
- {KeyEventBaseImpl::DOM_VK_F20, Qt::Key_F20},
- {KeyEventBaseImpl::DOM_VK_F21, Qt::Key_F21},
- {KeyEventBaseImpl::DOM_VK_F22, Qt::Key_F22},
- {KeyEventBaseImpl::DOM_VK_F23, Qt::Key_F23},
- {KeyEventBaseImpl::DOM_VK_F24, Qt::Key_F24},
+ {KeyEventBaseImpl::DOM_VK_F1, TQt::Key_F1},
+ {KeyEventBaseImpl::DOM_VK_F2, TQt::Key_F2},
+ {KeyEventBaseImpl::DOM_VK_F3, TQt::Key_F3},
+ {KeyEventBaseImpl::DOM_VK_F4, TQt::Key_F4},
+ {KeyEventBaseImpl::DOM_VK_F5, TQt::Key_F5},
+ {KeyEventBaseImpl::DOM_VK_F6, TQt::Key_F6},
+ {KeyEventBaseImpl::DOM_VK_F7, TQt::Key_F7},
+ {KeyEventBaseImpl::DOM_VK_F8, TQt::Key_F8},
+ {KeyEventBaseImpl::DOM_VK_F9, TQt::Key_F9},
+ {KeyEventBaseImpl::DOM_VK_F10, TQt::Key_F10},
+ {KeyEventBaseImpl::DOM_VK_F11, TQt::Key_F11},
+ {KeyEventBaseImpl::DOM_VK_F12, TQt::Key_F12},
+ {KeyEventBaseImpl::DOM_VK_F13, TQt::Key_F13},
+ {KeyEventBaseImpl::DOM_VK_F14, TQt::Key_F14},
+ {KeyEventBaseImpl::DOM_VK_F15, TQt::Key_F15},
+ {KeyEventBaseImpl::DOM_VK_F16, TQt::Key_F16},
+ {KeyEventBaseImpl::DOM_VK_F17, TQt::Key_F17},
+ {KeyEventBaseImpl::DOM_VK_F18, TQt::Key_F18},
+ {KeyEventBaseImpl::DOM_VK_F19, TQt::Key_F19},
+ {KeyEventBaseImpl::DOM_VK_F20, TQt::Key_F20},
+ {KeyEventBaseImpl::DOM_VK_F21, TQt::Key_F21},
+ {KeyEventBaseImpl::DOM_VK_F22, TQt::Key_F22},
+ {KeyEventBaseImpl::DOM_VK_F23, TQt::Key_F23},
+ {KeyEventBaseImpl::DOM_VK_F24, TQt::Key_F24},
{0, 0}
};
@@ -657,8 +657,8 @@ void KeyEventBaseImpl::buildQKeyEvent() const
}
//Neuter F keys as well.
- if (key >= Qt::Key_F1 && key <= Qt::Key_F35)
- key = Qt::Key_ScrollLock;
+ if (key >= TQt::Key_F1 && key <= TQt::Key_F35)
+ key = TQt::Key_ScrollLock;
m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress,
key, ascii, modifiers, text);
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index b896d05a3..1841f4e4f 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -299,7 +299,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
m_paintDeviceMetrics = 0;
m_paintDevice = 0;
m_decoderMibEnum = 0;
- m_textColor = Qt::black;
+ m_textColor = TQt::black;
m_view = v;
m_renderArena.reset();
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 7e2e1bc5f..a00b072b9 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -508,13 +508,13 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over
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: