Diffstat (limited to 'libkdepim/externalapphandler.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libkdepim/externalapphandler.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index f376e6c..3fc548a 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -41,3 +41,5 @@ $Id$ #include <qapplication.h> -#include <qprocess.h> +#include <q3process.h> +//Added by qt3to4: +#include <Q3CString> #endif @@ -125,3 +127,3 @@ void QCopTransferItem::setSourceChannel(const QString& sourceChannel) /*********************************************************************************/ -bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) +bool QCopTransferItem::appMessage( const Q3CString& cmsg, const QByteArray& data ) { @@ -148,3 +150,3 @@ bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data - QDataStream stream( data, IO_ReadOnly ); + QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly ); @@ -228,3 +230,3 @@ bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QSt /*********************************************************************************/ -bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) +bool QCopMapTransferItem::appMessage( const Q3CString& cmsg, const QByteArray& data ) { @@ -234,3 +236,3 @@ bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& da { - QDataStream stream( data, IO_ReadOnly ); + QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly ); @@ -307,3 +309,3 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString /*********************************************************************************/ -bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) +bool QCopListTransferItem::appMessage( const Q3CString& cmsg, const QByteArray& data ) { @@ -316,3 +318,3 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d { - QDataStream stream( data, IO_ReadOnly ); + QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly ); @@ -520,5 +522,5 @@ void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& la -QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type) +Q3PtrList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type) { - QList<DefaultAppItem> list; + Q3PtrList<DefaultAppItem> list; @@ -748,3 +750,3 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS //KMessageBox::sorry( 0, message2 ); - QProcess * proc = new QProcess( this ); + Q3Process * proc = new Q3Process( this ); int i = 0; @@ -774,3 +776,3 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS proc->addArgument( arg); - proc->launch(""); + proc->launch(QString()); #endif @@ -833,3 +835,3 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e //KMessageBox::sorry( 0,channel ); - QProcess * proc = new QProcess( this ); + Q3Process * proc = new Q3Process( this ); proc->addArgument( channel ); @@ -852,3 +854,3 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e proc->addArgument( parameters ); - proc->launch(""); + proc->launch(QString()); #endif @@ -1234,3 +1236,3 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete -void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) +void ExternalAppHandler::appMessage( const Q3CString& cmsg, const QByteArray& data ) { |