summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp4
-rw-r--r--tdehtml/html/html_documentimpl.cpp6
-rw-r--r--tdehtml/java/kjavaappletserver.cpp2
-rw-r--r--tdehtml/java/kjavaappletviewer.cpp4
-rw-r--r--tdehtml/misc/loader.cpp2
-rw-r--r--tdehtml/tdehtml_ext.cpp2
-rw-r--r--tdehtml/tdehtml_part.cpp18
-rw-r--r--tdehtml/tdehtmlview.cpp6
-rw-r--r--tdehtml/test_regression.cpp18
-rw-r--r--tdehtml/xml/dom_docimpl.cpp12
10 files changed, 37 insertions, 37 deletions
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 27fb181bb..afeac6132 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -860,12 +860,12 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
}
if (dontShowAgain) {
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false));
config->sync();
TQByteArray data;
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+ tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
}
return (m_mode != Stop);
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index c27573844..346af3d08 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -117,7 +117,7 @@ DOMString HTMLDocumentImpl::cookie() const
TQByteArray params, reply;
TQDataStream stream(params, IO_WriteOnly);
stream << URL().url() << windowId;
- if (!kapp->dcopClient()->call("kcookiejar", "kcookiejar",
+ if (!tdeApp->dcopClient()->call("kcookiejar", "kcookiejar",
"findDOMCookies(TQString,long int)", params,
replyType, reply))
{
@@ -151,12 +151,12 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
fake_header.append(value.string().latin1());
fake_header.append("\n");
stream << URL().url() << fake_header << windowId;
- if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
+ if (!tdeApp->dcopClient()->send("kcookiejar", "kcookiejar",
"addCookies(TQString,TQCString,long int)", params))
{
// Maybe it wasn't running (e.g. we're opening local html files)
TDEApplication::startServiceByDesktopName( "kcookiejar");
- if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
+ if (!tdeApp->dcopClient()->send("kcookiejar", "kcookiejar",
"addCookies(TQString,TQCString,long int)", params))
kdWarning(6010) << "Can't communicate with cookiejar!" << endl;
}
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 640473489..cf7f12590 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -726,7 +726,7 @@ void KJavaAppletServer::waitForReturnData(JSStackFrame * frame) {
killTimers();
startTimer(15000);
while (!frame->exit)
- kapp->eventLoop()->processEvents (TQEventLoop::AllEvents | TQEventLoop::WaitForMore);
+ tdeApp->eventLoop()->processEvents (TQEventLoop::AllEvents | TQEventLoop::WaitForMore);
if (d->jsstack.size() <= 1)
killTimers();
kdDebug(6100) << "<KJavaAppletServer::waitForReturnData stacksize:" << d->jsstack.size() << endl;
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 5a00e14eb..237d74408 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -303,7 +303,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
// check codebase first
const KURL kbaseURL( baseurl );
const KURL newURL(kbaseURL, codebase);
- if (kapp->authorizeURLAction("redirect", KURL(baseurl), newURL))
+ if (tdeApp->authorizeURLAction("redirect", KURL(baseurl), newURL))
applet->setCodeBase (newURL.url());
applet->setAppletClass (classname);
KJavaAppletContext* const cxt = serverMaintainer->getContext (parent, baseurl);
@@ -329,7 +329,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
TQDataStream stream(params, IO_WriteOnly);
stream << info << m_view->topLevelWidget()->winId();
- if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
+ if (!tdeApp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
} else if ( replyType == "TDEIO::AuthInfo" ) {
TQDataStream stream2( reply, IO_ReadOnly );
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 50525c342..8b98f0749 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -1022,7 +1022,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
KURL fullURL (m_doc->completeURL( url.string() )); \
if ( !fullURL.isValid() || \
( m_part && m_part->onlyLocalReferences() && fullURL.protocol() != "file" && fullURL.protocol() != "data") || \
- doRedirectCheck && ( kapp && m_doc && !kapp->authorizeURLAction("redirect", m_doc->URL(), fullURL))) \
+ doRedirectCheck && ( tdeApp && m_doc && !tdeApp->authorizeURLAction("redirect", m_doc->URL(), fullURL))) \
return 0L;
CachedImage *DocLoader::requestImage( const DOM::DOMString &url)
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index c18cd53ac..5a5dbaa58 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -657,7 +657,7 @@ void TDEHTMLPopupGUIClient::slotSendImage()
TQStringList urls;
urls.append( d->m_imageURL.url());
TQString subject = d->m_imageURL.url();
- kapp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
+ tdeApp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
TQString::null, //body
TQString::null,
urls); // attachments
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 1b74c5388..81cd2fa97 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
d->m_startOffset = 0;
d->m_endOffset = 0;
#ifndef TQT_NO_CLIPBOARD
- connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+ connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
#endif
d->m_jobPercent = 0;
@@ -2426,7 +2426,7 @@ void TDEHTMLPart::slotRedirect()
if ( openedByJS() && d->m_opener )
cUrl = d->m_opener->url();
- if (!kapp || !kapp->authorizeURLAction("redirect", cUrl, url))
+ if (!tdeApp || !tdeApp->authorizeURLAction("redirect", cUrl, url))
{
kdWarning(6050) << "TDEHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl;
emit completed();
@@ -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(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
+ disconnect( tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
#endif
// Now show the dialog in which the user can choose options.
@@ -3039,7 +3039,7 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
return;
#ifndef TQT_NO_CLIPBOARD
- connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
+ connect( tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
#endif
// Create the KFind object
@@ -4779,7 +4779,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB
KGuiItem(i18n("&Send Unencrypted")),
"WarnOnUnencryptedForm");
// Move this setting into KSSL instead
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
TDEConfigGroupSaver saver( config, grpNotifMsgs );
@@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
#ifndef TQT_NO_CLIPBOARD
TQString text = selectedText();
text.replace(TQChar(0xa0), ' ');
- disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
- kapp->clipboard()->setText(text,TQClipboard::Selection);
- connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
+ disconnect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
+ tdeApp->clipboard()->setText(text,TQClipboard::Selection);
+ connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
#endif
//kdDebug( 6000 ) << "selectedText = " << text << endl;
emitSelectionChanged();
@@ -6819,7 +6819,7 @@ bool TDEHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message,
bool linkAllowed = true;
if ( d->m_doc )
- linkAllowed = kapp && kapp->authorizeURLAction("redirect", url(), linkURL);
+ linkAllowed = tdeApp && tdeApp->authorizeURLAction("redirect", url(), linkURL);
if ( !linkAllowed ) {
tdehtml::Tokenizer *tokenizer = d->m_doc->tokenizer();
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index bbc45da95..8aac65a36 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -493,7 +493,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
d = new TDEHTMLViewPrivate;
TQScrollView::setVScrollBarMode(d->vmode);
TQScrollView::setHScrollBarMode(d->hmode);
- connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
+ connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved()));
// initialize QScrollView
@@ -4574,12 +4574,12 @@ void TDEHTMLView::scrollTick() {
d->dy -= ddy;
// TQScrollView::setContentsPos( contentsX() + ddx, contentsY() + ddy);
- kapp->syncX();
+ tdeApp->syncX();
TQScrollView::scrollBy(ddx, ddy);
// Unaccelerated X can get seriously overloaded by scrolling and for some reason
// will send KeyPress events only infrequently. This should help to reduce
// the load.
- kapp->syncX();
+ tdeApp->syncX();
}
void TDEHTMLView::startScrolling()
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 81b0b9a4e..12769358e 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -139,7 +139,7 @@ void PartMonitor::waitForCompletion()
sm_highestMonitor = this;
- kapp->enter_loop();
+ tdeApp->enter_loop();
//connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) );
//m_timeout_timer->stop();
@@ -147,12 +147,12 @@ void PartMonitor::waitForCompletion()
}
TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) );
- kapp->enter_loop();
+ tdeApp->enter_loop();
}
void PartMonitor::timeout()
{
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
void PartMonitor::finishTimers()
@@ -164,7 +164,7 @@ void PartMonitor::finishTimers()
TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) );
return;
}
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
void PartMonitor::partCompleted()
@@ -324,7 +324,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
PartMonitor pm(m_part);
m_part->openURL(url);
pm.waitForCompletion();
- kapp->processEvents(60000);
+ tdeApp->processEvents(60000);
break;
}
case OpenPageAsUrl: {
@@ -361,7 +361,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
m_part->end();
pm.waitForCompletion();
}
- kapp->processEvents(60000);
+ tdeApp->processEvents(60000);
break;
}
case Begin: {
@@ -376,7 +376,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
}
case End: {
m_part->end();
- kapp->processEvents(60000);
+ tdeApp->processEvents(60000);
break;
}
case ExecuteScript: {
@@ -386,11 +386,11 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
proxy->evaluate("",0,code,0,&comp);
if (comp.complType() == Throw)
exec->setException(comp.value());
- kapp->processEvents(60000);
+ tdeApp->processEvents(60000);
break;
}
case ProcessEvents: {
- kapp->processEvents(60000);
+ tdeApp->processEvents(60000);
break;
}
}
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 245585d74..e280d195c 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -2349,7 +2349,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const
return false;
// do we allow this suburl ?
- if ( !kapp || (newURL.protocol() != "javascript" && !kapp->authorizeURLAction("redirect", thisPart->url(), newURL)) )
+ if ( !tdeApp || (newURL.protocol() != "javascript" && !tdeApp->authorizeURLAction("redirect", thisPart->url(), newURL)) )
return false;
// We allow one level of self-reference because some sites depend on that.
@@ -2409,7 +2409,7 @@ void DocumentImpl::abort()
{
if (m_inSyncLoad) {
m_inSyncLoad = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
if (m_loadingXMLDoc)
@@ -2421,7 +2421,7 @@ void DocumentImpl::load(const DOMString &uri)
{
if (m_inSyncLoad) {
m_inSyncLoad = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
m_hadLoadError = false;
@@ -2447,7 +2447,7 @@ void DocumentImpl::load(const DOMString &uri)
if (!m_async && m_docLoading) {
m_inSyncLoad = true;
- kapp->enter_loop();
+ tdeApp->enter_loop();
}
}
@@ -2470,7 +2470,7 @@ void DocumentImpl::setStyleSheet(const DOM::DOMString &url, const DOM::DOMString
m_docLoading = false;
if (m_inSyncLoad) {
m_inSyncLoad = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
assert(m_loadingXMLDoc != 0);
@@ -2483,7 +2483,7 @@ void DocumentImpl::error(int err, const TQString &text)
m_docLoading = false;
if (m_inSyncLoad) {
m_inSyncLoad = false;
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
m_hadLoadError = true;
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-15 09:30:09 +0000