diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /libkonq/konq_popupmenu.cc | |
| 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 'libkonq/konq_popupmenu.cc')
| -rw-r--r-- | libkonq/konq_popupmenu.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 9e2f0bf53..8d2503c30 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -306,7 +306,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, return count; } -bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg) +bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg) { if ( !cfg.hasKey( "X-TDE-AuthorizeAction") ) { @@ -423,9 +423,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) // If a local path is available, monitor that instead of the given remote URL... KURL realURL = m_sViewURL; if (!realURL.isLocalFile()) { - KIO::LocalURLJob* localURLJob = KIO::localURL(m_sViewURL); + TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL); if (localURLJob) { - connect(localURLJob, TQT_SIGNAL(localURL(KIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(KIO::Job*, const KURL&, bool))); + connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::Job*, const KURL&, bool))); connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); d->localURLSlotFired = false; while (!d->localURLSlotFired) { @@ -593,7 +593,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) addDel = true; } else { - KConfigGroup configGroup( kapp->config(), "KDE" ); + TDEConfigGroup configGroup( kapp->config(), "KDE" ); if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) ) addDel = true; } @@ -1226,7 +1226,7 @@ KURL::List KonqPopupMenu::popupURLList() const return m_lstPopupURLs; } -void KonqPopupMenu::slotLocalURL(KIO::Job *job, const KURL& url, bool isLocal) +void KonqPopupMenu::slotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal) { d->localURLSlotFired = true; d->localURLResultURL = url; |