Rename kinstance.{h,cpp} to tdeinstance.{h,cpp}. A dummy kinstance.h has been temporarily added to keep other apps building while the replacement is completed across all TDE code base.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(manually cherry-picked from commit cfe383b06)

35 files changed, 234 insertions, 233 deletions

diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 24348088e..f2eb61719 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES
     kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
     kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
-    kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
+    kallocator.h kvmallocator.h kcrash.h krfcdate.h tdeinstance.h kinstance.h
     kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
     kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
@@ -116,7 +116,7 @@ set( ${target}_SRCS
   kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
   kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
-  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
+  tdeinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
   kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
   tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index ae94ecd7c..d873b5a54 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -6,10 +6,10 @@ When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
 dmalloc.cpp
-tdeaboutdata.cpp		David Faure <faure@kde.org>
+tdeaboutdata.cpp	David Faure <faure@kde.org>
 tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
 tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
-tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaccelbase.cpp	Ellis Whitehead <ellis@kde.org>
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
 kappdcopiface.cpp
 tdeapplication.cpp	Waldo Bastian <bastian@kde.org>
@@ -22,7 +22,7 @@ kcompletion.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kcompletionbase.cpp
 tdeconfig.cpp		Waldo Bastian <bastian@kde.org>
 tdeconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
-tdeconfigbase.cpp		Waldo Bastian <bastian@kde.org>
+tdeconfigbase.cpp	Waldo Bastian <bastian@kde.org>
 kcrash.cpp		Waldo Bastian <bastian@kde.org>
 kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <coolo@kde.org>
@@ -34,7 +34,7 @@ tdeglobalsettings.cpp	David Faure <faure@kde.org>
 kiconeffect.cpp
 kiconloader.cpp
 kicontheme.cpp
-kinstance.cpp 		Stephan Kulow <coolo@kde.org>
+tdeinstance.cpp 	Stephan Kulow <coolo@kde.org>
 kipc.cpp        	Lubos Lunak <l.lunak@kde.org>
 kkey_x11.cpp		Ellis Whitehead <ellis@kde.org>
 kkeynative_x11.cpp	Ellis Whitehead <ellis@kde.org>
@@ -65,7 +65,7 @@ kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
 tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
 tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
-tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
+tdesycocadict.cpp	Waldo Bastian <bastian@kde.org>
 tdesycocafactory.cpp	Waldo Bastian <bastian@kde.org>
 tdetempfile.cpp		Waldo Bastian <bastian@kde.org>
 kuniqueapplication.cpp	Waldo Bastian <bastian@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 1bc47e379..df448f637 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -47,7 +47,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	kregexp.h kcompletion.h kstringhandler.h \
 	kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
-	kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
+	tdeinstance.h kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
 	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
@@ -100,7 +100,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
 	kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
-	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
+	tdeinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
 	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
 	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 163b10d36..daec49164 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -45,7 +45,7 @@
 
 #include <tqwindowdefs.h>
 #include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index d6b29c799..6df5d8a8c 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -28,7 +28,7 @@
 
 #include "tdeapplication.h"
 #include "tdeglobal.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 #include "kstandarddirs.h"
 
 #include <tqmessagebox.h>
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index e6722b8dd..1ed1b41ee 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -21,7 +21,7 @@
 
 #include <klibloader.h>
 #include <ktypelist.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.tcc>
 #include <tdeglobal.h>
 #include <tdelocale.h>
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index f6e267a86..1d099d9c1 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -33,7 +33,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 #include <kicontheme.h>
 #include <kiconloader.h>
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 067ba5640..3876efc02 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kicontheme.h>
 
 struct TDEIconGroup;
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index dd2cd2944..748fa9b7e 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -33,7 +33,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 #include "kicontheme.h"
 
@@ -136,7 +136,7 @@ TDEIconTheme::TDEIconTheme(const TQString& name, const TQString& appName)
 	fileName = mDir + "index.theme";
 	mainSection="Icon Theme";
     }
