Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 3 insertions, 3 deletions

diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index 303fe044f..e1cee86d7 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -72,7 +72,7 @@ struct KonqPropsView::Private
    TQString sortcriterion;
 };
 
-KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps )
+KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultProps )
     : m_bSaveViewPropertiesLocally( false ), // will be overridden by setSave... anyway
     // if this is the default properties instance, then keep config object for saving
     m_dotDirExists( true ), // HACK so that enterDir returns true initially
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();