From 16652efd0f5da6775487e6796493785d2602717d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 13 Jul 2025 19:55:30 +0900 Subject: [PATCH] Use TDEDesktopFile Signed-off-by: Michele Calgaro --- kappfinder/common.cpp | 4 +-- kappfinder/toplevel.cpp | 4 +-- kate/app/kateexternaltools.cpp | 2 +- kate/app/katemainwindow.cpp | 2 +- kcontrol/filetypes/filetypesview.cpp | 4 +-- kcontrol/filetypes/typeslistitem.cpp | 2 +- kcontrol/kded/kcmkded.cpp | 8 ++--- kcontrol/keys/treeview.h | 2 +- kcontrol/kicker/extensionInfo.cpp | 4 +-- kcontrol/kicker/menutab_impl.cpp | 4 +-- kcontrol/screensaver/saverconfig.cpp | 4 +-- kdesktop/init.cpp | 8 ++--- kdesktop/kdiconview.cpp | 6 ++-- kdesktop/lock/lockprocess.cpp | 2 +- khelpcenter/docentry.cpp | 4 +-- khelpcenter/navigator.cpp | 4 +-- khelpcenter/searchhandler.cpp | 4 +-- khotkeys/shared/actions.cpp | 2 +- kicker/applets/launcher/quickaddappsmenu.cpp | 2 +- kicker/applets/launcher/quickbutton.cpp | 2 +- kicker/applets/media/mediumbutton.cpp | 2 +- kicker/kicker/buttons/nontdeappbutton.cpp | 6 ++-- kicker/kicker/buttons/servicebutton.cpp | 4 +-- kicker/kicker/buttons/urlbutton.cpp | 10 +++--- kicker/kicker/core/container_extension.cpp | 4 +-- kicker/kicker/core/containerarea.cpp | 4 +-- kicker/kicker/ui/browser_mnu.cpp | 4 +-- kicker/kicker/ui/itemview.cpp | 14 ++++---- kicker/kicker/ui/k_new_mnu.cpp | 32 +++++++++---------- kicker/kicker/ui/service_mnu.cpp | 6 ++-- kicker/libkicker/appletinfo.cpp | 4 +-- kicker/menuext/recentdocs/recentdocsmenu.cpp | 6 ++-- kicker/menuext/remote/remotemenu.cpp | 4 +-- kicker/menuext/tom/tom.cpp | 2 +- kmenuedit/basictab.cpp | 6 ++-- kmenuedit/menufile.cpp | 2 +- kmenuedit/menuinfo.cpp | 10 +++--- kmenuedit/menuinfo.h | 6 ++-- kmenuedit/treeview.cpp | 22 ++++++------- kmenuedit/treeview.h | 4 +-- konqueror/keditbookmarks/commands.cpp | 4 +-- konqueror/sidebar/sidebar_widget.cpp | 6 ++-- .../trees/dirtree_module/dirtree_module.cpp | 4 +-- konqueror/sidebar/trees/konq_sidebartree.cpp | 6 ++-- kpersonalizer/tdestylepage.cpp | 16 +++++----- libkonq/knewmenu.cpp | 14 ++++---- libkonq/konq_operations.cpp | 6 ++-- libkonq/konq_settings.cpp | 2 +- nsplugins/pluginscan.cpp | 4 +-- .../libmediacommon/notifierserviceaction.cpp | 4 +-- .../media/libmediacommon/notifiersettings.cpp | 8 ++--- .../media/libmediacommon/notifiersettings.h | 4 +-- .../remote/kdedmodule/remotedirnotify.cpp | 2 +- tdeioslave/remote/remoteimpl.cpp | 8 ++--- .../system/kdedmodule/systemdirnotify.cpp | 4 +-- tdeioslave/system/systemimpl.cpp | 8 ++--- tdeioslave/system/systemimpl.h | 2 +- tdeioslave/trash/ktrashpropsdlgplugin.cpp | 4 +-- tdescreensaver/random.cpp | 6 ++-- .../kcmtwin/twindecoration/twindecoration.cpp | 6 ++-- 60 files changed, 172 insertions(+), 172 deletions(-) diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp index 14bc673a7..6a54f1a05 100644 --- a/kappfinder/common.cpp +++ b/kappfinder/common.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include @@ -50,7 +50,7 @@ void copyFile( const TQString &inFileName, const TQString &outFileName ) bool scanDesktopFile( TQPtrList &appCache, const TQString &templ, TQString destDir ) { - KDesktopFile desktop( templ, true ); + TDEDesktopFile desktop( templ, true ); // find out where to put the .desktop files TQString destName; diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index a757aa104..dd4958657 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -202,7 +202,7 @@ void TopLevel::slotScan() if (found) continue; - KDesktopFile desktop( *it, true ); + TDEDesktopFile desktop( *it, true ); // copy over the desktop file, if exists if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) { diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index e93e758ea..a52c70618 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -92,7 +92,7 @@ bool KateExternalTool::checkExec() if ( tryexec.isEmpty() ) tryexec = command.section( " ", 0, 0, TQString::SectionSkipEmpty ); - // NOTE this code is modified taken from kdesktopfile.cpp, from KDesktopFile::tryExec() + // NOTE this code is modified taken from tdedesktopfile.cpp, from TDEDesktopFile::tryExec() if (!tryexec.isEmpty()) { if (tryexec[0] == '/') { if (::access(TQFile::encodeName(tryexec), R_OK | X_OK)) diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 1c7f0f4ba..76f6d5d6a 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index c362dbfcc..e414014fe 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -362,7 +362,7 @@ bool FileTypesView::sync( TQValueList& itemsModified ) loc = m_ptr->desktopEntryPath(); loc = locateLocal("mime", loc); - KDesktopFile config(loc, false, "mime"); + TDEDesktopFile config(loc, false, "mime"); config.writeEntry("Type", "MimeType"); config.writeEntry("MimeType", m_ptr->name()); config.writeEntry("Hidden", true); diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 97e9a031d..1c5d8b6f7 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "typeslistitem.h" diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index b71170b56..a6bec1ca8 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -156,8 +156,8 @@ void KDEDConfig::load( bool useDefaults ) { CheckListItem* clitem; for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - if ( KDesktopFile::isDesktopFile( *it ) ) { - KDesktopFile file( *it, true, "services" ); + if ( TDEDesktopFile::isDesktopFile( *it ) ) { + TDEDesktopFile file( *it, true, "services" ); if ( file.readBoolEntry("X-TDE-Kded-autoload") ) { clitem = new CheckListItem(_lvStartup, TQString::null); @@ -194,7 +194,7 @@ void KDEDConfig::save() { for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { - if ( KDesktopFile::isDesktopFile( *it ) ) { + if ( TDEDesktopFile::isDesktopFile( *it ) ) { TDEConfig file( *it, false, false, "services" ); file.setGroup("Desktop Entry"); diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h index 591658ffe..a61cf591a 100644 --- a/kcontrol/keys/treeview.h +++ b/kcontrol/keys/treeview.h @@ -26,7 +26,7 @@ class TQPopupMenu; class TDEActionCollection; -class KDesktopFile; +class TDEDesktopFile; class AppTreeItem : public TDEListViewItem { diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index a773e063d..bd0bd2f11 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "extensionInfo.h" @@ -54,7 +54,7 @@ void ExtensionInfo::load() } else { - KDesktopFile df(_desktopFile); + TDEDesktopFile df(_desktopFile); _name = df.readName(); _resizeable = df.readBoolEntry("X-TDE-PanelExt-Resizeable", _resizeable); diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 2c03414b7..44643d366 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -150,7 +150,7 @@ void MenuTab::load( bool useDefaults ) TQStringList av = d.entryList(); for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it) { - KDesktopFile df(d.absFilePath(*it), true); + TDEDesktopFile df(d.absFilePath(*it), true); menuItem = new kSubMenuItem(m_subMenus, df.readName(), *it, diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index 75ee227f1..f85740911 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "saverconfig.h" @@ -9,7 +9,7 @@ SaverConfig::SaverConfig() bool SaverConfig::read(const TQString &file) { - KDesktopFile config(file, true); + TDEDesktopFile config(file, true); if( !config.tryExec()) return false; mExec = config.readPathEntry("Exec"); diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp index 0259c5a40..25e3dd717 100644 --- a/kdesktop/init.cpp +++ b/kdesktop/init.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -145,7 +145,7 @@ static void copyDesktopLinks() TQString desktopPath = realDesktopPath(); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) { - KDesktopFile desk( *it ); + TDEDesktopFile desk( *it ); if (desk.readBoolEntry("Hidden")) continue; copyFile( *it, desktopPath ); @@ -213,13 +213,13 @@ void testLocalInstallation() if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) { TQString oldIcon, oldEmptyIcon; if ( trashDesktopExists ) { - KDesktopFile trashDesktop( trashDesktopPath, true ); + TDEDesktopFile trashDesktop( trashDesktopPath, true ); oldIcon = trashDesktop.readIcon(); oldEmptyIcon = trashDesktop.readEntry( "EmptyIcon" ); } copyFile( locate( "data", "kdesktop/directory.trash" ), trashDesktopPath ); if ( trashDesktopExists ) { - KDesktopFile trashDesktop( trashDesktopPath ); + TDEDesktopFile trashDesktop( trashDesktopPath ); trashDesktop.writeEntry( "Icon", oldIcon ); trashDesktop.writeEntry( "EmptyIcon", oldEmptyIcon ); trashDesktop.sync(); diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp index 9c86a07a1..70f1010b7 100644 --- a/kdesktop/kdiconview.cpp +++ b/kdesktop/kdiconview.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -914,7 +914,7 @@ bool KDIconView::deleteGlobalDesktopFiles() } } - KDesktopFile df(desktopPath + fItem->url().fileName()); + TDEDesktopFile df(desktopPath + fItem->url().fileName()); df.writeEntry("Hidden", true); df.sync(); @@ -1578,7 +1578,7 @@ void KDIconView::slotClipboardDataChanged() void KDIconView::renameDesktopFile(const TQString &path, const TQString &name) { - KDesktopFile cfg( path, false ); + TDEDesktopFile cfg( path, false ); // if we don't have the desktop entry group, then we assume that // it's not a config file (and we don't nuke it!) diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index 41fb78371..789ceee0f 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -800,7 +800,7 @@ void LockProcess::readSaver() bool opengl = tdeApp->authorize("opengl_screensavers"); bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers"); - KDesktopFile config(file, true); + TDEDesktopFile config(file, true); if (config.readEntry("X-TDE-Type").utf8() != 0) { TQString saverType = config.readEntry("X-TDE-Type").utf8(); TQStringList saverTypes = TQStringList::split(";", saverType); diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index d77fce982..d3242c7d8 100644 --- a/khelpcenter/docentry.cpp +++ b/khelpcenter/docentry.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include @@ -204,7 +204,7 @@ bool DocEntry::isDirectory() const bool DocEntry::readFromFile( const TQString &fileName ) { - KDesktopFile file( fileName ); + TDEDesktopFile file( fileName ); mName = file.readName(); mSearch = file.readEntry( "X-DOC-Search" ); diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index a87d5039f..d2658e8e1 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include @@ -279,7 +279,7 @@ void Navigator::insertAppletDocs( NavigatorItem *topItem ) void Navigator::createItemFromDesktopFile( NavigatorItem *topItem, const TQString &file ) { - KDesktopFile desktopFile( file ); + TDEDesktopFile desktopFile( file ); TQString docPath = desktopFile.readDocPath(); if ( !docPath.isNull() ) { // First parameter is ignored if second is an absolute path diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index b52643f5e..1b66c32ee 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -24,7 +24,7 @@ #include "prefs.h" #include "docentry.h" -#include +#include #include #include #include @@ -44,7 +44,7 @@ SearchHandler *SearchHandler::initFromFile( const TQString &filename ) { SearchHandler *handler = new SearchHandler; - KDesktopFile file( filename ); + TDEDesktopFile file( filename ); handler->mSearchCommand = file.readEntry( "SearchCommand" ); handler->mSearchUrl = file.readEntry( "SearchUrl" ); diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index 72ac70afd..b5e7baa8e 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 69c65864f..40957c44f 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include -#include +#include #include #include #include diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 7c8186ce5..e7226c8a4 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index be75a3d40..4cc27ffe8 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index 4b6af8ce1..eb4d1396d 100644 --- a/kicker/kicker/buttons/nontdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include @@ -174,11 +174,11 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev) ++it) { const KURL &url(*it); - if (KDesktopFile::isDesktopFile(url.path())) + if (TDEDesktopFile::isDesktopFile(url.path())) { // this URL is actually a .desktop file, so let's grab // the URL it actually points to ... - KDesktopFile deskFile(url.path()); + TDEDesktopFile deskFile(url.path()); deskFile.setDesktopGroup(); // ... and add it to the exec string diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index f6062854b..2c392d29e 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) _id = locate("appdata", id.mid(1)); if (!_id.isEmpty()) { - KDesktopFile df(_id, true); + TDEDesktopFile df(_id, true); _service = new KService(&df); } } diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index cc9bfb0c6..afdf90fa9 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ void URLButton::initialize( const TQString& _url ) if (!url.isLocalFile() || !url.path().endsWith(".desktop")) { TQString file = KickerLib::newDesktopFile(url); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", url.prettyURL()); @@ -107,9 +107,9 @@ void URLButton::saveConfig( TDEConfigGroup& config ) const void URLButton::setToolTip() { if (fileItem->isLocalFile() - && KDesktopFile::isDesktopFile(fileItem->url().path())) + && TDEDesktopFile::isDesktopFile(fileItem->url().path())) { - KDesktopFile df(fileItem->url().path()); + TDEDesktopFile df(fileItem->url().path()); if (df.readComment().isEmpty()) { @@ -145,7 +145,7 @@ void URLButton::dropEvent(TQDropEvent *ev) if(KURLDrag::decode(ev, execList)){ KURL url( fileItem->url() ); if(!execList.isEmpty()) { - if (KDesktopFile::isDesktopFile(url.path())){ + if (TDEDesktopFile::isDesktopFile(url.path())){ TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(), 0, 0, 0, "", true); } diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 66fbfce79..a58b006ee 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include @@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) if (!_opMnu) { - KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); + TDEDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); _opMnu = new PanelExtensionOpMenu(f.readName(), m_extension ? m_extension->actions() : 0, this); diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index f3d80cc2b..cb61b16e8 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include @@ -1322,7 +1322,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { // a local desktop file being dragged from an external program. // Make a copy first. - KDesktopFile df(url.path()); + TDEDesktopFile df(url.path()); KURL newUrl; newUrl.setPath(KickerLib::copyDesktopFile(url)); if (df.readType() == "Link") diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 85f5c74cc..a3dad738d 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include @@ -237,7 +237,7 @@ void PanelBrowserMenu::initialize() bool mimecheck = false; // .desktop files - if(KDesktopFile::isDesktopFile(path)) + if(TDEDesktopFile::isDesktopFile(path)) { TDESimpleConfig c(path, true); c.setDesktopGroup(); diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index aef71d84f..873fbaa9f 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -837,7 +837,7 @@ KMenuItem* ItemView::insertDocumentItem(const TQString& s, int nId, int nIndex, KMenuItem* ItemView::insertRecentlyItem(const TQString& s, int nId, int nIndex) { - KDesktopFile f(s, true /* read only */); + TDEDesktopFile f(s, true /* read only */); KMenuItem* newItem = findItem(nId); @@ -1056,7 +1056,7 @@ TQDragObject * ItemView::dragObject() TQString uri = kitem->path(); if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } @@ -1153,9 +1153,9 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) TQString url = *it; kdDebug () << "Url " << url << endl; item.m_path = KURL( url ).path(); - if ( KDesktopFile::isDesktopFile( item.m_path ) ) + if ( TDEDesktopFile::isDesktopFile( item.m_path ) ) { - KDesktopFile df( item.m_path, true ); + TDEDesktopFile df( item.m_path, true ); item.m_description = df.readGenericName(); item.m_icon = df.readIcon(); item.m_title = df.readName(); @@ -1215,13 +1215,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==uri) break; } @@ -1243,7 +1243,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==text) break; } diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 5549bcf42..324c46f0e 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1284,7 +1284,7 @@ void KMenu::initialize() for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); TQString url = df.readURL(); if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString()))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); @@ -2789,7 +2789,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.icon = kitem->icon(); if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(m_popupPath.path,true); + TDEDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } } @@ -2822,7 +2822,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) break; } @@ -2954,7 +2954,7 @@ void KMenu::slotContextMenu(int selected) job->setDefaultPermissions( true ); } else { - KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); + TDEDesktopFile* df = new TDEDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); df->writeEntry("GenericName", m_popupPath.description); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", m_popupPath.path ); @@ -2997,7 +2997,7 @@ void KMenu::slotContextMenu(int selected) case AddMenuToDesktop: { accept(); - KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); + TDEDesktopFile *df = new TDEDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath ); df->writeEntry( "Name", m_popupPath.title ); @@ -3025,14 +3025,14 @@ void KMenu::slotContextMenu(int selected) TQStringList::Iterator it; for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) break; } } if (it==favs.end()) { TQString file = KickerLib::newDesktopFile(m_popupPath.path); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", m_popupPath.title); @@ -3067,7 +3067,7 @@ void KMenu::slotContextMenu(int selected) else { for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==m_popupPath.path) { TQFile::remove((*it)); favs.erase(it); @@ -3311,7 +3311,7 @@ void KMenu::searchActionClicked(TQListViewItem* item) list << "kurisearchfilter" << "kuriikwsfilter"; if( !KURIFilter::self()->filterURI(data, list) ) { - KDesktopFile file("searchproviders/google.desktop", true, "services"); + TDEDesktopFile file("searchproviders/google.desktop", true, "services"); data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText())); } @@ -3420,7 +3420,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==kitem->path()) { addFav = *it; @@ -3445,7 +3445,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir { if ((*it)[0]=='/' && !kafterNow->service()) { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; @@ -3615,7 +3615,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { TQString uri = item.m_path; if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { - KDesktopFile df(uri,true); + TDEDesktopFile df(uri,true); uri=df.readURL(); } @@ -3624,7 +3624,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==uri) break; } @@ -3632,7 +3632,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (it==favs.end()) { TQString file = KickerLib::newDesktopFile(uri); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item.m_title); @@ -3666,7 +3666,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) { if ((*it)[0]=='/') { - KDesktopFile df((*it),true); + TDEDesktopFile df((*it),true); if (df.readURL().replace("file://",TQString())==text) break; } @@ -3677,7 +3677,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) KURL kurl(text); TQString file = KickerLib::newDesktopFile(text); - KDesktopFile df(file); + TDEDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index f18816d69..59d63e533 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include @@ -672,7 +672,7 @@ void PanelServiceMenu::slotContextMenu(int selected) KURL src,dest; TDEIO::CopyJob *job; - KDesktopFile *df; + TDEDesktopFile *df; switch (selected) { case AddItemToDesktop: @@ -718,7 +718,7 @@ void PanelServiceMenu::slotContextMenu(int selected) dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( g->caption() ); - df = new KDesktopFile( dest.path() ); + df = new TDEDesktopFile( dest.path() ); df->writeEntry( "Icon", g->icon() ); df->writePathEntry( "URL", "programs:/"+g->name() ); df->writeEntry( "Name", g->caption() ); diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index 73a13749f..0e8b70994 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/kicker/libkicker/appletinfo.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include -#include +#include #include #include "appletinfo.h" @@ -53,7 +53,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co break; } - KDesktopFile df(m_desktopFile, true, resource); + TDEDesktopFile df(m_desktopFile, true, resource); // set the appletssimple attributes setName(df.readName()); diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 65834db13..df583f3f3 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ void RecentDocsMenu::initialize() { char alreadyPresentInMenu; TQStringList previousEntries; for (TQStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) { - KDesktopFile f(*it, true /* read only */); + TDEDesktopFile f(*it, true /* read only */); // Make sure this entry is not already present in the menu alreadyPresentInMenu = 0; @@ -128,7 +128,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { if (id < 0) return; - KDesktopFile f(_fileList[id], true /* read only */); + TDEDesktopFile f(_fileList[id], true /* read only */); KURL url ( f.readURL() ); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index c01c7aa24..b9556a15a 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -97,7 +97,7 @@ void RemoteMenu::initialize() { names_found.append(*name); TQString filename = *dirpath+*name; - KDesktopFile desktop(filename); + TDEDesktopFile desktop(filename); id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName()); m_desktopMap[id] = filename; } diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp index bbae60622..5f42bd0f0 100644 --- a/kicker/menuext/tom/tom.cpp +++ b/kicker/menuext/tom/tom.cpp @@ -237,7 +237,7 @@ void TOM::initializeRecentDocs() * TODO: make the number of visible items configurable? */ - KDesktopFile f(*it, true /* read only */); + TDEDesktopFile f(*it, true /* read only */); m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium), f.readName().replace('&', "&&"), id); ++id; diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 2805ec1b3..597ce4f81 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -337,7 +337,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo) return; } - KDesktopFile *df = entryInfo->desktopFile(); + TDEDesktopFile *df = entryInfo->desktopFile(); _nameEdit->setText(df->readName()); _descriptionEdit->setText(df->readGenericName()); @@ -398,7 +398,7 @@ void BasicTab::apply() _menuEntryInfo->setDescription(_descriptionEdit->text()); _menuEntryInfo->setIcon(_iconButton->icon()); - KDesktopFile *df = _menuEntryInfo->desktopFile(); + TDEDesktopFile *df = _menuEntryInfo->desktopFile(); df->writeEntry("Comment", _commentEdit->text()); if (_systrayCB->isChecked()) df->writePathEntry("Exec", _execEdit->lineEdit()->text().prepend("ksystraycmd ")); diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp index ec3f91afd..612da6cd1 100644 --- a/kmenuedit/menufile.cpp +++ b/kmenuedit/menufile.cpp @@ -188,7 +188,7 @@ TQDomElement MenuFile::findMenu(TQDomElement elem, const TQString &menuName, boo static TQString entryToDirId(const TQString &path) { - // See also KDesktopFile::locateLocal + // See also TDEDesktopFile::locateLocal TQString local; if (path.startsWith("/")) { diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp index ed0c9bf77..c6fe00a12 100644 --- a/kmenuedit/menuinfo.cpp +++ b/kmenuedit/menuinfo.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include @@ -191,7 +191,7 @@ void MenuFolderInfo::save(MenuFile *menuFile) if (dirty) { - TQString local = KDesktopFile::locateLocal(directoryFile); + TQString local = TDEDesktopFile::locateLocal(directoryFile); TDEConfig *df = 0; if (directoryFile != local) @@ -305,11 +305,11 @@ MenuEntryInfo::~MenuEntryInfo() delete df; } -KDesktopFile *MenuEntryInfo::desktopFile() +TDEDesktopFile *MenuEntryInfo::desktopFile() { if (!df) { - df = new KDesktopFile(service->desktopEntryPath()); + df = new TDEDesktopFile(service->desktopEntryPath()); } return df; } @@ -323,7 +323,7 @@ void MenuEntryInfo::setDirty() TQString local = locateLocal("xdgdata-apps", service->menuId()); if (local != service->desktopEntryPath()) { - KDesktopFile *oldDf = desktopFile(); + TDEDesktopFile *oldDf = desktopFile(); df = oldDf->copyTo(local); df->setDesktopGroup(); delete oldDf; diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h index 9497022d0..f766e4612 100644 --- a/kmenuedit/menuinfo.h +++ b/kmenuedit/menuinfo.h @@ -142,7 +142,7 @@ public: class MenuEntryInfo : public MenuInfo { public: - MenuEntryInfo(const KService::Ptr &_service, KDesktopFile *_df = 0) + MenuEntryInfo(const KService::Ptr &_service, TDEDesktopFile *_df = 0) : service(_service), df(_df), shortcutLoaded(false), shortcutDirty(false), dirty(_df != 0), hidden(false) { @@ -174,14 +174,14 @@ public: void save(); - KDesktopFile *desktopFile(); + TDEDesktopFile *desktopFile(); public: TQString caption; TQString description; TQString icon; KService::Ptr service; - KDesktopFile *df; + TDEDesktopFile *df; TDEShortcut shortCut; bool shortcutLoaded; bool shortcutDirty; diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index ad20f1923..304d95e42 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -316,7 +316,7 @@ void TreeView::fill() TQApplication::restoreOverrideCursor(); } -TQString TreeView::findName(KDesktopFile *df, bool deleted) +TQString TreeView::findName(TDEDesktopFile *df, bool deleted) { TQString name = df->readName(); if (deleted) @@ -340,7 +340,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted) continue; } - KDesktopFile df2(*it); + TDEDesktopFile df2(*it); name = df2.readName(); if (!name.isEmpty() && (name != "empty")) @@ -692,10 +692,10 @@ static TQString createDesktopFile(const TQString &file, TQString *menuId, TQStri return result; } -static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList) +static TDEDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList) { TQString result = createDesktopFile(entryInfo->file(), menuId, excludeList); - KDesktopFile *df = entryInfo->desktopFile()->copyTo(result); + TDEDesktopFile *df = entryInfo->desktopFile()->copyTo(result); df->deleteEntry("Categories"); // Don't set any categories! return df; @@ -749,8 +749,8 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI TQString menuId; TQString result = createDesktopFile(path, &menuId, &m_newMenuIds); - KDesktopFile orig_df(path); - KDesktopFile *df = orig_df.copyTo(result); + TDEDesktopFile orig_df(path); + TDEDesktopFile *df = orig_df.copyTo(result); df->deleteEntry("Categories"); // Don't set any categories! KService *s = new KService(df); @@ -869,7 +869,7 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI { // Need to copy file and then add it - KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate + TDEDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate //UNDO-ACTION: NEW_MENU_ID (menuId) KService *s = new KService(df); @@ -1030,7 +1030,7 @@ void TreeView::newsubmenu() folderInfo->hidden = false; folderInfo->setDirty(); - KDesktopFile *df = new KDesktopFile(file); + TDEDesktopFile *df = new TDEDesktopFile(file); df->writeEntry("Name", folderInfo->caption); df->writeEntry("Icon", folderInfo->icon); df->sync(); @@ -1073,7 +1073,7 @@ void TreeView::newitem() file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create - KDesktopFile *df = new KDesktopFile(file); + TDEDesktopFile *df = new TDEDesktopFile(file); df->writeEntry("Name", caption); df->writeEntry("Type", "Application"); @@ -1314,7 +1314,7 @@ void TreeView::paste() if (command == COPY_FILE) { // Need to copy file and then add it - KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate + TDEDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate KService *s = new KService(df); s->setMenuId(menuId); diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h index c456d1c9c..329dbcf9e 100644 --- a/kmenuedit/treeview.h +++ b/kmenuedit/treeview.h @@ -29,7 +29,7 @@ class TQPopupMenu; class TDEActionCollection; -class KDesktopFile; +class TDEDesktopFile; class MenuFile; class MenuFolderInfo; class MenuEntryInfo; @@ -133,7 +133,7 @@ protected: void del(TreeItem *, bool deleteInfo); void fill(); void fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent); - TQString findName(KDesktopFile *df, bool deleted); + TQString findName(TDEDesktopFile *df, bool deleted); void closeAllItems(TQListViewItem *item); diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index 6f228e565..eefe5bff6 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include TQString KEBMacroCommand::affectedBookmarks() const { @@ -665,7 +665,7 @@ KEBMacroCommand* CmdGen::insertMimeSource( urlBks << KBookmark::standaloneBookmark((*uit).prettyURL(), (*uit)); continue; } - KDesktopFile df((*uit).path(), true); + TDEDesktopFile df((*uit).path(), true); TQString title = df.readName(); KURL url(df.readURL()); if (title.isNull()) diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 2cd49fbe5..94734851c 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include "konqsidebar.h" @@ -88,9 +88,9 @@ void addBackEnd::aboutToShowAddMenu() for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ ) { - KDesktopFile *confFile; + TDEDesktopFile *confFile; - confFile = new KDesktopFile(*it, true); + confFile = new TDEDesktopFile(*it, true); if (! confFile->tryExec()) { delete confFile; i--; diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 7592c5479..487bbf4dd 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -22,7 +22,7 @@ #include "dirtree_item.h" #include #include -#include +#include #include #include #include @@ -76,7 +76,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it if(m_topLevelItem) // We can handle only one at a time ! kdError() << "KonqSidebarDirTreeModule::addTopLevelItem: Impossible, we can have only one toplevel item !" << endl; - KDesktopFile cfg( item->path(), true ); + TDEDesktopFile cfg( item->path(), true ); cfg.setDollarExpansion(true); KURL targetURL; diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 64de7c4e0..9132d531b 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -390,7 +390,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url TQString filename = findUniqueFilename(path, name); destUrl.setPath(filename); - KDesktopFile cfg(filename); + TDEDesktopFile cfg(filename); cfg.writeEntry("Encoding", "UTF-8"); cfg.writeEntry("Type","Link"); cfg.writeEntry("URL", url.url()); @@ -755,7 +755,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename ) { - KDesktopFile cfg( filename, true ); + TDEDesktopFile cfg( filename, true ); cfg.setDollarExpansion(true); TQFileInfo inf( filename ); diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp index 8b59699eb..db26b343a 100644 --- a/kpersonalizer/tdestylepage.cpp +++ b/kpersonalizer/tdestylepage.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -117,21 +117,21 @@ void TDEStylePage::saveStyle(bool curSettings){ void TDEStylePage::saveKWin(bool curSettings){ TQString twin = origKWinStyle; if(curSettings) { - KDesktopFile* kdf = 0L; + TDEDesktopFile* kdf = 0L; TDEStandardDirs* kstd = TDEGlobal::dirs(); if (cde->isSelected() && twin_cde_exist) - kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop")); + kdf = new TDEDesktopFile(kstd->findResource("data", "twin/cde.desktop")); else if (win->isSelected() && twin_win_exist) - kdf = new KDesktopFile(kstd->findResource("data", "twin/redmond.desktop")); + kdf = new TDEDesktopFile(kstd->findResource("data", "twin/redmond.desktop")); else if (platinum->isSelected() && twin_system_exist) - kdf = new KDesktopFile(kstd->findResource("data", "twin/system.desktop")); + kdf = new TDEDesktopFile(kstd->findResource("data", "twin/system.desktop")); else if (keramik->isSelected() && twin_keramik_exist) - kdf = new KDesktopFile(kstd->findResource("data", "twin/keramik.desktop")); + kdf = new TDEDesktopFile(kstd->findResource("data", "twin/keramik.desktop")); else if (kde->isSelected()) { if (twin_plastik_exist && (TQColor::numBitPlanes() > 8)) - kdf = new KDesktopFile(kstd->findResource("data", "twin/plastik.desktop")); + kdf = new TDEDesktopFile(kstd->findResource("data", "twin/plastik.desktop")); else if (twin_quartz_exist) - kdf = new KDesktopFile(kstd->findResource("data", "twin/quartz.desktop")); + kdf = new TDEDesktopFile(kstd->findResource("data", "twin/quartz.desktop")); } if (kdf) { diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp index 051b3f236..146090edf 100644 --- a/libkonq/knewmenu.cpp +++ b/libkonq/knewmenu.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -145,7 +145,7 @@ void KNewMenu::parseFiles() TQString templatePath; // If a desktop file, then read the name from it. // Otherwise (or if no name in it?) use file name - if ( KDesktopFile::isDesktopFile( filePath ) ) { + if ( TDEDesktopFile::isDesktopFile( filePath ) ) { TDESimpleConfig config( filePath, true ); config.setDesktopGroup(); text = config.readEntry("Name"); @@ -260,9 +260,9 @@ void KNewMenu::fillMenu() { linkApp = act; } - else if ( KDesktopFile::isDesktopFile( entry.templatePath ) ) + else if ( TDEDesktopFile::isDesktopFile( entry.templatePath ) ) { - KDesktopFile df( entry.templatePath ); + TDEDesktopFile df( entry.templatePath ); if(df.readType() == "FSDevice") act->plug( d->m_menuDev->popupMenu() ); else @@ -388,9 +388,9 @@ void KNewMenu::slotNewFile() } m_isURLDesktopFile = false; TQString name; - if ( KDesktopFile::isDesktopFile( entry.templatePath ) ) + if ( TDEDesktopFile::isDesktopFile( entry.templatePath ) ) { - KDesktopFile df( entry.templatePath ); + TDEDesktopFile df( entry.templatePath ); //kdDebug(1203) << df.readType() << endl; if ( df.readType() == "Link" ) { @@ -505,7 +505,7 @@ void KNewMenu::slotResult( TDEIO::Job * job ) // destURL is the original destination for the new file. // But in case of a renaming (due to a conflict), the real path is in m_destPath kdDebug(1203) << " destURL=" << destURL.path() << " " << " d->m_destPath=" << d->m_destPath << endl; - KDesktopFile df( d->m_destPath ); + TDEDesktopFile df( d->m_destPath ); df.writeEntry( "Icon", KProtocolInfo::icon( KURL(m_linkURL).protocol() ) ); df.writePathEntry( "URL", m_linkURL ); df.sync(); diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp index a57746bee..7c715d084 100644 --- a/libkonq/konq_operations.cpp +++ b/libkonq/konq_operations.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -428,7 +428,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) || (destItem->mimetype() == "media/builtin-webbrowser") ) { // Local .desktop file. What type ? - KDesktopFile desktopFile( m_destURL.path() ); + TDEDesktopFile desktopFile( m_destURL.path() ); if ( desktopFile.hasApplicationType() ) { TQString error; @@ -503,7 +503,7 @@ void KonqOperations::doFileCopy() bool local = (*it).isLocalFile(); if ( KProtocolInfo::supportsDeleting( *it ) && (!local || TQFileInfo((*it).directory()).isWritable() )) mlst.append(*it); - if ( local && KDesktopFile::isDesktopFile((*it).path())) + if ( local && TDEDesktopFile::isDesktopFile((*it).path())) isDesktopFile = true; if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath())) itemIsOnDesktop = true; diff --git a/libkonq/konq_settings.cpp b/libkonq/konq_settings.cpp index 4b59f3375..3334a2eca 100644 --- a/libkonq/konq_settings.cpp +++ b/libkonq/konq_settings.cpp @@ -22,7 +22,7 @@ #include "tdeglobalsettings.h" #include #include -#include +#include #include #include #include diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 21b6bb5a0..8ea6b1ffb 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include @@ -112,7 +112,7 @@ TDEConfig *infoConfig = 0; bool isPluginMimeType( TQString fname ) { - KDesktopFile cfg( fname, true ); + TDEDesktopFile cfg( fname, true ); cfg.setDesktopGroup(); return cfg.hasKey( "X-TDE-nsplugin" ); } diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp index 5ebd976b1..0888a8f40 100644 --- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include NotifierServiceAction::NotifierServiceAction() @@ -150,7 +150,7 @@ bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const void NotifierServiceAction::save() const { TQFile::remove( m_filePath ); - KDesktopFile desktopFile(m_filePath); + TDEDesktopFile desktopFile(m_filePath); desktopFile.setGroup(TQString("Desktop Action ") + m_service.m_strName); desktopFile.writeEntry(TQString("Icon"), m_service.m_strIcon); diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index 9bfc062b7..86e118acc 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.cpp +++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp @@ -20,7 +20,7 @@ #include "notifiersettings.h" #include -#include +#include #include #include #include @@ -298,7 +298,7 @@ void NotifierSettings::save() } } -TQValueList NotifierSettings::loadActions( KDesktopFile &desktop ) const +TQValueList NotifierSettings::loadActions( TDEDesktopFile &desktop ) const { desktop.setDesktopGroup(); @@ -328,7 +328,7 @@ TQValueList NotifierSettings::loadActions( KDesktopFile } -bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const +bool NotifierSettings::shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const { desktop.setDesktopGroup(); @@ -386,7 +386,7 @@ TQValueList NotifierSettings::listServices( const TQStri { TQString filename = *dir_it + *entry_it; - KDesktopFile desktop( filename, true ); + TDEDesktopFile desktop( filename, true ); if ( shouldLoadActions(desktop, mimetype) ) { diff --git a/tdeioslave/media/libmediacommon/notifiersettings.h b/tdeioslave/media/libmediacommon/notifiersettings.h index dee5c440b..0bb033945 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.h +++ b/tdeioslave/media/libmediacommon/notifiersettings.h @@ -51,8 +51,8 @@ public: private: TQValueList listServices( const TQString &mimetype = TQString() ) const; - bool shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const; - TQValueList loadActions( KDesktopFile &desktop ) const; + bool shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const; + TQValueList loadActions( TDEDesktopFile &desktop ) const; TQStringList m_supportedMimetypes; TQValueList m_actions; diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp index 474201350..22bd19e7b 100644 --- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp index 4f11381ed..659273834 100644 --- a/tdeioslave/remote/remoteimpl.cpp +++ b/tdeioslave/remote/remoteimpl.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -140,7 +140,7 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const TQString file = findDesktopFile(filename); if (!file.isEmpty()) { - KDesktopFile desktop(file, true); + TDEDesktopFile desktop(file, true); return desktop.readURL(); } @@ -219,7 +219,7 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry, kdDebug(1220) << "RemoteImpl::createEntry" << endl; TQString desktopPath(directory + file); - KDesktopFile desktop(desktopPath, true); + TDEDesktopFile desktop(desktopPath, true); kdDebug(1220) << "path = " << directory << file << endl; @@ -289,7 +289,7 @@ bool RemoteImpl::renameFolders(const TQString &src, const TQString &dest, bool res = dir.rename(src+".desktop", dest+".desktop"); if (res) { - KDesktopFile desktop(directory+dest+".desktop"); + TDEDesktopFile desktop(directory+dest+".desktop"); desktop.writeEntry("Name", dest); } return res; diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp index 3a404d85b..80e27d212 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include @@ -65,7 +65,7 @@ void SystemDirNotify::init() { if (!names_found.contains(*name)) { - KDesktopFile desktop(*dirpath+*name, true); + TDEDesktopFile desktop(*dirpath+*name, true); TQString system_name = *name; system_name.truncate(system_name.length()-8); diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp index 9a44bc4e4..52f1ace36 100644 --- a/tdeioslave/system/systemimpl.cpp +++ b/tdeioslave/system/systemimpl.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -169,7 +169,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const { if (*name==filename+".desktop") { - KDesktopFile desktop(*dirpath+filename+".desktop", true); + TDEDesktopFile desktop(*dirpath+filename+".desktop", true); if ( desktop.readURL().isEmpty() ) { KURL url; @@ -226,7 +226,7 @@ TQString SystemImpl::readPathINL(TQString filename) line = s.readLine(); } if (isPathExpanded == false) { - KDesktopFile desktop(filename, true); + TDEDesktopFile desktop(filename, true); return desktop.readPath(); } else { @@ -240,7 +240,7 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry, { kdDebug() << "SystemImpl::createEntry" << endl; - KDesktopFile desktop(directory+file, true); + TDEDesktopFile desktop(directory+file, true); kdDebug() << "path = " << directory << file << endl; diff --git a/tdeioslave/system/systemimpl.h b/tdeioslave/system/systemimpl.h index d4cc0e1cb..41d0242a3 100644 --- a/tdeioslave/system/systemimpl.h +++ b/tdeioslave/system/systemimpl.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp index 7b36aaaf4..76882f956 100644 --- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp +++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -63,7 +63,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha if (!KPropsDlgPlugin::isDesktopFile(item)) return; - KDesktopFile deskFile( itemUrl.path(), true /* readonly */ ); + TDEDesktopFile deskFile( itemUrl.path(), true /* readonly */ ); if ( deskFile.readURL() != "trash:/" ) return; } diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp index 07e39b1fb..bd8c1d640 100644 --- a/tdescreensaver/random.cpp +++ b/tdescreensaver/random.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) howoften = 0; } - KDesktopFile saver(tempSaverFileList[i], true); + TDEDesktopFile saver(tempSaverFileList[i], true); if (!saver.tryExec()) continue; TQString saverType = saver.readEntry("X-TDE-Type"); @@ -203,7 +203,7 @@ int main(int argc, char *argv[]) int indx = rnd.getLong(saverFileList.count()); TQString filename = *(saverFileList.at(indx)); - KDesktopFile config(filename, true); + TDEDesktopFile config(filename, true); TQString cmd; if (windowId && config.hasActionGroup("InWindow")) diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index c2f260d62..408bd563c 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include @@ -409,9 +409,9 @@ void KWinDecorationModule::findDecorations() for (TQFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) { TQString filename(it.current()->absFilePath()); - if (KDesktopFile::isDesktopFile(filename)) + if (TDEDesktopFile::isDesktopFile(filename)) { - KDesktopFile desktopFile(filename); + TDEDesktopFile desktopFile(filename); TQString libName = desktopFile.readEntry("X-TDE-Library"); if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_"))