From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- khtml/java/kjavaappletviewer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'khtml/java/kjavaappletviewer.cpp') diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index 05c2eb7d0..979403df4 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -315,12 +315,12 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, if (!server->usingKIO ()) { /* if this page needs authentication */ - KIO::AuthInfo info; + TDEIO::AuthInfo info; TQString errorMsg; TQCString replyType; TQByteArray params; TQByteArray reply; - KIO::AuthInfo authResult; + TDEIO::AuthInfo authResult; //(void) dcopClient(); // Make sure to have a dcop client. info.url = baseurl; @@ -329,9 +329,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQDataStream stream(params, IO_WriteOnly); stream << info << m_view->topLevelWidget()->winId(); - if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) { + if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; - } else if ( replyType == "KIO::AuthInfo" ) { + } else if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream stream2( reply, IO_ReadOnly ); stream2 >> authResult; applet->setUser (authResult.username); -- cgit v1.2.1