Rename KInstance and KAboutData to avoid conflicts with KDE4

37 files changed, 113 insertions, 113 deletions

diff --git a/tdeui/kaboutapplication.cpp b/tdeui/kaboutapplication.cpp
index 8d5828960..4be70c48c 100644
--- a/tdeui/kaboutapplication.cpp
+++ b/tdeui/kaboutapplication.cpp
@@ -43,7 +43,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name,
   buildDialog(KGlobal::instance()->aboutData());
 }
 
-KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *parent,
+KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent,
                                       const char *name, bool modal )
   :KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close,
      parent, name, modal )
@@ -51,7 +51,7 @@ KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *par
   buildDialog(aboutData);
 }
 
-void KAboutApplication::buildDialog( const KAboutData *aboutData )
+void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
 {
   if( !aboutData )
   {
@@ -65,7 +65,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
 
     TQString appPageText =
       i18n("No information available.\n"
-     "The supplied KAboutData object does not exist.");
+     "The supplied TDEAboutData object does not exist.");
     TQLabel *appPageLabel = new TQLabel( "\n\n\n\n"+appPageText+"\n\n\n\n", 0 );
     appPage->addWidget( appPageLabel );
     return;
@@ -172,7 +172,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
      .arg((*it).emailAddress());
       }
 
-      text += KAboutData::aboutTranslationTeam() + "</qt>";
+      text += TDEAboutData::aboutTranslationTeam() + "</qt>";
       addTextPage( i18n("T&ranslation"), text, true);
   }
 
diff --git a/tdeui/kaboutapplication.h b/tdeui/kaboutapplication.h
index 58145aa45..7fe088d02 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/kaboutapplication.h
@@ -31,7 +31,7 @@
  * 
  * This class provides the standard "About Application" dialog box
  * that is used by KHelpMenu. It uses the information of the global
- * KAboutData that is specified at the start of your program in
+ * TDEAboutData that is specified at the start of your program in
  * main(). Normally you should not use this class directly but rather
  * the KHelpMenu class or even better just subclass your toplevel
  * window from KMainWindow. If you do the latter, the help menu and
@@ -61,12 +61,12 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
 
     /**
      * Constructor. Mostly does the same stuff as the previous constructor, except
-     * that it can take a custom KAboutData object instead of the one specified
+     * that it can take a custom TDEAboutData object instead of the one specified
      * in your main() function. This is especially useful for applications
      * which are implemented as (dynamically loaded) libraries, e.g. panel
      * applets.
      *
-     * @param aboutData A pointer to a KAboutData object which data
+     * @param aboutData A pointer to a TDEAboutData object which data
      *        will be used for filling the dialog.
      * @param parent The parent of the dialog box. You should use the
      *        toplevel window so that the dialog becomes centered.
@@ -76,17 +76,17 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
      *        made visible using TQWidget::show(). Otherwise it will be
      *        modal and must be made visible using TQWidget::exec().
      */
-    KAboutApplication( const KAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
+    KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
 
 /*
  FIXME: The two constructors should be replaced with the following  after the lib freeze:
 
-    KAboutApplication( const KAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
+    KAboutApplication( const TDEAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
 
  This will make buildDialog() obsolete as well (Frerich).
 */
   protected:
-    void buildDialog( const KAboutData *aboutData );
+    void buildDialog( const TDEAboutData *aboutData );
 };
 
 
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp
index 4937b3a87..89e397450 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/kaction.cpp
@@ -658,7 +658,7 @@ int KAction::plug( TQWidget *w, int index )
 
     if ( d->hasIcon() )
     {
-        KInstance *instance;
+        TDEInstance *instance;
         if ( m_parentCollection )
           instance = m_parentCollection->instance();
         else
@@ -698,7 +698,7 @@ int KAction::plug( TQWidget *w, int index )
     KToolBar *bar = static_cast<KToolBar *>( w );
 
     int id_ = getToolButtonID();
-    KInstance *instance;
+    TDEInstance *instance;
     if ( m_parentCollection )
       instance = m_parentCollection->instance();
     else
diff --git a/tdeui/kaction.h b/tdeui/kaction.h
index dca99b4b0..a6ebbfb9d 100644
--- a/tdeui/kaction.h
+++ b/tdeui/kaction.h
@@ -48,7 +48,7 @@ class KAccelActions;
 class KConfig;
 class KConfigBase;
 class KURL;
-class KInstance;
+class TDEInstance;
 class KToolBar;
 class KActionCollection;
 class KPopupMenu;
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index 9e2241408..e83a9f05d 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -1278,7 +1278,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index )
 
     int id_ = KAction::getToolButtonID();
 
