Rename KInstance and KAboutData to avoid conflicts with KDE4

4 files changed, 8 insertions, 8 deletions

diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp
index e0857a51e..844a4ba17 100644
--- a/kparts/tests/notepad.cpp
+++ b/kparts/tests/notepad.cpp
@@ -46,9 +46,9 @@ void NotepadPart::setReadWrite( bool rw )
     ReadWritePart::setReadWrite( rw );
 }
 
-KAboutData* NotepadPart::createAboutData()
+TDEAboutData* NotepadPart::createAboutData()
 {
-  return new KAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
+  return new TDEAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
 }
 
 bool NotepadPart::openFile()
diff --git a/kparts/tests/notepad.h b/kparts/tests/notepad.h
index d192d42ec..9cc4f2d9a 100644
--- a/kparts/tests/notepad.h
+++ b/kparts/tests/notepad.h
@@ -5,7 +5,7 @@
 #include <kparts/genericfactory.h>
 #include <kparts/part.h>
 
-class KAboutData;
+class TDEAboutData;
 class TQMultiLineEdit;
 
 /**
@@ -24,7 +24,7 @@ public:
 
   virtual void setReadWrite( bool rw );
 
-  static KAboutData* createAboutData();
+  static TDEAboutData* createAboutData();
 
 protected:
   virtual bool openFile();
diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp
index d932a168f..97ebdd4fb 100644
--- a/kparts/tests/parts.cpp
+++ b/kparts/tests/parts.cpp
@@ -21,7 +21,7 @@
 Part1::Part1( TQObject *parent, TQWidget * parentWidget )
  : KParts::ReadOnlyPart( parent, "Part1" )
 {
-  m_instance = new KInstance( "kpartstestpart" );
+  m_instance = new TDEInstance( "kpartstestpart" );
   setInstance( m_instance );
   m_edit = new TQMultiLineEdit( parentWidget );
   setWidget( m_edit );
@@ -59,7 +59,7 @@ bool Part1::openFile()
 Part2::Part2( TQObject *parent, TQWidget * parentWidget )
  : KParts::Part( parent, "Part2" )
 {
-  m_instance = new KInstance( "part2" );
+  m_instance = new TDEInstance( "part2" );
   setInstance( m_instance );
   TQWidget * w = new TQWidget( parentWidget, "Part2Widget" );
   setWidget( w );
diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h
index 6f373a85c..0d4e6480a 100644
--- a/kparts/tests/parts.h
+++ b/kparts/tests/parts.h
@@ -21,7 +21,7 @@ protected:
 
 protected:
   TQMultiLineEdit * m_edit;
-  KInstance *m_instance;
+  TDEInstance *m_instance;
 };
 
 class Part2 : public KParts::Part
@@ -37,7 +37,7 @@ protected:
   // (i.e. in a part manager)
   // There is a default impl for ReadOnlyPart...
   virtual void guiActivateEvent( KParts::GUIActivateEvent * );
-  KInstance *m_instance;
+  TDEInstance *m_instance;
 };
 
 #endif