summaryrefslogtreecommitdiffstats
path: root/tdehtml/rendering
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/rendering')
-rw-r--r--tdehtml/rendering/render_form.cpp66
-rw-r--r--tdehtml/rendering/render_frames.cpp4
-rw-r--r--tdehtml/rendering/render_layer.cpp2
-rw-r--r--tdehtml/rendering/render_replaced.cpp4
4 files changed, 38 insertions, 38 deletions
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 0fd9029db..f18ce9ae6 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -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()
@@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
{
setMouseTracking(true);
TDEActionCollection *ac = new TDEActionCollection(this);
- m_spellAction = KStdAction::spelling( 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" ), 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;
@@ -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( this, TQT_SLOT( slotFind() ), ac );
- m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac );
- m_replaceAction = KStdAction::replace( 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_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 70bb4fc17..1035f97a0 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -636,7 +636,7 @@ void RenderPart::setWidget( TQWidget *widget )
setQWidget( widget );
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();
@@ -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 );
diff --git a/tdehtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp
index 24e00ebe8..1da1e0b82 100644
--- a/tdehtml/rendering/render_layer.cpp
+++ b/tdehtml/rendering/render_layer.cpp
@@ -616,7 +616,7 @@ RenderLayer::showScrollbar(TQt::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;
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 3c71656e1..103cad9e8 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -202,14 +202,14 @@ 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")) && !::tqt_cast<TQFrame*>(m_widget))