diff options
120 files changed, 130 insertions, 181 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index baecceb88..2aeda5792 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ include( TDESetupPaths ) ##### setup and find essential stuff ############ tde_setup_paths( ) -tde_setup_architecture_flags( ) +tde_setup_compiler_flags( ) enable_testing( ) find_package( TQt ) diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index bc1c51dd7..981359d1a 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <kfinddialog.h> #include <kreplacedialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kstaticdeleter.h> #include <tqpopupmenu.h> diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 3d90d187f..3b4c3790e 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -23,7 +23,7 @@ #include <tdeparts/factory.h> #include <ktrader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> // katepart version must be a string in double quotes, format: "x.x" @@ -224,7 +224,7 @@ class KateFactory TDEAboutData m_aboutData; /** - * our kinstance + * our TDEInstance */ TDEInstance m_instance; diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index c7e5393d2..d5af43f57 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -34,7 +34,7 @@ #include <tdeconfig.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kmimetype.h> #include <tdelocale.h> #include <kregexp.h> diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp index f2238a67f..af629aec8 100644 --- a/kdoctools/main.cpp +++ b/kdoctools/main.cpp @@ -13,7 +13,7 @@ #include <libxslt/xsltutils.h> #include <tqstring.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <stdlib.h> #include "tdeio_help.h" diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp index c394776b7..cca632d2d 100644 --- a/kdoctools/main_ghelp.cpp +++ b/kdoctools/main_ghelp.cpp @@ -13,7 +13,7 @@ #include <libxslt/xsltutils.h> #include <tqstring.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <stdlib.h> #include "tdeio_help.h" diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index f1afaa0da..df8cdbb77 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -17,7 +17,7 @@ #include <libxslt/xsltutils.h> #include <tqstring.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <xslt.h> #include <tqfile.h> #include <tqdir.h> diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp index 2c2fb0583..7c33fafb1 100644 --- a/kdoctools/tdeio_help.cpp +++ b/kdoctools/tdeio_help.cpp @@ -28,7 +28,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "tdeio_help.h" #include <libxslt/xsltutils.h> diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 7798aac61..582828529 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -10,7 +10,7 @@ #include <tqdir.h> #include <tqregexp.h> #include <xslt.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "tdeio_help.h" #include <tdelocale.h> #include <assert.h> diff --git a/kjs/regexp.cpp b/kjs/regexp.cpp index c92a69d6a..04159904f 100644 --- a/kjs/regexp.cpp +++ b/kjs/regexp.cpp @@ -30,17 +30,21 @@ using namespace KJS; +#ifdef HAVE_PCRE2POSIX RegExp::UTF8SupportState RegExp::utf8Support = RegExp::Unknown; +#endif RegExp::RegExp(const UString &p, int f) : pat(p), flgs(f), m_notEmpty(false), valid(true), buffer(0), originalPos(0) { +#ifdef HAVE_PCRE2POSIX // Determine whether libpcre has unicode support if need be.. if (utf8Support == Unknown) { uint32_t supported; pcre2_config(PCRE2_CONFIG_COMPILED_WIDTHS, (void*)&supported); utf8Support = (supported & 0x0001) ? Supported : Unsupported; } +#endif nrSubPatterns = 0; // determined in match() with POSIX regex. @@ -276,9 +280,11 @@ void RegExp::prepareMatch(const UString &s) { delete[] originalPos; // Just to be sure.. delete[] buffer; +#ifdef HAVE_PCRE2POSIX if (utf8Support == Supported) prepareUtf8(s); else +#endif prepareASCII(s); #ifndef NDEBUG diff --git a/kjs/regexp.h b/kjs/regexp.h index e731eb714..d84fca17c 100644 --- a/kjs/regexp.h +++ b/kjs/regexp.h @@ -21,6 +21,7 @@ #ifndef _KJS_REGEXP_H_ #define _KJS_REGEXP_H_ +#include <stdint.h> #include <sys/types.h> #include "config.h" diff --git a/libtdemid/deviceman.cpp b/libtdemid/deviceman.cpp index 18bb9fcc2..137bff135 100644 --- a/libtdemid/deviceman.cpp +++ b/libtdemid/deviceman.cpp @@ -66,7 +66,7 @@ #endif #if 1 -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdeconfig.h> #endif diff --git a/pics/crystalsvg/cr128-app-go.png b/pics/crystalsvg/cr128-app-go.png Binary files differindex 0bd71f4bb..b47d9093f 100755..100644 --- a/pics/crystalsvg/cr128-app-go.png +++ b/pics/crystalsvg/cr128-app-go.png diff --git a/pics/crystalsvg/cr128-app-kmenu.png b/pics/crystalsvg/cr128-app-kmenu.png Binary files differindex 0bd71f4bb..b47d9093f 100755..100644 --- a/pics/crystalsvg/cr128-app-kmenu.png +++ b/pics/crystalsvg/cr128-app-kmenu.png diff --git a/pics/crystalsvg/cr16-action-about_kde.png b/pics/crystalsvg/cr16-action-about_kde.png Binary files differindex 8115666fa..efb616744 100755..100644 --- a/pics/crystalsvg/cr16-action-about_kde.png +++ b/pics/crystalsvg/cr16-action-about_kde.png diff --git a/pics/crystalsvg/cr16-action-help-about.png b/pics/crystalsvg/cr16-action-help-about.png Binary files differindex 8115666fa..efb616744 100755..100644 --- a/pics/crystalsvg/cr16-action-help-about.png +++ b/pics/crystalsvg/cr16-action-help-about.png diff --git a/pics/crystalsvg/cr16-app-accessories-character-map.png b/pics/crystalsvg/cr16-app-accessories-character-map.png Binary files differindex 26a5724f8..5efaa44bd 100644 --- a/pics/crystalsvg/cr16-app-accessories-character-map.png +++ b/pics/crystalsvg/cr16-app-accessories-character-map.png diff --git a/pics/crystalsvg/cr16-app-go.png b/pics/crystalsvg/cr16-app-go.png Binary files differindex 8115666fa..efb616744 100755..100644 --- a/pics/crystalsvg/cr16-app-go.png +++ b/pics/crystalsvg/cr16-app-go.png diff --git a/pics/crystalsvg/cr16-app-kmenu.png b/pics/crystalsvg/cr16-app-kmenu.png Binary files differindex 8115666fa..efb616744 100755..100644 --- a/pics/crystalsvg/cr16-app-kmenu.png +++ b/pics/crystalsvg/cr16-app-kmenu.png diff --git a/pics/crystalsvg/cr22-action-about_kde.png b/pics/crystalsvg/cr22-action-about_kde.png Binary files differindex 7d9a3d78b..ff3e2d49a 100755..100644 --- a/pics/crystalsvg/cr22-action-about_kde.png +++ b/pics/crystalsvg/cr22-action-about_kde.png diff --git a/pics/crystalsvg/cr22-action-help-about.png b/pics/crystalsvg/cr22-action-help-about.png Binary files differindex 7d9a3d78b..ff3e2d49a 100755..100644 --- a/pics/crystalsvg/cr22-action-help-about.png +++ b/pics/crystalsvg/cr22-action-help-about.png diff --git a/pics/crystalsvg/cr22-app-accessories-character-map.png b/pics/crystalsvg/cr22-app-accessories-character-map.png Binary files differindex d416fcf36..de92bbbd8 100644 --- a/pics/crystalsvg/cr22-app-accessories-character-map.png +++ b/pics/crystalsvg/cr22-app-accessories-character-map.png diff --git a/pics/crystalsvg/cr22-app-go.png b/pics/crystalsvg/cr22-app-go.png Binary files differindex 7d9a3d78b..ff3e2d49a 100755..100644 --- a/pics/crystalsvg/cr22-app-go.png +++ b/pics/crystalsvg/cr22-app-go.png diff --git a/pics/crystalsvg/cr22-app-kmenu.png b/pics/crystalsvg/cr22-app-kmenu.png Binary files differindex 7d9a3d78b..ff3e2d49a 100755..100644 --- a/pics/crystalsvg/cr22-app-kmenu.png +++ b/pics/crystalsvg/cr22-app-kmenu.png diff --git a/pics/crystalsvg/cr32-action-about_kde.png b/pics/crystalsvg/cr32-action-about_kde.png Binary files differindex 6e2099a89..d6e096f17 100755..100644 --- a/pics/crystalsvg/cr32-action-about_kde.png +++ b/pics/crystalsvg/cr32-action-about_kde.png diff --git a/pics/crystalsvg/cr32-action-help-about.png b/pics/crystalsvg/cr32-action-help-about.png Binary files differindex 6e2099a89..d6e096f17 100755..100644 --- a/pics/crystalsvg/cr32-action-help-about.png +++ b/pics/crystalsvg/cr32-action-help-about.png diff --git a/pics/crystalsvg/cr32-app-accessories-character-map.png b/pics/crystalsvg/cr32-app-accessories-character-map.png Binary files differindex ea4370592..93617e567 100644 --- a/pics/crystalsvg/cr32-app-accessories-character-map.png +++ b/pics/crystalsvg/cr32-app-accessories-character-map.png diff --git a/pics/crystalsvg/cr32-app-go.png b/pics/crystalsvg/cr32-app-go.png Binary files differindex 6e2099a89..d6e096f17 100755..100644 --- a/pics/crystalsvg/cr32-app-go.png +++ b/pics/crystalsvg/cr32-app-go.png diff --git a/pics/crystalsvg/cr32-app-kmenu.png b/pics/crystalsvg/cr32-app-kmenu.png Binary files differindex 6e2099a89..d6e096f17 100755..100644 --- a/pics/crystalsvg/cr32-app-kmenu.png +++ b/pics/crystalsvg/cr32-app-kmenu.png diff --git a/pics/crystalsvg/cr48-app-accessories-character-map.png b/pics/crystalsvg/cr48-app-accessories-character-map.png Binary files differindex d56136608..a52790297 100644 --- a/pics/crystalsvg/cr48-app-accessories-character-map.png +++ b/pics/crystalsvg/cr48-app-accessories-character-map.png diff --git a/pics/crystalsvg/cr48-app-go.png b/pics/crystalsvg/cr48-app-go.png Binary files differindex e1f1f814f..80adfab25 100755..100644 --- a/pics/crystalsvg/cr48-app-go.png +++ b/pics/crystalsvg/cr48-app-go.png diff --git a/pics/crystalsvg/cr48-app-kmenu.png b/pics/crystalsvg/cr48-app-kmenu.png Binary files differindex e1f1f814f..80adfab25 100755..100644 --- a/pics/crystalsvg/cr48-app-kmenu.png +++ b/pics/crystalsvg/cr48-app-kmenu.png diff --git a/pics/crystalsvg/cr64-app-go.png b/pics/crystalsvg/cr64-app-go.png Binary files differindex a7491a494..1c6757c10 100755..100644 --- a/pics/crystalsvg/cr64-app-go.png +++ b/pics/crystalsvg/cr64-app-go.png diff --git a/pics/crystalsvg/cr64-app-kmenu.png b/pics/crystalsvg/cr64-app-kmenu.png Binary files differindex a7491a494..1c6757c10 100755..100644 --- a/pics/crystalsvg/cr64-app-kmenu.png +++ b/pics/crystalsvg/cr64-app-kmenu.png diff --git a/pics/crystalsvg/crsc-action-about_kde.svgz b/pics/crystalsvg/crsc-action-about_kde.svgz Binary files differindex 75d3c3dc2..b26fba183 100644 --- a/pics/crystalsvg/crsc-action-about_kde.svgz +++ b/pics/crystalsvg/crsc-action-about_kde.svgz diff --git a/pics/crystalsvg/crsc-action-help-about.svgz b/pics/crystalsvg/crsc-action-help-about.svgz Binary files differindex 3bd5e364e..f3cabc573 100644 --- a/pics/crystalsvg/crsc-action-help-about.svgz +++ b/pics/crystalsvg/crsc-action-help-about.svgz diff --git a/pics/crystalsvg/crsc-app-go.svgz b/pics/crystalsvg/crsc-app-go.svgz Binary files differindex c2b46a7be..f50ab05ea 100644 --- a/pics/crystalsvg/crsc-app-go.svgz +++ b/pics/crystalsvg/crsc-app-go.svgz diff --git a/pics/crystalsvg/crsc-app-kmenu.svgz b/pics/crystalsvg/crsc-app-kmenu.svgz Binary files differindex cb18321b8..389038511 100644 --- a/pics/crystalsvg/crsc-app-kmenu.svgz +++ b/pics/crystalsvg/crsc-app-kmenu.svgz diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp index b124eddbe..67073d435 100644 --- a/tdeabc/addressbook.cpp +++ b/tdeabc/addressbook.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdestandarddirs.h> diff --git a/tdecert/tdecertpart.cpp b/tdecert/tdecertpart.cpp index d59f48837..995eae8bd 100644 --- a/tdecert/tdecertpart.cpp +++ b/tdecert/tdecertpart.cpp @@ -21,7 +21,7 @@ #include "tdecertpart.h" #include <tdeparts/genericfactory.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tqframe.h> #include <tdelocale.h> diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp index 43e790360..d074ff0b4 100644 --- a/tdeconf_update/tdeconf_update.cpp +++ b/tdeconf_update/tdeconf_update.cpp @@ -35,7 +35,7 @@ #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetempfile.h> static TDECmdLineOptions options[] = 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> diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp index 7aaf16b5a..2f0233403 100644 --- a/tdehtml/tdehtml_factory.cpp +++ b/tdehtml/tdehtml_factory.cpp @@ -29,7 +29,7 @@ #include "misc/loader.h" #include "misc/arena.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tdelocale.h> diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index 726f6d6c1..3ade9bd4d 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -30,7 +30,7 @@ #include <tqtimer.h> #include <tdeio/job.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kmimetype.h> #include <tdelocale.h> diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp index 7afda5741..ccb7cdaea 100644 --- a/tdehtml/tdemultipart/tdemultipart.cpp +++ b/tdehtml/tdemultipart/tdemultipart.cpp @@ -20,7 +20,7 @@ #include "tdemultipart.h" #include <tqvbox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kmimetype.h> #include <tdelocale.h> #include <tdeio/job.h> diff --git a/tdeinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp index b9a0e55b6..4ea169f4e 100644 --- a/tdeinit/tdedostartupconfig.cpp +++ b/tdeinit/tdedostartupconfig.cpp @@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <tqfile.h> #include <tqtextstream.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp index debe0be12..392cd0662 100644 --- a/tdeinit/tdeinit.cpp +++ b/tdeinit/tdeinit.cpp @@ -52,7 +52,7 @@ #include <tqtextstream.h> #include <tqregexp.h> #include <tqfont.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h index fe6dcc6ba..c9f3fed8d 100644 --- a/tdeio/tdefile/knotifydialog.h +++ b/tdeio/tdefile/knotifydialog.h @@ -21,7 +21,7 @@ #include <tdelistview.h> #include <kdialogbase.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "knotifywidgetbase.h" diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index fa6d8ea47..ec8040f51 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -36,7 +36,7 @@ #include <tdeglobal.h> #include <kicondialog.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klineedit.h> #include <tdelocale.h> #include <kmimetype.h> diff --git a/tdeio/tdeio/dataprotocol.cpp b/tdeio/tdeio/dataprotocol.cpp index efbf549ad..3bfd3ed1c 100644 --- a/tdeio/tdeio/dataprotocol.cpp +++ b/tdeio/tdeio/dataprotocol.cpp @@ -29,7 +29,7 @@ #include <tqtextcodec.h> #ifdef DATAKIOSLAVE -# include <kinstance.h> +# include <tdeinstance.h> # include <stdlib.h> #endif #ifdef TESTKIO diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp index 903bf7775..c916abf0f 100644 --- a/tdeio/tdeio/kdatatool.cpp +++ b/tdeio/tdeio/kdatatool.cpp @@ -23,7 +23,7 @@ #include <tdestandarddirs.h> #include <klibloader.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h index cfc70e08a..d7d8ffe0b 100644 --- a/tdeio/tdeio/kscan.h +++ b/tdeio/tdeio/kscan.h @@ -21,7 +21,7 @@ #define KSCAN_H #include <kdialogbase.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klibloader.h> class TQImage; diff --git a/tdeio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp index ed73d6782..5e0fdfba4 100644 --- a/tdeio/tests/kfiltertest.cpp +++ b/tdeio/tests/kfiltertest.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> void test_block( const TQString & fileName ) { diff --git a/tdeio/tests/kmfitest.cpp b/tdeio/tests/kmfitest.cpp index a2ec91717..aadde7652 100644 --- a/tdeio/tests/kmfitest.cpp +++ b/tdeio/tests/kmfitest.cpp @@ -1,7 +1,7 @@ #include <stdio.h> #include <tqdir.h> #include <tqfile.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> #include <tdefilemetainfo.h> #include <kmimetype.h> diff --git a/tdeio/tests/kmimemagictest.cpp b/tdeio/tests/kmimemagictest.cpp index 00c545c3c..47583ea21 100644 --- a/tdeio/tests/kmimemagictest.cpp +++ b/tdeio/tests/kmimemagictest.cpp @@ -19,7 +19,7 @@ #include <kmimetype.h> #include <kmimemagic.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <stdio.h> int main( int argc, char** argv ) diff --git a/tdeio/tests/kmimetypetest.cpp b/tdeio/tests/kmimetypetest.cpp index 631521c8a..bf41d8c40 100644 --- a/tdeio/tests/kmimetypetest.cpp +++ b/tdeio/tests/kmimetypetest.cpp @@ -17,7 +17,7 @@ */ #include <kmimetype.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktempdir.h> #include <kprotocolinfo.h> #include <tqdir.h> diff --git a/tdeio/tests/ktartest.cpp b/tdeio/tests/ktartest.cpp index 2c470f6e4..84ada6c06 100644 --- a/tdeio/tests/ktartest.cpp +++ b/tdeio/tests/ktartest.cpp @@ -18,7 +18,7 @@ #include "ktar.h" #include <stdio.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqfile.h> #include <assert.h> diff --git a/tdeio/tests/kziptest.cpp b/tdeio/tests/kziptest.cpp index 84d38d134..1e34c98b8 100644 --- a/tdeio/tests/kziptest.cpp +++ b/tdeio/tests/kziptest.cpp @@ -18,7 +18,7 @@ #include "kzip.h" #include <stdio.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tqfile.h> diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp index ba13cc10f..ba42792ee 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -73,7 +73,7 @@ #include <kshred.h> #include <kdebug.h> #include <kurl.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdesimpleconfig.h> #include <tdetempfile.h> #include <tdelocale.h> diff --git a/tdeioslave/ftp/ftp.cpp b/tdeioslave/ftp/ftp.cpp index 8a87305f6..780e999cb 100644 --- a/tdeioslave/ftp/ftp.cpp +++ b/tdeioslave/ftp/ftp.cpp @@ -53,7 +53,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kmimemagic.h> #include <kmimetype.h> #include <ksockaddr.h> diff --git a/tdeioslave/http/http.cpp b/tdeioslave/http/http.cpp index 5cc638bd0..7520349d9 100644 --- a/tdeioslave/http/http.cpp +++ b/tdeioslave/http/http.cpp @@ -57,7 +57,7 @@ #include <kservice.h> #include <krfcdate.h> #include <kmdcodec.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kresolver.h> #include <kmimemagic.h> #include <dcopclient.h> diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp index 08ca740b2..0375042e8 100644 --- a/tdeioslave/http/http_cache_cleaner.cpp +++ b/tdeioslave/http/http_cache_cleaner.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> #include <tqptrlist.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeglobal.h> diff --git a/tdeioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp index 4688a3e7a..40a7eb738 100644 --- a/tdeioslave/iso/iso.cpp +++ b/tdeioslave/iso/iso.cpp @@ -30,7 +30,7 @@ #include <tqfile.h> #include <kurl.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiso.h> #include <kmimemagic.h> @@ -274,7 +274,7 @@ void tdeio_isoProtocol::listDir( const KURL & url ) const KArchiveDirectory* dir; if (!path.isEmpty() && path != "/") { - kdDebug() << TQString(TQString("Looking for entry %1").arg(path)) << endl; + kdDebug() << TQString("Looking for entry %1").arg(path) << endl; const KArchiveEntry* e = root->entry( path ); if ( !e ) { diff --git a/tdeioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp index fdd2df413..bcc11810d 100644 --- a/tdeioslave/iso/kiso.cpp +++ b/tdeioslave/iso/kiso.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ /* This file is heavily based on ktar.cpp from tdelibs (c) David Faure */ - + #include <stdio.h> #include <stdlib.h> #include <time.h> @@ -125,6 +125,8 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype ) mimetype = "application/x-gzip"; else if ( mimetype == "application/x-tbz" ) // that's a bzipped2 tar file, so ask for bz2 filter mimetype = "application/x-bzip2"; + else if ( mimetype == "application/x-txz" ) // that's a xzipped tar file, so ask for xz filter + mimetype = "application/x-xz"; else { // Something else. Check if it's not really gzip though (e.g. for KOffice docs) @@ -144,6 +146,14 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype ) if ( fourthByte == 4 ) mimetype = "application/x-zip"; } + else if ( firstByte == 0xfd && secondByte == '7' && thirdByte == 'z' ) + { + unsigned char fourthByte = file.getch(); + unsigned char fifthByte = file.getch(); + unsigned char sixthByte = file.getch(); + if ( fourthByte == 'X' && fifthByte == 'Z' && sixthByte == 0) + mimetype = "application/x-xz"; + } } } forced = false; @@ -155,13 +165,13 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype ) void KIso::prepareDevice( const TQString & filename, const TQString & mimetype, bool forced ) { - /* 'hack' for Qt's false assumption that only S_ISREG is seekable */ + /* 'hack' for TQt's false assumption that only S_ISREG is seekable */ if( "inode/blockdevice" == mimetype ) setDevice( new QFileHack( filename ) ); else { - if( "application/x-gzip" == mimetype - || "application/x-bzip2" == mimetype) + if("application/x-gzip" == mimetype || "application/x-bzip2" == mimetype || + "application/x-xz" == mimetype) forced = true; TQIODevice *dev = KFilterDev::deviceForFile( filename, mimetype, forced ); @@ -295,7 +305,7 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) { boot_entry *be; TQString path; KIsoFile *entry; - + entry=new KIsoFile( this, "Catalog", dirent->permissions() & ~S_IFDIR, dirent->date(), dirent->adate(), dirent->cdate(), dirent->user(), dirent->group(), TQString::null, @@ -327,7 +337,7 @@ void KIso::readParams() TDEConfig *config; config = new TDEConfig("tdeio_isorc"); - + showhidden=config->readBoolEntry("showhidden",false); showrr=config->readBoolEntry("showrr",true); delete config; @@ -373,7 +383,7 @@ bool KIso::openArchive( int mode ) if (trackno==0) trackno=1; for (i=0;i<trackno;i++) { - c_b=1;c_i=1;c_j=1; + c_b=1;c_i=1;c_j=1; root=rootDir(); if (trackno>1) { path=TQString::null; @@ -397,11 +407,11 @@ bool KIso::openArchive( int mode ) if ( !memcmp(EL_TORITO_ID,bootdesc->system_id,ISODCL(8,39)) ) { path="El Torito Boot"; if (c_b>1) path += " (" + TQString::number(c_b) + ")"; - + dirent = new KIsoDirectory( this, path, access | S_IFDIR, buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString::null ); root->addEntry(dirent); - + addBoot(bootdesc); c_b++; } diff --git a/tdeioslave/iso/qfilehack.h b/tdeioslave/iso/qfilehack.h index 3f0b1f6a6..fe43217b2 100644 --- a/tdeioslave/iso/qfilehack.h +++ b/tdeioslave/iso/qfilehack.h @@ -23,7 +23,7 @@ /** *@author Szombathelyi György - * Qt thinks if a file is not S_IFREG, you cannot seek in it. It's false (what about + * TQt thinks if a file is not S_IFREG, you cannot seek in it. It's false (what about * block devices for example? */ diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp index 7a1bd5703..405f26416 100644 --- a/tdeparts/dockmainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -25,7 +25,7 @@ #include <tdeaccel.h> #include <tdeparts/plugin.h> #include <kstatusbar.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <khelpmenu.h> #include <tdestandarddirs.h> #include <tqapplication.h> diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp index 0b7d1c84c..69636ad6a 100644 --- a/tdeparts/factory.cpp +++ b/tdeparts/factory.cpp @@ -25,7 +25,7 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> using namespace KParts; diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index 2e6d2b7c3..a0a011a96 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -22,7 +22,7 @@ #include <tdeparts/event.h> #include <tdeparts/part.h> #include <tdeparts/plugin.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kstatusbar.h> #include <khelpmenu.h> #include <tdestandarddirs.h> diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp index 9a558ee01..2ca0c058f 100644 --- a/tdeparts/part.cpp +++ b/tdeparts/part.cpp @@ -32,7 +32,7 @@ #include <tqtextstream.h> #include <tqfileinfo.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdetempfile.h> #include <tdemessagebox.h> diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp index ba3d6a663..9d1c78940 100644 --- a/tdeparts/plugin.cpp +++ b/tdeparts/plugin.cpp @@ -30,7 +30,7 @@ #include <tqfileinfo.h> #include <klibloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <kdebug.h> #include <kxmlguifactory.h> diff --git a/tdeprint/pics/tdeprint_landscape.png b/tdeprint/pics/tdeprint_landscape.png Binary files differindex d374455b3..967d3b9f2 100755 --- a/tdeprint/pics/tdeprint_landscape.png +++ b/tdeprint/pics/tdeprint_landscape.png diff --git a/tdeprint/pics/tdeprint_portrait.png b/tdeprint/pics/tdeprint_portrait.png Binary files differindex 94556f975..4a9df8298 100755 --- a/tdeprint/pics/tdeprint_portrait.png +++ b/tdeprint/pics/tdeprint_portrait.png diff --git a/tdeprint/pics/tdeprint_revlandscape.png b/tdeprint/pics/tdeprint_revlandscape.png Binary files differindex 7d62ccf29..64ceb7230 100755 --- a/tdeprint/pics/tdeprint_revlandscape.png +++ b/tdeprint/pics/tdeprint_revlandscape.png diff --git a/tdeprint/pics/tdeprint_revportrait.png b/tdeprint/pics/tdeprint_revportrait.png Binary files differindex 4688d687f..89c04c92d 100755 --- a/tdeprint/pics/tdeprint_revportrait.png +++ b/tdeprint/pics/tdeprint_revportrait.png diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp index a97c7b2f1..a6a0fe5f6 100644 --- a/tdersync/rsyncconfigdialog.cpp +++ b/tdersync/rsyncconfigdialog.cpp @@ -72,7 +72,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <twin.h> #include <tdeaction.h> diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h index a3a6ced31..0d642fcde 100644 --- a/tdersync/tdersync.h +++ b/tdersync/tdersync.h @@ -50,7 +50,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <twin.h> #include <kurl.h> diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 04bc15016..be0d47a51 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <kicontheme.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <kxmlguifactory.h> #include <kseparator.h> diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index 7b2657376..b8fd549f5 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -28,7 +28,7 @@ #include <tqregexp.h> #include <tqguardedptr.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 07e5af78c..bee9683c4 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -34,7 +34,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdeshortcut.h> #include <tdestandarddirs.h> diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp index 06ca1acda..7b6670b9e 100644 --- a/tdeui/tdecmodule.cpp +++ b/tdeui/tdecmodule.cpp @@ -28,7 +28,7 @@ #include <tdeconfigdialogmanager.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include "tdecmodule.h" diff --git a/tdeunittest/modrunner.cpp b/tdeunittest/modrunner.cpp index 350778f6c..3ba83628f 100644 --- a/tdeunittest/modrunner.cpp +++ b/tdeunittest/modrunner.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index e9b2b6446..84d1629ea 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -55,7 +55,7 @@ #include <tqsplitter.h> #include <tqframe.h> #include "kplugininfo.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tqptrdict.h> #include <tqstringlist.h> #include "tdecmoduleproxy.h" diff --git a/tdewidgets/kde.widgets b/tdewidgets/kde.widgets index 28e31c78a..499a14ca8 100644 --- a/tdewidgets/kde.widgets +++ b/tdewidgets/kde.widgets @@ -1,6 +1,6 @@ [Global] PluginName=KDEWidgets -Includes=kinstance.h,classpreviews.h +Includes=tdeinstance.h,classpreviews.h Init=new TDEInstance("tdewidgets"); [KActiveLabel] diff --git a/tdewidgets/maketdewidgets.cpp b/tdewidgets/maketdewidgets.cpp index ca3daf732..fbed4b7f4 100644 --- a/tdewidgets/maketdewidgets.cpp +++ b/tdewidgets/maketdewidgets.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2004-2005 ian reinhart geiser <geiseri@sourcextreme.com> */ #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kmacroexpander.h> diff --git a/tdewidgets/tests/test.widgets b/tdewidgets/tests/test.widgets index e8acdb945..b78ae6ba3 100644 --- a/tdewidgets/tests/test.widgets +++ b/tdewidgets/tests/test.widgets @@ -1,6 +1,6 @@ [Global] PluginName=KDEWidgets -Includes=kinstance.h,classpreviews.h +Includes=tdeinstance.h,classpreviews.h Init=new TDEInstance("tdewidgets"); [KActiveLabel] diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index 5806fd3e2..0c13e5884 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -68,7 +68,7 @@ tdeaccelmanager.cpp \ tdeshortcut.cpp \ tdeshortcutmenu.cpp \ tdeshortcutlist.cpp \ -kinstance.cpp \ +tdeinstance.cpp \ tdeversion.cpp \ tdelocale.cpp \ kicontheme.cpp \ |
