summaryrefslogtreecommitdiffstats
path: root/libkonq/konq_popupmenu.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /libkonq/konq_popupmenu.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_popupmenu.h')
-rw-r--r--libkonq/konq_popupmenu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index a190ae98f..744d67c4d 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -178,7 +178,7 @@ protected:
KActionCollection m_ownActions;
private slots:
- void slotLocalURL( KIO::Job *, const KURL&, bool );
+ void slotLocalURL( TDEIO::Job *, const KURL&, bool );
void slotLocalURLKIODestroyed( );
private:
@@ -187,7 +187,7 @@ private:
void addPlugins( );
int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin);
int insertServices(const ServiceList& list, TQDomElement& menu, bool isBuiltin);
- bool KIOSKAuthorizedAction(KConfig& cfg);
+ bool KIOSKAuthorizedAction(TDEConfig& cfg);
KPropertiesDialog* showPropertiesDialog();
class KonqPopupMenuPrivate;