diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /krdc | |
parent | c48e769eb275917717e2b55eb869f7e559293ac8 (diff) | |
download | tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'krdc')
-rw-r--r-- | krdc/hostpreferences.cpp | 2 | ||||
-rw-r--r-- | krdc/hostpreferences.h | 8 | ||||
-rw-r--r-- | krdc/rdp/rdphostpref.cpp | 2 | ||||
-rw-r--r-- | krdc/rdp/rdphostpref.h | 2 | ||||
-rw-r--r-- | krdc/vnc/vnchostpref.cpp | 2 | ||||
-rw-r--r-- | krdc/vnc/vnchostpref.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/krdc/hostpreferences.cpp b/krdc/hostpreferences.cpp index 1c8ec573..f0722880 100644 --- a/krdc/hostpreferences.cpp +++ b/krdc/hostpreferences.cpp @@ -38,7 +38,7 @@ HostPreferences *HostPreferences::instance() return m_instance; } -HostPref::HostPref(KConfig *conf, const TQString &host, const TQString &type) : +HostPref::HostPref(TDEConfig *conf, const TQString &host, const TQString &type) : m_host(host), m_type(type), m_config(conf) { diff --git a/krdc/hostpreferences.h b/krdc/hostpreferences.h index 9b74b235..a8f409c5 100644 --- a/krdc/hostpreferences.h +++ b/krdc/hostpreferences.h @@ -24,16 +24,16 @@ #include "smartptr.h" class HostPreferences; -class KConfig; +class TDEConfig; class HostPref { protected: friend class HostPreferences; TQString m_host; TQString m_type; - KConfig *m_config; + TDEConfig *m_config; - HostPref(KConfig *conf, const TQString &host, const TQString &type); + HostPref(TDEConfig *conf, const TQString &host, const TQString &type); virtual void load() = 0; virtual void setDefaults() = 0; @@ -77,7 +77,7 @@ public: private: HostPreferences(); - KConfig *m_config; + TDEConfig *m_config; static HostPreferences *m_instance; }; diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp index ba876146..d64960b5 100644 --- a/krdc/rdp/rdphostpref.cpp +++ b/krdc/rdp/rdphostpref.cpp @@ -23,7 +23,7 @@ const TQString RdpHostPref::RdpType = "RDP"; -RdpHostPref::RdpHostPref(KConfig *conf, const TQString &host, const TQString &type) : +RdpHostPref::RdpHostPref(TDEConfig *conf, const TQString &host, const TQString &type) : HostPref(conf, host, type), m_width(0), m_height(0), diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h index 7b7be704..af8fa8ae 100644 --- a/krdc/rdp/rdphostpref.h +++ b/krdc/rdp/rdphostpref.h @@ -105,7 +105,7 @@ class RdpHostPref : public HostPref public: static const TQString RdpType; - RdpHostPref(KConfig *conf, const TQString &host=TQString(), + RdpHostPref(TDEConfig *conf, const TQString &host=TQString(), const TQString &type=TQString()); virtual ~RdpHostPref(); diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp index 7fea2889..c29f1877 100644 --- a/krdc/vnc/vnchostpref.cpp +++ b/krdc/vnc/vnchostpref.cpp @@ -21,7 +21,7 @@ const TQString VncHostPref::VncType = "VNC"; -VncHostPref::VncHostPref(KConfig *conf, const TQString &host, const TQString &type) : +VncHostPref::VncHostPref(TDEConfig *conf, const TQString &host, const TQString &type) : HostPref(conf, host, type), m_quality(0), m_useKWallet(true), diff --git a/krdc/vnc/vnchostpref.h b/krdc/vnc/vnchostpref.h index d6a2c97c..77f25208 100644 --- a/krdc/vnc/vnchostpref.h +++ b/krdc/vnc/vnchostpref.h @@ -36,7 +36,7 @@ protected: public: static const TQString VncType; - VncHostPref(KConfig *conf, const TQString &host=TQString(), + VncHostPref(TDEConfig *conf, const TQString &host=TQString(), const TQString &type=TQString()); virtual ~VncHostPref(); |