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_propsview.h | |
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_propsview.h')
-rw-r--r-- | libkonq/konq_propsview.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index 4edfe8246..fb0383072 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -27,8 +27,8 @@ #include <libkonq_export.h> class TDEInstance; -class KConfigBase; -class KConfig; +class TDEConfigBase; +class TDEConfig; /** * The class KonqPropsView holds the properties for a Konqueror View @@ -126,10 +126,10 @@ protected: TQPixmap loadPixmap() const; // Current config object for _saving_ - KConfigBase * currentConfig(); + TDEConfigBase * currentConfig(); // Current config object for _saving_ settings related to colors - KConfigBase * currentColorConfig(); + TDEConfigBase * currentColorConfig(); TQString currentGroup() const { return isDefaultProperties() ? @@ -160,8 +160,8 @@ private: // save-view-properties-locally mode, otherwise to the global config // It is set to 0L to mark it as "needs to be constructed". // This is to be used for SAVING only. - // Can be a KConfig or a KSimpleConfig - KConfigBase * m_currentConfig; + // Can be a TDEConfig or a KSimpleConfig + TDEConfigBase * m_currentConfig; // If this is not a "default properties" instance (but one used by a view) // then m_defaultProps points to the "default properties" instance |