-    KInstance * instance;
+    TDEInstance * instance;
     if ( m_parentCollection )
         instance = m_parentCollection->instance();
     else
@@ -1827,7 +1827,7 @@ int KActionMenu::plug( TQWidget* widget, int index )
                          index );
     else
     {
-      KInstance *instance;
+      TDEInstance *instance;
 
       if ( m_parentCollection )
         instance = m_parentCollection->instance();
@@ -1954,7 +1954,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index )
                            isEnabled(), plainText(),
                            index );
     } else {
-        KInstance * instance;
+        TDEInstance * instance;
         if ( m_parentCollection )
             instance = m_parentCollection->instance();
         else
@@ -2290,7 +2290,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index )
 
     int id_ = KAction::getToolButtonID();
 
-    KInstance * instance;
+    TDEInstance * instance;
     if ( m_parentCollection )
         instance = m_parentCollection->instance();
     else
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index 06e00d179..0a6a105f0 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -51,7 +51,7 @@ class KAccelActions;
 class KConfig;
 class KConfigBase;
 class KURL;
-class KInstance;
+class TDEInstance;
 class KToolBar;
 class KActionCollection;
 class KPopupMenu;
diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp
index ba809087c..9cc76902b 100644
--- a/tdeui/kactioncollection.cpp
+++ b/tdeui/kactioncollection.cpp
@@ -56,7 +56,7 @@ public:
     m_parentGUIClient = 0L;
   }
 
-  KInstance *m_instance;
+  TDEInstance *m_instance;
   TQString m_sXMLFile;
   bool m_bAutoConnectShortcuts;
   //bool m_bOneKAccelOnly;
@@ -77,7 +77,7 @@ public:
 };
 
 KActionCollection::KActionCollection( TQWidget *parent, const char *name,
-                                      KInstance *instance )
+                                      TDEInstance *instance )
   : TQObject( parent, name )
 {
   kdDebug(129) << "KActionCollection::KActionCollection( " << parent << ", " << name << " ): this = " << this << endl; // ellis
@@ -90,7 +90,7 @@ KActionCollection::KActionCollection( TQWidget *parent, const char *name,
 
 
 KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const char *name,
-                                      KInstance *instance )
+                                      TDEInstance *instance )
   : TQObject( parent, name )
 {
   kdDebug(129) << "KActionCollection::KActionCollection( " << watch << ", " << parent << ", " << name << " ): this = " << this << endl; //ellis
@@ -104,10 +104,10 @@ KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const c
 #ifndef KDE_NO_COMPAT
 // KDE 4: remove
 KActionCollection::KActionCollection( TQObject *parent, const char *name,
-                                      KInstance *instance )
+                                      TDEInstance *instance )
   : TQObject( parent, name )
 {
-  kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, KInstance *instance )" << endl; //ellis
+  kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis
   kdDebug(129) << kdBacktrace() << endl;
   d = new KActionCollectionPrivate;
   TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
@@ -457,7 +457,7 @@ KActionPtrList KActionCollection::actions() const
   return lst;
 }
 
-void KActionCollection::setInstance( KInstance *instance )
+void KActionCollection::setInstance( TDEInstance *instance )
 {
   if ( instance )
     d->m_instance = instance;
@@ -465,7 +465,7 @@ void KActionCollection::setInstance( KInstance *instance )
     d->m_instance = KGlobal::instance();
 }
 
