diff options
173 files changed, 666 insertions, 633 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e5fde6fe3..baecceb88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1102,6 +1102,16 @@ if( WITH_LIBBFD ) endif( NOT HAVE_LIBBFD ) set( LIBBFD_LIBRARIES bfd ) check_include_file( "demangle.h" HAVE_DEMANGLE_H ) + + tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "${LIBBFD_LIBRARIES}" ) + check_c_source_compiles(" + #define PACKAGE tdelibs + #define PACKAGE_VERSION \"${TDE_VERSION}\" + #include <bfd.h> + int main() {bfd_section_flags((asection *)0); return 0;} " + HAVE_LIBBFD_2_34_API + ) + tde_restore( CMAKE_REQUIRED_LIBRARIES ) endif( WITH_LIBBFD ) @@ -1343,12 +1353,18 @@ endif() if( WITH_NETWORK_MANAGER_BACKEND ) pkg_search_module( LIBNM libnm ) - if( NOT LIBNM_FOUND ) - tde_message_fatal( "libnm was requested but it was not found on your system." ) - endif( NOT LIBNM_FOUND ) - pkg_get_variable( NM_VPN_SERVICE_DIR libnm vpnservicedir ) + if( LIBNM_FOUND ) + pkg_get_variable( NM_VPN_SERVICE_DIR libnm vpnservicedir ) + endif( ) if( "${NM_VPN_SERVICE_DIR}" STREQUAL "" ) set( NM_VPN_SERVICE_DIR "/usr/lib/NetworkManager/VPN" ) + message( WARNING "NetworkManager support was requested, but the value for NM_VPN_SERVICE_DIR " + "couldn't be determined (either because NetworkManger or libnm's pkg-config " + "files are not installed or they don't declare it explicitly). " + "Falling back to the default value:\n" + " ${NM_VPN_SERVICE_DIR}\n" + "If the value doesn't suite your needs consider setting it manually by " + "passing \"-DNM_VPN_SERVICE_DIR=/path/to/your/NetworkManager/VPN\" to cmake." ) endif( "${NM_VPN_SERVICE_DIR}" STREQUAL "" ) endif( WITH_NETWORK_MANAGER_BACKEND ) @@ -63,7 +63,7 @@ that we would like to make for the next binary incompatible release. - Use of the C++ keyword "explicit". Make all ctors explicit which can be used with one parameter to minimize wrong use of the class (i.e. have a look at - Dirk's work on KURL). Another candidate: KService( KDesktopFile *config ). + Dirk's work on KURL). Another candidate: KService( TDEDesktopFile *config ). KGuiItem has one of these dangerous ctors, too. KUser has a whole bunch of them. diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index 27e0845fa..d7ad91d65 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -19,7 +19,7 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <flowsystem.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeprocess.h> #include <tdestandarddirs.h> #include <tqdir.h> @@ -68,7 +68,7 @@ Arts::SoundServerV2 KArtsServer::server(void) bool x11Comm = config.readBoolEntry("X11GlobalComm", false); // put the value of x11Comm into .mcoprc - KSimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); + TDESimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); if(x11Comm) X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm"); diff --git a/config.h.cmake b/config.h.cmake index cd2ec1c96..7aaf0a23f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -108,6 +108,10 @@ /* Define to 1 if libbfd provides demangle.h header */ #cmakedefine HAVE_DEMANGLE_H 1 +/* Define to 1 if libbfd have API of version 2.34+ (i.e. + * bfd_section_flags() has only one paremater) */ +#cmakedefine HAVE_LIBBFD_2_34_API 1 + /* Define if getaddrinfo is broken and should be replaced */ #cmakedefine HAVE_BROKEN_GETADDRINFO 1 diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp index 7e956f718..627d66914 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.cpp +++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp @@ -28,7 +28,7 @@ #include <kdcopservicestarter.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kiconloader.h> #include <kservice.h> #include <kservicetype.h> @@ -643,7 +643,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) TQString KIMProxy::preferredApp() { - TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE ); + TDEConfig *store = new TDESimpleConfig( IM_CLIENT_PREFERENCES_FILE ); store->setGroup( IM_CLIENT_PREFERENCES_SECTION ); TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY ); //kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl; diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index 4abd9421d..916ad2c74 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -24,7 +24,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kstandarsdirs.h> #include <tdestdaccel.h> #include <kdebug.h> @@ -67,9 +67,9 @@ TDESelectAction * ScriptLoader::getScripts() while( (fi=it.current())) { // Query each desktop file - if(KDesktopFile::isDesktopFile(fi->absFilePath())) + if(TDEDesktopFile::isDesktopFile(fi->absFilePath())) { - KDesktopFile desktop((fi->absFilePath()), true); + TDEDesktopFile desktop((fi->absFilePath()), true); kdDebug () << "Trying to load script type: " << desktop.readType() << endl; KScriptInterface *tmpIface = KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>(desktop.readType() ); if( tmpIface != 0 ) diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp index 01dab8f47..1f546485a 100644 --- a/interfaces/tdescript/scriptmanager.cpp +++ b/interfaces/tdescript/scriptmanager.cpp @@ -2,7 +2,7 @@ #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdestandarddirs.h> #include <tdelocale.h> @@ -46,9 +46,9 @@ bool KScriptManager::addScript( const TQString &scriptDesktopFile) TQString tmpScriptMethod = ""; // Read the desktop file - if(KDesktopFile::isDesktopFile(scriptDesktopFile)) + if(TDEDesktopFile::isDesktopFile(scriptDesktopFile)) { - KDesktopFile desktop(scriptDesktopFile, true); + TDEDesktopFile desktop(scriptDesktopFile, true); m_scripts.insert(desktop.readName(), new ScriptInfo()); m_scripts[desktop.readName()]->scriptType = desktop.readType(); TQString localpath = TQString(tdeApp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", ""); 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/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 4419f0254..972d8a7ea 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -44,7 +44,7 @@ #include "katefactory.h" #include <tdeio/job.h> #include <tdemainwindow.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> #include <tqcolor.h> @@ -464,7 +464,7 @@ int main(int argc, char *argv[]) TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle("windows"); - KSimpleConfig cfg( "testkateregressionrc" ); + TDESimpleConfig cfg( "testkateregressionrc" ); cfg.setGroup("Kate Document Defaults"); cfg.writeEntry("Basic Config Flags", KateDocumentConfig::cfBackspaceIndents @@ -492,7 +492,7 @@ int main(int argc, char *argv[]) int rv = 1; { - KSimpleConfig dc( "kdebugrc" ); + TDESimpleConfig dc( "kdebugrc" ); // FIXME adapt to kate static int areas[] = { 1000, 13000, 13001, 13002, 13010, 13020, 13025, 13030, 13033, 13035, @@ -563,14 +563,14 @@ int main(int argc, char *argv[]) failureSnapshot = findMostRecentFailureSnapshot(); if (!failureSnapshot.isEmpty()) regressionTest->setFailureSnapshotConfig( - new KSimpleConfig(failureSnapshotPrefix + failureSnapshot, true), + new TDESimpleConfig(failureSnapshotPrefix + failureSnapshot, true), failureSnapshot); } if (args->isSet("save-failures")) { TQString failureSaver = args->getOption("save-failures"); regressionTest->setFailureSnapshotSaver( - new KSimpleConfig(failureSnapshotPrefix + failureSaver, false), + new TDESimpleConfig(failureSnapshotPrefix + failureSaver, false), failureSaver); } diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index a06170033..54c09ac9c 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -80,7 +80,7 @@ KBuildServiceFactory::createEntry( const TQString& file, const char *resource ) if (!name.endsWith(".desktop") && !name.endsWith(".kdelnk")) return 0; - KDesktopFile desktopFile(file, true, resource); + TDEDesktopFile desktopFile(file, true, resource); KService * serv = new KService( &desktopFile ); diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index 64f07a550..7599c43a0 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <assert.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> template class TQDict<KMimeType>; @@ -78,7 +78,7 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource if (name.isEmpty()) return 0; - KDesktopFile desktopFile(file, true, resource); + TDEDesktopFile desktopFile(file, true, resource); if ( desktopFile.readBoolEntry( "Hidden", false ) == true ) return 0; 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/tdeabc/address.cpp b/tdeabc/address.cpp index 9f47a279e..309d97ec9 100644 --- a/tdeabc/address.cpp +++ b/tdeabc/address.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> @@ -340,7 +340,7 @@ TQString Address::formattedAddress( const TQString &realName, // fall back to our own country ciso = TDEGlobal::locale()->country(); } - KSimpleConfig entry( locate( "locale", + TDESimpleConfig entry( locate( "locale", TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) ); entry.setGroup( "KCM Locale" ); @@ -368,7 +368,7 @@ TQString Address::formattedAddress( const TQString &realName, // now add the country line if needed (formatting this time according to // the rules of our own system country ) if ( !country().isEmpty() ) { - KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) + TDESimpleConfig entry( locate( "locale", TQString( "l10n/" ) + TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); entry.setGroup( "KCM Locale" ); TQString cpos = entry.readEntry( "AddressCountryPosition" ); 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/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp index cb2b93b58..40f221438 100644 --- a/tdeabc/distributionlist.cpp +++ b/tdeabc/distributionlist.cpp @@ -22,7 +22,7 @@ #include <tqpair.h> #include <tqvaluelist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kdebug.h> @@ -185,7 +185,7 @@ TQStringList DistributionListManager::listNames() bool DistributionListManager::load() { - KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); + TDESimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); TQMap<TQString,TQString> entryMap = cfg.entryMap( "DistributionLists" ); cfg.setGroup( "DistributionLists" ); @@ -233,7 +233,7 @@ bool DistributionListManager::save() { kdDebug(5700) << "DistListManager::save()" << endl; - KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); + TDESimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); cfg.deleteGroup( "DistributionLists" ); cfg.setGroup( "DistributionLists" ); diff --git a/tdeabc/formatfactory.cpp b/tdeabc/formatfactory.cpp index 656cfe0cb..ead39805e 100644 --- a/tdeabc/formatfactory.cpp +++ b/tdeabc/formatfactory.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> @@ -59,7 +59,7 @@ FormatFactory::FormatFactory() const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"tdeabc/formats/*.desktop", true, true ); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !config.hasGroup( "Misc" ) || !config.hasGroup( "Plugin" ) ) continue; diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp index de30c703f..bb5fc0558 100644 --- a/tdeabc/stdaddressbook.cpp +++ b/tdeabc/stdaddressbook.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/manager.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> diff --git a/tdecert/tdecertpart.cpp b/tdecert/tdecertpart.cpp index 04f70cd9a..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> @@ -716,7 +716,7 @@ void KCertPart::slotChain(int c) { void KCertPart::slotImport() { if (_p12) { - KSimpleConfig cfg("ksslcertificates", false); + TDESimpleConfig cfg("ksslcertificates", false); if (cfg.hasGroup(_p12->getCertificate()->getSubject())) { TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?"); diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp index 4e99a34e9..d074ff0b4 100644 --- a/tdeconf_update/tdeconf_update.cpp +++ b/tdeconf_update/tdeconf_update.cpp @@ -29,13 +29,13 @@ #include <tqtextstream.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetempfile.h> static TDECmdLineOptions options[] = @@ -280,7 +280,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id) // tqDebug("File %s, id %s", file.latin1(), id.latin1()); - KSimpleConfig cfg(file); + TDESimpleConfig cfg(file); cfg.setGroup("$Version"); TQStringList ids = cfg.readListEntry("update_info"); if (ids.contains(id)) @@ -791,7 +791,7 @@ void KonfUpdate::gotScript(const TQString &_script) tmp1.setAutoDelete(false); log() << "Script input stored in " << tmp1.name() << endl; } - KSimpleConfig cfg(tmp1.name()); + TDESimpleConfig cfg(tmp1.name()); if (oldGroup.isEmpty()) { diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 8528c4c01..d8b71696d 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 kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h @@ -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..e31e76ef4 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 kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \ krandomsequence.h knotifyclient.h kiconeffect.h \ kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \ netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \ @@ -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/kinstance.h b/tdecore/kinstance.h index b46947218..2db63c3e1 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -1,192 +1 @@ -/* This file is part of the KDE libraries - Copyright (C) 1999 Torben Weis <weis@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef _KINSTANCE_H -#define _KINSTANCE_H - -#include <tqstring.h> -#include "tdelibs_export.h" - -class TDEStandardDirs; -class TDEAboutData; -class TDEConfig; -class TDEIconLoader; -class KCharsets; -class TQFont; -class TDEInstancePrivate; -class KMimeSourceFactory; -class TDESharedConfig; -#ifdef __TDE_HAVE_TDEHWLIB -class TDEHardwareDevices; -class TDEGlobalNetworkManager; -#endif - - -/** - * Access to KDE global objects for use in shared libraries. In - * practical terms, this class is used in KDE components. This allows - * components to store things that normally would be accessed by - * TDEGlobal. - * - * @author Torben Weis - */ -class TDECORE_EXPORT TDEInstance -{ - friend class TDEStandardDirs; - - public: - /** - * Constructor. - * @param instanceName the name of the instance - */ - TDEInstance( const TQCString& instanceName) ; - - /** - * Constructor. - * When building a TDEInstance that is not your TDEApplication, - * make sure that the TDEAboutData and the TDEInstance have the same life time. - * You have to destroy both, since the instance doesn't own the about data. - * Don't build a TDEAboutData on the stack in this case ! - * Building a TDEAboutData on the stack is only ok for usage with - * TDECmdLineArgs and TDEApplication (not destroyed until the app exits). - * @param aboutData data about this instance (see TDEAboutData) - */ - TDEInstance( const TDEAboutData * aboutData ); - - /* - * @internal - * Only for K(Unique)Application - * Initialize from src and delete it. - */ - - TDEInstance( TDEInstance* src ); - - /** - * Destructor. - */ - virtual ~TDEInstance(); - - /** - * Returns the application standard dirs object. - * @return The TDEStandardDirs of the application. - */ - TDEStandardDirs *dirs() const; - - /** - * Returns the general config object ("appnamerc"). - * @return the TDEConfig object for the instance. - */ - TDEConfig *config() const; - - /** - * Returns the general config object ("appnamerc"). - * @return the TDEConfig object for the instance. - */ - TDESharedConfig *sharedConfig() const; - - /** - * Set a read-only flag on the configuration files - * This must be called before config() or dirs() to have any effect - * Defaults to false - * @param ro read only if true - */ - void setConfigReadOnly(bool ro); - - /** - * Returns an iconloader object. - * @return the iconloader object. - */ - TDEIconLoader *iconLoader() const; - -#ifdef __TDE_HAVE_TDEHWLIB - /** - * Returns a TDEHardwareDevices object. - * @return the hardwaredevices object. - */ - TDEHardwareDevices *hardwareDevices() const; - - /** - * Returns a TDEGlobalNetworkManager object. - * @return the networkmanager object. - */ - TDEGlobalNetworkManager *networkManager() const; -#endif - - /** - * Re-allocate the global iconloader. - */ - void newIconLoader() const; - - /** - * Returns the about data of this instance - * Warning, can be 0L - * @return the about data of the instance, or 0 if it has - * not been set yet - */ - const TDEAboutData *aboutData() const; - - /** - * Returns the name of the instance - * @return the instance name, can be null if the TDEInstance has been - * created with a null name - */ - TQCString instanceName() const; - - /** - * Returns the KMimeSourceFactory of the instance. - * Mainly added for API completeness and future extensibility. - * @return the KMimeSourceFactory set as default for this application. - */ - KMimeSourceFactory* mimeSourceFactory () const; - -protected: - /** - * Copy Constructor is not allowed - */ - TDEInstance( const TDEInstance& ); - - /** - * Set name of default config file. - * @param name the name of the default config file - * @since 3.1 - */ - void setConfigName(const TQString &name); - -private: - mutable TDEStandardDirs *_dirs; - - mutable TDEConfig *_config; - mutable TDEIconLoader *_iconLoader; - -#ifdef __TDE_HAVE_TDEHWLIB - mutable TDEHardwareDevices *_hardwaredevices; - mutable TDEGlobalNetworkManager *_networkmanager; -#endif - mutable void *_placeholder; - - TQCString _name; - const TDEAboutData *_aboutData; - -protected: - virtual void virtual_hook( int id, void* data ); -private: - TDEInstancePrivate *d; - bool m_configReadOnly; -}; - -#endif - +#include <tdeinstance.h> diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp index 8ed02941e..c13c22e2d 100644 --- a/tdecore/kmimesourcefactory.cpp +++ b/tdecore/kmimesourcefactory.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include "kmimesourcefactory.h" diff --git a/tdecore/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/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/tdeinstance.h b/tdecore/tdeinstance.h new file mode 100644 index 000000000..7ded51878 --- /dev/null +++ b/tdecore/tdeinstance.h @@ -0,0 +1,192 @@ +/* This file is part of the TDE libraries + Copyright (C) 1999 Torben Weis <weis@kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +#ifndef _TDEINSTANCE_H +#define _TDEINSTANCE_H + +#include <tqstring.h> +#include "tdelibs_export.h" + +class TDEStandardDirs; +class TDEAboutData; +class TDEConfig; +class TDEIconLoader; +class KCharsets; +class TQFont; +class TDEInstancePrivate; +class KMimeSourceFactory; +class TDESharedConfig; +#ifdef __TDE_HAVE_TDEHWLIB +class TDEHardwareDevices; +class TDEGlobalNetworkManager; +#endif + + +/** + * Access to TDE global objects for use in shared libraries. In + * practical terms, this class is used in TDE components. This allows + * components to store things that normally would be accessed by + * TDEGlobal. + * + * @author Torben Weis + */ +class TDECORE_EXPORT TDEInstance +{ + friend class TDEStandardDirs; + + public: + /** + * Constructor. + * @param instanceName the name of the instance + */ + TDEInstance( const TQCString& instanceName) ; + + /** + * Constructor. + * When building a TDEInstance that is not your TDEApplication, + * make sure that the TDEAboutData and the TDEInstance have the same life time. + * You have to destroy both, since the instance doesn't own the about data. + * Don't build a TDEAboutData on the stack in this case ! + * Building a TDEAboutData on the stack is only ok for usage with + * TDECmdLineArgs and TDEApplication (not destroyed until the app exits). + * @param aboutData data about this instance (see TDEAboutData) + */ + TDEInstance( const TDEAboutData * aboutData ); + + /* + * @internal + * Only for K(Unique)Application + * Initialize from src and delete it. + */ + + TDEInstance( TDEInstance* src ); + + /** + * Destructor. + */ + virtual ~TDEInstance(); + + /** + * Returns the application standard dirs object. + * @return The TDEStandardDirs of the application. + */ + TDEStandardDirs *dirs() const; + + /** + * Returns the general config object ("appnamerc"). + * @return the TDEConfig object for the instance. + */ + TDEConfig *config() const; + + /** + * Returns the general config object ("appnamerc"). + * @return the TDEConfig object for the instance. + */ + TDESharedConfig *sharedConfig() const; + + /** + * Set a read-only flag on the configuration files + * This must be called before config() or dirs() to have any effect + * Defaults to false + * @param ro read only if true + */ + void setConfigReadOnly(bool ro); + + /** + * Returns an iconloader object. + * @return the iconloader object. + */ + TDEIconLoader *iconLoader() const; + +#ifdef __TDE_HAVE_TDEHWLIB + /** + * Returns a TDEHardwareDevices object. + * @return the hardwaredevices object. + */ + TDEHardwareDevices *hardwareDevices() const; + + /** + * Returns a TDEGlobalNetworkManager object. + * @return the networkmanager object. + */ + TDEGlobalNetworkManager *networkManager() const; +#endif + + /** + * Re-allocate the global iconloader. + */ + void newIconLoader() const; + + /** + * Returns the about data of this instance + * Warning, can be 0L + * @return the about data of the instance, or 0 if it has + * not been set yet + */ + const TDEAboutData *aboutData() const; + + /** + * Returns the name of the instance + * @return the instance name, can be null if the TDEInstance has been + * created with a null name + */ + TQCString instanceName() const; + + /** + * Returns the KMimeSourceFactory of the instance. + * Mainly added for API completeness and future extensibility. + * @return the KMimeSourceFactory set as default for this application. + */ + KMimeSourceFactory* mimeSourceFactory () const; + +protected: + /** + * Copy Constructor is not allowed + */ + TDEInstance( const TDEInstance& ); + + /** + * Set name of default config file. + * @param name the name of the default config file + * @since 3.1 + */ + void setConfigName(const TQString &name); + +private: + mutable TDEStandardDirs *_dirs; + + mutable TDEConfig *_config; + mutable TDEIconLoader *_iconLoader; + +#ifdef __TDE_HAVE_TDEHWLIB + mutable TDEHardwareDevices *_hardwaredevices; + mutable TDEGlobalNetworkManager *_networkmanager; +#endif + mutable void *_placeholder; + + TQCString _name; + const TDEAboutData *_aboutData; + +protected: + virtual void virtual_hook( int id, void* data ); +private: + TDEInstancePrivate *d; + bool m_configReadOnly; +}; + +#endif + diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp index 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> diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 81d6d748a..9b5d2efe5 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -58,7 +58,7 @@ #include <krun.h> #include <kurifilter.h> #include <kiconloader.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdemultipledrag.h> #include <kinputdialog.h> @@ -272,7 +272,7 @@ void TDEHTMLPartBrowserExtension::searchProvider() if( !KURIFilter::self()->filterURI(data, list) ) { - KDesktopFile file("searchproviders/google.desktop", true, "services"); + TDEDesktopFile file("searchproviders/google.desktop", true, "services"); TQString encodedSearchTerm = m_part->selectedText(); TQUrl::encode(encodedSearchTerm); data.setData(file.readEntry("Query").replace("\\{@}", encodedSearchTerm)); 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/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index a351a5f74..d9f5e69a7 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -70,7 +70,7 @@ #include <tdelocale.h> #include <knotifyclient.h> #include <kprinter.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdestdaccel.h> #include <kstringhandler.h> @@ -347,7 +347,7 @@ public: bool ignoreWheelEvents:1; int borderX, borderY; - KSimpleConfig *formCompletions; + TDESimpleConfig *formCompletions; bool paged; @@ -3047,7 +3047,7 @@ TQStringList TDEHTMLView::formCompletionItems(const TQString &name) const if (!m_part->settings()->isFormCompletionEnabled()) return TQStringList(); if (!d->formCompletions) - d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions")); + d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions")); return d->formCompletions->readListEntry(name); } @@ -3055,7 +3055,7 @@ void TDEHTMLView::clearCompletionHistory(const TQString& name) { if (!d->formCompletions) { - d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions")); + d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions")); } d->formCompletions->writeEntry(name, ""); d->formCompletions->sync(); @@ -3101,7 +3101,7 @@ void TDEHTMLView::removeFormCompletionItem(const TQString &name, const TQString void TDEHTMLView::addNonPasswordStorableSite(const TQString& host) { if (!d->formCompletions) { - d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions")); + d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions")); } d->formCompletions->setGroup("NonPasswordStorableSites"); @@ -3115,7 +3115,7 @@ void TDEHTMLView::addNonPasswordStorableSite(const TQString& host) bool TDEHTMLView::nonPasswordStorableSite(const TQString& host) const { if (!d->formCompletions) { - d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions")); + d->formCompletions = new TDESimpleConfig(locateLocal("data", "tdehtml/formcompletions")); } d->formCompletions->setGroup("NonPasswordStorableSites"); TQStringList sites = d->formCompletions->readListEntry("Sites"); 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/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index c564dd92e..7082c9aed 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -64,7 +64,7 @@ #include "tdehtml_factory.h" #include <tdeio/job.h> #include <tdemainwindow.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> #include <tqcolor.h> @@ -514,7 +514,7 @@ int main(int argc, char *argv[]) TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle( "windows" ); - KSimpleConfig sc1( "cryptodefaults" ); + TDESimpleConfig sc1( "cryptodefaults" ); sc1.setGroup( "Warnings" ); sc1.writeEntry( "OnUnencrypted", false ); a.config()->setGroup( "Notification Messages" ); @@ -541,7 +541,7 @@ int main(int argc, char *argv[]) int rv = 1; if ( !args->isSet( "debug" ) ) { - KSimpleConfig dc( "kdebugrc" ); + TDESimpleConfig dc( "kdebugrc" ); static int areas[] = { 1000, 6000, 6005, 6010, 6020, 6030, 6031, 6035, 6036, 6040, 6041, 6045, 6050, 6060, 6061, 7000, 7006, 170, diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp index 1435aacb5..c5ebb794a 100644 --- a/tdeinit/autostart.cpp +++ b/tdeinit/autostart.cpp @@ -23,7 +23,7 @@ #include "autostart.h" #include <tdeconfig.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> #include <tdestandarddirs.h> @@ -125,7 +125,7 @@ AutoStart::loadAutoStartList() { continue; } - KDesktopFile config(*it, true); + TDEDesktopFile config(*it, true); if (config.hasKey("X-TDE-autostart-condition")) { if (!startCondition(config.readEntry("X-TDE-autostart-condition"))) continue; @@ -167,7 +167,7 @@ AutoStart::loadAutoStartList() if (localOuter == localInner) { // Overridden! // But is Hidden == True? - KDesktopFile innerConfig(*localit, true); + TDEDesktopFile innerConfig(*localit, true); if (innerConfig.readBoolEntry("Hidden", false)) { // Override confirmed; exit speedily without autostarting autostartOverriddenAndDisabled = true; 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/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h index 3e7158ecd..25c223bcb 100644 --- a/tdeio/bookmarks/kbookmarkimporter.h +++ b/tdeio/bookmarks/kbookmarkimporter.h @@ -22,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "kbookmark.h" diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h index d6bc81a12..d3818f3a8 100644 --- a/tdeio/bookmarks/kbookmarkimporter_crash.h +++ b/tdeio/bookmarks/kbookmarkimporter_crash.h @@ -23,7 +23,7 @@ #include <tqcstring.h> #include <tqstringlist.h> #include <tqmap.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemacros.h> #include "kbookmarkimporter.h" diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h index 70f4ee0b6..245968cbc 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ie.h +++ b/tdeio/bookmarks/kbookmarkimporter_ie.h @@ -22,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemacros.h> #include <kbookmarkimporter.h> diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cpp b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp index 9b59d1e33..31a68ad73 100644 --- a/tdeio/bookmarks/kbookmarkimporter_kde1.cpp +++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp @@ -92,7 +92,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & || (res->name() == "media/builtin-trash") || (res->name() == "media/builtin-webbrowser") ) { - KSimpleConfig cfg( file.path(), true ); + TDESimpleConfig cfg( file.path(), true ); cfg.setDesktopGroup(); TQString type = cfg.readEntry( "Type" ); // Is it really a bookmark file ? @@ -104,7 +104,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & else if ( res->name() == "text/plain") { // maybe its an IE Favourite.. - KSimpleConfig cfg( file.path(), true ); + TDESimpleConfig cfg( file.path(), true ); TQStringList grp = cfg.groupList().grep( "internetshortcut", false ); if ( grp.count() == 0 ) continue; @@ -122,7 +122,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & } void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _text, - KSimpleConfig& _cfg, const TQString &_group ) + TDESimpleConfig& _cfg, const TQString &_group ) { if ( !_group.isEmpty() ) _cfg.setGroup( _group ); diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.h b/tdeio/bookmarks/kbookmarkimporter_kde1.h index ae585c1c6..0cabcb6cc 100644 --- a/tdeio/bookmarks/kbookmarkimporter_kde1.h +++ b/tdeio/bookmarks/kbookmarkimporter_kde1.h @@ -22,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> /** * A class for importing the previous bookmarks (desktop files) @@ -39,7 +39,7 @@ public: private: void scanIntern( TQDomElement & parentElem, const TQString & _path ); void parseBookmark( TQDomElement & parentElem, TQCString _text, - KSimpleConfig& _cfg, const TQString &_group ); + TDESimpleConfig& _cfg, const TQString &_group ); TQDomDocument * m_pDoc; TQStringList m_lstParsedDirs; }; diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h index d765bd7db..d3987feef 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ns.h +++ b/tdeio/bookmarks/kbookmarkimporter_ns.h @@ -22,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemacros.h> #include "kbookmarkimporter.h" diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h index 1235ac642..af552308e 100644 --- a/tdeio/bookmarks/kbookmarkimporter_opera.h +++ b/tdeio/bookmarks/kbookmarkimporter_opera.h @@ -22,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kbookmarkimporter.h> diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h index d305243e4..986ecdc86 100644 --- a/tdeio/kssl/kopenssl.h +++ b/tdeio/kssl/kopenssl.h @@ -56,14 +56,14 @@ class KOpenSSLProxyPrivate; #define STACK _STACK #endif #endif -#endif - -#include <kstaticdeleter.h> #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *); typedef int X509_LOOKUP_TYPE; #endif +#endif // KSSL_HAVE_SSL + +#include <kstaticdeleter.h> /** * Dynamically load and wrap OpenSSL. diff --git a/tdeio/kssl/ksslcertificatehome.cpp b/tdeio/kssl/ksslcertificatehome.cpp index 9316bd221..d6c11b20b 100644 --- a/tdeio/kssl/ksslcertificatehome.cpp +++ b/tdeio/kssl/ksslcertificatehome.cpp @@ -23,12 +23,12 @@ #include <ksslpkcs12.h> #include <kresolver.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> using namespace KNetwork; TQStringList KSSLCertificateHome::getCertificateList() { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); TQStringList list = cfg.groupList(); TQString defaultstr("<default>"); TQString blankstr(""); @@ -42,7 +42,7 @@ return list; // KDE 4: make it const TQString & void KSSLCertificateHome::setDefaultCertificate(TQString name, TQString host, bool send, bool prompt) { -KSimpleConfig cfg("ksslauthmap", false); +TDESimpleConfig cfg("ksslauthmap", false); #ifdef TQ_WS_WIN //temporary cfg.setGroup(host); @@ -80,7 +80,7 @@ return true; bool KSSLCertificateHome::addCertificate(KSSLPKCS12 *cert, TQString passToStore) { if (!cert) return false; -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); cfg.setGroup(cert->name()); cfg.writeEntry("PKCS12Base64", cert->toString()); @@ -109,7 +109,7 @@ bool KSSLCertificateHome::deleteCertificate(KSSLPKCS12 *cert) { bool KSSLCertificateHome::deleteCertificateByName(const TQString &name) { if (name.isEmpty()) return false; -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); bool ok = cfg.deleteGroup(name); cfg.sync(); @@ -119,7 +119,7 @@ return ok; // KDE 4: make it const TQString & KSSLPKCS12* KSSLCertificateHome::getCertificateByName(TQString name, TQString password) { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (!cfg.hasGroup(name)) return NULL; cfg.setGroup(name); @@ -130,7 +130,7 @@ KSimpleConfig cfg("ksslcertificates", false); // KDE 4: make it const TQString & KSSLPKCS12* KSSLCertificateHome::getCertificateByName(TQString name) { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (!cfg.hasGroup(name)) return NULL; cfg.setGroup(name); @@ -141,7 +141,7 @@ KSimpleConfig cfg("ksslcertificates", false); // KDE 4: make it const TQString & bool KSSLCertificateHome::hasCertificateByName(TQString name) { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (!cfg.hasGroup(name)) return false; return true; } @@ -154,7 +154,7 @@ KSSLPKCS12* KSSLCertificateHome::getCertificateByHost(TQString host, TQString pa // KDE 4: make it const TQString & TQString KSSLCertificateHome::getDefaultCertificateName(TQString host, KSSLAuthAction *aa) { -KSimpleConfig cfg("ksslauthmap", false); +TDESimpleConfig cfg("ksslauthmap", false); #ifdef TQ_WS_WIN //temporary if (!cfg.hasGroup(host)) { @@ -206,7 +206,7 @@ return cfg.readEntry("DefaultCert", ""); // KDE 4: make it const TQString & KSSLPKCS12* KSSLCertificateHome::getDefaultCertificate(TQString password, KSSLAuthAction *aa) { TQString name = KSSLCertificateHome::getDefaultCertificateName(aa); -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (name.isEmpty()) return NULL; @@ -218,7 +218,7 @@ KSimpleConfig cfg("ksslcertificates", false); KSSLPKCS12* KSSLCertificateHome::getDefaultCertificate(KSSLAuthAction *aa) { TQString name = KSSLCertificateHome::getDefaultCertificateName(aa); -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (name.isEmpty()) return NULL; @@ -230,7 +230,7 @@ KSimpleConfig cfg("ksslcertificates", false); // KDE 4: make it const TQString & void KSSLCertificateHome::setDefaultCertificate(TQString name, bool send, bool prompt) { -KSimpleConfig cfg("ksslauthmap", false); +TDESimpleConfig cfg("ksslauthmap", false); cfg.setGroup("<default>"); cfg.writeEntry("defaultCertificate", name); diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp index 83d0b8412..bf377aec3 100644 --- a/tdeio/misc/kssld/kssld.cpp +++ b/tdeio/misc/kssld/kssld.cpp @@ -28,7 +28,7 @@ #include "kssld.h" #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ksslcertchain.h> #include <ksslcertificate.h> #include <ksslcertificatehome.h> @@ -114,7 +114,7 @@ static void updatePoliciesConfig(TDEConfig *cfg) { KSSLD::KSSLD(const TQCString &name) : KDEDModule(name) { // ----------------------- FOR THE CACHE ------------------------------------ - cfg = new KSimpleConfig("ksslpolicies", false); + cfg = new TDESimpleConfig("ksslpolicies", false); cfg->setGroup("General"); if (2 != cfg->readNumEntry("policies version", 0)) { ::updatePoliciesConfig(cfg); @@ -167,7 +167,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { // First convert to a binary format and then write the // tdeconfig entry write the (CN, policy, cert) to - // KSimpleConfig + // TDESimpleConfig cfg->setGroup(node->cert->getMD5Digest()); cfg->writeEntry("Certificate", node->cert->toString()); cfg->writeEntry("Policy", node->policy); @@ -205,7 +205,7 @@ KSSLCNode *node; void KSSLD::cacheReload() { cacheClearList(); delete cfg; - cfg = new KSimpleConfig("ksslpolicies", false); + cfg = new TDESimpleConfig("ksslpolicies", false); cacheLoadDefaultPolicies(); } diff --git a/tdeio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h index a20582ce2..981ed7ad6 100644 --- a/tdeio/misc/kssld/kssld.h +++ b/tdeio/misc/kssld/kssld.h @@ -32,7 +32,7 @@ #include <tqptrvector.h> -class KSimpleConfig; +class TDESimpleConfig; class KSSLCNode; class KOpenSSLProxy; @@ -136,7 +136,7 @@ private: void cacheLoadDefaultPolicies(); // for the cache portion: - KSimpleConfig *cfg; + TDESimpleConfig *cfg; TQPtrList<KSSLCNode> certList; // Our pointer to OpenSSL diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp index 545d2cb4b..8435f7c07 100644 --- a/tdeio/misc/tdetelnetservice.cpp +++ b/tdeio/misc/tdetelnetservice.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdeprocess.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> static const TDECmdLineOptions options[] = { 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/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 7524c063b..3e51f0b20 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -37,7 +37,7 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kcombobox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <tdeglobal.h> #include <klineedit.h> @@ -739,15 +739,15 @@ void KOpenWithDlg::slotOK() maxPreference = offerList.first().preference(); } - KDesktopFile *desktop = 0; + TDEDesktopFile *desktop = 0; if (!oldPath.isEmpty() && (oldPath != newPath)) { - KDesktopFile orig(oldPath, true); + TDEDesktopFile orig(oldPath, true); desktop = orig.copyTo(newPath); } else { - desktop = new KDesktopFile(newPath); + desktop = new TDEDesktopFile(newPath); } desktop->writeEntry("Type", TQString::fromLatin1("Application")); desktop->writeEntry("Name", initialServiceName); @@ -776,7 +776,7 @@ void KOpenWithDlg::slotOK() if ( !qServiceType.isEmpty() ) { // Also make sure the "auto embed" setting for this mimetype is off - KDesktopFile mimeDesktop( locateLocal( "mime", qServiceType + ".desktop" ) ); + TDEDesktopFile mimeDesktop( locateLocal( "mime", qServiceType + ".desktop" ) ); mimeDesktop.writeEntry( "X-TDE-AutoEmbed", false ); mimeDesktop.sync(); } diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index c8e324a2d..cfd57d7cc 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -92,7 +92,7 @@ extern "C" { #include <kdirnotify_stub.h> #include <kdiskfreesp.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kicondialog.h> #include <kurl.h> #include <kurlrequester.h> @@ -800,7 +800,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) filename = nameFromFileName( filename ); if ( d->bKDesktopMode && d->bDesktopFile ) { - KDesktopFile config( url.path(), true /* readonly */ ); + TDEDesktopFile config( url.path(), true /* readonly */ ); if ( config.hasKey( "Name" ) ) { filename = config.readName(); } @@ -875,7 +875,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // So we have to really open .desktop files TQString iconStr = KMimeType::findByURL( url, mode )->icon( url, isLocal ); if ( bDesktopFile && isLocal ) { - KDesktopFile config( url.path(), true ); + TDEDesktopFile config( url.path(), true ); config.setDesktopGroup(); iconStr = config.readEntry( "Icon" ); if ( config.hasDeviceType() ) { @@ -1432,7 +1432,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) { kdDebug(250) << "KFilePropsPlugin::slotCopyFinished " << m_sRelativePath << endl; KURL newURL; - newURL.setPath( KDesktopFile::locateLocal(m_sRelativePath) ); + newURL.setPath( TDEDesktopFile::locateLocal(m_sRelativePath) ); kdDebug(250) << "KFilePropsPlugin::slotCopyFinished path=" << newURL.path() << endl; properties->updateUrl( newURL ); } @@ -1440,7 +1440,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) if ( d->bKDesktopMode && d->bDesktopFile ) { // Renamed? Update Name field if ( d->oldFileName != properties->kurl().fileName() || m_bFromTemplate ) { - KDesktopFile config( properties->kurl().path() ); + TDEDesktopFile config( properties->kurl().path() ); TQString nameStr = nameFromFileName(properties->kurl().fileName()); config.writeEntry( "Name", nameStr ); config.writeEntry( "Name", nameStr, true, false, true ); @@ -1492,7 +1492,7 @@ void KFilePropsPlugin::applyIconChanges() } f.close(); - KDesktopFile cfg(path); + TDEDesktopFile cfg(path); kdDebug(250) << "sIcon = " << (sIcon) << endl; kdDebug(250) << "str = " << (str) << endl; cfg.writeEntry( "Icon", sIcon ); @@ -2627,7 +2627,7 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); URLStr = config.readPathEntry( "URL" ); @@ -2667,7 +2667,7 @@ bool KURLPropsPlugin::supports( KFileItemList _items ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasLinkType(); } @@ -2688,7 +2688,7 @@ void KURLPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Link")); config.writePathEntry( "URL", URLEdit->url() ); @@ -2779,7 +2779,7 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl return; f.close(); - KSimpleConfig config( _props->kurl().path() ); + TDESimpleConfig config( _props->kurl().path() ); config.setDesktopGroup(); TQString patternStr = config.readEntry( "Patterns" ); TQString iconStr = config.readEntry( "Icon" ); @@ -2828,7 +2828,7 @@ bool KBindingPropsPlugin::supports( KFileItemList _items ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasMimeTypeType(); } @@ -2845,7 +2845,7 @@ void KBindingPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("MimeType") ); @@ -2984,7 +2984,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP return; f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); TQString deviceStr = config.readEntry( "Dev" ); TQString mountPointStr = config.readEntry( "MountPoint" ); @@ -3127,7 +3127,7 @@ bool KDevicePropsPlugin::supports( KFileItemList _items ) if ( !KPropsDlgPlugin::isDesktopFile( item ) ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasDeviceType(); } @@ -3143,7 +3143,7 @@ void KDevicePropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("FSDevice") ); @@ -3205,7 +3205,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) return; f.close(); - KDesktopFile config( path ); + TDEDesktopFile config( path ); TQString nameStr = config.readName(); TQString genNameStr = config.readGenericName(); TQString commentStr = config.readComment(); @@ -3431,7 +3431,7 @@ void KDesktopPropsPlugin::applyChanges() // coupled to the command. checkCommandChanged(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Application")); config.writeEntry( "Comment", w->commentEdit->text() ); @@ -3627,7 +3627,7 @@ bool KDesktopPropsPlugin::supports( KFileItemList _items ) if ( !KPropsDlgPlugin::isDesktopFile( item ) ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access"); } @@ -3797,7 +3797,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) return; f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDollarExpansion( false ); config.setDesktopGroup(); execStr = config.readPathEntry( "Exec" ); @@ -3905,7 +3905,7 @@ bool KExecPropsPlugin::supports( KFileItemList _items ) if ( !KPropsDlgPlugin::isDesktopFile( item ) ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access"); } @@ -3923,7 +3923,7 @@ void KExecPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Application")); config.writePathEntry( "Exec", execEdit->text() ); @@ -4057,7 +4057,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props return; f.close(); - KDesktopFile config( path ); + TDEDesktopFile config( path ); TQString commentStr = config.readComment(); TQString genNameStr = config.readGenericName(); @@ -4166,7 +4166,7 @@ void TDEApplicationPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Application")); config.writeEntry( "Comment", commentEdit->text() ); 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/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp index 6e775ebc1..1a7268ea6 100644 --- a/tdeio/tdefile/tdefilesharedlg.cpp +++ b/tdeio/tdefile/tdefilesharedlg.cpp @@ -38,7 +38,7 @@ #include <kseparator.h> #include <tqpushbutton.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> class KFileSharePropsPlugin::Private diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp index dbaf876bd..11b390433 100644 --- a/tdeio/tdefile/tderecentdirs.cpp +++ b/tdeio/tdefile/tderecentdirs.cpp @@ -26,7 +26,7 @@ * */ #include <tderecentdirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdeglobalsettings.h> @@ -52,7 +52,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool if (key[1] == ':') { key = key.mid(2); - config = new KSimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly); + config = new TDESimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly); } else { diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp index 8c7205ca1..2b8a96102 100644 --- a/tdeio/tdefile/tderecentdocument.cpp +++ b/tdeio/tdefile/tderecentdocument.cpp @@ -26,13 +26,13 @@ * */ #include <tderecentdocument.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdeapplication.h> #include <kurl.h> #include <kdebug.h> #include <kmimetype.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tqdir.h> #include <tqfileinfo.h> #include <tqtextstream.h> @@ -61,7 +61,7 @@ TQStringList TDERecentDocument::recentDocuments() for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { TQString pathDesktop = d.absFilePath( *it ); - KDesktopFile tmpDesktopFile( pathDesktop, false); + TDEDesktopFile tmpDesktopFile( pathDesktop, false); KURL urlDesktopFile(tmpDesktopFile.readURL()); if( urlDesktopFile.isLocalFile() && !TQFile(urlDesktopFile.path()).exists()) d.remove(pathDesktop); @@ -106,7 +106,7 @@ void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName) // check for duplicates while(TQFile::exists(ddesktop)){ // see if it points to the same file and application - KSimpleConfig tmp(ddesktop); + TDESimpleConfig tmp(ddesktop); tmp.setDesktopGroup(); if(tmp.readEntry(TQString::fromLatin1("X-TDE-LastOpenedWith")) == desktopEntryName) @@ -135,7 +135,7 @@ void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName) } // create the applnk - KSimpleConfig conf(ddesktop); + TDESimpleConfig conf(ddesktop); conf.setDesktopGroup(); conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); 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/job.cpp b/tdeio/tdeio/job.cpp index 5bdea2fd8..d7ac59697 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -44,7 +44,7 @@ extern "C" { #include <tdeapplication.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <kdialog.h> #include <tdemessagebox.h> @@ -3455,7 +3455,7 @@ void CopyJob::copyNextFile() if ( f.open( IO_ReadWrite ) ) { f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); KURL url = (*it).uSource; url.setPass( "" ); 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/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp index a511324c0..b97a0f82b 100644 --- a/tdeio/tdeio/kmimemagic.cpp +++ b/tdeio/tdeio/kmimemagic.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeapplication.h> #include <tqfile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <klargefile.h> @@ -103,14 +103,14 @@ class KMimeMagicUtimeConf { if ( !confDirs.isEmpty() ) { TQString globalConf = confDirs.last() + "kmimemagicrc"; if ( TQFile::exists( globalConf ) ) { - KSimpleConfig cfg( globalConf ); + TDESimpleConfig cfg( globalConf ); cfg.setGroup( "Settings" ); tmpDirs = cfg.readListEntry( "atimeDirs" ); } if ( confDirs.count() > 1 ) { TQString localConf = confDirs.first() + "kmimemagicrc"; if ( TQFile::exists( localConf ) ) { - KSimpleConfig cfg( localConf ); + TDESimpleConfig cfg( localConf ); cfg.setGroup( "Settings" ); tmpDirs += cfg.readListEntry( "atimeDirs" ); } diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index 3be10a07c..d0014d99c 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -49,11 +49,11 @@ #include <tdeapplication.h> #include <tdeprocess.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdirwatch.h> #include <kiconloader.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kurl.h> #include <tdesycoca.h> @@ -365,14 +365,14 @@ KMimeType::KMimeType( const TQString & _fullpath, const TQString& _type, const T KMimeType::KMimeType( const TQString & _fullpath ) : KServiceType( _fullpath ) { - KDesktopFile _cfg( _fullpath, true ); + TDEDesktopFile _cfg( _fullpath, true ); init ( &_cfg ); if ( !isValid() ) kdWarning(7009) << "mimetype not valid '" << m_strName << "' (missing entry in the file ?)" << endl; } -KMimeType::KMimeType( KDesktopFile *config ) : KServiceType( config ) +KMimeType::KMimeType( TDEDesktopFile *config ) : KServiceType( config ) { init( config ); @@ -380,7 +380,7 @@ KMimeType::KMimeType( KDesktopFile *config ) : KServiceType( config ) kdWarning(7009) << "mimetype not valid '" << m_strName << "' (missing entry in the file ?)" << endl; } -void KMimeType::init( KDesktopFile * config ) +void KMimeType::init( TDEDesktopFile * config ) { config->setDesktopGroup(); m_lstPatterns = config->readListEntry( "Patterns", ';' ); @@ -617,7 +617,7 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const // a file instead of a directory if ( TDEStandardDirs::exists( u.path() ) ) { - KSimpleConfig cfg( u.path(), true ); + TDESimpleConfig cfg( u.path(), true ); cfg.setDesktopGroup(); icon = cfg.readEntry( "Icon" ); TQString empty_icon = cfg.readEntry( "EmptyIcon" ); @@ -685,7 +685,7 @@ TQString KFolderType::comment( const KURL& _url, bool _is_local ) const KURL u( _url ); u.addPath( ".directory" ); - KDesktopFile cfg( u.path(), true ); + TDEDesktopFile cfg( u.path(), true ); TQString comment = cfg.readComment(); if ( comment.isEmpty() ) return KMimeType::comment( _url, _is_local ); @@ -713,7 +713,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const if ( !_is_local ) return KMimeType::icon( _url, _is_local ); - KSimpleConfig cfg( _url.path(), true ); + TDESimpleConfig cfg( _url.path(), true ); cfg.setDesktopGroup(); TQString icon = cfg.readEntry( "Icon" ); TQString type = cfg.readEntry( "Type" ); @@ -738,7 +738,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const if ( url.protocol() == "trash" ) { // We need to find if the trash is empty, preferrably without using a TDEIO job. // So instead tdeio_trash leaves an entry in its config file for us. - KSimpleConfig trashConfig( "trashrc", true ); + TDESimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); if ( trashConfig.readBoolEntry( "Empty", true ) ) { return emptyIcon; @@ -779,7 +779,7 @@ TQString KDEDesktopMimeType::comment( const KURL& _url, bool _is_local ) const if ( !_is_local ) return KMimeType::comment( _url, _is_local ); - KDesktopFile cfg( _url.path(), true ); + TDEDesktopFile cfg( _url.path(), true ); TQString comment = cfg.readComment(); if ( comment.isEmpty() ) return KMimeType::comment( _url, _is_local ); @@ -794,7 +794,7 @@ pid_t KDEDesktopMimeType::run( const KURL& u, bool _is_local ) if ( !_is_local ) return 0; - KSimpleConfig cfg( u.path(), true ); + TDESimpleConfig cfg( u.path(), true ); cfg.setDesktopGroup(); TQString type = cfg.readEntry( "Type" ); if ( type.isEmpty() ) @@ -826,7 +826,7 @@ pid_t KDEDesktopMimeType::run( const KURL& u, bool _is_local ) return 0; } -pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cfg ) +pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const TDESimpleConfig &cfg ) { pid_t retval = 0; @@ -875,7 +875,7 @@ pid_t KDEDesktopMimeType::runApplication( const KURL& , const TQString & _servic return KRun::run( s, lst ); } -pid_t KDEDesktopMimeType::runLink( const KURL& _url, const KSimpleConfig &cfg ) +pid_t KDEDesktopMimeType::runLink( const KURL& _url, const TDESimpleConfig &cfg ) { TQString u = cfg.readPathEntry( "URL" ); if ( u.isEmpty() ) @@ -898,7 +898,7 @@ pid_t KDEDesktopMimeType::runLink( const KURL& _url, const KSimpleConfig &cfg ) return -1; // we don't want to return 0, but we don't want to return a pid } -pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) +pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const TDESimpleConfig & ) { // Hmm, can't really use keditfiletype since we might be looking // at the global file, or at a file not in share/mimelnk... @@ -924,7 +924,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co if ( !_url.isLocalFile() ) return result; - KSimpleConfig cfg( _url.path(), true ); + TDESimpleConfig cfg( _url.path(), true ); cfg.setDesktopGroup(); TQString type = cfg.readEntry( "Type" ); @@ -972,7 +972,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, bool bLocalFiles ) { - KSimpleConfig cfg( path, true ); + TDESimpleConfig cfg( path, true ); return userDefinedServices( path, cfg, bLocalFiles ); } @@ -1113,7 +1113,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT TQString path = urls.first().path(); //kdDebug(7009) << "MOUNT&UNMOUNT" << endl; - KSimpleConfig cfg( path, true ); + TDESimpleConfig cfg( path, true ); cfg.setDesktopGroup(); TQString dev = cfg.readEntry( "Dev" ); if ( dev.isEmpty() ) diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h index 5a7dcd345..ed1931361 100644 --- a/tdeio/tdeio/kmimetype.h +++ b/tdeio/tdeio/kmimetype.h @@ -32,7 +32,7 @@ #include <tdesycocatype.h> #include <kservicetype.h> -class KSimpleConfig; +class TDESimpleConfig; /** * Represent a mime type, like "text/plain", and the data that is associated * with it. @@ -78,7 +78,7 @@ public: * Construct a mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KMimeType( KDesktopFile *config ); + KMimeType( TDEDesktopFile *config ); /** * @internal Construct a service from a stream. @@ -436,7 +436,7 @@ public: protected: void loadInternal( TQDataStream& ); - void init( KDesktopFile * ); + void init( TDEDesktopFile * ); /** * Signal a missing mime type. @@ -486,7 +486,7 @@ public: * Construct a folder mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KFolderType( KDesktopFile *config) : KMimeType( config ) { } + KFolderType( TDEDesktopFile *config) : KMimeType( config ) { } /** \internal */ KFolderType( TQDataStream& _str, int offset ) : KMimeType( _str, offset ) { } @@ -531,7 +531,7 @@ public: * Construct a desktop mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KDEDesktopMimeType( KDesktopFile *config) : KMimeType( config ) { } + KDEDesktopMimeType( TDEDesktopFile *config) : KMimeType( config ) { } /** \internal */ KDEDesktopMimeType( TQDataStream& _str, int offset ) : KMimeType( _str, offset ) { } @@ -607,10 +607,10 @@ protected: TQString * path = 0L ) const { return KMimeType::pixmap( group, force_size, state, path ); } - static pid_t runFSDevice( const KURL& _url, const KSimpleConfig &cfg ); + static pid_t runFSDevice( const KURL& _url, const TDESimpleConfig &cfg ); static pid_t runApplication( const KURL& _url, const TQString & _serviceFile ); - static pid_t runLink( const KURL& _url, const KSimpleConfig &cfg ); - static pid_t runMimeType( const KURL& _url, const KSimpleConfig &cfg ); + static pid_t runLink( const KURL& _url, const TDESimpleConfig &cfg ); + static pid_t runMimeType( const KURL& _url, const TDESimpleConfig &cfg ); protected: virtual void virtual_hook( int id, void* data ); }; @@ -631,7 +631,7 @@ public: * Construct a executable mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KExecMimeType( KDesktopFile *config) : KMimeType( config ) { } + KExecMimeType( TDEDesktopFile *config) : KMimeType( config ) { } /** \internal */ KExecMimeType( TQDataStream& _str, int offset ) : KMimeType( _str, offset ) { } protected: diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index b28820444..d6fd8a80e 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -54,7 +54,7 @@ #include <tqtextstream.h> #include <tqdatetime.h> #include <tqregexp.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdestartupinfo.h> #include <kmacroexpander.h> #include <kshell.h> @@ -325,7 +325,7 @@ KRunMX2::subst( int option, const KURL &url, TQStringList &ret ) break; case 'v': if (url.isLocalFile() && TQFile::exists( url.path() ) ) - ret << KDesktopFile( url.path(), true ).readEntry( "Dev" ); + ret << TDEDesktopFile( url.path(), true ).readEntry( "Dev" ); break; } return; @@ -555,7 +555,7 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons const TQString &execName, const TQString & iconName, TQWidget* window, TQCString asn ) { if (service && !service->desktopEntryPath().isEmpty() - && !KDesktopFile::isAuthorizedDesktopFile( service->desktopEntryPath() )) + && !TDEDesktopFile::isAuthorizedDesktopFile( service->desktopEntryPath() )) { kdWarning() << "No authorization to execute " << service->desktopEntryPath() << endl; KMessageBox::sorry(window, i18n("You are not authorized to execute this file.")); @@ -775,7 +775,7 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi bool tempFiles, const TQString& suggestedFileName ) { if (!_service.desktopEntryPath().isEmpty() && - !KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath())) + !TDEDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath())) { kdWarning() << "No authorization to execute " << _service.desktopEntryPath() << endl; KMessageBox::sorry(window, i18n("You are not authorized to execute this service.")); diff --git a/tdeio/tdeio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp index d209812dd..fbc3c2e6e 100644 --- a/tdeio/tdeio/ksambashare.cpp +++ b/tdeio/tdeio/ksambashare.cpp @@ -23,7 +23,7 @@ #include <kdirwatch.h> #include <kstaticdeleter.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "ksambashare.h" @@ -62,7 +62,7 @@ bool KSambaSharePrivate::load() { * @return wether a smb.conf was found. **/ bool KSambaSharePrivate::findSmbConf() { - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); smbConf = config.readEntry("SMBCONF"); if ( TQFile::exists(smbConf) ) 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/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 34cd7816e..17545d8e6 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -37,10 +37,10 @@ #include <tqdir.h> #include <tqtl.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> #include <kiconloader.h> #include <tdelocale.h> @@ -80,19 +80,19 @@ KService::KService( const TQString & _name, const TQString &_exec, const TQStrin KService::KService( const TQString & _fullpath ) : KSycocaEntry( _fullpath) { - KDesktopFile config( _fullpath ); + TDEDesktopFile config( _fullpath ); init(&config); } -KService::KService( KDesktopFile *config ) +KService::KService( TDEDesktopFile *config ) : KSycocaEntry( config->fileName()) { init(config); } void -KService::init( KDesktopFile *config ) +KService::init( TDEDesktopFile *config ) { d = new KServicePrivate; m_bValid = true; @@ -738,7 +738,7 @@ bool KService::substituteUid() const { } TQString KService::username() const { - // See also KDesktopFile::tryExec() + // See also TDEDesktopFile::tryExec() TQString user; TQVariant v = property("X-TDE-Username", TQVariant::String); user = v.isValid() ? v.toString() : TQString::null; @@ -856,7 +856,7 @@ TQString KService::locateLocal() { if (d->menuId.isEmpty() || desktopEntryPath().startsWith(".hidden") || (TQDir::isRelativePath(desktopEntryPath()) && d->categories.isEmpty())) - return KDesktopFile::locateLocal(desktopEntryPath()); + return TDEDesktopFile::locateLocal(desktopEntryPath()); return ::locateLocal("xdgdata-apps", d->menuId); } diff --git a/tdeio/tdeio/kservice.h b/tdeio/tdeio/kservice.h index bd42f9b0d..09218ac9d 100644 --- a/tdeio/tdeio/kservice.h +++ b/tdeio/tdeio/kservice.h @@ -28,7 +28,7 @@ #include "tdesycocaentry.h" class TQDataStream; -class KDesktopFile; +class TDEDesktopFile; class KService; class KBuildSycoca; class TQWidget; @@ -74,7 +74,7 @@ public: * Construct a service and take all information from a desktop file. * @param config the desktop file to read */ - KService( KDesktopFile *config ); // KDE-4.0: make explicit + KService( TDEDesktopFile *config ); // KDE-4.0: make explicit /** * @internal @@ -521,7 +521,7 @@ public: protected: - void init(KDesktopFile *config); + void init(TDEDesktopFile *config); TQStringList &accessServiceTypes() { return m_lstServiceTypes; } diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp index fb86c35fa..e612705e5 100644 --- a/tdeio/tdeio/kservicegroup.cpp +++ b/tdeio/tdeio/kservicegroup.cpp @@ -69,7 +69,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp d->directoryEntryPath = cfg; - KDesktopFile config( cfg, true, "apps" ); + TDEDesktopFile config( cfg, true, "apps" ); m_strCaption = config.readName(); m_strIcon = config.readIcon(); diff --git a/tdeio/tdeio/kservicegroup.h b/tdeio/tdeio/kservicegroup.h index ac4646599..6cb910f18 100644 --- a/tdeio/tdeio/kservicegroup.h +++ b/tdeio/tdeio/kservicegroup.h @@ -25,7 +25,7 @@ #include <tqdatastream.h> #include <tqvariant.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <ksortablevaluelist.h> #include "tdesycocaentry.h" diff --git a/tdeio/tdeio/kservicetype.cpp b/tdeio/tdeio/kservicetype.cpp index 66d12698b..f94d7cc77 100644 --- a/tdeio/tdeio/kservicetype.cpp +++ b/tdeio/tdeio/kservicetype.cpp @@ -25,7 +25,7 @@ #include "kuserprofile.h" #include <assert.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> class KServiceType::KServiceTypePrivate { @@ -40,19 +40,19 @@ public: KServiceType::KServiceType( const TQString & _fullpath) : KSycocaEntry(_fullpath), d(0) { - KDesktopFile config( _fullpath ); + TDEDesktopFile config( _fullpath ); init(&config); } -KServiceType::KServiceType( KDesktopFile *config ) +KServiceType::KServiceType( TDEDesktopFile *config ) : KSycocaEntry(config->fileName()), d(0) { init(config); } void -KServiceType::init( KDesktopFile *config) +KServiceType::init( TDEDesktopFile *config) { // Is it a mimetype ? m_strName = config->readEntry( "MimeType" ); diff --git a/tdeio/tdeio/kservicetype.h b/tdeio/tdeio/kservicetype.h index d333188c1..8b40b7695 100644 --- a/tdeio/tdeio/kservicetype.h +++ b/tdeio/tdeio/kservicetype.h @@ -32,7 +32,7 @@ #include <tqdatastream.h> #include <tqvariant.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> /** * A service type is the generic notion for a mimetype, a type of service @@ -73,7 +73,7 @@ public: * Construct a service type and take all informations from a deskop file. * @param config the configuration file */ - KServiceType( KDesktopFile *config); + KServiceType( TDEDesktopFile *config); /** * @internal construct a service from a stream. @@ -227,7 +227,7 @@ public: static List allServiceTypes(); protected: - void init( KDesktopFile *config ); + void init( TDEDesktopFile *config ); protected: TQString m_strName; diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp index 84280ddcd..31533e6c7 100644 --- a/tdeio/tdeio/tdefileshare.cpp +++ b/tdeio/tdeio/tdefileshare.cpp @@ -32,7 +32,7 @@ #include <stdlib.h> #include <errno.h> #include <kdirnotify_stub.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kuser.h> KFileShare::Authorization KFileShare::s_authorization = NotInitialized; @@ -90,7 +90,7 @@ void KFileShare::readConfig() // static { // Create KFileSharePrivate instance KFileSharePrivate::self(); - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); s_sharingEnabled = config.readEntry("FILESHARING", "yes") == "yes"; s_restricted = config.readEntry("RESTRICT", "yes") == "yes"; 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/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index 57732e6c6..708b3b840 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdecmdlineargs.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqdir.h> #include <tqregexp.h> @@ -172,7 +172,7 @@ int main(int argc, char **argv) // There is no default search engine by default (since it was annoying when making typos), // so the user has to set it up, which we do here. { - KSimpleConfig cfg( "kuriikwsfilterrc" ); + TDESimpleConfig cfg( "kuriikwsfilterrc" ); cfg.setGroup( "General" ); cfg.writeEntry( "DefaultSearchEngine", "google" ); cfg.writeEntry( "Verbose", true ); @@ -182,7 +182,7 @@ int main(int argc, char **argv) // Enable verbosity for debugging { - KSimpleConfig cfg( "tdeshorturifilterrc" ); + TDESimpleConfig cfg( "tdeshorturifilterrc" ); cfg.writeEntry( "Verbose", true ); cfg.sync(); } 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 162f8a848..ba42792ee 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -73,8 +73,8 @@ #include <kshred.h> #include <kdebug.h> #include <kurl.h> -#include <kinstance.h> -#include <ksimpleconfig.h> +#include <tdeinstance.h> +#include <tdesimpleconfig.h> #include <tdetempfile.h> #include <tdelocale.h> #include <tqfile.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..b088dbb6a 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> 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 5225de500..9d1c78940 100644 --- a/tdeparts/plugin.cpp +++ b/tdeparts/plugin.cpp @@ -30,13 +30,13 @@ #include <tqfileinfo.h> #include <klibloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <kdebug.h> #include <kxmlguifactory.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> using namespace KParts; @@ -256,7 +256,7 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEI if( !desktopfile.isEmpty() ) { //kdDebug(1000) << "loadPlugins found desktop file for " << name << ": " << desktopfile << endl; - KSimpleConfig desktop( desktopfile, true ); + TDESimpleConfig desktop( desktopfile, true ); desktop.setDesktopGroup(); pluginEnabled = desktop.readBoolEntry( "X-TDE-PluginInfo-EnabledByDefault", enableNewPluginsByDefault ); diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index d63ca2872..2ffda7498 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstaticdeleter.h> #include <tdeapplication.h> #include <dcopclient.h> @@ -312,7 +312,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) TQString path(name); if (path[0] != '/') path = locate("data", TQString::fromLatin1("tdeprint/plugins/%1.print").arg(name)); - KSimpleConfig conf(path); + TDESimpleConfig conf(path); PluginInfo info; conf.setGroup("TDE Print Entry"); diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index f664ab66c..d0ace8e17 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <tdestandarddirs.h> #include <tdeglobal.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -60,7 +60,7 @@ bool KMSpecialManager::savePrinters() else confname = locateLocal("data","tdeprint/specials.desktop"); - KSimpleConfig conf(confname); + TDESimpleConfig conf(confname); // first clear existing groups conf.setGroup("General"); @@ -134,7 +134,7 @@ bool KMSpecialManager::loadPrinters() bool KMSpecialManager::loadDesktopFile(const TQString& filename) { - KSimpleConfig conf(filename); + TDESimpleConfig conf(filename); conf.setGroup("General"); int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index d9f3fc456..8dd15f9bd 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -31,7 +31,7 @@ #include <tqvaluelist.h> #include <tdestandarddirs.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdialogbase.h> #include <kdebug.h> #include <tdeprocess.h> @@ -218,7 +218,7 @@ void KXmlCommand::check(bool use_xml) void KXmlCommand::loadDesktop() { - KSimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop")); + TDESimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("TDE Print Filter Entry"); d->m_description = conf.readEntry("Comment"); d->m_outputMime = conf.readEntry("MimeTypeOut"); @@ -229,7 +229,7 @@ void KXmlCommand::loadDesktop() void KXmlCommand::saveDesktop() { - KSimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop")); + TDESimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("TDE Print Filter Entry"); conf.writeEntry("Comment", d->m_description); conf.writeEntry("MimeTypeIn", d->m_inputMime); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index 744ed73dd..ee2802a57 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -52,7 +52,7 @@ #include <tdepopupmenu.h> #include <klibloader.h> #include <kdialogbase.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeprocess.h> @@ -233,7 +233,7 @@ void KMMainView::initActions() TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { - KSimpleConfig conf(*it); + TDESimpleConfig conf(*it); conf.setGroup("Desktop Entry"); mact->popupMenu()->insertItem(conf.readEntry("Name", "Unnamed"), mact->popupMenu()->count()); m_toollist << conf.readEntry("X-TDE-Library"); diff --git a/tderandr/libtderandr.cpp b/tderandr/libtderandr.cpp index 1900f8503..94828e434 100644 --- a/tderandr/libtderandr.cpp +++ b/tderandr/libtderandr.cpp @@ -80,14 +80,14 @@ TQString capitalizeString(TQString in) { } TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenName, TQString kde_confdir) { - KSimpleConfig *t_config = NULL; - KSimpleConfig *t_systemconfig = NULL; + TDESimpleConfig *t_config = NULL; + TDESimpleConfig *t_systemconfig = NULL; int t_numberOfProfiles; TQStringList t_cfgProfiles; TQString retval; if ((profileName != NULL) && (profileName != "")) { - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new TDESimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); t_config->setGroup(NULL); if (t_config->readBoolEntry("EnableICC", false) == true) { t_config->setGroup(profileName); @@ -99,7 +99,7 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa delete t_config; } else { - t_systemconfig = new KSimpleConfig( kde_confdir + TQString("/kicc/kiccconfigrc") ); + t_systemconfig = new TDESimpleConfig( kde_confdir + TQString("/kicc/kiccconfigrc") ); t_systemconfig->setGroup(NULL); if (t_systemconfig->readBoolEntry("EnableICC", false) == true) { retval = t_systemconfig->readEntry("ICCFile"); @@ -266,12 +266,12 @@ TQString KRandrSimpleAPI::applyIccConfiguration(TQString profileName, TQString k Display *randr_display; ScreenInfo *randr_screen_info; XRROutputInfo *output_info; - KSimpleConfig *t_config; + TDESimpleConfig *t_config; int screenNumber = 0; TQString errorstr = ""; - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new TDESimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); // Find all screens if (isValid() == true) { @@ -373,9 +373,9 @@ TQByteArray KRandrSimpleAPI::getEDID(int card, TQString displayname) { TQString KRandrSimpleAPI::getCurrentProfile () { TQString profileName; - KSimpleConfig *t_config; + TDESimpleConfig *t_config; - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new TDESimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); profileName = t_config->readEntry("CurrentProfile"); delete t_config; return profileName; @@ -459,7 +459,7 @@ void KRandrSimpleAPI::saveDisplayConfiguration(bool enable, bool applyonstart, T filename = "displayglobals"; filename.prepend(kde_confdir.append("/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); display_config->setGroup("General"); display_config->writeEntry("EnableDisplayControl", enable); display_config->writeEntry("ApplySettingsOnStart", applyonstart); @@ -473,7 +473,7 @@ void KRandrSimpleAPI::saveDisplayConfiguration(bool enable, bool applyonstart, T } filename.prepend(kde_confdir.append("/displayconfig/")); - display_config = new KSimpleConfig( filename ); + display_config = new TDESimpleConfig( filename ); i=0; SingleScreenData *screendata; @@ -561,7 +561,7 @@ TQPtrList<SingleScreenData> KRandrSimpleAPI::loadDisplayConfiguration(TQString p } filename.prepend(kde_confdir.append("/displayconfig/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); TQStringList grouplist = display_config->groupList(); SingleScreenData *screendata; @@ -962,7 +962,7 @@ HotPlugRulesList KRandrSimpleAPI::getHotplugRules(TQString kde_confdir) { filename = "displayglobals"; filename.prepend(kde_confdir.append("/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); TQStringList grouplist = display_config->groupList(); for ( TQStringList::Iterator it = grouplist.begin(); it != grouplist.end(); ++it ) { @@ -987,7 +987,7 @@ void KRandrSimpleAPI::saveHotplugRules(HotPlugRulesList rules, TQString kde_conf filename = "displayglobals"; filename.prepend(kde_confdir.append("/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); TQStringList grouplist = display_config->groupList(); for ( TQStringList::Iterator it = grouplist.begin(); it != grouplist.end(); ++it ) { if (!(*it).startsWith("Hotplug-Rule")) { @@ -1011,7 +1011,7 @@ void KRandrSimpleAPI::saveHotplugRules(HotPlugRulesList rules, TQString kde_conf bool KRandrSimpleAPI::getDisplayConfigurationEnabled(TQString kde_confdir) { TQString filename = "displayglobals"; filename.prepend(kde_confdir.append("/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); display_config->setGroup("General"); bool enabled = display_config->readBoolEntry("EnableDisplayControl", false); delete display_config; @@ -1022,7 +1022,7 @@ bool KRandrSimpleAPI::getDisplayConfigurationEnabled(TQString kde_confdir) { bool KRandrSimpleAPI::getDisplayConfigurationStartupAutoApplyEnabled(TQString kde_confdir) { TQString filename = "displayglobals"; filename.prepend(kde_confdir.append("/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); display_config->setGroup("General"); bool applyonstart = display_config->readBoolEntry("ApplySettingsOnStart", false); delete display_config; @@ -1033,7 +1033,7 @@ bool KRandrSimpleAPI::getDisplayConfigurationStartupAutoApplyEnabled(TQString kd TQString KRandrSimpleAPI::getDisplayConfigurationStartupAutoApplyName(TQString kde_confdir) { TQString filename = "displayglobals"; filename.prepend(kde_confdir.append("/")); - KSimpleConfig* display_config = new KSimpleConfig( filename ); + TDESimpleConfig* display_config = new TDESimpleConfig( filename ); display_config->setGroup("General"); TQString profilename = display_config->readEntry("StartupProfileName", ""); delete display_config; diff --git a/tderandr/libtderandr.h b/tderandr/libtderandr.h index ad9ccf4b9..106821f85 100644 --- a/tderandr/libtderandr.h +++ b/tderandr/libtderandr.h @@ -32,7 +32,7 @@ #include <tqfile.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelibs_export.h> /** diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index f857fdd95..0b00721e8 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kurlrequester.h> #include <tdelistview.h> diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp index a39a4574a..699dfe63f 100644 --- a/tderesources/factory.cpp +++ b/tderesources/factory.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> 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/tdestyles/utils/installtheme/main.cpp b/tdestyles/utils/installtheme/main.cpp index aa81b7254..a58a55daf 100644 --- a/tdestyles/utils/installtheme/main.cpp +++ b/tdestyles/utils/installtheme/main.cpp @@ -29,7 +29,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> static const char desc[] = I18N_NOOP("TDE Tool to build a cache list of all pixmap themes installed"); @@ -48,7 +48,7 @@ int main(int argc, char **argv) for (TQStringList::iterator i = themercs.begin(); i!=themercs.end(); ++i) { TQString file=*i; - KSimpleConfig config(file, true); + TDESimpleConfig config(file, true); TQString name = TQFileInfo(file).baseName(); //This is nice and static... //So we don't have to worry about our key changing when the language does. @@ -62,7 +62,7 @@ int main(int argc, char **argv) } } - KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); + TDESimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); #if 0 //Doesn't seem to work with present Qt.. diff --git a/tdeui/about/top-left.png b/tdeui/about/top-left.png Binary files differindex 5b6cc648d..71756a276 100755 --- a/tdeui/about/top-left.png +++ b/tdeui/about/top-left.png diff --git a/tdeui/abouttde.png b/tdeui/abouttde.png Binary files differindex 90d66e822..e2061e967 100755 --- a/tdeui/abouttde.png +++ b/tdeui/abouttde.png 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/tdeui/tests/go.png b/tdeui/tests/go.png Binary files differindex 5470c138f..65b83a303 100755 --- a/tdeui/tests/go.png +++ b/tdeui/tests/go.png diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 9a8a2b3ed..c72e0a43c 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -11,7 +11,7 @@ #include <kdialog.h> #include <tdelocale.h> #include <kiconloader.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqpushbutton.h> #include <tqlayout.h> @@ -137,7 +137,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_hc->completionObject()->setItems( list ); // Setup konq's combobox - KSimpleConfig historyConfig( "konq_history" ); + TDESimpleConfig historyConfig( "konq_history" ); historyConfig.setGroup( "Location Bar" ); TDECompletion * s_pCompletion = new TDECompletion; s_pCompletion->setOrder( TDECompletion::Weighted ); 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/kplugininfo.cpp b/tdeutils/kplugininfo.cpp index 9a5613745..c1b30307c 100644 --- a/tdeutils/kplugininfo.cpp +++ b/tdeutils/kplugininfo.cpp @@ -18,13 +18,13 @@ */ #include "kplugininfo.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ktrader.h> #include <kdebug.h> #include <tdeconfigbase.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kservice.h> class KPluginInfo::KPluginInfoPrivate @@ -70,7 +70,7 @@ class KPluginInfo::KPluginInfoPrivate KPluginInfo::KPluginInfo( const TQString & filename, const char* resource ) : d( new KPluginInfoPrivate ) { - KDesktopFile file( filename, true, resource ); + TDEDesktopFile file( filename, true, resource ); d->specfile = filename; diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index ac8caf25b..84d1629ea 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdialog.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> @@ -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" @@ -589,7 +589,7 @@ void KPluginSelector::addPlugins( const TQString & instanceName, checkNeedForTabWidget(); Q_ASSERT( config ); // please set config, or use addPlugins( instance, ... ) which takes care of it if ( !config ) // KDE4: ensure that config is always set; make it second in the arg list? - config = new KSimpleConfig( instanceName ); // memleak! + config = new TDESimpleConfig( instanceName ); // memleak! TDEConfigGroup * cfgGroup = new TDEConfigGroup( config, "KParts Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); diff --git a/tdeutils/kpluginselector.h b/tdeutils/kpluginselector.h index 12d484d0e..212e8737f 100644 --- a/tdeutils/kpluginselector.h +++ b/tdeutils/kpluginselector.h @@ -95,7 +95,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). - * For example KViewCanvas passes KSimpleConfig( + * For example KViewCanvas passes TDESimpleConfig( * "kviewcanvas" ). */ void addPlugins( const TQString & instanceName, @@ -134,7 +134,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). - * For example KViewCanvas passes KSimpleConfig( + * For example KViewCanvas passes TDESimpleConfig( * "kviewcanvas" ). */ void addPlugins( const TQValueList<KPluginInfo*> & plugininfos, diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox index 83a71767e..96da18a26 100644 --- a/tdeutils/ksettings/README.dox +++ b/tdeutils/ksettings/README.dox @@ -77,7 +77,7 @@ MyAppConfig::MyAppConfig( TQWidget *parent, const char *, const QStringList &arg \endcode For the TDEConfig object you can either use -TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). +TDEGlobal::config() (I don't recommend it) or TDESimpleConfig( "myapprc" ). I added a method to KSettings::Dispatcher that gives you the TDEConfig object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index 6aeccd3c8..cf84b0753 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -28,7 +28,7 @@ #include <kplugininfo.h> #include "ksettings/dispatcher.h" #include "ksettings/componentsdialog.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kiconloader.h> #include <tqvbox.h> @@ -511,7 +511,7 @@ bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const void Dialog::parseGroupFile( const TQString & filename ) { - KSimpleConfig file( filename ); + TDESimpleConfig file( filename ); TQStringList groups = file.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it ) diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 5cd5a4208..869cd86df 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -93,7 +93,7 @@ TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) return inst->config(); } //if( fallback ) - //return new KSimpleConfig( instanceName ); + //return new TDESimpleConfig( instanceName ); return 0; } diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp index 91a1814d4..dada2ad3b 100644 --- a/tdeutils/tdecmoduleinfo.cpp +++ b/tdeutils/tdecmoduleinfo.cpp @@ -23,7 +23,7 @@ #include <tqvariant.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdestandarddirs.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 5e9a8ce1d..0c13e5884 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -29,7 +29,7 @@ knotifyclient.cpp \ kcompletionbase.cpp \ kcompletion.cpp \ kmimesourcefactory.cpp \ -ksimpleconfig.cpp \ +tdesimpleconfig.cpp \ libintl.cpp \ kcatalogue.cpp \ kcalendarsystem.cpp \ @@ -68,7 +68,7 @@ tdeaccelmanager.cpp \ tdeshortcut.cpp \ tdeshortcutmenu.cpp \ tdeshortcutlist.cpp \ -kinstance.cpp \ +tdeinstance.cpp \ tdeversion.cpp \ tdelocale.cpp \ kicontheme.cpp \ @@ -87,7 +87,7 @@ tdeapplication.cpp \ kapplication_win.cpp \ tdeappdcopinterface.cpp \ tdeprocctrl.cpp \ -kdesktopfile.cpp \ +tdedesktopfile.cpp \ kbufferedio.cpp \ netsupp_win32.cpp \ kasyncio.cpp \ |
