diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /libkonq/konq_propsview.h | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_propsview.h')
| -rw-r--r-- | libkonq/konq_propsview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index c69b97966..4edfe8246 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -26,7 +26,7 @@ #include <kurl.h> #include <libkonq_export.h> -class KInstance; +class TDEInstance; class KConfigBase; class KConfig; @@ -51,7 +51,7 @@ public: * is the one used by a view, and its value can differ from the default ones. * The instance parameter should be the same for both... */ - KonqPropsView( KInstance * instance, KonqPropsView * defaultProps /*= 0L*/ ); + KonqPropsView( TDEInstance * instance, KonqPropsView * defaultProps /*= 0L*/ ); /** Destructor */ virtual ~KonqPropsView(); |