-KInstance *KActionCollection::instance() const
+TDEInstance *KActionCollection::instance() const
 {
   return d->m_instance;
 }
@@ -695,7 +695,7 @@ bool KActionShortcutList::isConfigurable( uint i ) const
 	{ return m_actions.action(i)->isShortcutConfigurable(); }
 bool KActionShortcutList::setShortcut( uint i, const KShortcut& cut )
 	{ return m_actions.action(i)->setShortcut( cut ); }
-const KInstance* KActionShortcutList::instance() const
+const TDEInstance* KActionShortcutList::instance() const
 	{ return m_actions.instance(); }
 TQVariant KActionShortcutList::getOther( Other, uint ) const
 	{ return TQVariant(); }
diff --git a/tdeui/kactioncollection.h b/tdeui/kactioncollection.h
index 8111effaf..28c9e530e 100644
--- a/tdeui/kactioncollection.h
+++ b/tdeui/kactioncollection.h
@@ -49,7 +49,7 @@ class KAccelActions;
 class KConfig;
 class KConfigBase;
 class KURL;
-class KInstance;
+class TDEInstance;
 class KToolBar;
 class KActionCollection;
 class KPopupMenu;
@@ -83,13 +83,13 @@ class TDEUI_EXPORT KActionCollection : public TQObject
   Q_OBJECT
 
 public:
-  KActionCollection( TQWidget *parent, const char *name = 0, KInstance *instance = 0 );
+  KActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 );
   /**
    * Use this constructor if you want the collection's actions to restrict
    * their accelerator keys to @p watch rather than the @p parent.  If
    * you don't require shortcuts, you can pass a null to the @p watch parameter.
    */
-  KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, KInstance *instance = 0 );
+  KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, TDEInstance *instance = 0 );
 #ifndef KDE_NO_COMPAT
   KActionCollection( const KActionCollection &copy );
 #endif
@@ -197,9 +197,9 @@ public:
    */
   bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const;
 
-  void setInstance( KInstance *instance );
+  void setInstance( TDEInstance *instance );
   /** The instance with which this class is associated. */
-  KInstance *instance() const;
+  TDEInstance *instance() const;
 
   /**
    * @deprecated
@@ -335,7 +335,7 @@ private:
 
 #ifndef KDE_NO_COMPAT
 public:
-  KActionCollection( TQObject *parent, const char *name = 0, KInstance *instance = 0 );
+  KActionCollection( TQObject *parent, const char *name = 0, TDEInstance *instance = 0 );
 #endif
 
 public:
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/kactionshortcutlist.h
index c61a7e2a8..7c5f5b0dd 100644
--- a/tdeui/kactionshortcutlist.h
+++ b/tdeui/kactionshortcutlist.h
@@ -24,7 +24,7 @@ class TDEUI_EXPORT KActionShortcutList : public KShortcutList
 	virtual bool isConfigurable( uint index ) const;
 	virtual bool setShortcut( uint index, const KShortcut& shortcut );
 
-	virtual const KInstance* instance() const;
+	virtual const TDEInstance* instance() const;
 
 	virtual TQVariant getOther( Other, uint index ) const;
 	virtual bool setOther( Other, uint index, TQVariant );
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index c3cf0b518..37f84a802 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -65,7 +65,7 @@ public:
     KURL url;
 };
 
-KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutData )
+KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *aboutData )
   : KDialogBase( Plain,
                  i18n("Submit Bug Report"),
                  Ok | Cancel,
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index 419ad3c81..2c60b091b 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -25,7 +25,7 @@ class TQMultiLineEdit;
 class TQLineEdit;
 class TQHButtonGroup;
 class KProcess;
-class KAboutData;
+class TDEAboutData;
 class KBugReportPrivate;
 
 /**
@@ -33,8 +33,8 @@ class KBugReportPrivate;
  *
  * All the information needed by the dialog box
  * (program name, version, bug-report address, etc.)
- * comes from the KAboutData class.
- * Make sure you create an instance of KAboutData and pass it
+ * comes from the TDEAboutData class.
+ * Make sure you create an instance of TDEAboutData and pass it
  * to TDECmdLineArgs.
  *
  * @author David Faure <faure@kde.org>
@@ -49,7 +49,7 @@ public:
    * since KHelpMenu takes care of the menu item
    * for "Report Bug..." and of creating a KBugReport dialog.
    */
