diff options
Diffstat (limited to 'tdecore')
53 files changed, 174 insertions, 237 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 8528c4c01..96032d616 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -49,8 +49,8 @@ link_directories( ##### headers ################################### install( FILES - tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h - tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h + tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h tdesimpleconfig.h + tdeconfigdialogmanager.h tdeconfigbase.h tdedesktopfile.h kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h tdeapplication.h tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.h tdeprocctrl.h @@ -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 @@ -106,8 +106,8 @@ set( target tdecore ) set( ${target}_SRCS libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp - tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp - kmanagerselection.cpp kdesktopfile.cpp tdestandarddirs.cpp + tdeconfigbase.cpp tdeconfig.cpp tdesimpleconfig.cpp tdeconfigbackend.cpp + kmanagerselection.cpp tdedesktopfile.cpp tdestandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp @@ -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/DESIGN.tdeconfig b/tdecore/DESIGN.tdeconfig index ef8c40546..1a3645051 100644 --- a/tdecore/DESIGN.tdeconfig +++ b/tdecore/DESIGN.tdeconfig @@ -176,7 +176,7 @@ Class overview TDEConfigBackend <-----> TDEConfig <------> TDEConfigSkeleton /--< myapp.kcfg | | | / v v |*---------------< -TDEConfigINIBackend KSimpleConfig |tdeconfig_compiler \ +TDEConfigINIBackend TDESimpleConfig |tdeconfig_compiler \ | \--< myconfig.kcfg-codegen v MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui @@ -187,7 +187,7 @@ TDEConfigBase: defines API for generic config class TDEConfig: functional generic config class that supports merging of cascaded configuration files -KSimpleConfig: functional generic config class without support for cascading +TDESimpleConfig: functional generic config class without support for cascading configuration files. TDEConfigBackend: defines API for config backend, t.i. the actual handling diff --git a/tdecore/KCONFIG_DESIGN b/tdecore/KCONFIG_DESIGN index d0fa141ff..83b6bf2d4 100644 --- a/tdecore/KCONFIG_DESIGN +++ b/tdecore/KCONFIG_DESIGN @@ -30,7 +30,7 @@ reads/writes the standard windows INI-style configuration files that KDE has used since KDE 1.x days. However, it is conceivable that one might program an XML backend, or even a database/registry style backend. Again, this abstract data type approach provides flexibility -for the future. Currently TDEConfig and KSimpleConfig hardcode that +for the future. Currently TDEConfig and TDESimpleConfig hardcode that they are using a TDEConfigINIBackEnd in the constructor. If more back ends are implemented, this will have to be changed to use a factory method of some sort to create the backend; all they maintain is a diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index fef36b95d..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,11 +22,11 @@ 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> -kdesktopfile.cpp +tdedesktopfile.cpp tdeglobal.cpp Stephan Kulow <coolo@kde.org> tdeglobalaccel.cpp Ellis Whitehead <ellis@kde.org> tdeglobalaccel_x11.cpp Ellis Whitehead <ellis@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> @@ -57,7 +57,7 @@ krfcdate.cpp Waldo Bastian <bastian@kde.org> krootprop.cpp Lubos Lunak <l.lunak@kde.org> ksavefile.cpp Waldo Bastian <bastian@kde.org> tdeshortcut.cpp Ellis Whitehead <ellis@kde.org> -ksimpleconfig.cpp Waldo Bastian <bastian@kde.org> +tdesimpleconfig.cpp Waldo Bastian <bastian@kde.org> ksocks.cpp tdestandarddirs.cpp Waldo Bastian <bastian@kde.org> tdestartupinfo.cpp Lubos Lunak <l.lunak@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 b3772b1c7..0997aad45 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -37,8 +37,8 @@ lib_LTLIBRARIES = libtdefakes.la libtdecore.la lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a include_HEADERS = tdeconfig.h tdeconfigskeleton.h \ - tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \ - tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \ + tdeconfigdata.h tdesimpleconfig.h tdeconfigdialogmanager.h \ + tdeconfigbase.h tdedesktopfile.h kurl.h ksock.h tdeaboutdata.h \ tdecmdlineargs.h tdeconfigbackend.h tdeapplication.h \ tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.h \ tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \ @@ -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 \ @@ -90,8 +90,8 @@ noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \ kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \ - kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp \ - tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \ + kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp tdesimpleconfig.cpp \ + tdeconfigbackend.cpp kmanagerselection.cpp tdedesktopfile.cpp \ tdestandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \ tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \ kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \ @@ -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 43b50880d..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> @@ -693,10 +693,15 @@ void bfdFillAdditionalFunctionsInfo(BacktraceFunctionInfo &func) { // found source file and line for given address for (asection *sect = abfd->sections; sect != NULL; sect = sect->next) { - +#ifdef HAVE_LIBBFD_2_34_API + if (bfd_section_flags(sect) & SEC_ALLOC) { + bfd_vma sectStart = bfd_section_vma(sect); + bfd_vma sectEnd = sectStart + bfd_section_size(sect); +#else // HAVE_LIBBFD_2_34_API if (bfd_get_section_flags(abfd, sect) & SEC_ALLOC) { bfd_vma sectStart = bfd_get_section_vma(abfd, sect); bfd_vma sectEnd = sectStart + bfd_section_size(abfd, sect); +#endif // HAVE_LIBBFD_2_34_API if (sectStart <= func.offset && func.offset < sectEnd) { bfd_vma sectOffset = func.offset - sectStart; const char* functionName; 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 8c56990d8..b1ee62efd 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -32,8 +32,8 @@ #include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kinstance.h> +#include <tdesimpleconfig.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 f0793f2c1..15bad692a 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -32,8 +32,8 @@ #include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kinstance.h> +#include <tdesimpleconfig.h> +#include <tdeinstance.h> #include "kicontheme.h" @@ -136,11 +136,11 @@ 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; - //was: KSimpleConfig cfg(fileName); + //was: TDESimpleConfig cfg(fileName); cfg.setGroup(mainSection); mName = cfg.readEntry("Name"); 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/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 3d08cccd5..482181784 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -29,7 +29,7 @@ #include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeconfig.h> #include <kstringhandler.h> @@ -58,7 +58,7 @@ KProtocolInfo::KProtocolInfo(const TQString &path) d = new KProtocolInfoPrivate; TQString fullPath = locate("services", path); - KSimpleConfig config( fullPath, true ); + TDESimpleConfig config( fullPath, true ); config.setGroup( "Protocol" ); m_name = config.readEntry( "protocol" ); 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.cpp b/tdecore/tdeapplication.cpp index bd410e4d5..4b5b427f3 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -76,7 +76,7 @@ #include <kiconloader.h> #include <kclipboard.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.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.h b/tdecore/tdeconfig.h index 0c23525af..7d535e38b 100644 --- a/tdecore/tdeconfig.h +++ b/tdecore/tdeconfig.h @@ -37,7 +37,7 @@ class TDEConfigPrivate; * This class implements KDE's default configuration system. * * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> -* @see TDEGlobal::config(), TDEConfigBase, KSimpleConfig +* @see TDEGlobal::config(), TDEConfigBase, TDESimpleConfig * @short KDE Configuration Management class */ class TDECORE_EXPORT TDEConfig : public TDEConfigBase diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp index ec4b16b96..a4f4bc9c0 100644 --- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp +++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp @@ -33,7 +33,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <iostream> @@ -994,7 +994,7 @@ int main( int argc, char **argv ) TQString baseName = args->url( 1 ).fileName(); baseName = baseName.left(baseName.length() - 6); - KSimpleConfig codegenConfig( codegenFilename, true ); + TDESimpleConfig codegenConfig( codegenFilename, true ); TQString nameSpace = codegenConfig.readEntry("NameSpace"); TQString className = codegenConfig.readEntry("ClassName"); 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/tdeconfigbase.h b/tdecore/tdeconfigbase.h index 43a8e281e..d05064e73 100644 --- a/tdecore/tdeconfigbase.h +++ b/tdecore/tdeconfigbase.h @@ -45,7 +45,7 @@ class TDEConfigGroup; * This class forms the base for all %KDE configuration. It is an * abstract base class, meaning that you cannot directly instantiate * objects of this class. Either use TDEConfig (for usual %KDE - * configuration) or KSimpleConfig (for special needs as in ksamba), or + * configuration) or TDESimpleConfig (for special needs as in ksamba), or * even TDESharedConfig (stores values in shared memory). * * All configuration entries are key, value pairs. Each entry also @@ -64,7 +64,7 @@ class TDEConfigGroup; * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> * @see TDEGlobal#config() * @see TDEConfig - * @see KSimpleConfig + * @see TDESimpleConfig * @see TDESharedConfig */ class TDECORE_EXPORT TDEConfigBase : public TQObject @@ -2025,7 +2025,7 @@ protected: bool bDirty; bool bLocaleInitialized; - bool bReadOnly; // currently only used by KSimpleConfig + bool bReadOnly; // currently only used by TDESimpleConfig mutable bool bExpand; // whether dollar expansion is used protected: @@ -2044,11 +2044,11 @@ private: class TDEConfigGroupSaverPrivate; /** - * Helper class to facilitate working with TDEConfig / KSimpleConfig + * Helper class to facilitate working with TDEConfig / TDESimpleConfig * groups. * * Careful programmers always set the group of a - * TDEConfig KSimpleConfig object to the group they want to read from + * TDEConfig TDESimpleConfig object to the group they want to read from * and set it back to the old one of afterwards. This is usually * written as: * \code @@ -2075,8 +2075,8 @@ class TDEConfigGroupSaverPrivate; * way. * * @author Matthias Kalle Dalheimer <kalle@kde.org> - * @see TDEConfigBase, TDEConfig, KSimpleConfig, TDEConfigGroup - * @short Helper class for easier use of TDEConfig/KSimpleConfig groups + * @see TDEConfigBase, TDEConfig, TDESimpleConfig, TDEConfigGroup + * @short Helper class for easier use of TDEConfig/TDESimpleConfig groups */ class TDECORE_EXPORT TDEConfigGroupSaver // KDE4 remove 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/kdesktopfile.cpp b/tdecore/tdedesktopfile.cpp index 27b25858b..7bb9bcbe2 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/tdedesktopfile.cpp @@ -37,10 +37,10 @@ #include "kcatalogue.h" #include "tdelocale.h" -#include "kdesktopfile.h" -#include "kdesktopfile.moc" +#include "tdedesktopfile.h" +#include "tdedesktopfile.moc" -KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, +TDEDesktopFile::TDEDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { @@ -53,12 +53,12 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, setDesktopGroup(); } -KDesktopFile::~KDesktopFile() +TDEDesktopFile::~TDEDesktopFile() { // no need to do anything } -TQString KDesktopFile::locateLocal(const TQString &path) +TQString TDEDesktopFile::locateLocal(const TQString &path) { TQString local; if (path.endsWith(".directory")) @@ -110,7 +110,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) return local; } -bool KDesktopFile::isDesktopFile(const TQString& path) +bool TDEDesktopFile::isDesktopFile(const TQString& path) { int len = path.length(); @@ -122,7 +122,7 @@ bool KDesktopFile::isDesktopFile(const TQString& path) return false; } -bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) +bool TDEDesktopFile::isAuthorizedDesktopFile(const TQString& path) { if (!tdeApp || tdeApp->authorize("run_desktop_files")) return true; @@ -147,7 +147,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) return false; } -TQString KDesktopFile::translatedEntry(const char* key) const +TQString TDEDesktopFile::translatedEntry(const char* key) const { if (hasTranslatedKey(key)) return readEntry(key); @@ -168,42 +168,42 @@ TQString KDesktopFile::translatedEntry(const char* key) const return TQString::null; } -TQString KDesktopFile::readType() const +TQString TDEDesktopFile::readType() const { return readEntry("Type"); } -TQString KDesktopFile::readIcon() const +TQString TDEDesktopFile::readIcon() const { return readEntry("Icon"); } -TQString KDesktopFile::readName() const +TQString TDEDesktopFile::readName() const { return translatedEntry("Name"); } -TQString KDesktopFile::readComment() const +TQString TDEDesktopFile::readComment() const { return translatedEntry("Comment"); } -TQString KDesktopFile::readGenericName() const +TQString TDEDesktopFile::readGenericName() const { return translatedEntry("GenericName"); } -TQString KDesktopFile::readPath() const +TQString TDEDesktopFile::readPath() const { return readPathEntry("Path"); } -TQString KDesktopFile::readDevice() const +TQString TDEDesktopFile::readDevice() const { return readEntry("Dev"); } -TQString KDesktopFile::readURL() const +TQString TDEDesktopFile::readURL() const { if (hasDeviceType()) { TQString device = readDevice(); @@ -234,43 +234,43 @@ TQString KDesktopFile::readURL() const } } -TQStringList KDesktopFile::readActions() const +TQStringList TDEDesktopFile::readActions() const { return readListEntry("Actions", ';'); } -void KDesktopFile::setActionGroup(const TQString &group) +void TDEDesktopFile::setActionGroup(const TQString &group) { setGroup(TQString::fromLatin1("Desktop Action ") + group); } -bool KDesktopFile::hasActionGroup(const TQString &group) const +bool TDEDesktopFile::hasActionGroup(const TQString &group) const { return hasGroup(TQString::fromLatin1("Desktop Action ") + group); } -bool KDesktopFile::hasLinkType() const +bool TDEDesktopFile::hasLinkType() const { return readEntry("Type") == TQString::fromLatin1("Link"); } -bool KDesktopFile::hasApplicationType() const +bool TDEDesktopFile::hasApplicationType() const { return readEntry("Type") == TQString::fromLatin1("Application"); } -bool KDesktopFile::hasMimeTypeType() const +bool TDEDesktopFile::hasMimeTypeType() const { return readEntry("Type") == TQString::fromLatin1("MimeType"); } -bool KDesktopFile::hasDeviceType() const +bool TDEDesktopFile::hasDeviceType() const { return readEntry("Type") == TQString::fromLatin1("FSDev") || readEntry("Type") == TQString::fromLatin1("FSDevice"); } -bool KDesktopFile::tryExec() const +bool TDEDesktopFile::tryExec() const { // Test for TryExec and "X-TDE-AuthorizeAction" TQString te = readPathEntry("TryExec"); @@ -345,31 +345,31 @@ bool KDesktopFile::tryExec() const * @return the filename as passed to the constructor. */ TQString -KDesktopFile::fileName() const { return backEnd->fileName(); } +TDEDesktopFile::fileName() const { return backEnd->fileName(); } /** * @return the resource type as passed to the constructor. */ TQString -KDesktopFile::resource() const { return backEnd->resource(); } +TDEDesktopFile::resource() const { return backEnd->resource(); } TQStringList -KDesktopFile::sortOrder() const +TDEDesktopFile::sortOrder() const { return readListEntry("SortOrder"); } -void KDesktopFile::virtual_hook( int id, void* data ) +void TDEDesktopFile::virtual_hook( int id, void* data ) { TDEConfig::virtual_hook( id, data ); } -TQString KDesktopFile::readDocPath() const +TQString TDEDesktopFile::readDocPath() const { return readPathEntry( "X-DocPath" ); } -KDesktopFile* KDesktopFile::copyTo(const TQString &file) const +TDEDesktopFile* TDEDesktopFile::copyTo(const TQString &file) const { - KDesktopFile *config = new KDesktopFile(TQString::null, false); + TDEDesktopFile *config = new TDEDesktopFile(TQString::null, false); TDEConfig::copyTo(file, config); config->setDesktopGroup(); return config; diff --git a/tdecore/kdesktopfile.h b/tdecore/tdedesktopfile.h index b4f59085a..fbda9f9fd 100644 --- a/tdecore/kdesktopfile.h +++ b/tdecore/tdedesktopfile.h @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (c) 1999 Pietro Iglio <iglio@kde.org> This library is free software; you can redistribute it and/or @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KDESKTOPFILE_H -#define _KDESKTOPFILE_H +#ifndef _TDEDESKTOPFILE_H +#define _TDEDESKTOPFILE_H #include "tdeconfig.h" #include "tdelibs_export.h" -class KDesktopFilePrivate; +class TDEDesktopFilePrivate; /** * KDE Desktop File Management. @@ -31,13 +31,13 @@ class KDesktopFilePrivate; * @see TDEConfigBase TDEConfig * @short KDE Desktop File Management class */ -class TDECORE_EXPORT KDesktopFile : public TDEConfig +class TDECORE_EXPORT TDEDesktopFile : public TDEConfig { TQ_OBJECT public: /** - * Constructs a KDesktopFile object and make it either read-write + * Constructs a TDEDesktopFile object and make it either read-write * or read-only. * * @param fileName The name or path of the desktop file. If it @@ -48,15 +48,15 @@ public: * to search for if @p fileName is not absolute. For * instance, you might want to specify "config". */ - KDesktopFile( const TQString &fileName, bool readOnly = false, + TDEDesktopFile( const TQString &fileName, bool readOnly = false, const char * resType = "apps"); /** - * Destructs the KDesktopFile object. + * Destructs the TDEDesktopFile object. * * Writes back any dirty configuration entries. */ - virtual ~KDesktopFile(); + virtual ~TDEDesktopFile(); /** * Checks whether this is really a desktop file. @@ -214,15 +214,15 @@ public: /** * Copies all entries from this config object to a new - * KDesktopFile object that will save itself to @p file. + * TDEDesktopFile object that will save itself to @p file. * * Actual saving to @p file happens when the returned object is * destructed or when sync() is called upon it. * - * @param file the new KDesktopFile object it will save itself to. + * @param file the new TDEDesktopFile object it will save itself to. * @since 3.2 */ - KDesktopFile* copyTo(const TQString &file) const; + TDEDesktopFile* copyTo(const TQString &file) const; #ifdef KDE_NO_COMPAT private: @@ -237,13 +237,13 @@ private: TQString translatedEntry(const char*) const; // copy-construction and assignment are not allowed - KDesktopFile( const KDesktopFile& ); - KDesktopFile& operator= ( const KDesktopFile& ); + TDEDesktopFile( const TDEDesktopFile& ); + TDEDesktopFile& operator= ( const TDEDesktopFile& ); protected: virtual void virtual_hook( int id, void* data ); private: - KDesktopFilePrivate *d; + TDEDesktopFilePrivate *d; }; 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/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp index 526970e1c..f03b4d9a5 100644 --- a/tdecore/tdeglobalsettings.cpp +++ b/tdecore/tdeglobalsettings.cpp @@ -24,7 +24,7 @@ #include <tqcursor.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <kipc.h> 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 07f3eea21..1e771c85a 100644 --- a/tdecore/tdelocale.cpp +++ b/tdecore/tdelocale.cpp @@ -34,8 +34,8 @@ #include "kcatalogue.h" #include "tdeglobal.h" #include "tdestandarddirs.h" -#include "ksimpleconfig.h" -#include "kinstance.h" +#include "tdesimpleconfig.h" +#include "tdeinstance.h" #include "tdeconfig.h" #include "kdebug.h" #include "kcalendarsystem.h" @@ -310,7 +310,7 @@ void TDELocale::initFormat() TDEConfigGroupSaver saver(config, "Locale"); - KSimpleConfig entry(locate("locale", + TDESimpleConfig entry(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_country)), true); entry.setGroup("KCM Locale"); @@ -370,7 +370,7 @@ void TDELocale::initFormat() //Grammatical //Precedence here is l10n / i18n / config file - KSimpleConfig language(locate("locale", + TDESimpleConfig language(locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(m_language)), true); language.setGroup("KCM Locale"); diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp index e3c82ce7e..e4337163f 100644 --- a/tdecore/tdeshortcut.cpp +++ b/tdecore/tdeshortcut.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.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/ksimpleconfig.cpp b/tdecore/tdesimpleconfig.cpp index 26a201f85..15638dd65 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/tdesimpleconfig.cpp @@ -35,13 +35,13 @@ #include "tdestandarddirs.h" #include "tdeconfigbackend.h" -#include "ksimpleconfig.h" +#include "tdesimpleconfig.h" -KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) +TDESimpleConfig::TDESimpleConfig(const TQString &fileName, bool bReadOnly) : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { - // the difference between TDEConfig and KSimpleConfig is just that - // for KSimpleConfig an absolute filename is guaranteed + // the difference between TDEConfig and TDESimpleConfig is just that + // for TDESimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { backEnd->changeFileName( TDEGlobal::dirs()-> saveLocation("config", TQString::null, !bReadOnly)+fileName, "config", false); @@ -52,20 +52,20 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) reparseConfiguration(); } -KSimpleConfig::KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly) +TDESimpleConfig::TDESimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly) : TDEConfig(backEnd, bReadOnly) {} -KSimpleConfig::~KSimpleConfig() +TDESimpleConfig::~TDESimpleConfig() { - // we need to call the KSimpleConfig version of sync. Relying on the - // regular TDEConfig sync is bad, because the KSimpleConfig sync has + // we need to call the TDESimpleConfig version of sync. Relying on the + // regular TDEConfig sync is bad, because the TDESimpleConfig sync has // different behavior. Syncing here will insure that the sync() call // in the TDEConfig destructor doesn't actually do anything. sync(); } -void KSimpleConfig::sync() +void TDESimpleConfig::sync() { if (isReadOnly()) return; @@ -75,7 +75,7 @@ void KSimpleConfig::sync() rollback(); } -void KSimpleConfig::virtual_hook( int id, void* data ) +void TDESimpleConfig::virtual_hook( int id, void* data ) { TDEConfig::virtual_hook( id, data ); } -#include "ksimpleconfig.moc" +#include "tdesimpleconfig.moc" diff --git a/tdecore/ksimpleconfig.h b/tdecore/tdesimpleconfig.h index 0ef703208..ec3e552b8 100644 --- a/tdecore/ksimpleconfig.h +++ b/tdecore/tdesimpleconfig.h @@ -18,12 +18,12 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KSIMPLECONFIG_H -#define _KSIMPLECONFIG_H +#ifndef _TDESIMPLECONFIG_H +#define _TDESIMPLECONFIG_H #include "tdeconfig.h" -class KSimpleConfigPrivate; +class TDESimpleConfigPrivate; /** * KDE Configuration entries @@ -38,13 +38,13 @@ class KSimpleConfigPrivate; * @see TDEConfigBase TDEConfig * @short KDE Configuration Management class with deletion ability */ -class TDECORE_EXPORT KSimpleConfig : public TDEConfig +class TDECORE_EXPORT TDESimpleConfig : public TDEConfig { TQ_OBJECT public: /** - * Construct a KSimpleConfig object and make it either read-write + * Construct a TDESimpleConfig object and make it either read-write * or read-only. * * @param fileName The file used for saving the config data. Either @@ -53,29 +53,29 @@ public: * directory for "config" files is used. * @param bReadOnly Whether the object should be read-only. */ - KSimpleConfig( const TQString &fileName, bool bReadOnly = false); + TDESimpleConfig( const TQString &fileName, bool bReadOnly = false); - KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false); + TDESimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false); /** * Destructor. * * Writes back any dirty configuration entries. */ - virtual ~KSimpleConfig(); + virtual ~TDESimpleConfig(); virtual void sync(); private: // copy-construction and assignment are not allowed - KSimpleConfig( const KSimpleConfig& ); - KSimpleConfig& operator= ( const KSimpleConfig& rConfig ); + TDESimpleConfig( const TDESimpleConfig& ); + TDESimpleConfig& operator= ( const TDESimpleConfig& rConfig ); protected: virtual void virtual_hook( int id, void* data ); private: - KSimpleConfigPrivate *d; + TDESimpleConfigPrivate *d; }; #endif diff --git a/tdecore/tdestandarddirs.cpp b/tdecore/tdestandarddirs.cpp index 89889367a..0821b22d1 100644 --- a/tdecore/tdestandarddirs.cpp +++ b/tdecore/tdestandarddirs.cpp @@ -48,9 +48,9 @@ #include "tdestandarddirs.h" #include "tdeconfig.h" -#include "kinstance.h" +#include "tdeinstance.h" #include "kshell.h" -#include "ksimpleconfig.h" +#include "tdesimpleconfig.h" #include "kuser.h" #include "kstaticdeleter.h" #include <kde_file.h> @@ -1487,7 +1487,7 @@ static TQStringList lookupProfiles(const TQString &mapFile) gid_t sup_gids[512]; int sup_gids_nr = getgroups(512, sup_gids); - KSimpleConfig mapCfg(mapFile, true); + TDESimpleConfig mapCfg(mapFile, true); mapCfg.setGroup("Users"); if (mapCfg.hasKey(user.data())) { 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/CMakeLists.txt b/tdecore/tests/CMakeLists.txt index 19b1fa9d3..2cabe1866 100644 --- a/tdecore/tests/CMakeLists.txt +++ b/tdecore/tests/CMakeLists.txt @@ -34,10 +34,10 @@ set( AUTOMATED_CHECKS kcharsetstest kglobaltest kmacroexpandertest krfcdatetest kstringhandlertest kurltest tdestdacceltest - # cplusplustest # -- skip (doesn't error on errors) - # ksimpleconfigtest # -- skip (doesn't error on errors) - # ksortablevaluelist # -- skip (doesn't error on errors) - # ksocktest # -- skip due to DNS failure + # cplusplustest # -- skip (doesn't error on errors) + # tdesimpleconfigtest # -- skip (doesn't error on errors) + # ksortablevaluelist # -- skip (doesn't error on errors) + # ksocktest # -- skip due to DNS failure ) # Tests that require some graphical interaction / confirmation. diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index b7d4dc88e..378e442d2 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) -check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest \ +check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest tdesimpleconfigtest \ tdestandarddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \ kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \ kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \ @@ -43,7 +43,7 @@ kdebugtest_SOURCES = kdebugtest.cpp klocaletest_SOURCES = klocaletest.cpp #klocaletest2_SOURCES = klocaletest2.cpp tdelocale.cpp libintl.cpp kcatalogue.cpp #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp -ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp +tdesimpleconfigtest_SOURCES = tdesimpleconfigtest.cpp kurltest_SOURCES = kurltest.cpp tdestandarddirstest_SOURCES = tdestandarddirstest.cpp tdeprocesstest_SOURCES = tdeprocesstest.cpp 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/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp index c785aa3b3..8db4fce3a 100644 --- a/tdecore/tests/tdeconfigtestgui.cpp +++ b/tdecore/tests/tdeconfigtestgui.cpp @@ -35,7 +35,7 @@ #include <tqfileinfo.h> #include <tqdatetime.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <config.h> // Standard Qt widgets diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h index 4c3384d90..520cb79cf 100644 --- a/tdecore/tests/tdeconfigtestgui.h +++ b/tdecore/tests/tdeconfigtestgui.h @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqtextstream.h> // Standard Qt widgets diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/tdesimpleconfigtest.cpp index ca91581dd..5759d8941 100644 --- a/tdecore/tests/ksimpleconfigtest.cpp +++ b/tdecore/tests/tdesimpleconfigtest.cpp @@ -3,9 +3,9 @@ // // configtest.cpp: libKDEcore example // -// demonstrates use of KSimpleConfig class +// demonstrates use of TDESimpleConfig class -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <unistd.h> #include <stdio.h> @@ -22,7 +22,7 @@ int main( int argc, char **argv ) { TDEApplication a( argc, argv, TQCString("tdeconfigtest") ); - KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" ); + TDESimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" ); aConfig.setGroup( "Test group" ); aConfig.writeEntry( "key1", "value1" ); @@ -32,17 +32,17 @@ int main( int argc, char **argv ) aConfig.writeEntry( "akey1", "avalue1" ); aConfig.writeEntry( "akey2", "avalue2" ); - fprintf( stderr, "[ksimpleconfigtest] entries written, sleeping for 10 seconds\n" ); + fprintf( stderr, "[tdesimpleconfigtest] entries written, sleeping for 10 seconds\n" ); aConfig.sync(); sleep( 10 ); aConfig.setGroup( "Test group" ); aConfig.deleteEntry( "key2", false ); - fprintf( stderr, "[ksimpleconfigtest] Deleted on entry from Test group, sleeping\n" ); + fprintf( stderr, "[tdesimpleconfigtest] Deleted on entry from Test group, sleeping\n" ); aConfig.sync(); sleep( 10 ); aConfig.deleteGroup( "Another Test group", true ); - fprintf( stderr, "[ksimpleconfigtest] Deleted Another Test group\n" ); + fprintf( stderr, "[tdesimpleconfigtest] Deleted Another Test group\n" ); } 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> |