summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/domtreeview.cpp4
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp22
-rw-r--r--tdehtml/ecma/kjs_window.cpp6
-rw-r--r--tdehtml/ecma/xmlhttprequest.cpp16
-rw-r--r--tdehtml/html/html_documentimpl.cpp12
-rw-r--r--tdehtml/html/html_objectimpl.cpp2
-rw-r--r--tdehtml/java/kjavaappletcontext.cpp2
-rw-r--r--tdehtml/java/kjavaappletserver.cpp14
-rw-r--r--tdehtml/java/kjavaappletviewer.cpp10
-rw-r--r--tdehtml/java/kjavaappletwidget.cpp8
-rw-r--r--tdehtml/java/kjavadownloader.cpp24
-rw-r--r--tdehtml/java/kjavaprocess.cpp16
-rw-r--r--tdehtml/misc/knsplugininstaller.cpp24
-rw-r--r--tdehtml/misc/loader.cpp22
-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
-rw-r--r--tdehtml/tdehtml_ext.cpp96
-rw-r--r--tdehtml/tdehtml_pagecache.cpp6
-rw-r--r--tdehtml/tdehtml_part.cpp322
-rw-r--r--tdehtml/tdehtmlimage.cpp20
-rw-r--r--tdehtml/tdehtmlview.cpp16
-rw-r--r--tdehtml/tdemultipart/tdemultipart.cpp106
-rw-r--r--tdehtml/test_regression.cpp20
-rw-r--r--tdehtml/testtdehtml.cpp20
-rw-r--r--tdehtml/xml/dom_docimpl.cpp2
27 files changed, 433 insertions, 433 deletions
diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index c68eb2007..88477fe03 100644
--- a/tdehtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -28,8 +28,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char
addColumn("Renderer");
setSorting(-1);
part = currentpart;
- connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &)));
- connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+ connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &)));
+ connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
m_nodedict.setAutoDelete(true);
}
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 1a75709f8..27fb181bb 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -384,7 +384,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
TQWidget *contextListContainer = new TQWidget(contextContainer);
m_contextList = new TQListBox(contextListContainer);
m_contextList->setMinimumSize(100,200);
- connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+ connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
TQHBoxLayout *clistLayout = new TQHBoxLayout(contextListContainer);
clistLayout->addWidget(m_contextList);
@@ -400,11 +400,11 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
TQVBoxLayout *ssdvl = new TQVBoxLayout(sourceSelDisplay);
m_sourceSel = new TQComboBox(toolBar());
- connect(m_sourceSel,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSourceSelected(int)));
+ connect(m_sourceSel,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSourceSelected(int)));
m_sourceDisplay = new SourceDisplay(this,sourceSelDisplay);
ssdvl->addWidget(m_sourceDisplay);
- connect(m_sourceDisplay,TQT_SIGNAL(lineDoubleClicked(int)),TQT_SLOT(slotToggleBreakpoint(int)));
+ connect(m_sourceDisplay,TQ_SIGNAL(lineDoubleClicked(int)),TQ_SLOT(slotToggleBreakpoint(int)));
TQValueList<int> vsplitSizes;
vsplitSizes.insert(vsplitSizes.end(),120);
@@ -419,7 +419,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
m_evalEdit = new EvalMultiLineEdit(evalContainer);
m_evalEdit->setWordWrap(TQMultiLineEdit::NoWrap);
m_evalEdit->setFont(font);
- connect(m_evalEdit,TQT_SIGNAL(returnPressed()),TQT_SLOT(slotEval()));
+ connect(m_evalEdit,TQ_SIGNAL(returnPressed()),TQ_SLOT(slotEval()));
m_evalDepth = 0;
TQVBoxLayout *evalLayout = new TQVBoxLayout(evalContainer);
@@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
// Venkman use F12, KDevelop 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,this,TQT_SLOT(slotNext()),
+ m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQ_SLOT(slotNext()),
m_actionCollection,"next");
- m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQT_SLOT(slotStep()),
+ m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQ_SLOT(slotStep()),
m_actionCollection,"step");
// Venkman use F5, Kdevelop F9
TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
scCont.append(KKeySequence(KKey(TQt::Key_F9)));
- m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()),
+ m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQ_SLOT(slotContinue()),
m_actionCollection,"cont");
- m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQT_SLOT(slotStop()),
+ m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQ_SLOT(slotStop()),
m_actionCollection,"stop");
- m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQT_SLOT(slotBreakNext()),
+ m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQ_SLOT(slotBreakNext()),
m_actionCollection,"breaknext");
@@ -1048,7 +1048,7 @@ void KJSDebugWin::leaveSession()
void KJSDebugWin::updateContextList()
{
- disconnect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+ disconnect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
m_contextList->clear();
for (int i = 0; i < m_execsCount; i++)
@@ -1060,7 +1060,7 @@ void KJSDebugWin::updateContextList()
setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine());
}
- connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+ connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
}
TQString KJSDebugWin::contextStr(const Context &ctx)
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 7acea8dee..3a1f7c897 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -1231,7 +1231,7 @@ void Window::scheduleClose()
{
kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl;
Q_ASSERT(winq);
- TQTimer::singleShot( 0, winq, TQT_SLOT( timeoutClose() ) );
+ TQTimer::singleShot( 0, winq, TQ_SLOT( timeoutClose() ) );
}
void Window::closeNow()
@@ -2169,8 +2169,8 @@ WindowQObject::WindowQObject(Window *w)
if ( !parent->m_frame )
kdDebug(6070) << "WARNING: null part in " << k_funcinfo << endl;
else
- connect( parent->m_frame, TQT_SIGNAL( destroyed() ),
- this, TQT_SLOT( parentDestroyed() ) );
+ connect( parent->m_frame, TQ_SIGNAL( destroyed() ),
+ this, TQ_SLOT( parentDestroyed() ) );
pausedTime = 0;
lastTimerId = 0;
currentlyDispatching = false;
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index a3d0b2b3d..d5937e9a0 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -420,17 +420,17 @@ void XMLHttpRequest::send(const TQString& _body)
return;
}
- qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+ qObject->connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
#ifdef APPLE_CHANGES
- qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
- TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
+ qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
+ TQ_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
#else
- qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
#endif
- qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
- TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
+ qObject->connect( job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+ TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
#ifdef APPLE_CHANGES
KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job);
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 52ada7a7b..c27573844 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -78,13 +78,13 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHT
m_doAutoFill = false;
/* dynamic history stuff to be fixed later (pfeiffer)
- connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
- TQT_SLOT( slotHistoryChanged() ));
+ connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( removed( const TQString& )),
+ TQ_SLOT( slotHistoryChanged() ));
*/
- connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
- TQT_SLOT( slotHistoryChanged() ));
- connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
- TQT_SLOT( slotHistoryChanged() ));
+ connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( inserted( const TQString& ) ),
+ TQ_SLOT( slotHistoryChanged() ));
+ connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( cleared()),
+ TQ_SLOT( slotHistoryChanged() ));
}
HTMLDocumentImpl::~HTMLDocumentImpl()
diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index 864de8ed7..0248b81b6 100644
--- a/tdehtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -136,7 +136,7 @@ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch )
void HTMLObjectBaseElementImpl::renderAlternative()
{
if ( m_renderAlternative ) return;
- TQTimer::singleShot( 0, this, TQT_SLOT( slotRenderAlternative() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotRenderAlternative() ) );
}
void HTMLObjectBaseElementImpl::slotRenderAlternative()
diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index b644b67ca..6d8af4667 100644
--- a/tdehtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -54,7 +54,7 @@ KJavaAppletContext::KJavaAppletContext()
{
d = new KJavaAppletContextPrivate;
server = KJavaAppletServer::allocateJavaServer();
- connect(server->javaProcess(), TQT_SIGNAL(exited(int)), this, TQT_SLOT(javaProcessExited(int)));
+ connect(server->javaProcess(), TQ_SIGNAL(exited(int)), this, TQ_SLOT(javaProcessExited(int)));
id = contextCount;
server->createContext( id, this );
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index a83dad118..640473489 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -136,8 +136,8 @@ KJavaAppletServer::KJavaAppletServer()
d = new KJavaAppletServerPrivate;
process = new KJavaProcess();
- connect( process, TQT_SIGNAL(received(const TQByteArray&)),
- this, TQT_SLOT(slotJavaRequest(const TQByteArray&)) );
+ connect( process, TQ_SIGNAL(received(const TQByteArray&)),
+ this, TQ_SLOT(slotJavaRequest(const TQByteArray&)) );
setupJava( process );
@@ -198,7 +198,7 @@ void KJavaAppletServer::freeJavaServer()
if( config.readBoolEntry( "ShutdownAppletServer", true ) )
{
const int value = config.readNumEntry( "AppletServerTimeout", 60 );
- TQTimer::singleShot( value*1000, self, TQT_SLOT( checkShutdown() ) );
+ TQTimer::singleShot( value*1000, self, TQ_SLOT( checkShutdown() ) );
}
}
}
@@ -810,10 +810,10 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
dialog->resize( dialog->minimumSizeHint() );
//clearWState( WState_Polished );
- connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
- connect( reject, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
- connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
- connect( grant, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+ connect( no, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+ connect( reject, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+ connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+ connect( grant, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
dialog->exec();
delete dialog;
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 6145470bf..5a00e14eb 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
setInstance (KJavaAppletViewerFactory::instance ());
KParts::Part::setWidget (m_view);
- connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded()));
- connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&)));
- connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &)));
- connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &)));
+ connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded()));
+ connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&)));
+ connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &)));
+ connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &)));
}
bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
@@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
if (applet->size().width() > 0 || m_view->isVisible())
w->showApplet ();
else
- TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ()));
+ TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ()));
if (!applet->failed ())
emit started (0L);
return url.isValid ();
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index 7f1d7f00f..83485019c 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -66,8 +66,8 @@ KJavaAppletWidget::~KJavaAppletWidget()
void KJavaAppletWidget::showApplet()
{
- connect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ),
- this, TQT_SLOT( setWindow( WId ) ) );
+ connect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ),
+ this, TQ_SLOT( setWindow( WId ) ) );
m_kwm->doNotManage( m_swallowTitle );
@@ -89,8 +89,8 @@ void KJavaAppletWidget::setWindow( WId w )
d->tmplabel = 0;
// disconnect from KWM events
- disconnect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ),
- this, TQT_SLOT( setWindow( WId ) ) );
+ disconnect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ),
+ this, TQ_SLOT( setWindow( WId ) ) );
embed( w );
diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index 5b1c55324..b58465d7f 100644
--- a/tdehtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
@@ -81,14 +81,14 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
d->job = TDEIO::get( *d->url, false, false );
d->job->addMetaData("PropagateHttpHeader", "true");
- connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
- this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
- this, TQT_SLOT(slotConnected(TDEIO::Job*)));
- connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
- this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
- connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotResult(TDEIO::Job*)) );
+ connect( d->job, TQ_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
+ this, TQ_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
+ connect( d->job, TQ_SIGNAL(connected(TDEIO::Job*)),
+ this, TQ_SLOT(slotConnected(TDEIO::Job*)));
+ connect( d->job, TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
+ this, TQ_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
+ connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotResult(TDEIO::Job*)) );
}
KJavaDownloader::~KJavaDownloader()
@@ -215,10 +215,10 @@ void KJavaUploader::start()
// create a suspended job
d->job = TDEIO::put( *d->url, -1, false, false, false );
d->job->suspend();
- connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
- this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotResult(TDEIO::Job*)) );
+ connect( d->job, TQ_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
+ this, TQ_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
+ connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotResult(TDEIO::Job*)) );
server->sendURLData( d->loaderID, CONNECTED, d->file );
KJavaAppletServer::freeJavaServer();
}
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 6b505c343..7f3a93e0a 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -54,12 +54,12 @@ KJavaProcess::KJavaProcess() : TDEProcess()
javaProcess = this; //new TDEProcess();
- connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
- this, TQT_SLOT( slotWroteData() ) );
- connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
- this, TQT_SLOT( slotReceivedData(int, int&) ) );
- connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ),
- this, TQT_SLOT( slotExited (TDEProcess *) ) );
+ connect( javaProcess, TQ_SIGNAL( wroteStdin( TDEProcess * ) ),
+ this, TQ_SLOT( slotWroteData() ) );
+ connect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ),
+ this, TQ_SLOT( slotReceivedData(int, int&) ) );
+ connect( javaProcess, TQ_SIGNAL( processExited (TDEProcess *) ),
+ this, TQ_SLOT( slotExited (TDEProcess *) ) );
d->jvmPath = "java";
d->mainClass = "-help";
@@ -319,8 +319,8 @@ bool KJavaProcess::invokeJVM()
void KJavaProcess::killJVM()
{
d->processKilled = true;
- disconnect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
- this, TQT_SLOT( slotReceivedData(int, int&) ) );
+ disconnect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ),
+ this, TQ_SLOT( slotReceivedData(int, int&) ) );
javaProcess->kill();
}
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index db83e5c75..aefa73192 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -238,8 +238,8 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
// start the download job
m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
// connect signals
- connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
- connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) );
+ connect(m_downloadJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
+ connect(m_downloadJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDownloadResult(TDEIO::Job *)) );
kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
}
@@ -284,8 +284,8 @@ void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job)
urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
}
m_installFileJob = TDEIO::copy(urlList , destURL, false );
- connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
- connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) );
+ connect(m_installFileJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
+ connect(m_installFileJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)) );
}
kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
@@ -312,10 +312,10 @@ void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job)
m_scanProc->addArgument( "nspluginscan" );
m_scanProc->addArgument( "--verbose" );
- connect( m_scanProc, TQT_SIGNAL(readyReadStdout()),
- this, TQT_SLOT(readScanProcFromStdout()) );
- connect( m_scanProc, TQT_SIGNAL(processExited()),
- this, TQT_SLOT(endScanProc()) );
+ connect( m_scanProc, TQ_SIGNAL(readyReadStdout()),
+ this, TQ_SLOT(readScanProcFromStdout()) );
+ connect( m_scanProc, TQ_SIGNAL(processExited()),
+ this, TQ_SLOT(endScanProc()) );
if ( !m_scanProc->start() ) {
emit installFailed();
}
@@ -426,7 +426,7 @@ void KNSPluginWizard::initLicencePage()
addPage (m_licenceVBox, i18n("Plugin licence"));
- connect(buttonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAgreementClicked(int)));
+ connect(buttonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAgreementClicked(int)));
}
void KNSPluginWizard::initInstallationProgressPage() {
@@ -486,9 +486,9 @@ void KNSPluginWizard::initPagesButtonStates()
void KNSPluginWizard::connectSignals() {
- connect(&m_installEngine, TQT_SIGNAL(installProgress(int)), m_installationProgressBar, TQT_SLOT(setProgress(int)) );
- connect(&m_installEngine, TQT_SIGNAL(installCompleted()), this, TQT_SLOT(slotInstallationCompleted()) );
- connect(&m_installEngine, TQT_SIGNAL(installFailed()), this, TQT_SLOT(slotInstallationFailed()) );
+ connect(&m_installEngine, TQ_SIGNAL(installProgress(int)), m_installationProgressBar, TQ_SLOT(setProgress(int)) );
+ connect(&m_installEngine, TQ_SIGNAL(installCompleted()), this, TQ_SLOT(slotInstallationCompleted()) );
+ connect(&m_installEngine, TQ_SIGNAL(installFailed()), this, TQ_SLOT(slotInstallationFailed()) );
}
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 7621b5e4f..50525c342 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -786,10 +786,10 @@ void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnima
imgSource->cleanBuffer();
delete p;
p = new TQPixmap(m->framePixmap());
- m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
- m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) ));
- m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
- TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
+ m->disconnectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) ));
+ m->disconnectStatus( this, TQ_SLOT( movieStatus( int ) ));
+ m->disconnectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) );
+ TQTimer::singleShot(0, this, TQ_SLOT( deleteMovie()));
imgSource = 0;
}
}
@@ -849,9 +849,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
{
imgSource = new ImageSource( _buffer.buffer());
m = new TQMovie( imgSource, 8192 );
- m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
- m->connectStatus( this, TQT_SLOT( movieStatus(int)));
- m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
+ m->connectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) ));
+ m->connectStatus( this, TQ_SLOT( movieStatus(int)));
+ m->connectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) );
}
}
@@ -1128,7 +1128,7 @@ Loader::Loader() : TQObject()
{
m_requestsPending.setAutoDelete( true );
m_requestsLoading.setAutoDelete( true );
- connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( servePendingRequests() ) );
+ connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( servePendingRequests() ) );
}
void Loader::load(DocLoader* dl, CachedObject *object, bool incremental)
@@ -1171,9 +1171,9 @@ void Loader::servePendingRequests()
}
}
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
- TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+ TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
if ( req->object->schedule() )
TDEIO::Scheduler::scheduleJob( job );
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))
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 89172f22a..6e2b6fa17 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -111,12 +111,12 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
if ( !m_connectedToClipboard && m_editableFormWidget )
{
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
- this, TQT_SLOT( updateEditActions() ) );
+ connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+ this, TQ_SLOT( updateEditActions() ) );
if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) )
- connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( updateEditActions() ) );
+ connect( m_editableFormWidget, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( updateEditActions() ) );
m_connectedToClipboard = true;
}
@@ -134,14 +134,14 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
if ( m_connectedToClipboard )
{
- disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
- this, TQT_SLOT( updateEditActions() ) );
+ disconnect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+ this, TQ_SLOT( updateEditActions() ) );
if ( oldWidget )
{
if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) )
- disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( updateEditActions() ) );
+ disconnect( oldWidget, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( updateEditActions() ) );
}
m_connectedToClipboard = false;
@@ -153,14 +153,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p
{
if ( m_extensionProxy )
{
- disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
- this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
+ disconnect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ),
+ this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) )
{
- disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
- this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
- disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ),
- this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) );
+ disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ),
+ this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) );
+ disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ),
+ this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) );
}
}
@@ -168,14 +168,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p
if ( m_extensionProxy )
{
- connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
- this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
+ connect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ),
+ this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) )
{
- connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
- this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
- connect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ),
- this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) );
+ connect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ),
+ this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) );
+ connect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ),
+ this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) );
}
enableAction( "cut", m_extensionProxy->isActionEnabled( "cut" ) );
@@ -223,7 +223,7 @@ void TDEHTMLPartBrowserExtension::copy()
TQClipboard *cb = TQApplication::clipboard();
- disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
+ disconnect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) );
#ifndef TQT_NO_MIMECLIPBOARD
TQString htmltext;
/*
@@ -249,7 +249,7 @@ void TDEHTMLPartBrowserExtension::copy()
cb->setText(text);
#endif
- connect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
+ connect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) );
}
else
{
@@ -429,7 +429,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if (hasSelection)
{
- TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
+ TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQ_SLOT( copy() ), actionCollection(), "copy" );
copyAction->setText(i18n("&Copy Text"));
copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" ));
actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) );
@@ -477,7 +477,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
// using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x
new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
- TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
+ TQ_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
// favorite search providers
TQStringList favoriteEngines;
@@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
name = service->name();
providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(),
- TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
+ TQ_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
}
}
}
@@ -515,13 +515,13 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if ( selectedText.contains("://") && KURL(selectedText).isValid() )
new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0,
- d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
+ d->m_tdehtml->browserExtension(), TQ_SLOT( openSelection() ), actionCollection(), "openSelection" );
}
else if ( url.isEmpty() && !isImage )
{
actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) );
actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) );
- new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+ new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ),
actionCollection(), "stopanimations" );
}
@@ -529,14 +529,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if (url.protocol() == "mailto")
{
- new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+ new TDEAction( i18n( "Copy Email Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ),
actionCollection(), "copylinklocation" );
}
else
{
- new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
+ new TDEAction( i18n( "&Save Link As..." ), 0, this, TQ_SLOT( slotSaveLinkAs() ),
actionCollection(), "savelinkas" );
- new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+ new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ),
actionCollection(), "copylinklocation" );
}
}
@@ -546,28 +546,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if ( tdehtml->parentPart() )
{
- new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ),
+ new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotFrameInWindow() ),
actionCollection(), "frameinwindow" );
- new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
+ new TDEAction( i18n( "Open in &This Window" ), 0, this, TQ_SLOT( slotFrameInTop() ),
actionCollection(), "frameintop" );
- new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
+ new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotFrameInTab() ),
actionCollection(), "frameintab" );
- new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
+ new TDEAction( i18n( "Reload Frame" ), 0, this, TQ_SLOT( slotReloadFrame() ),
actionCollection(), "reloadframe" );
if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
- new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
+ new TDEAction( i18n( "Block IFrame..." ), 0, this, TQ_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
}
- new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
+ new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQ_SLOT( slotViewDocumentSource() ),
actionCollection(), "viewFrameSource" );
- new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
+ new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
// This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either,
// and because print frame is already in the toolbar and the menu.
// But leave this here, so that it's easy to read it.
- new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
- new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+ new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQ_SLOT( print() ), actionCollection(), "printFrame" );
+ new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
@@ -578,7 +578,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
} else if (isImage || !url.isEmpty()) {
actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
- new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+ new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ),
actionCollection(), "stopanimations" );
}
@@ -597,35 +597,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
}
else
d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() );
- new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
+ new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveImageAs() ),
actionCollection(), "saveimageas" );
- new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
+ new TDEAction( i18n( "Send Image..." ), 0, this, TQ_SLOT( slotSendImage() ),
actionCollection(), "sendimage" );
#ifndef TQT_NO_MIMECLIPBOARD
- (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
+ (new TDEAction( i18n( "Copy Image" ), 0, this, TQ_SLOT( slotCopyImage() ),
actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull());
#endif
if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef TQT_NO_MIMECLIPBOARD
- new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
+ new TDEAction( i18n( "Copy Image Location" ), 0, this, TQ_SLOT( slotCopyImageLocation() ),
actionCollection(), "copyimagelocation" );
}
TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25);
- new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
+ new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQ_SLOT( slotViewImage() ),
actionCollection(), "viewimage" );
if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
{
- new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
+ new TDEAction( i18n( "Block Image..." ), 0, this, TQ_SLOT( slotBlockImage() ),
actionCollection(), "blockimage" );
if (!d->m_imageURL.host().isEmpty() &&
!d->m_imageURL.protocol().isEmpty())
{
- new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ),
+ new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQ_SLOT( slotBlockHost() ),
actionCollection(), "blockhost" );
}
}
@@ -995,7 +995,7 @@ void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction)
m_popup->insertItem( i18n( "%1%" ).arg( fastZoomSizes[ofs + i] ) );
}
- connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
+ connect( m_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) );
}
TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction()
diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index 319dd8162..df08f97d6 100644
--- a/tdehtml/tdehtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -108,7 +108,7 @@ TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot)
int fd = dup(m_file->handle());
lseek(fd, 0, SEEK_SET);
TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd);
- recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot);
+ recvObj->connect(delivery, TQ_SIGNAL(emitData(const TQByteArray&)), recvSlot);
delivery->recvObj = recvObj;
return delivery;
}
@@ -210,7 +210,7 @@ TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
if (!d->deliveryActive)
{
d->deliveryActive = true;
- TQTimer::singleShot(20, this, TQT_SLOT(sendData()));
+ TQTimer::singleShot(20, this, TQ_SLOT(sendData()));
}
}
@@ -265,7 +265,7 @@ TDEHTMLPageCache::sendData()
byteArray.resetRawData(buf, n);
d->delivery.append( delivery );
}
- TQTimer::singleShot(0, this, TQT_SLOT(sendData()));
+ TQTimer::singleShot(0, this, TQ_SLOT(sendData()));
}
void
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 6e9d77619..31e49c53f 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -251,24 +251,24 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
d->m_bMousePressed = false;
d->m_bRightMousePressed = false;
d->m_bCleared = false;
- d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
- d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
- d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
- d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
- d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
+ d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
+ d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQ_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
+ d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
+ d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQ_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
+ d->m_paSaveDocument = KStdAction::saveAs( this, TQ_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
if ( parentPart() )
d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes
- d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
- d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
+ d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+ d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQ_SLOT( slotSecurity() ), actionCollection(), "security" );
d->m_paSecurity->setWhatsThis( i18n( "Security Settings<p>"
"Shows the certificate of the displayed page. Only "
"pages that have been transmitted using a secure, encrypted connection have a "
"certificate.<p> "
"Hint: If the image shows a closed lock, the page has been transmitted over a "
"secure connection.") );
- d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
- d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
- d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
+ d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQ_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
+ d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQ_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
+ d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
d->m_paSetEncoding->setDelayed( false );
@@ -291,14 +291,14 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
//d->m_automaticDetection->insertItem( i18n( "Unicode" ), 13 );
d->m_automaticDetection->insertItem( i18n( "Western European" ), 14 );
- connect( d->m_automaticDetection, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotAutomaticDetectionLanguage( int ) ) );
+ connect( d->m_automaticDetection, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAutomaticDetectionLanguage( int ) ) );
d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 );
d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) );
- d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
+ d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQ_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
d->m_manualDetection->setItems( encodings );
d->m_manualDetection->setCurrentItem( -1 );
@@ -353,40 +353,40 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
}
- d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
+ d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQ_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
if ( prof == BrowserViewGUI ) {
d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n(
"Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this,
- TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" );
+ TQ_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" );
d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>"
"Make the font in this window bigger. "
"Click and hold down the mouse button for a menu with all available font sizes." ) );
d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n(
"Shrink Font" ), "zoom-out", CTRL + Key_Minus, this,
- TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" );
+ TQ_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" );
d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>"
"Make the font in this window smaller. "
"Click and hold down the mouse button for a menu with all available font sizes." ) );
}
- d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" );
+ d->m_paFind = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find" );
d->m_paFind->setWhatsThis( i18n( "Find text<p>"
"Shows a dialog that allows you to find text on the displayed page." ) );
- d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" );
+ d->m_paFindNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection(), "findNext" );
d->m_paFindNext->setWhatsThis( i18n( "Find next<p>"
"Find the next occurrence of the text that you "
"have found using the <b>Find Text</b> function" ) );
- d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" );
+ d->m_paFindPrev = KStdAction::findPrev( this, TQ_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" );
d->m_paFindPrev->setWhatsThis( i18n( "Find previous<p>"
"Find the previous occurrence of the text that you "
"have found using the <b>Find Text</b> function" ) );
- d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
+ d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQ_SLOT( slotFindAheadText()),
actionCollection(), "findAheadText");
- d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
+ d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQ_SLOT( slotFindAheadLink()),
actionCollection(), "findAheadLink");
d->m_paFindAheadText->setEnabled( false );
d->m_paFindAheadLinks->setEnabled( false );
@@ -400,17 +400,17 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
d->m_paFindAheadLinks->setShortcut( TDEShortcut());
}
- d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+ d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQ_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
"Some pages have several frames. To print only a single frame, click "
"on it and then use this function." ) );
- d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" );
+ d->m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectAll" );
if ( parentPart() )
d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes
d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"),
- Key_F7, this, TQT_SLOT(slotToggleCaretMode()),
+ Key_F7, this, TQ_SLOT(slotToggleCaretMode()),
actionCollection(), "caretMode");
d->m_paToggleCaretMode->setChecked(isCaretMode());
if (parentPart())
@@ -427,30 +427,30 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
// Set the meta-refresh flag...
d->m_metaRefreshEnabled = d->m_settings->isAutoDelayedActionsEnabled ();
- connect( view, TQT_SIGNAL( zoomView( int ) ), TQT_SLOT( slotZoomView( int ) ) );
+ connect( view, TQ_SIGNAL( zoomView( int ) ), TQ_SLOT( slotZoomView( int ) ) );
- connect( this, TQT_SIGNAL( completed() ),
- this, TQT_SLOT( updateActions() ) );
- connect( this, TQT_SIGNAL( completed( bool ) ),
- this, TQT_SLOT( updateActions() ) );
- connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
- this, TQT_SLOT( updateActions() ) );
+ connect( this, TQ_SIGNAL( completed() ),
+ this, TQ_SLOT( updateActions() ) );
+ connect( this, TQ_SIGNAL( completed( bool ) ),
+ this, TQ_SLOT( updateActions() ) );
+ connect( this, TQ_SIGNAL( started( TDEIO::Job * ) ),
+ this, TQ_SLOT( updateActions() ) );
d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) );
- connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
- this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
- connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
- this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
- connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
- this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+ connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+ this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+ connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+ this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+ connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+ this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
- connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) );
+ connect ( &d->m_progressUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressUpdate() ) );
findTextBegin(); //reset find variables
- connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotRedirect() ) );
+ connect( &d->m_redirectionTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotRedirect() ) );
d->m_dcopobject = new TDEHTMLPartIface(this);
@@ -495,12 +495,12 @@ TDEHTMLPart::~TDEHTMLPart()
if (!d->m_bComplete)
closeURL();
- disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
- this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
- disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
- this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
- disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
- this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+ disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+ this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+ disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+ this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+ disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+ this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
clear();
@@ -551,10 +551,10 @@ bool TDEHTMLPart::restoreURL( const KURL &url )
m_url = url;
d->m_restoreScrollPosition = true;
- disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
- connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+ disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
+ connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
- TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &)));
+ TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQ_SLOT(slotRestoreData(const TQByteArray &)));
emit started( 0L );
@@ -672,8 +672,8 @@ bool TDEHTMLPart::openURL( const KURL &url )
closeURL();
d->m_restoreScrollPosition = d->m_restored;
- disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
- connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+ disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
+ connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
// initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first
// data arrives) (Simon)
@@ -719,14 +719,14 @@ bool TDEHTMLPart::openURL( const KURL &url )
d->m_job->setWindow(widget()->topLevelWidget());
d->m_job->addMetaData(args.metaData());
- connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
- connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
- connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
- connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
- TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
+ connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
+ connect( d->m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect ( d->m_job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+ connect( d->m_job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+ TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
@@ -742,14 +742,14 @@ bool TDEHTMLPart::openURL( const KURL &url )
d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
- connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
- this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
+ connect( d->m_job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+ this, TQ_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
- connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
- this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
+ connect( d->m_job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+ this, TQ_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
- connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) );
+ connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotJobDone( TDEIO::Job* ) ) );
d->m_jobspeed = 0;
@@ -758,8 +758,8 @@ bool TDEHTMLPart::openURL( const KURL &url )
if ( args.reload && !settings()->userStyleSheet().isEmpty() ) {
KURL url( settings()->userStyleSheet() );
TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
}
emit started( 0L );
@@ -790,7 +790,7 @@ bool TDEHTMLPart::closeURL()
d->m_bLoadEventEmitted = true; // don't want that one either
d->m_cachePolicy = KProtocolManager::cacheControl(); // reset cache policy
- disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+ disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
TDEHTMLPageCache::self()->cancelFetch(this);
if ( d->m_doc && d->m_doc->parsing() )
@@ -1079,8 +1079,8 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() {
d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false);
TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors."));
d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance()));
- connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog()));
- connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu()));
+ connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchJSErrorDialog()));
+ connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(jsErrorDialogContextMenu()));
}
if (!d->m_jsedlg) {
d->m_jsedlg = new KJSErrorDlg;
@@ -1119,8 +1119,8 @@ void TDEHTMLPart::disableJSErrorExtension() {
void TDEHTMLPart::jsErrorDialogContextMenu() {
TDEPopupMenu *m = new TDEPopupMenu(0L);
- m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension()));
- m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension()));
+ m->insertItem(i18n("&Hide Errors"), this, TQ_SLOT(removeJSErrorExtension()));
+ m->insertItem(i18n("&Disable Error Reporting"), this, TQ_SLOT(disableJSErrorExtension()));
m->popup(TQCursor::pos());
}
@@ -1347,7 +1347,7 @@ void TDEHTMLPart::setAutoloadImages( bool enable )
d->m_paLoadImages = 0;
}
else if ( !d->m_paLoadImages )
- d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
+ d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQ_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
if ( d->m_paLoadImages ) {
TQPtrList<TDEAction> lst;
@@ -1429,8 +1429,8 @@ void TDEHTMLPart::clear()
// We don't want to change between parts if we are going to delete all of them anyway
if (partManager()) {
- disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
- this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ disconnect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+ this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
}
if (d->m_frames.count())
@@ -1464,8 +1464,8 @@ void TDEHTMLPart::clear()
// Listen to part changes again
if (partManager()) {
- connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
- this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ connect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+ this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
}
d->m_delayRedirect = 0;
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
d->m_startOffset = 0;
d->m_endOffset = 0;
#ifndef TQT_NO_CLIPBOARD
- connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+ connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
#endif
d->m_jobPercent = 0;
@@ -1531,7 +1531,7 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec )
d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
d->m_statusBarIconLabel->setUseCursor( false );
d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false );
- connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) );
+ connect( d->m_statusBarIconLabel, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( slotSecurity() ) );
} else if (d->m_statusBarIconLabel) {
TQToolTip::remove(d->m_statusBarIconLabel);
}
@@ -1953,7 +1953,7 @@ void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setRestoreState(args.docState);
d->m_doc->open();
- connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
+ connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
emit d->m_extension->enableAction( "print", true );
@@ -2071,8 +2071,8 @@ void TDEHTMLPart::resetFromScript()
closeURL();
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
- disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
- connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
+ disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
+ connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
d->m_doc->setParsing(true);
emit started( 0L );
@@ -2082,7 +2082,7 @@ void TDEHTMLPart::slotFinishedParsing()
{
d->m_doc->setParsing(false);
checkEmitLoadEvent();
- disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
+ disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
if (!d->m_view)
return; // We are probably being destructed.
@@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText()
// The lineedit of the dialog would make tdehtml lose its selection, otherwise
#ifndef TQT_NO_CLIPBOARD
- disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
+ disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
#endif
// Now show the dialog in which the user can choose options.
@@ -3026,8 +3026,8 @@ void TDEHTMLPart::findText()
d->m_lastFindState.last_dir = -1;
d->m_findDialog->show();
- connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) );
- connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) );
+ connect( d->m_findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFindNext()) );
+ connect( d->m_findDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFindDialogDestroyed()) );
findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog );
}
@@ -3039,17 +3039,17 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
return;
#ifndef TQT_NO_CLIPBOARD
- connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
+ connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
#endif
// Create the KFind object
delete d->m_find;
d->m_find = new KFind( str, options, parent, findDialog );
d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up
- connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
- this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
- //connect(d->m_find, TQT_SIGNAL( findNext() ),
- // this, TQT_SLOT( slotFindNext() ) );
+ connect( d->m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ),
+ this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) );
+ //connect(d->m_find, TQ_SIGNAL( findNext() ),
+ // this, TQ_SLOT( slotFindNext() ) );
if ( !findDialog )
{
@@ -4494,7 +4494,7 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &
partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part );
delete (KParts::ReadOnlyPart *)child->m_part;
if (child->m_liveconnect) {
- disconnect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
+ disconnect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
child->m_liveconnect = 0L;
}
}
@@ -4515,65 +4515,65 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &
} else if (child->m_frame) {
child->m_liveconnect = KParts::LiveConnectExtension::childObject(part);
if (child->m_liveconnect)
- connect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
+ connect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
}
KParts::StatusBarExtension *sb = KParts::StatusBarExtension::childObject(part);
if (sb)
sb->setStatusBar( d->m_statusBarExtension->statusBar() );
- connect( part, TQT_SIGNAL( started( TDEIO::Job *) ),
- this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) );
- connect( part, TQT_SIGNAL( completed() ),
- this, TQT_SLOT( slotChildCompleted() ) );
- connect( part, TQT_SIGNAL( completed(bool) ),
- this, TQT_SLOT( slotChildCompleted(bool) ) );
- connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
- this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) );
+ connect( part, TQ_SIGNAL( started( TDEIO::Job *) ),
+ this, TQ_SLOT( slotChildStarted( TDEIO::Job *) ) );
+ connect( part, TQ_SIGNAL( completed() ),
+ this, TQ_SLOT( slotChildCompleted() ) );
+ connect( part, TQ_SIGNAL( completed(bool) ),
+ this, TQ_SLOT( slotChildCompleted(bool) ) );
+ connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+ this, TQ_SIGNAL( setStatusBarText( const TQString & ) ) );
if ( part->inherits( "TDEHTMLPart" ) )
{
- connect( this, TQT_SIGNAL( completed() ),
- part, TQT_SLOT( slotParentCompleted() ) );
- connect( this, TQT_SIGNAL( completed(bool) ),
- part, TQT_SLOT( slotParentCompleted() ) );
+ connect( this, TQ_SIGNAL( completed() ),
+ part, TQ_SLOT( slotParentCompleted() ) );
+ connect( this, TQ_SIGNAL( completed(bool) ),
+ part, TQ_SLOT( slotParentCompleted() ) );
// As soon as the child's document is created, we need to set its domain
// (but we do so only once, so it can't be simply done in the child)
- connect( part, TQT_SIGNAL( docCreated() ),
- this, TQT_SLOT( slotChildDocCreated() ) );
+ connect( part, TQ_SIGNAL( docCreated() ),
+ this, TQ_SLOT( slotChildDocCreated() ) );
}
child->m_extension = KParts::BrowserExtension::childObject( part );
if ( child->m_extension )
{
- connect( child->m_extension, TQT_SIGNAL( openURLNotify() ),
- d->m_extension, TQT_SIGNAL( openURLNotify() ) );
-
- connect( child->m_extension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
- this, TQT_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) );
-
- connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
- d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
- connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
- d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
-
- connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
- d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
- connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
- d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
- connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
- d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
- connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
- d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
- d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
- d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
-
- connect( child->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ),
- d->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) );
-
- connect( child->m_extension, TQT_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ),
- this, TQT_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) );
+ connect( child->m_extension, TQ_SIGNAL( openURLNotify() ),
+ d->m_extension, TQ_SIGNAL( openURLNotify() ) );
+
+ connect( child->m_extension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+ this, TQ_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+
+ connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+ d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+ connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+ d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
+
+ connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+ d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
+ connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+ d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+ connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+ d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+ connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+ connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+ connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+ d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+
+ connect( child->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ),
+ d->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) );
+
+ connect( child->m_extension, TQ_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ),
+ this, TQ_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) );
child->m_extension->setBrowserInterface( d->m_extension->browserInterface() );
}
@@ -4706,10 +4706,10 @@ KParts::PartManager *TDEHTMLPart::partManager()
{
d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" );
d->m_manager->setAllowNestedParts( true );
- connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
- this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
- connect( d->m_manager, TQT_SIGNAL( partRemoved( KParts::Part * ) ),
- this, TQT_SLOT( slotPartRemoved( KParts::Part * ) ) );
+ connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+ this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ connect( d->m_manager, TQ_SIGNAL( partRemoved( KParts::Part * ) ),
+ this, TQ_SLOT( slotPartRemoved( KParts::Part * ) ) );
}
return d->m_manager;
@@ -4717,7 +4717,7 @@ KParts::PartManager *TDEHTMLPart::partManager()
void TDEHTMLPart::submitFormAgain()
{
- disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain()));
+ disconnect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain()));
if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm)
TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary );
@@ -4924,7 +4924,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB
d->m_submitForm->target = _target;
d->m_submitForm->submitContentType = contentType;
d->m_submitForm->submitBoundary = boundary;
- connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain()));
+ connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain()));
}
else
{
@@ -5088,7 +5088,7 @@ void TDEHTMLPart::slotChildDocCreated()
}
}
// So it only happens once
- disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) );
+ disconnect( htmlFrame, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( slotChildDocCreated() ) );
}
void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
@@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
#ifndef TQT_NO_CLIPBOARD
TQString text = selectedText();
text.replace(TQChar(0xa0), ' ');
- disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
+ disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
kapp->clipboard()->setText(text,TQClipboard::Selection);
- connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+ connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
#endif
//kdDebug( 6000 ) << "selectedText = " << text << endl;
emitSelectionChanged();
@@ -6681,13 +6681,13 @@ void TDEHTMLPart::slotSelectAll()
void TDEHTMLPart::startAutoScroll()
{
- connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ));
+ connect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ));
d->m_scrollTimer.start(100, false);
}
void TDEHTMLPart::stopAutoScroll()
{
- disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ));
+ disconnect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ));
if (d->m_scrollTimer.isActive())
d->m_scrollTimer.stop();
}
@@ -7114,7 +7114,7 @@ void TDEHTMLPart::restoreScrollPosition()
if ( m_url.hasRef() && !d->m_restoreScrollPosition && !args.reload) {
if ( !d->m_doc || !d->m_doc->parsing() )
- disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+ disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
if ( !gotoAnchor(m_url.encodedHtmlRef()) )
gotoAnchor(m_url.htmlRef());
return;
@@ -7127,7 +7127,7 @@ void TDEHTMLPart::restoreScrollPosition()
if (d->m_view->contentsHeight() - d->m_view->visibleHeight() >= args.yOffset
|| d->m_bComplete) {
d->m_view->setContentsPos(args.xOffset, args.yOffset);
- disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+ disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
}
}
@@ -7165,8 +7165,8 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
d->m_wq = new TDEHTMLWalletQueue(this);
d->m_wq->wallet = wallet;
- connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
- connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
+ connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool)));
+ connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*)));
}
assert(form);
d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument()));
@@ -7207,8 +7207,8 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin
TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
d->m_wq = new TDEHTMLWalletQueue(this);
d->m_wq->wallet = wallet;
- connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
- connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
+ connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool)));
+ connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*)));
}
d->m_wq->savers.append(qMakePair(key, data));
#endif // TDEHTML_NO_WALLET
@@ -7249,7 +7249,7 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) {
d->m_wallet = wallet;
d->m_bWalletOpened = true;
- connect(d->m_wallet, TQT_SIGNAL(walletClosed()), TQT_SLOT(slotWalletClosed()));
+ connect(d->m_wallet, TQ_SIGNAL(walletClosed()), TQ_SLOT(slotWalletClosed()));
if (!d->m_statusBarWalletLabel) {
d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
@@ -7258,8 +7258,8 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) {
d->m_statusBarWalletLabel->setUseCursor(false);
d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false);
d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance()));
- connect(d->m_statusBarWalletLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchWalletManager()));
- connect(d->m_statusBarWalletLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(walletMenu()));
+ connect(d->m_statusBarWalletLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchWalletManager()));
+ connect(d->m_statusBarWalletLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(walletMenu()));
} else {
TQToolTip::remove(d->m_statusBarWalletLabel);
}
@@ -7317,7 +7317,7 @@ void TDEHTMLPart::walletMenu()
{
#ifndef TDEHTML_NO_WALLET
TDEPopupMenu *m = new TDEPopupMenu(0L);
- m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed()));
+ m->insertItem(i18n("&Close Wallet"), this, TQ_SLOT(slotWalletClosed()));
m->popup(TQCursor::pos());
#endif // TDEHTML_NO_WALLET
}
@@ -7360,7 +7360,7 @@ void TDEHTMLPart::setDebugScript( bool enable )
unplugActionList( "debugScriptList" );
if ( enable ) {
if (!d->m_paDebugScript) {
- d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
+ d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQ_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
}
d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
TQPtrList<TDEAction> lst;
@@ -7397,7 +7397,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP
d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) );
TQToolTip::add( d->m_statusBarPopupLabel, i18n("This page was prevented from opening a new window via JavaScript." ) );
- connect(d->m_statusBarPopupLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(suppressedPopupMenu()));
+ connect(d->m_statusBarPopupLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(suppressedPopupMenu()));
if (d->m_settings->jsPopupBlockerPassivePopup()) {
TQPixmap px;
px = MainBarIcon( "window_suppressed" );
@@ -7415,10 +7415,10 @@ void TDEHTMLPart::suppressedPopupMenu() {
TDEPopupMenu *m = new TDEPopupMenu(0L);
m->setCheckable(true);
if ( d->m_openableSuppressedPopups )
- m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups()));
- m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQT_SLOT(togglePopupPassivePopup()),0,57);
+ m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQ_SLOT(showSuppressedPopups()));
+ m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQ_SLOT(togglePopupPassivePopup()),0,57);
m->setItemChecked(57,d->m_settings->jsPopupBlockerPassivePopup());
- m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQT_SLOT(launchJSConfigDialog()));
+ m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQ_SLOT(launchJSConfigDialog()));
m->popup(TQCursor::pos());
}
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index fe8e31c8d..726f6d6c1 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -70,7 +70,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof );
m_tdehtml->setAutoloadImages( true );
m_tdehtml->widget()->installEventFilter(this);
- connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) );
+ connect( m_tdehtml->view(), TQ_SIGNAL( finishedLayout() ), this, TQ_SLOT( restoreScrollPosition() ) );
setWidget( box );
@@ -105,15 +105,15 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
// forward opening requests to parent frame (if existing)
TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent);
KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext;
- connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
- be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)));
+ connect(m_tdehtml->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
+ be, TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)));
- connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
- const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
+ connect( m_tdehtml->browserExtension(), TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
+ const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) );
- connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ),
- m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) );
+ connect( m_tdehtml->browserExtension(), TQ_SIGNAL( enableAction( const char *, bool ) ),
+ m_ext, TQ_SIGNAL( enableAction( const char *, bool ) ) );
m_ext->setURLDropHandlingEnabled( true );
}
@@ -169,8 +169,8 @@ bool TDEHTMLImage::openURL( const KURL &url )
m_tdehtml->end();
/*
- connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
- this, TQT_SLOT( updateWindowCaption() ) );
+ connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+ this, TQ_SLOT( updateWindowCaption() ) );
*/
return true;
}
@@ -242,7 +242,7 @@ void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job )
else
{
emit completed();
- TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) );
}
}
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 12087e4a3..eb8b6aac9 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -493,8 +493,8 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
d = new TDEHTMLViewPrivate;
TQScrollView::setVScrollBarMode(d->vmode);
TQScrollView::setHScrollBarMode(d->hmode);
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
- connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved()));
+ connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
+ connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved()));
// initialize QScrollView
enableClipper(true);
@@ -512,7 +512,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
#endif
#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
- connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout()));
+ connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(findTimeout()));
#endif // TDEHTML_NO_TYPE_AHEAD_FIND
init();
@@ -520,7 +520,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
viewport()->show();
#ifndef NO_SMOOTH_SCROLL_HACK
#define timer timer2
- connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick()));
+ connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick()));
#undef timer
#endif
}
@@ -967,7 +967,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
d->m_mouseScroll_byY = 0;
d->m_mouseScrollTimer = new TQTimer( this );
- connect( d->m_mouseScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMouseScrollTimer()) );
+ connect( d->m_mouseScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMouseScrollTimer()) );
if ( !d->m_mouseScrollIndicator ) {
TQPixmap pixmap, icon;
@@ -1095,7 +1095,7 @@ void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
}
d->possibleTripleClick=true;
- TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
+ TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout()));
}
void TDEHTMLView::tripleClickTimeout()
@@ -2283,8 +2283,8 @@ void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview,
if( !accesskey.isNull()) {
TQRect rec=en->getRect();
TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
- connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
- connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint()));
+ connect( origview, TQ_SIGNAL(hideAccessKeys()), lab, TQ_SLOT(close()) );
+ connect( this, TQ_SIGNAL(repaintAccessKeys()), lab, TQ_SLOT(repaint()));
lab->setPalette(TQToolTip::palette());
lab->setLineWidth(2);
lab->setFrameStyle(TQFrame::Box | TQFrame::Plain);
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index 15970bbaa..7afda5741 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -115,7 +115,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName,
m_tempFile = 0L;
m_timer = new TQTimer( this );
- connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressInfo() ) );
+ connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressInfo() ) );
}
KMultiPart::~KMultiPart()
@@ -167,10 +167,10 @@ bool KMultiPart::openURL( const KURL &url )
emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage
- connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) );
- connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotJobFinished( TDEIO::Job * ) ) );
+ connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
m_numberOfFrames = 0;
m_numberOfFramesSkipped = 0;
@@ -324,8 +324,8 @@ void KMultiPart::setPart( const TQString& mimeType )
insertChildClient( m_part );
m_part->widget()->show();
- connect( m_part, TQT_SIGNAL( completed() ),
- this, TQT_SLOT( slotPartCompleted() ) );
+ connect( m_part, TQ_SIGNAL( completed() ),
+ this, TQ_SLOT( slotPartCompleted() ) );
m_isHTMLPart = ( mimeType == "text/html" );
KParts::BrowserExtension* childExtension = KParts::BrowserExtension::childObject( m_part );
@@ -336,62 +336,62 @@ void KMultiPart::setPart( const TQString& mimeType )
// Forward signals from the part's browser extension
// this is very related (but not exactly like) TDEHTMLPart::processObjectRequest
- connect( childExtension, TQT_SIGNAL( openURLNotify() ),
- m_extension, TQT_SIGNAL( openURLNotify() ) );
+ connect( childExtension, TQ_SIGNAL( openURLNotify() ),
+ m_extension, TQ_SIGNAL( openURLNotify() ) );
- connect( childExtension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
- m_extension, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+ connect( childExtension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+ m_extension, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) );
- connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
- m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
- connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
- m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
+ connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+ m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+ connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+ m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
// Keep in sync with tdehtml_part.cpp
- connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
- m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
- connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
- m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
- connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
- m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
- connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
- m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
- m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
- connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
- m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+ connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+ m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
+ connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+ m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+ connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+ m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+ connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+ connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+ m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+ connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+ m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
if ( m_isHTMLPart )
- connect( childExtension, TQT_SIGNAL( infoMessage( const TQString & ) ),
- m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) );
+ connect( childExtension, TQ_SIGNAL( infoMessage( const TQString & ) ),
+ m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) );
// For non-HTML we prefer to show our infoMessage ourselves.
childExtension->setBrowserInterface( m_extension->browserInterface() );
- connect( childExtension, TQT_SIGNAL( enableAction( const char *, bool ) ),
- m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) );
- connect( childExtension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ),
- m_extension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ) );
- connect( childExtension, TQT_SIGNAL( setIconURL( const KURL& ) ),
- m_extension, TQT_SIGNAL( setIconURL( const KURL& ) ) );
- connect( childExtension, TQT_SIGNAL( loadingProgress( int ) ),
- m_extension, TQT_SIGNAL( loadingProgress( int ) ) );
+ connect( childExtension, TQ_SIGNAL( enableAction( const char *, bool ) ),
+ m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) );
+ connect( childExtension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ),
+ m_extension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ) );
+ connect( childExtension, TQ_SIGNAL( setIconURL( const KURL& ) ),
+ m_extension, TQ_SIGNAL( setIconURL( const KURL& ) ) );
+ connect( childExtension, TQ_SIGNAL( loadingProgress( int ) ),
+ m_extension, TQ_SIGNAL( loadingProgress( int ) ) );
if ( m_isHTMLPart ) // for non-HTML we have our own
- connect( childExtension, TQT_SIGNAL( speedProgress( int ) ),
- m_extension, TQT_SIGNAL( speedProgress( int ) ) );
- connect( childExtension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ),
- m_extension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ) );
- connect( childExtension, TQT_SIGNAL( selectionInfo( const TQString& ) ),
- m_extension, TQT_SIGNAL( selectionInfo( const TQString& ) ) );
- connect( childExtension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ),
- m_extension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ) );
- connect( childExtension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ),
- m_extension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ) );
- connect( childExtension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ),
- m_extension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ) );
- connect( childExtension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ),
- m_extension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ) );
+ connect( childExtension, TQ_SIGNAL( speedProgress( int ) ),
+ m_extension, TQ_SIGNAL( speedProgress( int ) ) );
+ connect( childExtension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ),
+ m_extension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ) );
+ connect( childExtension, TQ_SIGNAL( selectionInfo( const TQString& ) ),
+ m_extension, TQ_SIGNAL( selectionInfo( const TQString& ) ) );
+ connect( childExtension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ),
+ m_extension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ) );
+ connect( childExtension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ),
+ m_extension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ) );
+ connect( childExtension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ),
+ m_extension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ) );
+ connect( childExtension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ),
+ m_extension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ) );
}
m_partIsLoading = false;
@@ -414,7 +414,7 @@ void KMultiPart::startOfData()
if ( m_gzip )
{
m_filter = new HTTPFilterGZip;
- connect( m_filter, TQT_SIGNAL( output( const TQByteArray& ) ), this, TQT_SLOT( reallySendData( const TQByteArray& ) ) );
+ connect( m_filter, TQ_SIGNAL( output( const TQByteArray& ) ), this, TQ_SLOT( reallySendData( const TQByteArray& ) ) );
}
if ( m_mimeType != m_nextMimeType )
@@ -551,7 +551,7 @@ void KMultiPart::slotJobFinished( TDEIO::Job *job )
emit completed();
- //TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) );
+ //TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) );
}
m_job = 0L;
}
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 400ff1ac3..81b0b9a4e 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -118,7 +118,7 @@ PartMonitor::PartMonitor(TDEHTMLPart *_part)
{
m_part = _part;
m_completed = false;
- connect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted()));
+ connect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted()));
m_timer_waits = 200;
m_timeout_timer = new TQTimer(this);
}
@@ -141,12 +141,12 @@ void PartMonitor::waitForCompletion()
kapp->enter_loop();
- //connect(m_timeout_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( timeout() ) );
+ //connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) );
//m_timeout_timer->stop();
//m_timeout_timer->start( visual ? 100 : 2, true );
}
- TQTimer::singleShot( 0, this, TQT_SLOT( finishTimers() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) );
kapp->enter_loop();
}
@@ -161,7 +161,7 @@ void PartMonitor::finishTimers()
--m_timer_waits;
if ( m_timer_waits && (w && w->winq->hasTimers()) || m_part->inProgress()) {
// wait a bit
- TQTimer::singleShot( 10, this, TQT_SLOT(finishTimers() ) );
+ TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) );
return;
}
kapp->exit_loop();
@@ -172,9 +172,9 @@ void PartMonitor::partCompleted()
m_completed = true;
RenderWidget::flushWidgetResizes();
m_timeout_timer->stop();
- connect(m_timeout_timer, TQT_SIGNAL(timeout()),this, TQT_SLOT( timeout() ) );
+ connect(m_timeout_timer, TQ_SIGNAL(timeout()),this, TQ_SLOT( timeout() ) );
m_timeout_timer->start( visual ? 100 : 2, true );
- disconnect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted()));
+ disconnect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted()));
}
static void signal_handler( int )
@@ -593,10 +593,10 @@ int main(int argc, char *argv[])
args->isSet("genoutput"),
!args->isSet( "html" ),
!args->isSet( "js" ));
- TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
- regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
- TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )),
- regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int )));
+ TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
+ regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
+ TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )),
+ regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int )));
bool result = false;
QCStringList tests = args->getOptionList("test");
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 40a28621e..6c3d1506e 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -56,10 +56,10 @@ int main(int argc, char *argv[])
TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
Dummy *dummy = new Dummy( doc );
- TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
- dummy, TQT_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) );
+ TQObject::connect( doc->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
+ dummy, TQ_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) );
- TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) );
+ TQObject::connect( doc, TQ_SIGNAL(completed()), dummy, TQ_SLOT(handleDone()) );
if (args->url(0).url().right(4).find(".xml", 0, false) == 0) {
KParts::URLArgs ags(doc->browserExtension()->urlArgs());
@@ -105,16 +105,16 @@ int main(int argc, char *argv[])
e.setAttribute( "name", "print" );
toolBar.insertBefore( e, toolBar.firstChild() );
- (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" );
+ (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQ_SLOT( reload() ), doc->actionCollection(), "reload" );
+ (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQ_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
+ TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQ_SLOT( print() ), doc->actionCollection(), "print" );
kprint->setEnabled(true);
TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" );
ta->setChecked(doc->isCaretMode());
- TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
+ TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleNavigable(bool) ));
ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
ta->setChecked(doc->isEditable());
- TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) ));
+ TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleEditable(bool) ));
toplevel->guiFactory()->addClient( doc );
doc->setJScriptEnabled(true);
@@ -122,8 +122,8 @@ int main(int argc, char *argv[])
doc->setPluginsEnabled( true );
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 &)));
+ TQWidget::connect(doc, TQ_SIGNAL(setWindowCaption(const TQString &)),
+ doc->widget()->topLevelWidget(), TQ_SLOT(setCaption(const TQString &)));
doc->widget()->show();
toplevel->show();
((TQScrollView *)doc->widget())->viewport()->show();
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index c6dca1096..245585d74 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners )
m_tokenizer = createTokenizer();
m_decoderMibEnum = 0;
- connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing()));
+ connect(m_tokenizer,TQ_SIGNAL(finishedParsing()),this,TQ_SIGNAL(finishedParsing()));
m_tokenizer->begin();
}