-  KBugReport( TQWidget * parent = 0L, bool modal=true, const KAboutData *aboutData = 0L );
+  KBugReport( TQWidget * parent = 0L, bool modal=true, const TDEAboutData *aboutData = 0L );
   /**
    * Destructor
    */
@@ -101,7 +101,7 @@ protected:
   bool sendBugReport();
 
   KProcess * m_process;
-  const KAboutData * m_aboutData;
+  const TDEAboutData * m_aboutData;
 
   TQMultiLineEdit * m_lineedit;
   TQLineEdit * m_subject;
diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp
index 7d82d2957..a047fe6b8 100644
--- a/tdeui/kcmodule.cpp
+++ b/tdeui/kcmodule.cpp
@@ -44,8 +44,8 @@ public:
         _unmanagedWidgetChangeState( false )
         { }
 
-    KInstance *_instance;
-    KAboutData *_about;
+    TDEInstance *_instance;
+    TDEAboutData *_about;
     TQString _rootOnlyMsg;
     bool _useRootOnlyMsg;
     bool _hasOwnInstance;
@@ -64,17 +64,17 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &)
 {
     init();
     if (name && strlen(name)) {
-        d->_instance = new KInstance(name);
+        d->_instance = new TDEInstance(name);
         KGlobal::locale()->insertCatalogue(name);
     } else
-        d->_instance = new KInstance("kcmunnamed");
+        d->_instance = new TDEInstance("kcmunnamed");
     KGlobal::setActiveInstance(this->instance());
 
     d->managers.setAutoDelete( true );
 
 }
 
-KCModule::KCModule(KInstance *instance, TQWidget *parent, const TQStringList & )
+KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & )
     : TQWidget(parent, instance ? instance->instanceName().data() : 0)
 {
     init();
@@ -156,12 +156,12 @@ void KCModule::unmanagedWidgetChangeState(bool changed)
     widgetChanged();
 }
 
-const KAboutData *KCModule::aboutData() const
+const TDEAboutData *KCModule::aboutData() const
 {
     return d->_about;
 }
 
-void KCModule::setAboutData( KAboutData* about )
+void KCModule::setAboutData( TDEAboutData* about )
 {
     delete d->_about;
     d->_about = about;
@@ -192,7 +192,7 @@ void KCModule::changed()
     emit changed(true);
 }
 
-KInstance *KCModule::instance() const
+TDEInstance *KCModule::instance() const
 {
     return d->_instance;
 }
diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h
index bba06ae4a..c237ad163 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/kcmodule.h
@@ -29,11 +29,11 @@
 
 class TQStringList;
 
-class KAboutData;
+class TDEAboutData;
 class KConfigDialogManager;
 class KConfigSkeleton;
 class KCModulePrivate;
-class KInstance;
+class TDEInstance;
 
 /**
  * The base class for control center modules.
@@ -91,7 +91,7 @@ public:
    */
   KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() );
 