-    // Use TDESharedConfig to avoid parsing the file many times, from each kinstance.
+    // Use TDESharedConfig to avoid parsing the file many times, from each TDEInstance.
     // Need to keep a ref to it to make this useful
     d->sharedConfig = TDESharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
     TDEConfig& cfg = *d->sharedConfig;
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index b46947218..2db63c3e1 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -1,192 +1 @@
-/* This file is part of the KDE libraries
-   Copyright (C) 1999 Torben Weis <weis@kde.org>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef _KINSTANCE_H
-#define _KINSTANCE_H
-
-#include <tqstring.h>
-#include "tdelibs_export.h"
-
-class TDEStandardDirs;
-class TDEAboutData;
-class TDEConfig;
-class TDEIconLoader;
-class KCharsets;
-class TQFont;
-class TDEInstancePrivate;
-class KMimeSourceFactory;
-class TDESharedConfig;
-#ifdef __TDE_HAVE_TDEHWLIB
-class TDEHardwareDevices;
-class TDEGlobalNetworkManager;
-#endif
-
-
-/**
- * Access to KDE global objects for use in shared libraries.  In
- * practical terms, this class is used in KDE components.  This allows
- * components to store things that normally would be accessed by
- * TDEGlobal.
- *
- * @author Torben Weis
- */
-class TDECORE_EXPORT TDEInstance
-{
-    friend class TDEStandardDirs;
-
- public:
-    /**
-     *  Constructor.
-     *  @param instanceName the name of the instance
-     */
-    TDEInstance( const TQCString& instanceName) ;
-
-    /**
-     *  Constructor.
-     *  When building a TDEInstance that is not your TDEApplication,
-     *  make sure that the TDEAboutData and the TDEInstance have the same life time.
-     *  You have to destroy both, since the instance doesn't own the about data.
-     *  Don't build a TDEAboutData on the stack in this case !
-     *  Building a TDEAboutData on the stack is only ok for usage with
-     *  TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
-     *  @param aboutData data about this instance (see TDEAboutData)
-     */
-    TDEInstance( const TDEAboutData * aboutData );
-
-    /*
-     * @internal
-     * Only for K(Unique)Application
-     * Initialize from src and delete it.
-     */
-
-    TDEInstance( TDEInstance* src );
-
-    /**
-     * Destructor.
-     */
-    virtual ~TDEInstance();
-
-    /**
-     * Returns the application standard dirs object.
-     * @return The TDEStandardDirs of the application.
-     */
-    TDEStandardDirs	*dirs() const;
-
-    /**
-     * Returns the general config object ("appnamerc").
-     * @return the TDEConfig object for the instance.
-     */
-    TDEConfig            *config() const;
-
-    /**
-     * Returns the general config object ("appnamerc").
-     * @return the TDEConfig object for the instance.
-     */
-    TDESharedConfig      *sharedConfig() const;
-
-    /**
-     * Set a read-only flag on the configuration files
-     * This must be called before config() or dirs() to have any effect
-     * Defaults to false
-     * @param ro read only if true
-     */
-    void                setConfigReadOnly(bool ro);
-
-    /**
-     *  Returns an iconloader object.
-     * @return the iconloader object.
-     */
-    TDEIconLoader	       *iconLoader() const;
-
-#ifdef __TDE_HAVE_TDEHWLIB
-    /**
-     *  Returns a TDEHardwareDevices object.
-     * @return the hardwaredevices object.
-     */
-    TDEHardwareDevices	*hardwareDevices() const;
-
-    /**
-     *  Returns a TDEGlobalNetworkManager object.
-     * @return the networkmanager object.
-     */
-    TDEGlobalNetworkManager  *networkManager() const;
-#endif
-
-    /**
-     * Re-allocate the global iconloader.
-     */
-    void newIconLoader() const;
-
-    /**
-     *  Returns the about data of this instance
-     *  Warning, can be 0L
-     * @return the about data of the instance, or 0 if it has 
-     *         not been set yet
-     */
-    const TDEAboutData *aboutData() const;
-
-    /**
-     * Returns the name of the instance
-     * @return the instance name, can be null if the TDEInstance has been 
-     *         created with a null name
-     */
-    TQCString          instanceName() const;
-
-    /**
-     * Returns the KMimeSourceFactory of the instance.
-     * Mainly added for API completeness and future extensibility.
-     * @return the KMimeSourceFactory set as default for this application.
-     */
-    KMimeSourceFactory* mimeSourceFactory () const;
-
-protected:
-    /**
-     *  Copy Constructor is not allowed
-     */
-    TDEInstance( const TDEInstance& );
-
-    /**
-     * Set name of default config file.
-     * @param name the name of the default config file
-     * @since 3.1
-     */
-    void setConfigName(const TQString &name);
-
-private:
-    mutable TDEStandardDirs       *_dirs;
-
-    mutable TDEConfig             *_config;
-    mutable TDEIconLoader         *_iconLoader;
-
-#ifdef __TDE_HAVE_TDEHWLIB
-    mutable TDEHardwareDevices  *_hardwaredevices;
-    mutable TDEGlobalNetworkManager  *_networkmanager;
-#endif
-    mutable void                *_placeholder;
-
-    TQCString                     _name;
-    const TDEAboutData            *_aboutData;
-
-protected:
-    virtual void virtual_hook( int id, void* data );
-private:
-    TDEInstancePrivate *d;
-    bool m_configReadOnly;
-};
-
-#endif
-
+#include <tdeinstance.h>
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp
index 8ed02941e..c13c22e2d 100644
--- a/tdecore/kmimesourcefactory.cpp
+++ b/tdecore/kmimesourcefactory.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kiconloader.h>
 
 #include "kmimesourcefactory.h"
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 8a0b59c5f..c4b4e9081 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -48,7 +48,7 @@
 
 #include "kstandarddirs.h"
 #include "tdeconfig.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 #include "kshell.h"
 #include "ksimpleconfig.h"
 #include "kuser.h"
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index d16d2e185..f24f71693 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -49,7 +49,7 @@
 
 #include "tdeglobal.h"
 #include "tdeapplication.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 #include "ktempdir.h"
 #include "kstandarddirs.h"
 #include "kprocess.h"
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 14553d2e7..94549ecf5 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -1,6 +1,6 @@
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kstandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index 3e145a7f8..3a5f9fb5d 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -1,6 +1,6 @@
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kstandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 30a862cba..0a27763a2 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -37,7 +37,7 @@ typedef void Display;
 
 #include <tqapplication.h>
 #include <tqpixmap.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 struct _IceConn;
 class TQPopupMenu;
diff --git a/tdecore/tdeconfig_compiler/tests/test1main.cpp b/tdecore/tdeconfig_compiler/tests/test1main.cpp
index 79546639f..eaa9bc97b 100644
--- a/tdecore/tdeconfig_compiler/tests/test1main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test1main.cpp
@@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "test1.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test2main.cpp b/tdecore/tdeconfig_compiler/tests/test2main.cpp
index 5970bf03d..46b85c6bf 100644
--- a/tdecore/tdeconfig_compiler/tests/test2main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test2main.cpp
@@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "test2.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test3main.cpp b/tdecore/tdeconfig_compiler/tests/test3main.cpp
index f73ae38e3..262301b8b 100644
--- a/tdecore/tdeconfig_compiler/tests/test3main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test3main.cpp
@@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "test3.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test4main.cpp b/tdecore/tdeconfig_compiler/tests/test4main.cpp
index 5229d8a87..92e34c328 100644
--- a/tdecore/tdeconfig_compiler/tests/test4main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test4main.cpp
@@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "test4.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test5main.cpp b/tdecore/tdeconfig_compiler/tests/test5main.cpp
index 89f28587f..f9111cf24 100644
--- a/tdecore/tdeconfig_compiler/tests/test5main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test5main.cpp
@@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "test5.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test6main.cpp b/tdecore/tdeconfig_compiler/tests/test6main.cpp
index 9b1b7503e..90c5de929 100644
--- a/tdecore/tdeconfig_compiler/tests/test6main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test6main.cpp
@@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "test6.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test7main.cpp b/tdecore/tdeconfig_compiler/tests/test7main.cpp
index 81cca0184..522aa4ff6 100644
--- a/tdecore/tdeconfig_compiler/tests/test7main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test7main.cpp
@@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "test7.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test8main.cpp b/tdecore/tdeconfig_compiler/tests/test8main.cpp
index 2611a48af..a338ea096 100644
--- a/tdecore/tdeconfig_compiler/tests/test8main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test8main.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "test8a.h"
 #include "test8b.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeconfig_compiler/tests/test9main.cpp b/tdecore/tdeconfig_compiler/tests/test9main.cpp
index 8668d8d8c..e49899bc1 100644
--- a/tdecore/tdeconfig_compiler/tests/test9main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test9main.cpp
@@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "test9.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 #include <kdebug.h>
 #include <tqdir.h>
 
diff --git a/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
index b62ee17af..a46f7ae50 100644
--- a/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
@@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "test_dpointer.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 int main( int, char*[] )
 {
diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp
index aeac6f744..1f179b4c7 100644
--- a/tdecore/tdeglobal.cpp
+++ b/tdecore/tdeglobal.cpp
@@ -39,7 +39,7 @@
 #include <tdenetworkconnections.h>
 #endif
 #include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include "kstaticdeleter.h"
 
 #include <tqfont.h>
diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
index d604a4244..a8c16d3fb 100644
--- a/tdecore/tdeglobal.h
+++ b/tdecore/tdeglobal.h
@@ -19,7 +19,7 @@
 #define _TDEGLOBAL_H
 
 #include "tdelibs_export.h"
-#include <kinstance.h> // KDE4: class TDEInstance is enough here
+#include <tdeinstance.h> // KDE4: class TDEInstance is enough here
 
 class KCharsets;
 class TDEConfig;
diff --git a/tdecore/kinstance.cpp b/tdecore/tdeinstance.cpp
index 8ae747948..9f151f09d 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/tdeinstance.cpp
@@ -15,7 +15,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kinstance.h"
+#include "tdeinstance.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -46,7 +46,7 @@
   static TQPtrDict<TQCString> *allOldInstances = 0;
   #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<TDEInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
   #define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
-  #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
+  #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED TDEINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
 #else
   #define DEBUG_ADD
   #define DEBUG_REMOVE
diff --git a/tdecore/tdeinstance.h b/tdecore/tdeinstance.h
new file mode 100644
index 000000000..7ded51878
--- /dev/null
+++ b/tdecore/tdeinstance.h
@@ -0,0 +1,192 @@
+/* This file is part of the TDE libraries
+   Copyright (C) 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef _TDEINSTANCE_H
+#define _TDEINSTANCE_H
+
+#include <tqstring.h>
+#include "tdelibs_export.h"
+
+class TDEStandardDirs;
+class TDEAboutData;
+class TDEConfig;
+class TDEIconLoader;
+class KCharsets;
+class TQFont;
+class TDEInstancePrivate;
+class KMimeSourceFactory;
+class TDESharedConfig;
+#ifdef __TDE_HAVE_TDEHWLIB
+class TDEHardwareDevices;
+class TDEGlobalNetworkManager;
+#endif
+
+
+/**
+ * Access to TDE global objects for use in shared libraries.  In
+ * practical terms, this class is used in TDE components.  This allows
+ * components to store things that normally would be accessed by
+ * TDEGlobal.
+ *
+ * @author Torben Weis
+ */
+class TDECORE_EXPORT TDEInstance
+{
+    friend class TDEStandardDirs;
+
+ public:
+    /**
+     *  Constructor.
+     *  @param instanceName the name of the instance
+     */
+    TDEInstance( const TQCString& instanceName) ;
+
+    /**
+     *  Constructor.
+     *  When building a TDEInstance that is not your TDEApplication,
+     *  make sure that the TDEAboutData and the TDEInstance have the same life time.
+     *  You have to destroy both, since the instance doesn't own the about data.
+     *  Don't build a TDEAboutData on the stack in this case !
+     *  Building a TDEAboutData on the stack is only ok for usage with
+     *  TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
+     *  @param aboutData data about this instance (see TDEAboutData)
+     */
+    TDEInstance( const TDEAboutData * aboutData );
+
+    /*
+     * @internal
+     * Only for K(Unique)Application
+     * Initialize from src and delete it.
+     */
+
+    TDEInstance( TDEInstance* src );
+
+    /**
+     * Destructor.
+     */
+    virtual ~TDEInstance();
+
+    /**
+     * Returns the application standard dirs object.
+     * @return The TDEStandardDirs of the application.
+     */
+    TDEStandardDirs	*dirs() const;
+
+    /**
+     * Returns the general config object ("appnamerc").
+     * @return the TDEConfig object for the instance.
+     */
+    TDEConfig            *config() const;
+
+    /**
+     * Returns the general config object ("appnamerc").
+     * @return the TDEConfig object for the instance.
+     */
+    TDESharedConfig      *sharedConfig() const;
+
+    /**
+     * Set a read-only flag on the configuration files
+     * This must be called before config() or dirs() to have any effect
+     * Defaults to false
+     * @param ro read only if true
+     */
+    void                setConfigReadOnly(bool ro);
+
+    /**
+     *  Returns an iconloader object.
+     * @return the iconloader object.
+     */
+    TDEIconLoader	       *iconLoader() const;
+
+#ifdef __TDE_HAVE_TDEHWLIB
+    /**
+     *  Returns a TDEHardwareDevices object.
+     * @return the hardwaredevices object.
+     */
+    TDEHardwareDevices	*hardwareDevices() const;
+
+    /**
+     *  Returns a TDEGlobalNetworkManager object.
+     * @return the networkmanager object.
+     */
+    TDEGlobalNetworkManager  *networkManager() const;
+#endif
+
+    /**
+     * Re-allocate the global iconloader.
+     */
+    void newIconLoader() const;
+
+    /**
+     *  Returns the about data of this instance
+     *  Warning, can be 0L
+     * @return the about data of the instance, or 0 if it has 
+     *         not been set yet
+     */
+    const TDEAboutData *aboutData() const;
+
+    /**
+     * Returns the name of the instance
+     * @return the instance name, can be null if the TDEInstance has been 
+     *         created with a null name
+     */
+    TQCString          instanceName() const;
+
+    /**
+     * Returns the KMimeSourceFactory of the instance.
+     * Mainly added for API completeness and future extensibility.
+     * @return the KMimeSourceFactory set as default for this application.
+     */
+    KMimeSourceFactory* mimeSourceFactory () const;
+
+protected:
+    /**
+     *  Copy Constructor is not allowed
+     */
+    TDEInstance( const TDEInstance& );
+
+    /**
+     * Set name of default config file.
+     * @param name the name of the default config file
+     * @since 3.1
+     */
+    void setConfigName(const TQString &name);
+
+private:
+    mutable TDEStandardDirs       *_dirs;
+
+    mutable TDEConfig             *_config;
+    mutable TDEIconLoader         *_iconLoader;
+
+#ifdef __TDE_HAVE_TDEHWLIB
+    mutable TDEHardwareDevices  *_hardwaredevices;
+    mutable TDEGlobalNetworkManager  *_networkmanager;
+#endif
+    mutable void                *_placeholder;
+
+    TQCString                     _name;
+    const TDEAboutData            *_aboutData;
+
+protected:
+    virtual void virtual_hook( int id, void* data );
+private:
+    TDEInstancePrivate *d;
+    bool m_configReadOnly;
+};
+
+#endif
+
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 3c6dc0cc8..703cba29b 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -35,7 +35,7 @@
 #include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "ksimpleconfig.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 #include "tdeconfig.h"
 #include "kdebug.h"
 #include "kcalendarsystem.h"
diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index ffacd001c..168344bc5 100644
--- a/tdecore/tdeshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <kglobalaccel.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeshortcut.h>
 #include "tdeshortcutlist.h"
 
diff --git a/tdecore/tdetempfile.cpp b/tdecore/tdetempfile.cpp
index 805d315a1..c3d08879e 100644
--- a/tdecore/tdetempfile.cpp
+++ b/tdecore/tdetempfile.cpp
@@ -50,7 +50,7 @@
 
 #include "tdeglobal.h"
 #include "tdeapplication.h"
-#include "kinstance.h"
+#include "tdeinstance.h"
 #include "tdetempfile.h"
 #include "kstandarddirs.h"
 #include "kde_file.h"
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index 9f07b3437..266eaeaae 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -1,6 +1,6 @@
 #include "kdebug.h"
 #include <tqwidget.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <iostream>
 #include <tqapplication.h>
 #include <tqpen.h>
diff --git a/tdecore/tests/kstandarddirstest.cpp b/tdecore/tests/kstandarddirstest.cpp
index ae6ea16bd..1240827c9 100644
--- a/tdecore/tests/kstandarddirstest.cpp
+++ b/tdecore/tests/kstandarddirstest.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>