From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- .../translator/kopete_translator_config.desktop | 2 +- kopete/plugins/translator/translatorplugin.cpp | 24 +++++++++++----------- kopete/plugins/translator/translatorplugin.h | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kopete/plugins/translator') diff --git a/kopete/plugins/translator/kopete_translator_config.desktop b/kopete/plugins/translator/kopete_translator_config.desktop index ac5e3a3b..a59090d6 100644 --- a/kopete/plugins/translator/kopete_translator_config.desktop +++ b/kopete/plugins/translator/kopete_translator_config.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=locale Type=Service -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kopete_translator diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index d331f8f2..a2614640 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -107,7 +107,7 @@ TranslatorPlugin* TranslatorPlugin::pluginStatic_ = 0L; void TranslatorPlugin::loadSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); int mode = 0; config->setGroup( "Translator Plugin" ); @@ -269,14 +269,14 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ kdDebug(14308) << k_funcinfo << " URL: " << gurl << endl; KURL geturl ( gurl ); - KIO::TransferJob *job = KIO::get( geturl, false, true ); - //job = KIO::http_post( translatorURL, postData, true ); + TDEIO::TransferJob *job = TDEIO::get( geturl, false, true ); + //job = TDEIO::http_post( translatorURL, postData, true ); //job->addMetaData( "content-type", "application/x-www-form-urlencoded" ); //job->addMetaData( "referrer", "http://www.google.com" ); - TQObject::connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) ); + TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); + TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) ); // KIO is async and we use a sync API, so use the processEvents hack to work around that // FIXME: We need to make the libkopete API async to get rid of this processEvents. @@ -309,10 +309,10 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS kdDebug( 14308 ) << k_funcinfo << "URL: " << gurl << endl; - KIO::TransferJob *job = KIO::get( geturl, false, true ); + TDEIO::TransferJob *job = TDEIO::get( geturl, false, true ); - TQObject::connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) ); + TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); + TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) ); // KIO is async and we use a sync API, so use the processEvents hack to work around that // FIXME: We need to make the libkopete API async to get rid of this processEvents. @@ -381,16 +381,16 @@ void TranslatorPlugin::sendTranslation( Kopete::Message &msg, const TQString &tr }; } -void TranslatorPlugin::slotDataReceived ( KIO::Job *job, const TQByteArray &data ) +void TranslatorPlugin::slotDataReceived ( TDEIO::Job *job, const TQByteArray &data ) { m_data[ job ] += TQCString( data, data.size() + 1 ); } -void TranslatorPlugin::slotJobDone ( KIO::Job *job ) +void TranslatorPlugin::slotJobDone ( TDEIO::Job *job ) { m_completed[ job ] = true; - TQObject::disconnect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) ); - TQObject::disconnect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) ); + TQObject::disconnect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); + TQObject::disconnect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) ); } void TranslatorPlugin::slotSetLanguage() diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h index f3b50bce..762b6018 100644 --- a/kopete/plugins/translator/translatorplugin.h +++ b/kopete/plugins/translator/translatorplugin.h @@ -73,8 +73,8 @@ public: private slots: void slotIncomingMessage( Kopete::Message& msg ); void slotOutgoingMessage( Kopete::Message& msg ); - void slotDataReceived ( KIO::Job *, const TQByteArray &data); - void slotJobDone ( KIO::Job *); + void slotDataReceived ( TDEIO::Job *, const TQByteArray &data); + void slotJobDone ( TDEIO::Job *); void slotSetLanguage(); void slotSelectionChanged(bool); void slotNewKMM(Kopete::ChatSession *); @@ -90,8 +90,8 @@ protected: private: - TQMap< KIO::Job *, TQCString> m_data; - TQMap< KIO::Job *, bool> m_completed; + TQMap< TDEIO::Job *, TQCString> m_data; + TQMap< TDEIO::Job *, bool> m_completed; KSelectAction* m_actionLanguage; -- cgit v1.2.1