-  KCModule(KInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
+  KCModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
 
   /*
    * Destroys the module.
@@ -182,15 +182,15 @@ public:
    * If you override you should  have it return a pointer to a constant.
    *
    *
-   * @returns the KAboutData for this module
+   * @returns the TDEAboutData for this module
    */
-  virtual const KAboutData *aboutData() const;
+  virtual const TDEAboutData *aboutData() const;
   
   /**
-   * This sets the KAboutData returned by aboutData()
+   * This sets the TDEAboutData returned by aboutData()
    * @since 3.3
    */
-   void setAboutData( KAboutData* about );
+   void setAboutData( TDEAboutData* about );
 
   /**
    * Indicate which buttons will be used.
@@ -228,7 +228,7 @@ public:
    */
   bool useRootOnlyMsg() const;
 
-  KInstance *instance() const;
+  TDEInstance *instance() const;
 
   /**
    * @return a list of @ref KConfigDialogManager's in use, if any.
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 418fb755d..b89a5b97a 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -214,7 +214,7 @@ public:
      * In a KParts application we let create a KXMLGUIClient create a dummy one,
      * but it probably isn't used.
      */
-  KEditToolbarWidgetPrivate(KInstance *instance, KActionCollection* collection)
+  KEditToolbarWidgetPrivate(TDEInstance *instance, KActionCollection* collection)
       : m_collection( collection )
   {
     m_instance = instance;
@@ -339,7 +339,7 @@ public:
 
   //TQValueList<KAction*> m_actionList;
   KActionCollection* m_collection;
-  KInstance         *m_instance;
+  TDEInstance         *m_instance;
 
   XmlData*     m_currentXmlData;
   TQDomElement m_currentToolbarElem;
@@ -466,7 +466,7 @@ void KEditToolbar::slotDefault()
 
             if (TQDir::isRelativePath(file))
             {
-                const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
+                const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
                 file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
             }
             else
diff --git a/tdeui/kguiitem.cpp b/tdeui/kguiitem.cpp
index 7b73c7401..e4d09bff2 100644
--- a/tdeui/kguiitem.cpp
+++ b/tdeui/kguiitem.cpp
@@ -149,7 +149,7 @@ TQString KGuiItem::plainText() const
     return stripped;
 }
 
-TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, KInstance* instance ) const
+TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, TDEInstance* instance ) const
 {
     if( d->m_hasIcon )
     {
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index 586998d48..189dc1292 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -61,10 +61,10 @@ public:
     TQString text() const;
     TQString plainText() const;
 #ifndef KDE_NO_COMPAT
-    TQIconSet iconSet( KIcon::Group, int size = 0, KInstance* instance = KGlobal::instance()) const;
+    TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = KGlobal::instance()) const;
     TQIconSet iconSet() const { return iconSet( KIcon::Small ); }
 #else
-    TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, KInstance* instance = KGlobal::instance()) const;
+    TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const;
 #endif
 
     TQString iconName() const;
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 071db1248..670439444 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -59,7 +59,7 @@ public:
         delete mSwitchApplicationLanguage;
     }
 
-    const KAboutData *mAboutData;
+    const TDEAboutData *mAboutData;
     KSwitchLanguageDialog *mSwitchApplicationLanguage;
 };
 
@@ -74,7 +74,7 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText,
   d->mAboutData = 0;
 }
 
-KHelpMenu::KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
+KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
 		      bool showWhatsThis, KActionCollection *actions )
   : TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0),
     d(new KHelpMenuPrivate)
@@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu()
     // I use hardcoded menu id's here. Reason is to stay backward
     // compatible.
     //
-    const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
+    const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
     TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
 
     mMenu = new KPopupMenu();
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index e58569bf6..0f2a7078f 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -31,7 +31,7 @@ class KActionCollection;
 class KPopupMenu;
 class TQWidget;
 
-class KAboutData;
+class TDEAboutData;
 class KAboutKDE;
 class KBugReport;
 class KDialogBase;
@@ -175,7 +175,7 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
      *        standard actions.
      *
      */
-    KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
+    KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
 	       bool showWhatsThis=true, KActionCollection *actions = 0 );
 
     /**
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index 4df3e2ecd..d291a87d9 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -306,7 +306,7 @@ public:
 	 * Simply call insert with the action collections of each one in turn.
          *
          * @param title the title associated with the collection (if null, the
-         * KAboutData::progName() of the collection's instance is used)
+         * TDEAboutData::progName() of the collection's instance is used)
          * @return true :)
 	 * @since 3.1
 	 */
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index d03a2efcf..56b5f2666 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -189,7 +189,7 @@ public:
      *
      * @param aboutAppText The string that is used in the application
      *        specific dialog box. If you leave this string empty the
