diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /libkonq/konq_settings.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_settings.h')
| -rw-r--r-- | libkonq/konq_settings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h index b81457e02..daca8babe 100644 --- a/libkonq/konq_settings.h +++ b/libkonq/konq_settings.h @@ -20,7 +20,7 @@ #ifndef __konq_settings_h__ #define __konq_settings_h__ -class KConfig; +class TDEConfig; #include <tqcolor.h> #include <tqstring.h> #include <tqfont.h> @@ -48,7 +48,7 @@ protected: * @internal * Constructs a KonqFMSettings instance from a config file. */ - KonqFMSettings( KConfig * config ); + KonqFMSettings( TDEConfig * config ); /** Destructor. Don't delete any instance by yourself. */ virtual ~KonqFMSettings(); @@ -128,7 +128,7 @@ private: int m_iconTransparency; /** Called by constructor and reparseConfiguration */ - void init( KConfig * config ); + void init( TDEConfig * config ); struct KonqFMSettingsPrivate * d; |