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 --- krfb/kinetd/kinetd.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'krfb/kinetd/kinetd.h') diff --git a/krfb/kinetd/kinetd.h b/krfb/kinetd/kinetd.h index cb29889d..caae1d2d 100644 --- a/krfb/kinetd/kinetd.h +++ b/krfb/kinetd/kinetd.h @@ -56,10 +56,10 @@ private: TQDateTime m_slpLifetimeEnd; TQString m_uuid; - KServerSocket *m_socket; + TDEServerSocket *m_socket; TDEProcess m_process; - KConfig *m_config; + TDEConfig *m_config; KServiceRegistry *m_srvreg; DNSSD::PublicService *m_dnssdreg; @@ -70,7 +70,7 @@ private: void setServiceRegistrationEnabledInternal(bool enabled); public: - PortListener(KService::Ptr s, KConfig *c, KServiceRegistry *srvreg); + PortListener(KService::Ptr s, TDEConfig *c, KServiceRegistry *srvreg); ~PortListener(); bool acquirePort(); @@ -89,7 +89,7 @@ public: void refreshRegistration(); private slots: - void accepted(KSocket*); + void accepted(TDESocket*); }; class KInetD : public KDEDModule { @@ -179,7 +179,7 @@ k_dcop: void setPortRetryTimer(bool retry); void setReregistrationTimer(); - KConfig *m_config; + TDEConfig *m_config; KServiceRegistry *m_srvreg; TQPtrList m_portListeners; TQTimer m_expirationTimer; -- cgit v1.2.1