-     *        information in the global KAboutData of the
+     *        information in the global TDEAboutData of the
      *        application will be used to make a standard dialog box.
      *
      * @param showWhatsThis Set this to false if you do not want to include
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e1adac16a..befd93fc1 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -64,9 +64,9 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 		 case Preferences:
 		 case HelpContents:
 			{
-			const KAboutData *aboutData = KGlobal::instance()->aboutData();
+			const TDEAboutData *aboutData = KGlobal::instance()->aboutData();
 			/* TODO KDE4
-			const KAboutData *aboutData;
+			const TDEAboutData *aboutData;
 			if ( parent )
 			    aboutData = parent->instance()->aboutData();
 			else
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 1ae786d67..668f070dd 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -312,7 +312,7 @@ KActionCollection* KSystemTray::actionCollection()
     return d->actionCollection;
 }
 
-TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance )
+TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance )
 {
     KConfig *appCfg = kapp->config();
     KConfigGroupSaver configSaver(appCfg, "System Tray");
@@ -320,7 +320,7 @@ TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance )
     return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
 }
 
-TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance )
+TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance )
 {
     return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
 }
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 79d73d3e3..a74dc9be6 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -105,7 +105,7 @@ public:
 
     /**
      * Changes the tray's text description (which can be seen e.g. in the systray
-     * configuration dialog). The default value is KAboutData::programName().
+     * configuration dialog). The default value is TDEAboutData::programName().
      */
     virtual void setCaption( const TQString& title );
 
@@ -117,7 +117,7 @@ public:
      *
      * @since 3.2
      */
-    static TQPixmap loadIcon( const TQString &icon, KInstance *instance=KGlobal::instance() );
+    static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=KGlobal::instance() );
 
     /**
      * Loads an icon @p icon using the icon loader class of the given instance @p instance.
@@ -128,7 +128,7 @@ public:
      *
      * @since 3.5.12
      */
