diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdeprint/tdeprintd.cpp | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/tdeprintd.cpp')
| -rw-r--r-- | tdeprint/tdeprintd.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 7777e19ce..617fddf8f 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -162,7 +162,7 @@ void KDEPrintd::slotPrintError( KPrintProcess *proc, const TQString& msg ) TQString KDEPrintd::openPassDlg(const TQString& user) { TQString user_(user), pass_, result; - if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) result.append(user_).append(":").append(pass_); return result; } @@ -252,7 +252,7 @@ void KDEPrintd::processRequest() return; Request *req = m_requestsPending.first(); - KIO::AuthInfo info; + TDEIO::AuthInfo info; TQByteArray params, reply; TQCString replyType; TQString authString( "::" ); @@ -264,13 +264,13 @@ void KDEPrintd::processRequest() TQDataStream input( params, IO_WriteOnly ); input << info << TQString(i18n( "Authentication failed (user name=%1)" ).arg( info.username )) << 0L << (long int) req->seqNbr; - if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)", + if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo,TQString,long int,long int)", params, replyType, reply ) ) { - if ( replyType == "KIO::AuthInfo" ) + if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream output( reply, IO_ReadOnly ); - KIO::AuthInfo result; + TDEIO::AuthInfo result; int seqNbr; output >> result >> seqNbr; @@ -278,7 +278,7 @@ void KDEPrintd::processRequest() authString = result.username + ":" + result.password + ":" + TQString::number( seqNbr ); } else - kdWarning( 500 ) << "DCOP returned type error, expected KIO::AuthInfo, received " << replyType << endl; + kdWarning( 500 ) << "DCOP returned type error, expected TDEIO::AuthInfo, received " << replyType << endl; } else kdWarning( 500 ) << "Cannot communicate with kded_kpasswdserver" << endl; @@ -298,7 +298,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons { TQByteArray params, reply; TQCString replyType; - KIO::AuthInfo info; + TDEIO::AuthInfo info; info.username = user; info.password = passwd; @@ -307,7 +307,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons TQDataStream input( params, IO_WriteOnly ); input << info << ( long int )0; - if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo,long int)", + if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo,long int)", params, replyType, reply ) ) kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl; } |