summaryrefslogtreecommitdiffstats
path: root/tdehtml/rendering
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/rendering')
-rw-r--r--tdehtml/rendering/render_applet.cpp2
-rw-r--r--tdehtml/rendering/render_block.cpp4
-rw-r--r--tdehtml/rendering/render_box.cpp4
-rw-r--r--tdehtml/rendering/render_form.cpp88
-rw-r--r--tdehtml/rendering/render_form.h20
-rw-r--r--tdehtml/rendering/render_frames.cpp24
-rw-r--r--tdehtml/rendering/render_frames.h10
-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.cpp16
-rw-r--r--tdehtml/rendering/render_layer.h12
-rw-r--r--tdehtml/rendering/render_list.cpp22
-rw-r--r--tdehtml/rendering/render_object.cpp18
-rw-r--r--tdehtml/rendering/render_replaced.cpp76
-rw-r--r--tdehtml/rendering/render_replaced.h4
-rw-r--r--tdehtml/rendering/render_style.h4
-rw-r--r--tdehtml/rendering/render_table.cpp4
-rw-r--r--tdehtml/rendering/render_text.cpp4
19 files changed, 164 insertions, 164 deletions
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index eb9762897..6f60c90e6 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -32,7 +32,7 @@
#include <tqlabel.h>
-#ifndef Q_WS_QWS // We don't have Java in Qt Embedded
+#ifndef TQ_WS_QWS // We don't have Java in Qt Embedded
#include "java/kjavaappletwidget.h"
#include "misc/htmltags.h"
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 9d302bfc8..f18ce9ae6 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -99,25 +99,25 @@ void RenderFormElement::layout()
setNeedsLayout(false);
}
-TQ_Alignment 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;
}
// -------------------------------------------------------------------------
@@ -146,7 +146,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
// prevent firing toggled() signals on initialization
b->setChecked(element->checked());
- connect(b,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(slotStateChanged(int)));
+ connect(b,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(slotStateChanged(int)));
}
@@ -192,7 +192,7 @@ RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element)
// prevent firing toggled() signals on initialization
b->setChecked(element->checked());
- connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
+ connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
}
void RenderRadioButton::updateFromElement()
@@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth()
raw = TQString::fromLatin1("X");
TQFontMetrics fm = pb->fontMetrics();
TQSize ts = fm.size( ShowPrefix, raw);
- TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts )
+ TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts )
.expandedTo(TQApplication::globalStrut()));
int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
@@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
{
setMouseTracking(true);
TDEActionCollection *ac = new TDEActionCollection(this);
- m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
+ m_spellAction = KStdAction::spelling( this, TQ_SLOT( slotCheckSpelling() ), ac );
}
LineEditWidget::~LineEditWidget()
@@ -328,11 +328,11 @@ void LineEditWidget::slotCheckSpelling()
}
delete m_spell;
- m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
+ m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
- connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) );
- connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
- connect( m_spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) );
+ connect( m_spell, TQ_SIGNAL( death() ),this, TQ_SLOT( spellCheckerFinished() ) );
+ connect( m_spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
+ connect( m_spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) );
}
void LineEditWidget::spellCheckerMisspelling( const TQString &_text, const TQStringList &, unsigned int pos)
@@ -362,7 +362,7 @@ void LineEditWidget::spellCheckerFinished()
void LineEditWidget::slotSpellCheckReady( KSpell *s )
{
s->check( text() );
- connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) );
+ connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) );
}
void LineEditWidget::slotSpellCheckDone( const TQString &s )
@@ -380,8 +380,8 @@ TQPopupMenu *LineEditWidget::createPopupMenu()
return 0L;
}
- connect( popup, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( extendedMenuActivated( int ) ) );
+ connect( popup, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( extendedMenuActivated( int ) ) );
if (m_input->autoComplete()) {
popup->insertSeparator();
@@ -414,7 +414,7 @@ void LineEditWidget::extendedMenuActivated( int id)
case EditHistory:
{
KHistoryComboEditor dlg( compObj() ? compObj()->items() : TQStringList(), this );
- connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) );
+ connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) );
dlg.exec();
}
default:
@@ -469,8 +469,8 @@ RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
: RenderFormElement(element)
{
LineEditWidget *edit = new LineEditWidget(element, view(), view()->viewport());
- connect(edit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
- connect(edit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &)));
+ connect(edit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed()));
+ connect(edit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &)));
if(element->inputType() == HTMLInputElementImpl::PASSWORD)
edit->setEchoMode( TQLineEdit::Password );
@@ -785,9 +785,9 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
w->setMode(KFile::File | KFile::ExistingOnly);
w->completionObject()->setDir(TDEGlobalSettings::documentPath());
- connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
- connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &)));
- connect(w, TQT_SIGNAL(urlSelected(const TQString &)),this,TQT_SLOT(slotUrlSelected(const TQString &)));
+ connect(w->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed()));
+ connect(w->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &)));
+ connect(w, TQ_SIGNAL(urlSelected(const TQString &)),this,TQ_SLOT(slotUrlSelected(const TQString &)));
setQWidget(w);
m_haveFocus = false;
@@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth()
int h = fm.lineSpacing();
int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some"
KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit();
- TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit,
+ TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit,
edit,
TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
.expandedTo(TQApplication::globalStrut());
@@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e)
return true;
if (e->type()==TQEvent::KeyPress)
{
- TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
switch(ke->key())
{
case Key_Return:
@@ -907,9 +907,9 @@ bool ComboBoxWidget::event(TQEvent *e)
bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e)
{
- if (TQT_BASE_OBJECT(dest)==TQT_BASE_OBJECT(listBox()) && e->type()==TQEvent::KeyPress)
+ if (dest==listBox() && e->type()==TQEvent::KeyPress)
{
- TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
bool forward = false;
switch(ke->key())
{
@@ -1226,8 +1226,8 @@ TDEListBox* RenderSelect::createListBox()
lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
// ### looks broken
//lb->setAutoMask(true);
- connect( lb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) );
-// connect( lb, TQT_SIGNAL( clicked( TQListBoxItem * ) ), this, TQT_SLOT( slotClicked() ) );
+ connect( lb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) );
+// connect( lb, TQ_SIGNAL( clicked( TQListBoxItem * ) ), this, TQ_SLOT( slotClicked() ) );
m_ignoreSelectEvents = false;
lb->setMouseTracking(true);
@@ -1237,7 +1237,7 @@ TDEListBox* RenderSelect::createListBox()
ComboBoxWidget *RenderSelect::createComboBox()
{
ComboBoxWidget *cb = new ComboBoxWidget(view()->viewport());
- connect(cb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelected(int)));
+ connect(cb, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelected(int)));
return cb;
}
@@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
setMouseTracking(true);
TDEActionCollection *ac = new TDEActionCollection(this);
- m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac );
- m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac );
- m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac );
+ m_findAction = KStdAction::find( this, TQ_SLOT( slotFind() ), ac );
+ m_findNextAction = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac );
+ m_replaceAction = KStdAction::replace( this, TQ_SLOT( slotReplace() ), ac );
}
@@ -1387,11 +1387,11 @@ void TextAreaWidget::slotDoReplace()
// Connect highlight signal to code which handles highlighting
// of found text.
- connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)),
- this, TQT_SLOT(slotFindHighlight(const TQString &, int, int)));
- connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext()));
- connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)),
- this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int)));
+ connect(m_replace, TQ_SIGNAL(highlight(const TQString &, int, int)),
+ this, TQ_SLOT(slotFindHighlight(const TQString &, int, int)));
+ connect(m_replace, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotReplaceNext()));
+ connect(m_replace, TQ_SIGNAL(replace(const TQString &, int, int, int)),
+ this, TQ_SLOT(slotReplaceText(const TQString &, int, int, int)));
m_repDlg->close();
slotReplaceNext();
@@ -1486,9 +1486,9 @@ void TextAreaWidget::slotDoFind()
// Connect highlight signal to code which handles highlighting
// of found text.
- connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)),
- this, TQT_SLOT(slotFindHighlight(const TQString &, int, int)));
- connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()));
+ connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)),
+ this, TQ_SLOT(slotFindHighlight(const TQString &, int, int)));
+ connect(m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()));
m_findDlg->close();
m_find->closeFindNextDialog();
@@ -1562,7 +1562,7 @@ void TextAreaWidget::slotFind()
KWin::activateWindow( m_findDlg->winId() );
} else {
m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog");
- connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
+ connect( m_findDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoFind()) );
}
m_findDlg->show();
}
@@ -1578,7 +1578,7 @@ void TextAreaWidget::slotReplace()
} else {
m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0,
TQStringList(), TQStringList(), false);
- connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) );
+ connect( m_repDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoReplace()) );
}
m_repDlg->show();
}
@@ -1618,7 +1618,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element)
edit->setCheckSpellingEnabled( settings->autoSpellCheck() );
edit->setTabChangesFocus( ! settings->allowTabulation() );
- connect(edit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged()));
+ connect(edit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged()));
}
RenderTextArea::~RenderTextArea()
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index d6124528d..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; }
- TQ_Alignment textAlignment() const;
+ TQt::AlignmentFlags textAlignment() const;
TQPoint m_mousePos;
int m_state;
@@ -106,7 +106,7 @@ protected:
// generic class for all buttons
class RenderButton : public RenderFormElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderButton(DOM::HTMLGenericFormElementImpl* node);
@@ -126,7 +126,7 @@ protected:
class RenderCheckBox : public RenderButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderCheckBox(DOM::HTMLInputElementImpl* node);
@@ -146,7 +146,7 @@ public slots:
class RenderRadioButton : public RenderButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderRadioButton(DOM::HTMLInputElementImpl* node);
@@ -216,7 +216,7 @@ public:
class RenderLineEdit : public RenderFormElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderLineEdit(DOM::HTMLInputElementImpl *element);
@@ -253,7 +253,7 @@ private:
class LineEditWidget : public KLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
LineEditWidget(DOM::HTMLInputElementImpl* input,
TDEHTMLView* view, TQWidget* parent);
@@ -307,7 +307,7 @@ protected:
class RenderFileButton : public RenderFormElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderFileButton(DOM::HTMLInputElementImpl *element);
@@ -378,7 +378,7 @@ protected:
class RenderSelect : public RenderFormElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderSelect(DOM::HTMLSelectElementImpl *element);
@@ -417,7 +417,7 @@ protected slots:
// -------------------------------------------------------------------------
class TextAreaWidget : public KTextEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
TextAreaWidget(int wrap, TQWidget* parent);
virtual ~TextAreaWidget();
@@ -452,7 +452,7 @@ private:
class RenderTextArea : public RenderFormElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderTextArea(DOM::HTMLTextAreaElementImpl *element);
~RenderTextArea();
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 68c66495a..1035f97a0 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;
@@ -634,9 +634,9 @@ void RenderPart::setWidget( TQWidget *widget )
#endif
setQWidget( widget );
- widget->setFocusPolicy(TQ_WheelFocus);
+ widget->setFocusPolicy(TQWidget::WheelFocus);
if(widget->inherits("TDEHTMLView"))
- connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) );
+ connect( widget, TQ_SIGNAL( cleared() ), this, TQ_SLOT( slotViewCleared() ) );
setNeedsLayoutAndMinMaxRecalc();
@@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame )
void RenderFrame::slotViewCleared()
{
- if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) {
+ if(m_widget->inherits("TQScrollView")) {
#ifdef DEBUG_LAYOUT
kdDebug(6031) << "frame is a scrollview!" << endl;
#endif
@@ -888,7 +888,7 @@ bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame,
}
// Dissociate ourselves from the current event loop (to prevent crashes
// due to the message box staying up)
- TQTimer::singleShot( 0, this, TQT_SLOT( slotPartLoadingErrorNotify() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotPartLoadingErrorNotify() ) );
#if 0
Tokenizer *tokenizer = static_cast<DOM::DocumentImpl *>(part->document().handle())->tokenizer();
if (tokenizer) tokenizer->setOnHold( true );
@@ -989,7 +989,7 @@ void RenderPartObject::layout( )
void RenderPartObject::slotViewCleared()
{
- if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) {
+ if(m_widget->inherits("TQScrollView") ) {
#ifdef DEBUG_LAYOUT
kdDebug(6031) << "iframe is a scrollview!" << endl;
#endif
diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 49d1e8dc1..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];
@@ -93,7 +93,7 @@ private:
class RenderPart : public tdehtml::RenderWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderPart(DOM::HTMLElementImpl* node);
@@ -123,7 +123,7 @@ public slots:
class RenderFrame : public tdehtml::RenderPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderFrame( DOM::HTMLFrameElementImpl *frame );
@@ -146,7 +146,7 @@ public slots:
// I can hardly call the class RenderObject ;-)
class RenderPartObject : public tdehtml::RenderPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderPartObject( DOM::HTMLElementImpl * );
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..1da1e0b82 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();
@@ -616,14 +616,14 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show)
sb->show();
if (!m_scrollMediator)
m_scrollMediator = new RenderScrollMediator(this);
- m_scrollMediator->connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged()));
+ m_scrollMediator->connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged()));
}
else if (!show && sb) {
delete sb;
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 ae5ddff65..2854f2c87 100644
--- a/tdehtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -65,7 +65,7 @@ namespace tdehtml {
class RenderScrollMediator: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderScrollMediator(RenderLayer* layer)
:m_layer(layer) {}
@@ -80,7 +80,7 @@ private:
// This class handles the auto-scrolling of layers with overflow: marquee.
class Marquee: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Marquee(RenderLayer* l);
@@ -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();
@@ -241,7 +241,7 @@ public:
// paints the layers that intersect the damage rect from back to
// front. The nodeAtPoint method looks for mouse events by walking
// layers that intersect the point from front to back.
- KDE_EXPORT void paint(TQPainter *p, const TQRect& damageRect, bool selectionOnly=false);
+ TDE_EXPORT void paint(TQPainter *p, const TQRect& damageRect, bool selectionOnly=false);
bool nodeAtPoint(RenderObject::NodeInfo& info, int x, int y);
// This method figures out our layerBounds in coordinates relative to
@@ -260,7 +260,7 @@ public:
void detach(RenderArena* renderArena);
#ifdef ENABLE_DUMP
- KDE_EXPORT void dump(TQTextStream &stream, const TQString &ind = TQString::null);
+ TDE_EXPORT void dump(TQTextStream &stream, const TQString &ind = TQString::null);
#endif
// Overloaded new operator. Derived classes must override operator new
@@ -283,7 +283,7 @@ private:
void collectLayers(TQPtrVector<RenderLayer>*&, TQPtrVector<RenderLayer>*&);
- KDE_EXPORT void paintLayer(RenderLayer* rootLayer, TQPainter *p, const TQRect& paintDirtyRect, bool selectionOnly=false);
+ TDE_EXPORT void paintLayer(RenderLayer* rootLayer, TQPainter *p, const TQRect& paintDirtyRect, bool selectionOnly=false);
RenderLayer* nodeAtPointForLayer(RenderLayer* rootLayer, RenderObject::NodeInfo& info,
int x, int y, const TQRect& hitTestRect);
bool shouldBeOverflowOnly() const;
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 2d991c3a2..103cad9e8 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -186,7 +186,7 @@ bool RenderWidget::event( TQEvent *e )
repaint();
}
// eat all events - except if this is a frame (in which case TDEHTMLView handles it all)
- if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
+ if ( ::tqt_cast<TDEHTMLView *>( m_widget ) )
return TQObject::event( e );
return true;
}
@@ -202,21 +202,21 @@ void RenderWidget::setQWidget(TQWidget *widget)
{
if (m_widget) {
m_widget->removeEventFilter(this);
- disconnect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
+ disconnect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed()));
m_widget->hide();
m_widget->deleteLater(); //Might happen due to event on the widget, so be careful
m_widget = 0;
}
m_widget = widget;
if (m_widget) {
- connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
+ connect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed()));
m_widget->installEventFilter(this);
- if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget))
+ if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast<TQFrame*>(m_widget))
m_widget->setBackgroundMode( TQWidget::NoBackground );
- if (m_widget->focusPolicy() > TQ_StrongFocus)
- m_widget->setFocusPolicy(TQ_StrongFocus);
+ if (m_widget->focusPolicy() > TQWidget::StrongFocus)
+ m_widget->setFocusPolicy(TQWidget::StrongFocus);
// if we've already received a layout, apply the calculated space to the
// widget immediately, but we have to have really been full constructed (with a non-null
// style pointer).
@@ -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);
}
@@ -330,7 +330,7 @@ void RenderWidget::updateFromElement()
else
m_widget->unsetPalette();
// Border:
- TQFrame* frame = ::tqqt_cast<TQFrame*>(m_widget);
+ TQFrame* frame = ::tqt_cast<TQFrame*>(m_widget);
if (frame) {
if (shouldPaintBackgroundOrBorder())
{
@@ -532,7 +532,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
TQObjectList childWidgets = widget->childrenListObject();
TQObjectListIterator it(childWidgets);
for (; it.current(); ++it) {
- TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current());
+ TQWidget* const w = ::tqt_cast<TQWidget *>(it.current());
if ( w && !w->isTopLevel() && !w->isHidden()) {
TQRect r2 = w->geometry();
blit -= r2;
@@ -613,7 +613,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty)
bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
{
// no special event processing if this is a frame (in which case TDEHTMLView handles it all)
- if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
+ if ( ::tqt_cast<TDEHTMLView *>( m_widget ) )
return false;
if ( !element() ) return true;
@@ -642,7 +642,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// Don't count popup as a valid reason for losing the focus
// (example: opening the options of a select combobox shouldn't emit onblur)
- if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup )
+ if ( static_cast<TQFocusEvent*>(e)->reason() != TQFocusEvent::Popup )
handleFocusOut();
break;
case TQEvent::FocusIn:
@@ -663,7 +663,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
case TQEvent::KeyRelease:
// TODO this seems wrong - Qt events are not correctly translated to DOM ones,
// like in TDEHTMLView::dispatchKeyEvent()
- if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
+ if (element()->dispatchKeyEvent(static_cast<TQKeyEvent*>(e),false))
filtered = true;
break;
@@ -673,8 +673,8 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// currently focused. this avoids accidentally changing a select box
// or something while wheeling a webpage.
if (tqApp->focusWidget() != widget() &&
- widget()->focusPolicy() <= TQ_StrongFocus) {
- TQT_TQWHEELEVENT(e)->ignore();
+ widget()->focusPolicy() <= TQWidget::StrongFocus) {
+ static_cast<TQWheelEvent*>(e)->ignore();
TQApplication::sendEvent(view(), e);
filtered = true;
}
@@ -697,22 +697,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
switch(e->type()) {
case TQEvent::MouseButtonPress:
- mousePressEvent(TQT_TQMOUSEEVENT(e));
+ mousePressEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonRelease:
- mouseReleaseEvent(TQT_TQMOUSEEVENT(e));
+ mouseReleaseEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonDblClick:
- mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+ mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseMove:
- mouseMoveEvent(TQT_TQMOUSEEVENT(e));
+ mouseMoveEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::KeyPress:
- keyPressEvent(TQT_TQKEYEVENT(e));
+ keyPressEvent(static_cast<TQKeyEvent*>(e));
break;
case TQEvent::KeyRelease:
- keyReleaseEvent(TQT_TQKEYEVENT(e));
+ keyReleaseEvent(static_cast<TQKeyEvent*>(e));
break;
default:
break;
@@ -722,22 +722,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) {
switch(e->type()) {
case TQEvent::MouseButtonPress:
- viewportMousePressEvent(TQT_TQMOUSEEVENT(e));
+ viewportMousePressEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonRelease:
- viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e));
+ viewportMouseReleaseEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonDblClick:
- viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+ viewportMouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseMove:
- viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e));
+ viewportMouseMoveEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::KeyPress:
- keyPressEvent(TQT_TQKEYEVENT(e));
+ keyPressEvent(static_cast<TQKeyEvent*>(e));
break;
case TQEvent::KeyRelease:
- keyReleaseEvent(TQT_TQKEYEVENT(e));
+ keyReleaseEvent(static_cast<TQKeyEvent*>(e));
break;
default:
break;
@@ -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;
@@ -809,11 +809,11 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
// << " pos=" << p << " type=" << type
// << " button=" << button << " state=" << state << endl;
TQMouseEvent e(type, p, button, state);
- TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget);
- if (sc && !::tqqt_cast<TQListBox*>(m_widget))
- static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e));
+ TQScrollView * sc = ::tqt_cast<TQScrollView*>(m_widget);
+ if (sc && !::tqt_cast<TQListBox*>(m_widget))
+ static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(static_cast<TQEvent*>(&e));
else
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&e));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&e));
ret = e.isAccepted();
break;
}
@@ -827,7 +827,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break;
TQKeyEvent* const ke = domKeyEv.qKeyEvent();
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke));
ret = ke->isAccepted();
break;
}
@@ -847,16 +847,16 @@ 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();
if (ke->isAutoRepeat()) {
TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(),
ke->text(), ke->isAutoRepeat(), ke->count() );
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&releaseEv));
}
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke));
ret = ke->isAccepted();
break;
}
diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 3d8a68f9c..24617e0ca 100644
--- a/tdehtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -83,7 +83,7 @@ protected:
class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget>
{
- Q_OBJECT
+ TQ_OBJECT
public:
RenderWidget(DOM::NodeImpl* node);
virtual ~RenderWidget();
@@ -115,7 +115,7 @@ public:
#endif
// for ECMA to flush all pending resizes
- KDE_EXPORT static void flushWidgetResizes();
+ TDE_EXPORT static void flushWidgetResizes();
public slots:
void slotWidgetDestructed();
diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 28b6b999d..fbf62a161 100644
--- a/tdehtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -843,7 +843,7 @@ class RenderStyle : public Shared<RenderStyle>
{
friend class CSSStyleSelector;
public:
- KDE_EXPORT static void cleanup();
+ TDE_EXPORT static void cleanup();
// pseudo elements
enum PseudoId {
@@ -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 3a349844b..c2bf27af5 100644
--- a/tdehtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
m_reversed ? TQPainter::RTL : TQPainter::LTR);
p.end();
- TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32);
+ TQImage img = pixmap.convertToImage().convertDepth(32);
int md = thickness*thickness; // max-dist^2
@@ -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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 05:34:08 +0000