From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- khtml/html/html_documentimpl.cpp | 2 +- khtml/html/html_formimpl.cpp | 2 +- khtml/java/tests/testkjavaappletserver.cpp | 2 +- khtml/khtml_part.cpp | 4 ++-- khtml/khtml_part.h | 2 +- khtml/khtmlview.cpp | 6 +++--- khtml/rendering/render_frames.cpp | 4 ++-- khtml/rendering/render_image.cpp | 2 +- khtml/test_regression.cpp | 2 +- khtml/test_regression_fontoverload.cpp | 4 ++-- khtml/testkhtml.cpp | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'khtml') diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index e2ee3ba57..457908943 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -155,7 +155,7 @@ void HTMLDocumentImpl::setCookie( const DOMString & value ) "addCookies(TQString,TQCString,long int)", params)) { // Maybe it wasn't running (e.g. we're opening local html files) - KApplication::startServiceByDesktopName( "kcookiejar"); + TDEApplication::startServiceByDesktopName( "kcookiejar"); if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar", "addCookies(TQString,TQCString,long int)", params)) kdWarning(6010) << "Can't communicate with cookiejar!" << endl; diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index adf28d563..b7ae2a8f4 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -83,7 +83,7 @@ HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit) m_doingsubmit = false; m_inreset = false; m_enctype = "application/x-www-form-urlencoded"; - m_boundary = "----------" + KApplication::randomString( 42 + 13 ); + m_boundary = "----------" + TDEApplication::randomString( 42 + 13 ); m_acceptcharset = "UNKNOWN"; m_malformed = false; } diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/khtml/java/tests/testkjavaappletserver.cpp index cb85550e6..fb5ed8c0d 100644 --- a/khtml/java/tests/testkjavaappletserver.cpp +++ b/khtml/java/tests/testkjavaappletserver.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TQString path_to_tdelibs = "/build/wynnw/kde-src"; diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index a2843a53a..ffa1e0853 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() { void KHTMLPart::launchJSConfigDialog() { TQStringList args; args << "khtml_java_js"; - KApplication::tdeinitExec( "kcmshell", args ); + TDEApplication::tdeinitExec( "kcmshell", args ); } TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) @@ -7299,7 +7299,7 @@ void KHTMLPart::launchWalletManager() { #ifndef KHTML_NO_WALLET if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) { - KApplication::startServiceByDesktopName("kwalletmanager_show"); + TDEApplication::startServiceByDesktopName("kwalletmanager_show"); } else { DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1"); r.send("show"); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index c3c0ba23f..e65a41c11 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -450,7 +450,7 @@ public: * Java and Plugins support. This might change in the future if the security model * is becoming more sophisticated, so don't rely on this behaviour. * - * ( default false - everything is loaded unless forbidden by KApplication::authorizeURLAction). + * ( default false - everything is loaded unless forbidden by TDEApplication::authorizeURLAction). */ void setOnlyLocalReferences( bool enable ); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 2831550c3..14169e651 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -637,7 +637,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e) }/*end if*/ #endif - KApplication::sendPostedEvents(viewport(), TQEvent::Paint); + TDEApplication::sendPostedEvents(viewport(), TQEvent::Paint); } // this is to get rid of a compiler virtual overload mismatch warning. do not remove @@ -1730,7 +1730,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift ) d->scrollSuspendPreActivate = false; if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton - && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) + && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) { if (d->scrollTimerId) { @@ -1746,7 +1746,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) { if (d->accessKeysPreActivate && _ke->key() != Key_Control) d->accessKeysPreActivate=false; - if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton)) + if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton)) { displayAccessKeys(); m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText); diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index bc3f00be4..2535b534e 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -509,7 +509,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT) { setResizing(true); - KApplication::setOverrideCursor(TQCursor(m_cursor)); + TDEApplication::setOverrideCursor(TQCursor(m_cursor)); m_vSplitPos = _x; m_hSplitPos = _y; m_oldpos = -1; @@ -519,7 +519,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) if(m_resizing && evt->id() == EventImpl::MOUSEUP_EVENT) { setResizing(false); - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); if(m_vSplit != -1 ) { diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index e387920d6..f931e9ca5 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if ( !berrorPic ) { //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight); qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight, - KApplication::palette().inactive(), true, 1 ); + TDEApplication::palette().inactive(), true, 1 ); } TQPixmap const* pix = i ? &i->pixmap() : 0; if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) ) diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 860d54718..8db2c590a 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -511,7 +511,7 @@ int main(int argc, char *argv[]) setenv( "DISPLAY", ":47", 1 ); } - KApplication a; + TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle( "windows" ); KSimpleConfig sc1( "cryptodefaults" ); diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index 2cea9f5a4..88e95031e 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -354,9 +354,9 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool , } #include -void KApplication::dcopFailure( const TQString & ) +void TDEApplication::dcopFailure( const TQString & ) { - tqDebug( "KApplication::dcopFailure" ); + tqDebug( "TDEApplication::dcopFailure" ); } #include diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index a5ffcae26..257b656c2 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) "a basic web browser using the KHTML library", "1.0"); TDECmdLineArgs::addCmdLineOptions(options); - KApplication a; + TDEApplication a; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( ); if ( args->count() == 0 ) { TDECmdLineArgs::usage(); -- cgit v1.2.1