-    static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance=KGlobal::instance() );
+    static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=KGlobal::instance() );
 
 signals:
     /**
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index 32e5b9f14..0fd9e5ada 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -255,7 +255,7 @@ void KToolBar::init( bool readConfig, bool honorStyle )
 }
 
 int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
-                            const TQString& text, int index, KInstance *_instance )
+                            const TQString& text, int index, TDEInstance *_instance )
 {
     KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance );
 
@@ -268,7 +268,7 @@ int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
 
 int KToolBar::insertButton(const TQString& icon, int id, const char *signal,
                             const TQObject *receiver, const char *slot,
-                            bool enabled, const TQString& text, int index, KInstance *_instance )
+                            bool enabled, const TQString& text, int index, TDEInstance *_instance )
 {
     KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance);
     insertWidgetInternal( button, index, id );
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index 1f233f23d..aa3717324 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -49,7 +49,7 @@ class KToolBarButton;
 class KToolBoxManager;
 class KAnimWidget;
 class KPopupMenu;
-class KInstance;
+class TDEInstance;
 class KComboBox;
 class KXMLGUIClient;
 
@@ -207,7 +207,7 @@ public:
    */
     int insertButton(const TQString& icon, int id, bool enabled = true,
 		     const TQString& text = TQString::null, int index=-1,
-		     KInstance *_instance = KGlobal::instance());
+		     TDEInstance *_instance = KGlobal::instance());
 
    /**
    * This is the same as above, but with specified signals and
@@ -230,7 +230,7 @@ public:
     int insertButton(const TQString& icon, int id, const char *signal,
 		     const TQObject *receiver, const char *slot,
 		     bool enabled = true, const TQString& text = TQString::null,
-		     int index=-1, KInstance *_instance = KGlobal::instance() );
+		     int index=-1, TDEInstance *_instance = KGlobal::instance() );
 
   /**
    * Inserts a button (a KToolBarButton) with the specified
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index 1316081c6..66b9d6ee9 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -93,7 +93,7 @@ public:
 
   TQPoint m_mousePressPos;
 
-  KInstance  *m_instance;
+  TDEInstance  *m_instance;
 };
 
 // This will construct a separator
@@ -109,7 +109,7 @@ KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name )
 
 KToolBarButton::KToolBarButton( const TQString& _icon, int _id,
                                 TQWidget *_parent, const char *_name,
-                                const TQString &_txt, KInstance *_instance )
+                                const TQString &_txt, TDEInstance *_instance )
     : TQToolButton( _parent, _name ), d( 0 )
 {
   d = new KToolBarButtonPrivate;
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index 340761bd0..df26fea7c 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -61,7 +61,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index c31242ff1..43f716870 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -61,7 +61,7 @@ public:
 
     TQString attrIcon;
 
-    KInstance *m_instance;
+    TDEInstance *m_instance;
     KXMLGUIClient *m_client;
 };
 
@@ -174,7 +174,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
     if ( !icon.isEmpty() )
     {
-      KInstance *instance = d->m_instance;
+      TDEInstance *instance = d->m_instance;
       if ( !instance )
         instance = KGlobal::instance();
 
@@ -371,7 +371,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
 
       if ( !icon.isEmpty() )
       {
-        KInstance *instance = d->m_instance;
+        TDEInstance *instance = d->m_instance;
         if ( !instance )
           instance = KGlobal::instance();
 
@@ -409,12 +409,12 @@ void KXMLGUIBuilder::setBuilderClient( KXMLGUIClient *client )
       setBuilderInstance( client->instance() );
 }
 
-KInstance *KXMLGUIBuilder::builderInstance() const
+TDEInstance *KXMLGUIBuilder::builderInstance() const
 {
   return d->m_instance;
 }
 
-void KXMLGUIBuilder::setBuilderInstance( KInstance *instance )
+void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance )
 {
   d->m_instance = instance;
 }
diff --git a/tdeui/kxmlguibuilder.h b/tdeui/kxmlguibuilder.h
index f32c30243..657add5f8 100644
--- a/tdeui/kxmlguibuilder.h
+++ b/tdeui/kxmlguibuilder.h
@@ -27,7 +27,7 @@
 
 class KXMLGUIBuilderPrivate;
 class TQWidget;
-class KInstance;
+class TDEInstance;
 class KXMLGUIClient;
 
 /**
@@ -48,9 +48,9 @@ class TDEUI_EXPORT KXMLGUIBuilder
   /* @internal */
   void setBuilderClient( KXMLGUIClient *client );
   /* @internal */
-  KInstance *builderInstance() const;
+  TDEInstance *builderInstance() const;
   /* @internal */
-  void setBuilderInstance( KInstance *instance );
+  void setBuilderInstance( TDEInstance *instance );
   /* @internal */
   TQWidget *widget();
 
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index ff463e45f..d8548cadb 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -50,7 +50,7 @@ public:
   {
   }
 
-  KInstance *m_instance;
+  TDEInstance *m_instance;
 
   TQDomDocument m_doc;
   KActionCollection *m_actionCollection;
@@ -120,7 +120,7 @@ KAction *KXMLGUIClient::action( const TQDomElement &element ) const
   return actionCollection()->action( element.attribute( attrName ).latin1() );
 }
 
-KInstance *KXMLGUIClient::instance() const
+TDEInstance *KXMLGUIClient::instance() const
 {
   return d->m_instance;
 }
@@ -154,7 +154,7 @@ void KXMLGUIClient::reloadXML()
         setXMLFile( file );
 }
 
