diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /konqueror/sidebar/sidebar_widget.cpp | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/sidebar_widget.cpp')
-rw-r--r-- | konqueror/sidebar/sidebar_widget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index f1dd6ad22..6a5ecd22d 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -130,7 +130,7 @@ void addBackEnd::doRollBack() dirEntries.remove(".."); for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) { if ((*it)!="add") - KIO::NetAccess::del(KURL( loc+(*it) ), m_parent); + TDEIO::NetAccess::del(KURL( loc+(*it) ), m_parent); } emit initialCopyNeeded(); } @@ -303,11 +303,11 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (universalMode) { - m_config = new KConfig("konqsidebartng_kicker.rc"); + m_config = new TDEConfig("konqsidebartng_kicker.rc"); } else { - m_config = new KConfig("konqsidebartng.rc"); + m_config = new TDEConfig("konqsidebartng.rc"); m_config->setGroup(currentProfile); } readConfig(); @@ -1195,8 +1195,8 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { - connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); + if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) { + connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { |