diff options
Diffstat (limited to 'tdecore')
35 files changed, 50 insertions, 118 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index f5c356073..96032d616 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -59,7 +59,7 @@ install( FILES tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h kregexp.h kcompletion.h kstringhandler.h tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h - kallocator.h kvmallocator.h tdecrash.h krfcdate.h kinstance.h + kallocator.h kvmallocator.h tdecrash.h krfcdate.h tdeinstance.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 tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp tdecrash.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 tdeuniqueapplication.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 4f306527a..902ffd444 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> tdeappdcopinterface.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> tdecrash.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> tdeuniqueapplication.cpp Waldo Bastian <bastian@kde.org> diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index 200254181..0997aad45 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 \ tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \ kallocator.h kvmallocator.h tdecrash.h krfcdate.h \ - kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \ + tdeinstance.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 \ tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \ tdecrash.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 \ tdeuniqueapplication.cpp tdeaccelmanager.cpp \ ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \ tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \ diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index e30ebeae0..18af9c030 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 "tdestandarddirs.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 177e3d781..b1ee62efd 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -33,7 +33,7 @@ #include <tdeglobal.h> #include <tdeconfig.h> #include <tdesimpleconfig.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 7c2c34aa1..15bad692a 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -33,7 +33,7 @@ #include <tdeglobal.h> #include <tdeconfig.h> #include <tdesimpleconfig.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/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/ktempdir.cpp b/tdecore/ktempdir.cpp index db954010e..045695c07 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 "tdestandarddirs.h" #include "tdeprocess.h" diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 7c1eebbd2..accc5c80f 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 <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in index 9ef991b41..4968d9d4a 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 <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index 14f63e048..171ae2eec 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/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp index 707f4fe69..c7944ed12 100644 --- a/tdecore/tdeconfigbackend.cpp +++ b/tdecore/tdeconfigbackend.cpp @@ -431,80 +431,23 @@ bool TDEConfigINIBackEnd::parseConfigFiles() return true; } -#ifdef HAVE_MMAP -#ifdef SIGBUS -static sigjmp_buf mmap_jmpbuf; -struct sigaction mmap_old_sigact; - -extern "C" { - static void mmap_sigbus_handler(int) - { - siglongjmp (mmap_jmpbuf, 1); - } -} -#endif -#endif - extern bool kde_kiosk_exception; void TDEConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile, KEntryMap *pWriteBackMap, bool bGlobal, bool bDefault) { - const char *s; // May get clobbered by sigsetjump, but we don't use them afterwards. - const char *eof; // May get clobbered by sigsetjump, but we don't use them afterwards. - TQByteArray data; - if (!rFile.isOpen()) // come back, if you have real work for us ;-> return; - //using kdDebug() here leads to an infinite loop - //remove this for the release, aleXXX - //tqWarning("Parsing %s, global = %s default = %s", - // rFile.name().latin1(), bGlobal ? "true" : "false", bDefault ? "true" : "false"); - TQCString aCurrentGroup("<default>"); unsigned int ll = localeString.length(); -#ifdef HAVE_MMAP - static volatile const char *map; - map = ( const char* ) mmap(0, rFile.size(), PROT_READ, MAP_PRIVATE, - rFile.handle(), 0); - - if ( map != MAP_FAILED ) - { - s = (const char*) map; - eof = s + rFile.size(); - -#ifdef SIGBUS - struct sigaction act; - act.sa_handler = mmap_sigbus_handler; - sigemptyset( &act.sa_mask ); -#ifdef SA_ONESHOT - act.sa_flags = SA_ONESHOT; -#else - act.sa_flags = SA_RESETHAND; -#endif - sigaction( SIGBUS, &act, &mmap_old_sigact ); - - if (sigsetjmp (mmap_jmpbuf, 1)) - { -tqWarning("SIGBUS while reading %s", rFile.name().latin1()); - munmap(( char* )map, rFile.size()); - sigaction (SIGBUS, &mmap_old_sigact, 0); - return; - } -#endif - } - else -#endif - { - rFile.at(0); - data = rFile.readAll(); - s = data.data(); - eof = s + data.size(); - } + rFile.at(0); + TQByteArray data = rFile.readAll(); + const char *s = data.data(); + const char *eof = s + data.size(); bool fileOptionImmutable = false; bool groupOptionImmutable = false; @@ -757,19 +700,8 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1()); } } - if (fileOptionImmutable) bFileImmutable = true; - -#ifdef HAVE_MMAP - if (map) - { - munmap(( char* )map, rFile.size()); -#ifdef SIGBUS - sigaction (SIGBUS, &mmap_old_sigact, 0); -#endif - } -#endif } void TDEConfigINIBackEnd::translateKey(TDELocale& locale, TQCString currentGroup, TQCString key) { diff --git a/tdecore/tdecrash.cpp b/tdecore/tdecrash.cpp index e1ff0ab57..b1dc62957 100644 --- a/tdecore/tdecrash.cpp +++ b/tdecore/tdecrash.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/tdeglobal.cpp b/tdecore/tdeglobal.cpp index f00a8467c..517debcad 100644 --- a/tdecore/tdeglobal.cpp +++ b/tdecore/tdeglobal.cpp @@ -39,7 +39,7 @@ #include <tdenetworkconnections.h> #endif #include <tdestandarddirs.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 c5fe83ccc..c8235e45e 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/kinstance.h b/tdecore/tdeinstance.h index b46947218..7ded51878 100644 --- a/tdecore/kinstance.h +++ b/tdecore/tdeinstance.h @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* 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 @@ -15,8 +15,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KINSTANCE_H -#define _KINSTANCE_H +#ifndef _TDEINSTANCE_H +#define _TDEINSTANCE_H #include <tqstring.h> #include "tdelibs_export.h" @@ -37,8 +37,8 @@ class TDEGlobalNetworkManager; /** - * Access to KDE global objects for use in shared libraries. In - * practical terms, this class is used in KDE components. This allows + * 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. * diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp index 53e85de22..1e771c85a 100644 --- a/tdecore/tdelocale.cpp +++ b/tdecore/tdelocale.cpp @@ -35,7 +35,7 @@ #include "tdeglobal.h" #include "tdestandarddirs.h" #include "tdesimpleconfig.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 cc9961199..b4ceb86d8 100644 --- a/tdecore/tdeshortcutlist.cpp +++ b/tdecore/tdeshortcutlist.cpp @@ -7,7 +7,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdeglobalaccel.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeshortcut.h> #include "tdeshortcutlist.h" diff --git a/tdecore/tdestandarddirs.cpp b/tdecore/tdestandarddirs.cpp index ac827c883..0821b22d1 100644 --- a/tdecore/tdestandarddirs.cpp +++ b/tdecore/tdestandarddirs.cpp @@ -48,7 +48,7 @@ #include "tdestandarddirs.h" #include "tdeconfig.h" -#include "kinstance.h" +#include "tdeinstance.h" #include "kshell.h" #include "tdesimpleconfig.h" #include "kuser.h" diff --git a/tdecore/tdetempfile.cpp b/tdecore/tdetempfile.cpp index d498f1258..4f6dade45 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 "tdestandarddirs.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/tdestandarddirstest.cpp b/tdecore/tests/tdestandarddirstest.cpp index 53d76a83c..28c974b9e 100644 --- a/tdecore/tests/tdestandarddirstest.cpp +++ b/tdecore/tests/tdestandarddirstest.cpp @@ -1,6 +1,6 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <tdeconfig.h> |