-void KXMLGUIClient::setInstance( KInstance *instance )
+void KXMLGUIClient::setInstance( TDEInstance *instance )
 {
   d->m_instance = instance;
   actionCollection()->setInstance( instance );
diff --git a/tdeui/kxmlguiclient.h b/tdeui/kxmlguiclient.h
index c05a1afd8..78c412602 100644
--- a/tdeui/kxmlguiclient.h
+++ b/tdeui/kxmlguiclient.h
@@ -29,7 +29,7 @@
 class TQWidget;
 class KAction;
 class KActionCollection;
-class KInstance;
+class TDEInstance;
 class KXMLGUIClientPrivate;
 class KXMLGUIFactory;
 class KXMLGUIBuilder;
@@ -95,9 +95,9 @@ public:
   virtual KActionCollection* actionCollection() const;
 
   /**
-   * @return The instance ( KInstance ) for this GUI client.
+   * @return The instance ( TDEInstance ) for this GUI client.
    */
-  virtual KInstance *instance() const;
+  virtual TDEInstance *instance() const;
 
   /**
    * @return The parsed XML in a TQDomDocument, set by
@@ -271,12 +271,12 @@ protected:
   //bool addSuperClient( KXMLGUIClient * );
 
   /**
-   * Sets the instance ( KInstance) for this part.
+   * Sets the instance ( TDEInstance) for this part.
    *
    * Call this first in the inherited class constructor.
    * (At least before setXMLFile().)
    */
-  virtual void setInstance( KInstance *instance );
+  virtual void setInstance( TDEInstance *instance );
 
   /**
    * Sets the name of the rc file containing the XML for the part.
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 7aa427937..3c3f24668 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -96,14 +96,14 @@ public:
     BuildStateStack m_stateStack;
 };
 
-TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const KInstance *instance )
+TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInstance *instance )
 {
     return readConfigFile( filename, false, instance );
 }
 
-TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const KInstance *_instance )
+TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance )
 {
-    const KInstance *instance = _instance ? _instance : KGlobal::instance();
+    const TDEInstance *instance = _instance ? _instance : KGlobal::instance();
     TQString xml_file;
 
     if (!TQDir::isRelativePath(filename))
@@ -140,9 +140,9 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
 }
 
 bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
-                                     const TQString& filename, const KInstance *_instance )
+                                     const TQString& filename, const TDEInstance *_instance )
 {
-    const KInstance *instance = _instance ? _instance : KGlobal::instance();
+    const TDEInstance *instance = _instance ? _instance : KGlobal::instance();
     TQString xml_file(filename);
 
     if (TQDir::isRelativePath(xml_file))
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index 9b4733790..bf49c6b60 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -32,7 +32,7 @@ class KAction;
 class KXMLGUIFactoryPrivate;
 class KXMLGUIClient;
 class KXMLGUIBuilder;
-class KInstance;
+class TDEInstance;
 
 namespace KXMLGUI
 {
@@ -79,10 +79,10 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
   ~KXMLGUIFactory();
 
   // XXX move to somewhere else? (Simon)
-  static TQString readConfigFile( const TQString &filename, bool never_null, const KInstance *instance = 0 );
-  static TQString readConfigFile( const TQString &filename, const KInstance *instance = 0 );
+  static TQString readConfigFile( const TQString &filename, bool never_null, const TDEInstance *instance = 0 );
+  static TQString readConfigFile( const TQString &filename, const TDEInstance *instance = 0 );
   static bool saveConfigFile( const TQDomDocument& doc, const TQString& filename,
-                              const KInstance *instance = 0 );
+                              const TDEInstance *instance = 0 );
 
   static TQString documentToXML( const TQDomDocument& doc );
   static TQString elementToXML( const TQDomElement& elem );
diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp
index 279753277..26d120de7 100644
--- a/tdeui/kxmlguifactory_p.cpp
+++ b/tdeui/kxmlguifactory_p.cpp
@@ -805,7 +805,7 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index,
         }
     }
 
-    KInstance *oldInstance = m_state.builder->builderInstance();
+    TDEInstance *oldInstance = m_state.builder->builderInstance();
     KXMLGUIClient *oldClient = m_state.builder->builderClient();
 
     m_state.builder->setBuilderClient( m_state.guiClient );
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();