diff options
Diffstat (limited to 'kopete/plugins/addbookmarks')
6 files changed, 22 insertions, 22 deletions
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index 113ec95e..320eeb3e 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -75,7 +75,7 @@ void BookmarksPlugin::slotBookmarkURLsInMessage(Kopete::Message & msg) delete URLsList; } -void BookmarksPlugin::slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArray &data ) +void BookmarksPlugin::slotAddKopeteBookmark( TDEIO::Job *transfer, const TQByteArray &data ) { TQTextCodec *codec = getPageEncoding( data ); TQString htmlpage = codec->toUnicode( data ); @@ -84,21 +84,21 @@ void BookmarksPlugin::slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArr int pos = rx.search( htmlpage ); KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager(); KBookmarkGroup group = getKopeteFolder(); - TQString sender = m_map[(KIO::TransferJob*)transfer].sender; + TQString sender = m_map[(TDEIO::TransferJob*)transfer].sender; if ( m_settings.useSubfolderForContact( sender ) ) group = getFolder( group, sender ); if( pos == -1 ){ - group.addBookmark( mgr, m_map[(KIO::TransferJob*)transfer].url.prettyURL(), m_map[(KIO::TransferJob*)transfer].url.url() ); + group.addBookmark( mgr, m_map[(TDEIO::TransferJob*)transfer].url.prettyURL(), m_map[(TDEIO::TransferJob*)transfer].url.url() ); kdDebug( 14501 ) << "failed to extract title from first data chunk" << endl; }else { group.addBookmark( mgr, rx.cap( 1 ).simplifyWhiteSpace(), - m_map[(KIO::TransferJob*)transfer].url.url() ); + m_map[(TDEIO::TransferJob*)transfer].url.url() ); } mgr->save(); mgr->emitChanged( group ); - m_map.remove( (KIO::TransferJob*)transfer ); + m_map.remove( (TDEIO::TransferJob*)transfer ); transfer->kill(); } @@ -129,12 +129,12 @@ void BookmarksPlugin::addKopeteBookmark( const KURL& url, const TQString& sender // either restrict to http(s) or to KProtocolInfo::protocolClass() == :internet if( !isURLInGroup( url, group ) && url.isValid() && url.protocol().startsWith("http") ) { - KIO::TransferJob *transfer; + TDEIO::TransferJob *transfer; // make asynchronous transfer to avoid GUI freezing due to overloaded web servers - transfer = KIO::get(url, false, false); + transfer = TDEIO::get(url, false, false); transfer->setInteractive(false); - connect ( transfer, TQT_SIGNAL ( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT ( slotAddKopeteBookmark( KIO::Job *, const TQByteArray & ) ) ); + connect ( transfer, TQT_SIGNAL ( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT ( slotAddKopeteBookmark( TDEIO::Job *, const TQByteArray & ) ) ); m_map[transfer].url = url; m_map[transfer].sender = sender; } diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h index 4de58478..32143ff9 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.h +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h @@ -36,7 +36,7 @@ private: KURL url; TQString sender; } URLandName; - typedef TQMap<KIO::TransferJob*,URLandName> JobsToURLsMap; + typedef TQMap<TDEIO::TransferJob*,URLandName> JobsToURLsMap; JobsToURLsMap m_map; BookmarksPrefsSettings m_settings; void addKopeteBookmark( const KURL& url, const TQString& sender ); @@ -49,7 +49,7 @@ public slots: void slotReloadSettings(); private slots: - void slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArray &data ); + void slotAddKopeteBookmark( TDEIO::Job *transfer, const TQByteArray &data ); }; typedef KGenericFactory<BookmarksPlugin> BookmarksPluginFactory; diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp index a6175750..703ec550 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp @@ -27,7 +27,7 @@ typedef KGenericFactory<BookmarksPreferences> BookmarksPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_addbookmarks, BookmarksPreferencesFactory("kcm_kopete_addbookmarks") ) BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, const TQStringList &args) - : KCModule(BookmarksPreferencesFactory::instance(), parent, args) + : TDECModule(BookmarksPreferencesFactory::instance(), parent, args) { Q_UNUSED( name ); ( new TQVBoxLayout (this) )->setAutoAdd( true ); @@ -67,7 +67,7 @@ void BookmarksPreferences::save() m_settings.setAddBookmarksFromUnknownContacts( p_dialog->m_addUntrusted->isChecked() ); m_settings.save(); emit PreferencesChanged(); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void BookmarksPreferences::slotSetStatusChanged() @@ -77,12 +77,12 @@ void BookmarksPreferences::slotSetStatusChanged() else p_dialog->contactList->setEnabled(true); - emit KCModule::changed(true); + emit TDECModule::changed(true); } void BookmarksPreferences::slotAddUntrustedChanged() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } void BookmarksPreferences::load() @@ -108,7 +108,7 @@ void BookmarksPreferences::load() p_dialog->contactList->setSelected( item, true ); } } - emit KCModule::changed(false); + emit TDECModule::changed(false); } #include "addbookmarkspreferences.moc" diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.h b/kopete/plugins/addbookmarks/addbookmarkspreferences.h index 19ba80b5..6f07c8b5 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.h +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.h @@ -19,7 +19,7 @@ /** @author Roie Kerstein <[email protected]> */ -class BookmarksPreferences : public KCModule +class BookmarksPreferences : public TDECModule { Q_OBJECT diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index acb1b1b1..31f12978 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -28,11 +28,11 @@ BookmarksPrefsSettings::~BookmarksPrefsSettings() void BookmarksPrefsSettings::load() { - KConfig * configfile = TDEGlobal::config(); + TDEConfig * configfile = TDEGlobal::config(); m_isfolderforeachcontact = Always; m_contactslist.clear(); m_addbookmarksfromunknowns = false; - if( configfile->getConfigState() == KConfigBase::NoAccess ){ + if( configfile->getConfigState() == TDEConfigBase::NoAccess ){ kdDebug( 14501 ) << "load: failed to open config file for reading" << endl; return; } @@ -48,9 +48,9 @@ void BookmarksPrefsSettings::load() void BookmarksPrefsSettings::save() { - KConfig * configfile = TDEGlobal::config(); + TDEConfig * configfile = TDEGlobal::config(); - if( configfile->getConfigState() != KConfigBase::ReadWrite ){ + if( configfile->getConfigState() != TDEConfigBase::ReadWrite ){ kdDebug( 14501 ) << "save: failed to open config file for writing" << endl; return; } diff --git a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop index 8129d0b8..7c25fdef 100644 --- a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop +++ b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop @@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签 Comment[zh_HK]=自動將收到的訊息內的連結加到書籤 Comment[zh_TW]=自動將接收訊息中的連結加入書籤 Icon=konqueror -ServiceTypes=KCModule +ServiceTypes=TDECModule X-TDE-ModuleType=Library X-TDE-Library=kopete_addbookmarks |