Rename KInstance and KAboutData to avoid conflicts with KDE4

3 files changed, 3 insertions, 3 deletions

diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index c9b3485cc..cfb4160d2 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -118,7 +118,7 @@ void KLineEditTest::slotHide()
 
 int main ( int argc, char **argv)
 {
-    KAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
+    TDEAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication::addCmdLineOptions();
     
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index dbe688ebf..9f764e774 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -36,7 +36,7 @@ int main( int argc, char **argv )
     KXMLGUIFactory *factory = new KXMLGUIFactory( builder );
 
     Client *shell = new Client;
-    shell->setInstance( new KInstance( "konqueror" ) );
+    shell->setInstance( new TDEInstance( "konqueror" ) );
     shell->instance()->dirs()->addResourceDir( "data", TQDir::currentDirPath() );
 
     (void)new KAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );
diff --git a/tdeui/tests/kxmlguitest.h b/tdeui/tests/kxmlguitest.h
index 1adb1a14b..bc88711f7 100644
--- a/tdeui/tests/kxmlguitest.h
+++ b/tdeui/tests/kxmlguitest.h
@@ -11,7 +11,7 @@ public:
     Client() {}
 
     void setXMLFile( const TQString &f, bool merge = true ) { KXMLGUIClient::setXMLFile( f, merge ); }
-    void setInstance( KInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
+    void setInstance( TDEInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
 
 public slots:
     void slotSec();