diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kode | |
parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kode')
-rw-r--r-- | kode/kwsdl/converter.cpp | 10 | ||||
-rw-r--r-- | kode/kwsdl/kung/binaryinputfield.cpp | 10 | ||||
-rw-r--r-- | kode/kwsdl/kung/transport.cpp | 10 | ||||
-rw-r--r-- | kode/kwsdl/kung/transport.h | 4 | ||||
-rw-r--r-- | kode/kwsdl/schema/fileprovider.cpp | 14 | ||||
-rw-r--r-- | kode/kwsdl/schema/fileprovider.h | 6 | ||||
-rw-r--r-- | kode/kwsdl/tests/google/transport.cpp | 10 | ||||
-rw-r--r-- | kode/kwsdl/tests/google/transport.h | 4 |
8 files changed, 34 insertions, 34 deletions
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index a858f5d46..253b6bd21 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -935,7 +935,7 @@ void Converter::createTransportClass() queryCode += "TQDataStream stream( postData, IO_WriteOnly );"; queryCode += "stream.writeRawBytes( xml.utf8(), xml.utf8().length() );"; queryCode.newLine(); - queryCode += "KIO::TransferJob* job = KIO::http_post( KURL( " + url.name() + " ), postData, false );"; + queryCode += "TDEIO::TransferJob* job = TDEIO::http_post( KURL( " + url.name() + " ), postData, false );"; queryCode += "if ( !job ) {"; queryCode.indent(); queryCode += "kdWarning() << \"Unable to create KIO job for \" << " + url.name() + " << endl;"; @@ -946,8 +946,8 @@ void Converter::createTransportClass() queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );"; queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );"; queryCode.newLine(); - queryCode += "connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );"; - queryCode += "connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );"; + queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; + queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );"; query.setBody( queryCode ); @@ -962,7 +962,7 @@ void Converter::createTransportClass() // data slot KODE::Function slotData( "slotData", "void", KODE::Function::Private | KODE::Function::Slot ); - slotData.addArgument( "KIO::Job*" ); + slotData.addArgument( "TDEIO::Job*" ); slotData.addArgument( "const TQByteArray &data" ); KODE::Code slotDataCode; @@ -976,7 +976,7 @@ void Converter::createTransportClass() // result slot KODE::Function slotResult( "slotResult", "void", KODE::Function::Private | KODE::Function::Slot ); - slotResult.addArgument( "KIO::Job* job" ); + slotResult.addArgument( "TDEIO::Job* job" ); KODE::Code slotResultCode; slotResultCode += "if ( job->error() != 0 ) {"; diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index ea7c17394..b053f5d1e 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -151,7 +151,7 @@ void BinaryWidget::load() return; TQString tempFile; - if ( KIO::NetAccess::download( url, tempFile, this ) ) { + if ( TDEIO::NetAccess::download( url, tempFile, this ) ) { TQFile file( tempFile ); if ( !file.open( IO_ReadOnly ) ) { KMessageBox::error( this, i18n( "Unable to open file %1" ).arg( url.url() ) ); @@ -162,11 +162,11 @@ void BinaryWidget::load() setData( data ); file.close(); - KIO::NetAccess::removeTempFile( tempFile ); + TDEIO::NetAccess::removeTempFile( tempFile ); emit valueChanged( data ); } else - KMessageBox::error( this, KIO::NetAccess::lastErrorString() ); + KMessageBox::error( this, TDEIO::NetAccess::lastErrorString() ); } void BinaryWidget::save() @@ -179,8 +179,8 @@ void BinaryWidget::save() tempFile.file()->writeBlock( mData ); tempFile.close(); - if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) - KMessageBox::error( this, KIO::NetAccess::lastErrorString() ); + if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) ) + KMessageBox::error( this, TDEIO::NetAccess::lastErrorString() ); } #include "binaryinputfield.moc" diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp index 76f3acc82..32cfbe6ef 100644 --- a/kode/kwsdl/kung/transport.cpp +++ b/kode/kwsdl/kung/transport.cpp @@ -36,7 +36,7 @@ void Transport::query( const TQString &xml ) TQDataStream stream( postData, IO_WriteOnly ); stream.writeRawBytes( xml.utf8(), xml.utf8().length() ); - KIO::TransferJob* job = KIO::http_post( KURL( mUrl ), postData, false ); + TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false ); if ( !job ) { kdWarning() << "Unable to create KIO job for " << mUrl << endl; return; @@ -45,18 +45,18 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KDE Kung" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); } -void Transport::slotData( KIO::Job*, const TQByteArray &data ) +void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) { unsigned int oldSize = mData.size(); mData.resize( oldSize + data.size() ); memcpy( mData.data() + oldSize, data.data(), data.size() ); } -void Transport::slotResult( KIO::Job* job ) +void Transport::slotResult( TDEIO::Job* job ) { if ( job->error() != 0 ) emit error( job->errorText() ); diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h index 3047b8815..71c4fa9de 100644 --- a/kode/kwsdl/kung/transport.h +++ b/kode/kwsdl/kung/transport.h @@ -37,8 +37,8 @@ class Transport : public TQObject void error( const TQString &errorMsg ); private slots: - void slotData( KIO::Job*, const TQByteArray &data ); - void slotResult( KIO::Job* job ); + void slotData( TDEIO::Job*, const TQByteArray &data ); + void slotResult( TDEIO::Job* job ); private: TQString mUrl; diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index 10c46381b..d12d4eee3 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -52,11 +52,11 @@ bool FileProvider::get( const TQString &url, TQString &target ) tqDebug( "Downloading external schema '%s'", url.latin1() ); - KIO::TransferJob* job = KIO::get( KURL( url ), false, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotResult( KIO::Job* ) ) ); + TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); mBlocked = true; while ( mBlocked ) { @@ -73,14 +73,14 @@ void FileProvider::cleanUp() mFileName = TQString(); } -void FileProvider::slotData( KIO::Job*, const TQByteArray &data ) +void FileProvider::slotData( TDEIO::Job*, const TQByteArray &data ) { unsigned int oldSize = mData.size(); mData.resize( oldSize + data.size() ); memcpy( mData.data() + oldSize, data.data(), data.size() ); } -void FileProvider::slotResult( KIO::Job *job ) +void FileProvider::slotResult( TDEIO::Job *job ) { if ( job->error() ) { tqDebug( "%s", job->errorText().latin1() ); diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h index 679cd0a2b..c855416dc 100644 --- a/kode/kwsdl/schema/fileprovider.h +++ b/kode/kwsdl/schema/fileprovider.h @@ -24,7 +24,7 @@ #include <tqobject.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -42,8 +42,8 @@ class FileProvider : TQObject void cleanUp(); private slots: - void slotData( KIO::Job*, const TQByteArray& ); - void slotResult( KIO::Job* ); + void slotData( TDEIO::Job*, const TQByteArray& ); + void slotResult( TDEIO::Job* ); private: TQString mFileName; diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp index 55d3c7a88..a37e5fc19 100644 --- a/kode/kwsdl/tests/google/transport.cpp +++ b/kode/kwsdl/tests/google/transport.cpp @@ -39,7 +39,7 @@ void Transport::query( const TQString &xml ) TQDataStream stream( postData, IO_WriteOnly ); stream.writeRawBytes( xml.utf8(), xml.utf8().length() ); - KIO::TransferJob* job = KIO::http_post( KURL( mUrl ), postData, false ); + TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false ); if ( !job ) { kdWarning() << "Unable to create KIO job for " << mUrl << endl; return; @@ -48,18 +48,18 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KWSDL" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); } -void Transport::slotData( KIO::Job*, const TQByteArray &data ) +void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) { unsigned int oldSize = mData.size(); mData.resize( oldSize + data.size() ); memcpy( mData.data() + oldSize, data.data(), data.size() ); } -void Transport::slotResult( KIO::Job* job ) +void Transport::slotResult( TDEIO::Job* job ) { if ( job->error() != 0 ) { kdWarning() << "Error occurred " << job->errorText() << endl; diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h index d07d246c0..0b5b49fa4 100644 --- a/kode/kwsdl/tests/google/transport.h +++ b/kode/kwsdl/tests/google/transport.h @@ -40,8 +40,8 @@ class Transport : public TQObject void result( const TQString &xml ); private slots: - void slotData( KIO::Job*, const TQByteArray &data ); - void slotResult( KIO::Job* job ); + void slotData( TDEIO::Job*, const TQByteArray &data ); + void slotResult( TDEIO::Job* job ); private: TQString mUrl; |