TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Use TDEDesktopFile

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/645/head
Michele Calgaro 3 months ago
parent 51230c05dc
commit 16652efd0f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
60 changed files with 172 additions and 172 deletions
Show Stats Download Patch File Download Diff File

4
kappfinder/common.cpp
Unescape Escape View File

@ -20,7 +20,7 @@
*/ */
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
@ -50,7 +50,7 @@ void copyFile( const TQString &inFileName, const TQString &outFileName )
bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ, bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
TQString destDir ) TQString destDir )
{ {
KDesktopFile desktop( templ, true ); TDEDesktopFile desktop( templ, true );
// find out where to put the .desktop files // find out where to put the .desktop files
TQString destName; TQString destName;

4
kappfinder/toplevel.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kbuttonbox.h> #include <kbuttonbox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdelocale.h> #include <tdelocale.h>
@ -202,7 +202,7 @@ void TopLevel::slotScan()
if (found) if (found)
continue; continue;
KDesktopFile desktop( *it, true ); TDEDesktopFile desktop( *it, true );
// copy over the desktop file, if exists // copy over the desktop file, if exists
if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) { if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) {

2
kate/app/kateexternaltools.cpp
Unescape Escape View File

@ -92,7 +92,7 @@ bool KateExternalTool::checkExec()
if ( tryexec.isEmpty() ) if ( tryexec.isEmpty() )
tryexec = command.section( " ", 0, 0, TQString::SectionSkipEmpty ); 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.isEmpty()) {
if (tryexec[0] == '/') { if (tryexec[0] == '/') {
if (::access(TQFile::encodeName(tryexec), R_OK | X_OK)) if (::access(TQFile::encodeName(tryexec), R_OK | X_OK))

2
kate/app/katemainwindow.cpp
Unescape Escape View File

@ -71,7 +71,7 @@
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <ktrader.h> #include <ktrader.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <tdemultitabbar.h> #include <tdemultitabbar.h>
#include <ktip.h> #include <ktip.h>

4
kcontrol/filetypes/filetypesview.cpp
Unescape Escape View File

@ -11,7 +11,7 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kcursor.h> #include <kcursor.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kipc.h> #include <kipc.h>
#include <klineedit.h> #include <klineedit.h>
#include <tdelistview.h> #include <tdelistview.h>
@ -362,7 +362,7 @@ bool FileTypesView::sync( TQValueList<TypesListItem *>& itemsModified )
loc = m_ptr->desktopEntryPath(); loc = m_ptr->desktopEntryPath();
loc = locateLocal("mime", loc); loc = locateLocal("mime", loc);
KDesktopFile config(loc, false, "mime"); TDEDesktopFile config(loc, false, "mime");
config.writeEntry("Type", "MimeType"); config.writeEntry("Type", "MimeType");
config.writeEntry("MimeType", m_ptr->name()); config.writeEntry("MimeType", m_ptr->name());
config.writeEntry("Hidden", true); config.writeEntry("Hidden", true);

2
kcontrol/filetypes/typeslistitem.cpp
Unescape Escape View File

@ -21,7 +21,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include "typeslistitem.h" #include "typeslistitem.h"

8
kcontrol/kded/kcmkded.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kbuttonbox.h> #include <kbuttonbox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdialog.h> #include <kdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <tdelistview.h> #include <tdelistview.h>
@ -156,8 +156,8 @@ void KDEDConfig::load( bool useDefaults ) {
CheckListItem* clitem; CheckListItem* clitem;
for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
if ( KDesktopFile::isDesktopFile( *it ) ) { if ( TDEDesktopFile::isDesktopFile( *it ) ) {
KDesktopFile file( *it, true, "services" ); TDEDesktopFile file( *it, true, "services" );
if ( file.readBoolEntry("X-TDE-Kded-autoload") ) { if ( file.readBoolEntry("X-TDE-Kded-autoload") ) {
clitem = new CheckListItem(_lvStartup, TQString::null); clitem = new CheckListItem(_lvStartup, TQString::null);
@ -194,7 +194,7 @@ void KDEDConfig::save() {
for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
if ( KDesktopFile::isDesktopFile( *it ) ) { if ( TDEDesktopFile::isDesktopFile( *it ) ) {
TDEConfig file( *it, false, false, "services" ); TDEConfig file( *it, false, false, "services" );
file.setGroup("Desktop Entry"); file.setGroup("Desktop Entry");

2
kcontrol/keys/treeview.h
Unescape Escape View File

@ -26,7 +26,7 @@
class TQPopupMenu; class TQPopupMenu;
class TDEActionCollection; class TDEActionCollection;
class KDesktopFile; class TDEDesktopFile;
class AppTreeItem : public TDEListViewItem class AppTreeItem : public TDEListViewItem
{ {

4
kcontrol/kicker/extensionInfo.cpp
Unescape Escape View File

@ -19,7 +19,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdelocale.h> #include <tdelocale.h>
#include "extensionInfo.h" #include "extensionInfo.h"
@ -54,7 +54,7 @@ void ExtensionInfo::load()
} }
else else
{ {
KDesktopFile df(_desktopFile); TDEDesktopFile df(_desktopFile);
_name = df.readName(); _name = df.readName();
_resizeable = df.readBoolEntry("X-TDE-PanelExt-Resizeable", _resizeable); _resizeable = df.readBoolEntry("X-TDE-PanelExt-Resizeable", _resizeable);

4
kcontrol/kicker/menutab_impl.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include <dcopref.h> #include <dcopref.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdelistview.h> #include <tdelistview.h>
#include <tdelocale.h> #include <tdelocale.h>
@ -150,7 +150,7 @@ void MenuTab::load( bool useDefaults )
TQStringList av = d.entryList(); TQStringList av = d.entryList();
for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it) 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, menuItem = new kSubMenuItem(m_subMenus,
df.readName(), df.readName(),
*it, *it,

4
kcontrol/screensaver/saverconfig.cpp
Unescape Escape View File

@ -1,4 +1,4 @@
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdelocale.h> #include <tdelocale.h>
#include "saverconfig.h" #include "saverconfig.h"
@ -9,7 +9,7 @@ SaverConfig::SaverConfig()
bool SaverConfig::read(const TQString &file) bool SaverConfig::read(const TQString &file)
{ {
KDesktopFile config(file, true); TDEDesktopFile config(file, true);
if( !config.tryExec()) if( !config.tryExec())
return false; return false;
mExec = config.readPathEntry("Exec"); mExec = config.readPathEntry("Exec");

8
kdesktop/init.cpp
Unescape Escape View File

@ -20,7 +20,7 @@
#include <tdeio/job.h> #include <tdeio/job.h>
#include <tdeio/netaccess.h> #include <tdeio/netaccess.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdeprocess.h> #include <tdeprocess.h>
@ -145,7 +145,7 @@ static void copyDesktopLinks()
TQString desktopPath = realDesktopPath(); TQString desktopPath = realDesktopPath();
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) { for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) {
KDesktopFile desk( *it ); TDEDesktopFile desk( *it );
if (desk.readBoolEntry("Hidden")) if (desk.readBoolEntry("Hidden"))
continue; continue;
copyFile( *it, desktopPath ); copyFile( *it, desktopPath );
@ -213,13 +213,13 @@ void testLocalInstallation()
if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) { if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) {
TQString oldIcon, oldEmptyIcon; TQString oldIcon, oldEmptyIcon;
if ( trashDesktopExists ) { if ( trashDesktopExists ) {
KDesktopFile trashDesktop( trashDesktopPath, true ); TDEDesktopFile trashDesktop( trashDesktopPath, true );
oldIcon = trashDesktop.readIcon(); oldIcon = trashDesktop.readIcon();
oldEmptyIcon = trashDesktop.readEntry( "EmptyIcon" ); oldEmptyIcon = trashDesktop.readEntry( "EmptyIcon" );
} }
copyFile( locate( "data", "kdesktop/directory.trash" ), trashDesktopPath ); copyFile( locate( "data", "kdesktop/directory.trash" ), trashDesktopPath );
if ( trashDesktopExists ) { if ( trashDesktopExists ) {
KDesktopFile trashDesktop( trashDesktopPath ); TDEDesktopFile trashDesktop( trashDesktopPath );
trashDesktop.writeEntry( "Icon", oldIcon ); trashDesktop.writeEntry( "Icon", oldIcon );
trashDesktop.writeEntry( "EmptyIcon", oldEmptyIcon ); trashDesktop.writeEntry( "EmptyIcon", oldEmptyIcon );
trashDesktop.sync(); trashDesktop.sync();

6
kdesktop/kdiconview.cpp
Unescape Escape View File

@ -27,7 +27,7 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kcolordrag.h> #include <kcolordrag.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <kpropertiesdialog.h> #include <kpropertiesdialog.h>
@ -914,7 +914,7 @@ bool KDIconView::deleteGlobalDesktopFiles()
} }
} }
KDesktopFile df(desktopPath + fItem->url().fileName()); TDEDesktopFile df(desktopPath + fItem->url().fileName());
df.writeEntry("Hidden", true); df.writeEntry("Hidden", true);
df.sync(); df.sync();
@ -1578,7 +1578,7 @@ void KDIconView::slotClipboardDataChanged()
void KDIconView::renameDesktopFile(const TQString &path, const TQString &name) 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 // 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!) // it's not a config file (and we don't nuke it!)

2
kdesktop/lock/lockprocess.cpp
Unescape Escape View File

@ -800,7 +800,7 @@ void LockProcess::readSaver()
bool opengl = tdeApp->authorize("opengl_screensavers"); bool opengl = tdeApp->authorize("opengl_screensavers");
bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers"); bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers");
KDesktopFile config(file, true); TDEDesktopFile config(file, true);
if (config.readEntry("X-TDE-Type").utf8() != 0) { if (config.readEntry("X-TDE-Type").utf8() != 0) {
TQString saverType = config.readEntry("X-TDE-Type").utf8(); TQString saverType = config.readEntry("X-TDE-Type").utf8();
TQStringList saverTypes = TQStringList::split(";", saverType); TQStringList saverTypes = TQStringList::split(";", saverType);

4
khelpcenter/docentry.cpp
Unescape Escape View File

@ -2,7 +2,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kurl.h> #include <kurl.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <tdeapplication.h> #include <tdeapplication.h>
@ -204,7 +204,7 @@ bool DocEntry::isDirectory() const
bool DocEntry::readFromFile( const TQString &fileName ) bool DocEntry::readFromFile( const TQString &fileName )
{ {
KDesktopFile file( fileName ); TDEDesktopFile file( fileName );
mName = file.readName(); mName = file.readName();
mSearch = file.readEntry( "X-DOC-Search" ); mSearch = file.readEntry( "X-DOC-Search" );

4
khelpcenter/navigator.cpp
Unescape Escape View File

@ -50,7 +50,7 @@
#include <tdeprocio.h> #include <tdeprocio.h>
#include <kcharsets.h> #include <kcharsets.h>
#include <kdialog.h> #include <kdialog.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kservicegroup.h> #include <kservicegroup.h>
@ -279,7 +279,7 @@ void Navigator::insertAppletDocs( NavigatorItem *topItem )
void Navigator::createItemFromDesktopFile( NavigatorItem *topItem, void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
const TQString &file ) const TQString &file )
{ {
KDesktopFile desktopFile( file ); TDEDesktopFile desktopFile( file );
TQString docPath = desktopFile.readDocPath(); TQString docPath = desktopFile.readDocPath();
if ( !docPath.isNull() ) { if ( !docPath.isNull() ) {
// First parameter is ignored if second is an absolute path // First parameter is ignored if second is an absolute path

4
khelpcenter/searchhandler.cpp
Unescape Escape View File

@ -24,7 +24,7 @@
#include "prefs.h" #include "prefs.h"
#include "docentry.h" #include "docentry.h"
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeprocess.h> #include <tdeprocess.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
@ -44,7 +44,7 @@ SearchHandler *SearchHandler::initFromFile( const TQString &filename )
{ {
SearchHandler *handler = new SearchHandler; SearchHandler *handler = new SearchHandler;
KDesktopFile file( filename ); TDEDesktopFile file( filename );
handler->mSearchCommand = file.readEntry( "SearchCommand" ); handler->mSearchCommand = file.readEntry( "SearchCommand" );
handler->mSearchUrl = file.readEntry( "SearchUrl" ); handler->mSearchUrl = file.readEntry( "SearchUrl" );

2
khotkeys/shared/actions.cpp
Unescape Escape View File

@ -24,7 +24,7 @@
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <kservice.h> #include <kservice.h>

2
kicker/applets/launcher/quickaddappsmenu.cpp
Unescape Escape View File

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/ ******************************************************************/
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdesycocaentry.h> #include <tdesycocaentry.h>
#include <kservice.h> #include <kservice.h>

2
kicker/applets/launcher/quickbutton.cpp
Unescape Escape View File

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeactionclasses.h> #include <tdeactionclasses.h>
#include <kickertip.h> #include <kickertip.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <krun.h> #include <krun.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>

2
kicker/applets/media/mediumbutton.cpp
Unescape Escape View File

@ -30,7 +30,7 @@
#include <tdemessagebox.h> #include <tdemessagebox.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <krun.h> #include <krun.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <kcursor.h> #include <kcursor.h>

6
kicker/kicker/buttons/nontdeappbutton.cpp
Unescape Escape View File

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <krun.h> #include <krun.h>
@ -174,11 +174,11 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev)
++it) ++it)
{ {
const KURL &url(*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 // this URL is actually a .desktop file, so let's grab
// the URL it actually points to ... // the URL it actually points to ...
KDesktopFile deskFile(url.path()); TDEDesktopFile deskFile(url.path());
deskFile.setDesktopGroup(); deskFile.setDesktopGroup();
// ... and add it to the exec string // ... and add it to the exec string

4
kicker/kicker/buttons/servicebutton.cpp
Unescape Escape View File

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kicontheme.h> #include <kicontheme.h>
@ -92,7 +92,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
_id = locate("appdata", id.mid(1)); _id = locate("appdata", id.mid(1));
if (!_id.isEmpty()) if (!_id.isEmpty())
{ {
KDesktopFile df(_id, true); TDEDesktopFile df(_id, true);
_service = new KService(&df); _service = new KService(&df);
} }
} }

10
kicker/kicker/buttons/urlbutton.cpp
Unescape Escape View File

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqfile.h> #include <tqfile.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdefileitem.h> #include <tdefileitem.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <kicontheme.h> #include <kicontheme.h>
@ -71,7 +71,7 @@ void URLButton::initialize( const TQString& _url )
if (!url.isLocalFile() || !url.path().endsWith(".desktop")) if (!url.isLocalFile() || !url.path().endsWith(".desktop"))
{ {
TQString file = KickerLib::newDesktopFile(url); TQString file = KickerLib::newDesktopFile(url);
KDesktopFile df(file); TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link"); df.writeEntry("Type","Link");
df.writeEntry("Name", url.prettyURL()); df.writeEntry("Name", url.prettyURL());
@ -107,9 +107,9 @@ void URLButton::saveConfig( TDEConfigGroup& config ) const
void URLButton::setToolTip() void URLButton::setToolTip()
{ {
if (fileItem->isLocalFile() 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()) if (df.readComment().isEmpty())
{ {
@ -145,7 +145,7 @@ void URLButton::dropEvent(TQDropEvent *ev)
if(KURLDrag::decode(ev, execList)){ if(KURLDrag::decode(ev, execList)){
KURL url( fileItem->url() ); KURL url( fileItem->url() );
if(!execList.isEmpty()) { if(!execList.isEmpty()) {
if (KDesktopFile::isDesktopFile(url.path())){ if (TDEDesktopFile::isDesktopFile(url.path())){
TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(), TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
0, 0, 0, "", true); 0, 0, 0, "", true);
} }

4
kicker/kicker/core/container_extension.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopclient.h> #include <dcopclient.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <kicker.h> #include <kicker.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
if (!_opMnu) if (!_opMnu)
{ {
KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); TDEDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile()));
_opMnu = new PanelExtensionOpMenu(f.readName(), _opMnu = new PanelExtensionOpMenu(f.readName(),
m_extension ? m_extension->actions() : 0, m_extension ? m_extension->actions() : 0,
this); this);

4
kicker/kicker/core/containerarea.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <tdeprocess.h> #include <tdeprocess.h>
@ -1322,7 +1322,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
{ {
// a local desktop file being dragged from an external program. // a local desktop file being dragged from an external program.
// Make a copy first. // Make a copy first.
KDesktopFile df(url.path()); TDEDesktopFile df(url.path());
KURL newUrl; KURL newUrl;
newUrl.setPath(KickerLib::copyDesktopFile(url)); newUrl.setPath(KickerLib::copyDesktopFile(url));
if (df.readType() == "Link") if (df.readType() == "Link")

4
kicker/kicker/ui/browser_mnu.cpp
Unescape Escape View File

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <tdefileitem.h> #include <tdefileitem.h>
#include <tdeglobal.h> #include <tdeglobal.h>
@ -237,7 +237,7 @@ void PanelBrowserMenu::initialize()
bool mimecheck = false; bool mimecheck = false;
// .desktop files // .desktop files
if(KDesktopFile::isDesktopFile(path)) if(TDEDesktopFile::isDesktopFile(path))
{ {
TDESimpleConfig c(path, true); TDESimpleConfig c(path, true);
c.setDesktopGroup(); c.setDesktopGroup();

14
kicker/kicker/ui/itemview.cpp
Unescape Escape View File

@ -837,7 +837,7 @@ KMenuItem* ItemView::insertDocumentItem(const TQString& s, int nId, int nIndex,
KMenuItem* ItemView::insertRecentlyItem(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); KMenuItem* newItem = findItem(nId);
@ -1056,7 +1056,7 @@ TQDragObject * ItemView::dragObject()
TQString uri = kitem->path(); TQString uri = kitem->path();
if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
KDesktopFile df(uri,true); TDEDesktopFile df(uri,true);
uri=df.readURL(); uri=df.readURL();
} }
@ -1153,9 +1153,9 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item)
TQString url = *it; TQString url = *it;
kdDebug () << "Url " << url << endl; kdDebug () << "Url " << url << endl;
item.m_path = KURL( url ).path(); 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_description = df.readGenericName();
item.m_icon = df.readIcon(); item.m_icon = df.readIcon();
item.m_title = df.readName(); item.m_title = df.readName();
@ -1215,13 +1215,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
TQString uri = item.m_path; TQString uri = item.m_path;
if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
KDesktopFile df(uri,true); TDEDesktopFile df(uri,true);
uri=df.readURL(); uri=df.readURL();
} }
for (it = favs.begin(); it != favs.end(); ++it) { for (it = favs.begin(); it != favs.end(); ++it) {
if ((*it)[0]=='/') { if ((*it)[0]=='/') {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==uri) if (df.readURL().replace("file://",TQString())==uri)
break; break;
} }
@ -1243,7 +1243,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
TQStringList::Iterator it; TQStringList::Iterator it;
for (it = favs.begin(); it != favs.end(); ++it) { for (it = favs.begin(); it != favs.end(); ++it) {
if ((*it)[0]=='/') { if ((*it)[0]=='/') {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==text) if (df.readURL().replace("file://",TQString())==text)
break; break;
} }

32
kicker/kicker/ui/k_new_mnu.cpp
Unescape Escape View File

@ -1284,7 +1284,7 @@ void KMenu::initialize()
for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it) for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it)
{ {
if ((*it)[0]=='/') { if ((*it)[0]=='/') {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
TQString url = df.readURL(); TQString url = df.readURL();
if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString()))) if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString())))
m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); 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(); m_popupPath.icon = kitem->icon();
if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { 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(); m_popupPath.path=df.readURL();
} }
} }
@ -2822,7 +2822,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
{ {
if ((*it)[0]=='/') if ((*it)[0]=='/')
{ {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==m_popupPath.path) if (df.readURL().replace("file://",TQString())==m_popupPath.path)
break; break;
} }
@ -2954,7 +2954,7 @@ void KMenu::slotContextMenu(int selected)
job->setDefaultPermissions( true ); job->setDefaultPermissions( true );
} }
else { 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("GenericName", m_popupPath.description);
df->writeEntry( "Icon", m_popupPath.icon ); df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", m_popupPath.path ); df->writePathEntry( "URL", m_popupPath.path );
@ -2997,7 +2997,7 @@ void KMenu::slotContextMenu(int selected)
case AddMenuToDesktop: { case AddMenuToDesktop: {
accept(); 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->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath ); df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath );
df->writeEntry( "Name", m_popupPath.title ); df->writeEntry( "Name", m_popupPath.title );
@ -3025,14 +3025,14 @@ void KMenu::slotContextMenu(int selected)
TQStringList::Iterator it; TQStringList::Iterator it;
for (it = favs.begin(); it != favs.end(); ++it) { for (it = favs.begin(); it != favs.end(); ++it) {
if ((*it)[0]=='/') { if ((*it)[0]=='/') {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==m_popupPath.path) if (df.readURL().replace("file://",TQString())==m_popupPath.path)
break; break;
} }
} }
if (it==favs.end()) { if (it==favs.end()) {
TQString file = KickerLib::newDesktopFile(m_popupPath.path); TQString file = KickerLib::newDesktopFile(m_popupPath.path);
KDesktopFile df(file); TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link"); df.writeEntry("Type","Link");
df.writeEntry("Name", m_popupPath.title); df.writeEntry("Name", m_popupPath.title);
@ -3067,7 +3067,7 @@ void KMenu::slotContextMenu(int selected)
else { else {
for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) {
if ((*it)[0]=='/') { if ((*it)[0]=='/') {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==m_popupPath.path) { if (df.readURL().replace("file://",TQString())==m_popupPath.path) {
TQFile::remove((*it)); TQFile::remove((*it));
favs.erase(it); favs.erase(it);
@ -3311,7 +3311,7 @@ void KMenu::searchActionClicked(TQListViewItem* item)
list << "kurisearchfilter" << "kuriikwsfilter"; list << "kurisearchfilter" << "kuriikwsfilter";
if( !KURIFilter::self()->filterURI(data, list) ) { 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())); data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText()));
} }
@ -3420,7 +3420,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
{ {
if ((*it)[0]=='/') if ((*it)[0]=='/')
{ {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==kitem->path()) if (df.readURL().replace("file://",TQString())==kitem->path())
{ {
addFav = *it; addFav = *it;
@ -3445,7 +3445,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
{ {
if ((*it)[0]=='/' && !kafterNow->service()) if ((*it)[0]=='/' && !kafterNow->service())
{ {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==kafterNow->path()) if (df.readURL().replace("file://",TQString())==kafterNow->path())
{ {
kdDebug() << "insert after " << kafterNow->path() << endl; kdDebug() << "insert after " << kafterNow->path() << endl;
@ -3615,7 +3615,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
{ {
TQString uri = item.m_path; TQString uri = item.m_path;
if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
KDesktopFile df(uri,true); TDEDesktopFile df(uri,true);
uri=df.readURL(); uri=df.readURL();
} }
@ -3624,7 +3624,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
{ {
if ((*it)[0]=='/') if ((*it)[0]=='/')
{ {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==uri) if (df.readURL().replace("file://",TQString())==uri)
break; break;
} }
@ -3632,7 +3632,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
if (it==favs.end()) if (it==favs.end())
{ {
TQString file = KickerLib::newDesktopFile(uri); TQString file = KickerLib::newDesktopFile(uri);
KDesktopFile df(file); TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link"); df.writeEntry("Type","Link");
df.writeEntry("Name", item.m_title); df.writeEntry("Name", item.m_title);
@ -3666,7 +3666,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
{ {
if ((*it)[0]=='/') if ((*it)[0]=='/')
{ {
KDesktopFile df((*it),true); TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==text) if (df.readURL().replace("file://",TQString())==text)
break; break;
} }
@ -3677,7 +3677,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
KURL kurl(text); KURL kurl(text);
TQString file = KickerLib::newDesktopFile(text); TQString file = KickerLib::newDesktopFile(text);
KDesktopFile df(file); TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link"); df.writeEntry("Type","Link");
df.writeEntry("Name", item->name()); df.writeEntry("Name", item->name());

6
kicker/kicker/ui/service_mnu.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdelocale.h> #include <tdelocale.h>
@ -672,7 +672,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
KURL src,dest; KURL src,dest;
TDEIO::CopyJob *job; TDEIO::CopyJob *job;
KDesktopFile *df; TDEDesktopFile *df;
switch (selected) { switch (selected) {
case AddItemToDesktop: case AddItemToDesktop:
@ -718,7 +718,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( g->caption() ); dest.setFileName( g->caption() );
df = new KDesktopFile( dest.path() ); df = new TDEDesktopFile( dest.path() );
df->writeEntry( "Icon", g->icon() ); df->writeEntry( "Icon", g->icon() );
df->writePathEntry( "URL", "programs:/"+g->name() ); df->writePathEntry( "URL", "programs:/"+g->name() );
df->writeEntry( "Name", g->caption() ); df->writeEntry( "Name", g->caption() );

4
kicker/libkicker/appletinfo.cpp
Unescape Escape View File

@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/ ******************************************************************/
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include "appletinfo.h" #include "appletinfo.h"
@ -53,7 +53,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co
break; break;
} }
KDesktopFile df(m_desktopFile, true, resource); TDEDesktopFile df(m_desktopFile, true, resource);
// set the appletssimple attributes // set the appletssimple attributes
setName(df.readName()); setName(df.readName());

6
kicker/menuext/recentdocs/recentdocsmenu.cpp
Unescape Escape View File

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kiconloader.h> #include <kiconloader.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kurldrag.h> #include <kurldrag.h>
@ -67,7 +67,7 @@ void RecentDocsMenu::initialize() {
char alreadyPresentInMenu; char alreadyPresentInMenu;
TQStringList previousEntries; TQStringList previousEntries;
for (TQStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) { 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 // Make sure this entry is not already present in the menu
alreadyPresentInMenu = 0; alreadyPresentInMenu = 0;
@ -128,7 +128,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
if (id < 0) if (id < 0)
return; return;
KDesktopFile f(_fileList[id], true /* read only */); TDEDesktopFile f(_fileList[id], true /* read only */);
KURL url ( f.readURL() ); KURL url ( f.readURL() );

4
kicker/menuext/remote/remotemenu.cpp
Unescape Escape View File

@ -24,7 +24,7 @@
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <krun.h> #include <krun.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kservice.h> #include <kservice.h>
#include <tqpixmap.h> #include <tqpixmap.h>
@ -97,7 +97,7 @@ void RemoteMenu::initialize()
{ {
names_found.append(*name); names_found.append(*name);
TQString filename = *dirpath+*name; TQString filename = *dirpath+*name;
KDesktopFile desktop(filename); TDEDesktopFile desktop(filename);
id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName()); id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName());
m_desktopMap[id] = filename; m_desktopMap[id] = filename;
} }

2
kicker/menuext/tom/tom.cpp
Unescape Escape View File

@ -237,7 +237,7 @@ void TOM::initializeRecentDocs()
* TODO: make the number of visible items configurable? * 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), m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium),
f.readName().replace('&', "&&"), id); f.readName().replace('&', "&&"), id);
++id; ++id;

6
kmenuedit/basictab.cpp
Unescape Escape View File

@ -34,7 +34,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <kcombobox.h> #include <kcombobox.h>
@ -337,7 +337,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
return; return;
} }
KDesktopFile *df = entryInfo->desktopFile(); TDEDesktopFile *df = entryInfo->desktopFile();
_nameEdit->setText(df->readName()); _nameEdit->setText(df->readName());
_descriptionEdit->setText(df->readGenericName()); _descriptionEdit->setText(df->readGenericName());
@ -398,7 +398,7 @@ void BasicTab::apply()
_menuEntryInfo->setDescription(_descriptionEdit->text()); _menuEntryInfo->setDescription(_descriptionEdit->text());
_menuEntryInfo->setIcon(_iconButton->icon()); _menuEntryInfo->setIcon(_iconButton->icon());
KDesktopFile *df = _menuEntryInfo->desktopFile(); TDEDesktopFile *df = _menuEntryInfo->desktopFile();
df->writeEntry("Comment", _commentEdit->text()); df->writeEntry("Comment", _commentEdit->text());
if (_systrayCB->isChecked()) if (_systrayCB->isChecked())
df->writePathEntry("Exec", _execEdit->lineEdit()->text().prepend("ksystraycmd ")); df->writePathEntry("Exec", _execEdit->lineEdit()->text().prepend("ksystraycmd "));

2
kmenuedit/menufile.cpp
Unescape Escape View File

@ -188,7 +188,7 @@ TQDomElement MenuFile::findMenu(TQDomElement elem, const TQString &menuName, boo
static TQString entryToDirId(const TQString &path) static TQString entryToDirId(const TQString &path)
{ {
// See also KDesktopFile::locateLocal // See also TDEDesktopFile::locateLocal
TQString local; TQString local;
if (path.startsWith("/")) if (path.startsWith("/"))
{ {

10
kmenuedit/menuinfo.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <khotkeys.h> #include <khotkeys.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
@ -191,7 +191,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
if (dirty) if (dirty)
{ {
TQString local = KDesktopFile::locateLocal(directoryFile); TQString local = TDEDesktopFile::locateLocal(directoryFile);
TDEConfig *df = 0; TDEConfig *df = 0;
if (directoryFile != local) if (directoryFile != local)
@ -305,11 +305,11 @@ MenuEntryInfo::~MenuEntryInfo()
delete df; delete df;
} }
KDesktopFile *MenuEntryInfo::desktopFile() TDEDesktopFile *MenuEntryInfo::desktopFile()
{ {
if (!df) if (!df)
{ {
df = new KDesktopFile(service->desktopEntryPath()); df = new TDEDesktopFile(service->desktopEntryPath());
} }
return df; return df;
} }
@ -323,7 +323,7 @@ void MenuEntryInfo::setDirty()
TQString local = locateLocal("xdgdata-apps", service->menuId()); TQString local = locateLocal("xdgdata-apps", service->menuId());
if (local != service->desktopEntryPath()) if (local != service->desktopEntryPath())
{ {
KDesktopFile *oldDf = desktopFile(); TDEDesktopFile *oldDf = desktopFile();
df = oldDf->copyTo(local); df = oldDf->copyTo(local);
df->setDesktopGroup(); df->setDesktopGroup();
delete oldDf; delete oldDf;

6
kmenuedit/menuinfo.h
Unescape Escape View File

@ -142,7 +142,7 @@ public:
class MenuEntryInfo : public MenuInfo class MenuEntryInfo : public MenuInfo
{ {
public: public:
MenuEntryInfo(const KService::Ptr &_service, KDesktopFile *_df = 0) MenuEntryInfo(const KService::Ptr &_service, TDEDesktopFile *_df = 0)
: service(_service), df(_df), : service(_service), df(_df),
shortcutLoaded(false), shortcutDirty(false), dirty(_df != 0), hidden(false) shortcutLoaded(false), shortcutDirty(false), dirty(_df != 0), hidden(false)
{ {
@ -174,14 +174,14 @@ public:
void save(); void save();
KDesktopFile *desktopFile(); TDEDesktopFile *desktopFile();
public: public:
TQString caption; TQString caption;
TQString description; TQString description;
TQString icon; TQString icon;
KService::Ptr service; KService::Ptr service;
KDesktopFile *df; TDEDesktopFile *df;
TDEShortcut shortCut; TDEShortcut shortCut;
bool shortcutLoaded; bool shortcutLoaded;
bool shortcutDirty; bool shortcutDirty;

22
kmenuedit/treeview.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
#include <tdesimpleconfig.h> #include <tdesimpleconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeaction.h> #include <tdeaction.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
#include <tdeapplication.h> #include <tdeapplication.h>
@ -316,7 +316,7 @@ void TreeView::fill()
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
} }
TQString TreeView::findName(KDesktopFile *df, bool deleted) TQString TreeView::findName(TDEDesktopFile *df, bool deleted)
{ {
TQString name = df->readName(); TQString name = df->readName();
if (deleted) if (deleted)
@ -340,7 +340,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted)
continue; continue;
} }
KDesktopFile df2(*it); TDEDesktopFile df2(*it);
name = df2.readName(); name = df2.readName();
if (!name.isEmpty() && (name != "empty")) if (!name.isEmpty() && (name != "empty"))
@ -692,10 +692,10 @@ static TQString createDesktopFile(const TQString &file, TQString *menuId, TQStri
return result; 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); 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! df->deleteEntry("Categories"); // Don't set any categories!
return df; return df;
@ -749,8 +749,8 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI
TQString menuId; TQString menuId;
TQString result = createDesktopFile(path, &menuId, &m_newMenuIds); TQString result = createDesktopFile(path, &menuId, &m_newMenuIds);
KDesktopFile orig_df(path); TDEDesktopFile orig_df(path);
KDesktopFile *df = orig_df.copyTo(result); TDEDesktopFile *df = orig_df.copyTo(result);
df->deleteEntry("Categories"); // Don't set any categories! df->deleteEntry("Categories"); // Don't set any categories!
KService *s = new KService(df); 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 // 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) //UNDO-ACTION: NEW_MENU_ID (menuId)
KService *s = new KService(df); KService *s = new KService(df);
@ -1030,7 +1030,7 @@ void TreeView::newsubmenu()
folderInfo->hidden = false; folderInfo->hidden = false;
folderInfo->setDirty(); folderInfo->setDirty();
KDesktopFile *df = new KDesktopFile(file); TDEDesktopFile *df = new TDEDesktopFile(file);
df->writeEntry("Name", folderInfo->caption); df->writeEntry("Name", folderInfo->caption);
df->writeEntry("Icon", folderInfo->icon); df->writeEntry("Icon", folderInfo->icon);
df->sync(); df->sync();
@ -1073,7 +1073,7 @@ void TreeView::newitem()
file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create
KDesktopFile *df = new KDesktopFile(file); TDEDesktopFile *df = new TDEDesktopFile(file);
df->writeEntry("Name", caption); df->writeEntry("Name", caption);
df->writeEntry("Type", "Application"); df->writeEntry("Type", "Application");
@ -1314,7 +1314,7 @@ void TreeView::paste()
if (command == COPY_FILE) if (command == COPY_FILE)
{ {
// Need to copy file and then add it // 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); KService *s = new KService(df);
s->setMenuId(menuId); s->setMenuId(menuId);

4
kmenuedit/treeview.h
Unescape Escape View File

@ -29,7 +29,7 @@
class TQPopupMenu; class TQPopupMenu;
class TDEActionCollection; class TDEActionCollection;
class KDesktopFile; class TDEDesktopFile;
class MenuFile; class MenuFile;
class MenuFolderInfo; class MenuFolderInfo;
class MenuEntryInfo; class MenuEntryInfo;
@ -133,7 +133,7 @@ protected:
void del(TreeItem *, bool deleteInfo); void del(TreeItem *, bool deleteInfo);
void fill(); void fill();
void fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent); void fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent);
TQString findName(KDesktopFile *df, bool deleted); TQString findName(TDEDesktopFile *df, bool deleted);
void closeAllItems(TQListViewItem *item); void closeAllItems(TQListViewItem *item);

4
konqueror/keditbookmarks/commands.cpp
Unescape Escape View File

@ -34,7 +34,7 @@
#include <kbookmarkmanager.h> #include <kbookmarkmanager.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
TQString KEBMacroCommand::affectedBookmarks() const TQString KEBMacroCommand::affectedBookmarks() const
{ {
@ -665,7 +665,7 @@ KEBMacroCommand* CmdGen::insertMimeSource(
urlBks << KBookmark::standaloneBookmark((*uit).prettyURL(), (*uit)); urlBks << KBookmark::standaloneBookmark((*uit).prettyURL(), (*uit));
continue; continue;
} }
KDesktopFile df((*uit).path(), true); TDEDesktopFile df((*uit).path(), true);
TQString title = df.readName(); TQString title = df.readName();
KURL url(df.readURL()); KURL url(df.readURL());
if (title.isNull()) if (title.isNull())

6
konqueror/sidebar/sidebar_widget.cpp
Unescape Escape View File

@ -43,7 +43,7 @@
#include <kurlrequesterdlg.h> #include <kurlrequesterdlg.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include "konqsidebar.h" #include "konqsidebar.h"
@ -88,9 +88,9 @@ void addBackEnd::aboutToShowAddMenu()
for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ ) 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()) { if (! confFile->tryExec()) {
delete confFile; delete confFile;
i--; i--;

4
konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include "dirtree_item.h" #include "dirtree_item.h"
#include <kdebug.h> #include <kdebug.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdirlister.h> #include <kdirlister.h>
@ -76,7 +76,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
if(m_topLevelItem) // We can handle only one at a time ! if(m_topLevelItem) // We can handle only one at a time !
kdError() << "KonqSidebarDirTreeModule::addTopLevelItem: Impossible, we can have only one toplevel item !" << endl; 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); cfg.setDollarExpansion(true);
KURL targetURL; KURL targetURL;

6
konqueror/sidebar/trees/konq_sidebartree.cpp
Unescape Escape View File

@ -33,7 +33,7 @@
#include <tdeaction.h> #include <tdeaction.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdirnotify_stub.h> #include <kdirnotify_stub.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -390,7 +390,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
TQString filename = findUniqueFilename(path, name); TQString filename = findUniqueFilename(path, name);
destUrl.setPath(filename); destUrl.setPath(filename);
KDesktopFile cfg(filename); TDEDesktopFile cfg(filename);
cfg.writeEntry("Encoding", "UTF-8"); cfg.writeEntry("Encoding", "UTF-8");
cfg.writeEntry("Type","Link"); cfg.writeEntry("Type","Link");
cfg.writeEntry("URL", url.url()); cfg.writeEntry("URL", url.url());
@ -755,7 +755,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt
void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename ) void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename )
{ {
KDesktopFile cfg( filename, true ); TDEDesktopFile cfg( filename, true );
cfg.setDollarExpansion(true); cfg.setDollarExpansion(true);
TQFileInfo inf( filename ); TQFileInfo inf( filename );

16
kpersonalizer/tdestylepage.cpp
Unescape Escape View File

@ -30,7 +30,7 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <tdelistview.h> #include <tdelistview.h>
#include <kipc.h> #include <kipc.h>
@ -117,21 +117,21 @@ void TDEStylePage::saveStyle(bool curSettings){
void TDEStylePage::saveKWin(bool curSettings){ void TDEStylePage::saveKWin(bool curSettings){
TQString twin = origKWinStyle; TQString twin = origKWinStyle;
if(curSettings) { if(curSettings) {
KDesktopFile* kdf = 0L; TDEDesktopFile* kdf = 0L;
TDEStandardDirs* kstd = TDEGlobal::dirs(); TDEStandardDirs* kstd = TDEGlobal::dirs();
if (cde->isSelected() && twin_cde_exist) 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) 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) 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) 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()) { else if (kde->isSelected()) {
if (twin_plastik_exist && (TQColor::numBitPlanes() > 8)) 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) 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) { if (kdf) {

14
libkonq/knewmenu.cpp
Unescape Escape View File

@ -20,7 +20,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kinstance.h> #include <kinstance.h>
#include <kinputdialog.h> #include <kinputdialog.h>
@ -145,7 +145,7 @@ void KNewMenu::parseFiles()
TQString templatePath; TQString templatePath;
// If a desktop file, then read the name from it. // If a desktop file, then read the name from it.
// Otherwise (or if no name in it?) use file name // Otherwise (or if no name in it?) use file name
if ( KDesktopFile::isDesktopFile( filePath ) ) { if ( TDEDesktopFile::isDesktopFile( filePath ) ) {
TDESimpleConfig config( filePath, true ); TDESimpleConfig config( filePath, true );
config.setDesktopGroup(); config.setDesktopGroup();
text = config.readEntry("Name"); text = config.readEntry("Name");
@ -260,9 +260,9 @@ void KNewMenu::fillMenu()
{ {
linkApp = act; 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") if(df.readType() == "FSDevice")
act->plug( d->m_menuDev->popupMenu() ); act->plug( d->m_menuDev->popupMenu() );
else else
@ -388,9 +388,9 @@ void KNewMenu::slotNewFile()
} }
m_isURLDesktopFile = false; m_isURLDesktopFile = false;
TQString name; 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; //kdDebug(1203) << df.readType() << endl;
if ( df.readType() == "Link" ) if ( df.readType() == "Link" )
{ {
@ -505,7 +505,7 @@ void KNewMenu::slotResult( TDEIO::Job * job )
// destURL is the original destination for the new file. // 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 // 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; 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.writeEntry( "Icon", KProtocolInfo::icon( KURL(m_linkURL).protocol() ) );
df.writePathEntry( "URL", m_linkURL ); df.writePathEntry( "URL", m_linkURL );
df.sync(); df.sync();

6
libkonq/konq_operations.cpp
Unescape Escape View File

@ -42,7 +42,7 @@
#include <kipc.h> #include <kipc.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdefileitem.h> #include <tdefileitem.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <kimageio.h> #include <kimageio.h>
@ -428,7 +428,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
|| (destItem->mimetype() == "media/builtin-webbrowser") ) || (destItem->mimetype() == "media/builtin-webbrowser") )
{ {
// Local .desktop file. What type ? // Local .desktop file. What type ?
KDesktopFile desktopFile( m_destURL.path() ); TDEDesktopFile desktopFile( m_destURL.path() );
if ( desktopFile.hasApplicationType() ) if ( desktopFile.hasApplicationType() )
{ {
TQString error; TQString error;
@ -503,7 +503,7 @@ void KonqOperations::doFileCopy()
bool local = (*it).isLocalFile(); bool local = (*it).isLocalFile();
if ( KProtocolInfo::supportsDeleting( *it ) && (!local || TQFileInfo((*it).directory()).isWritable() )) if ( KProtocolInfo::supportsDeleting( *it ) && (!local || TQFileInfo((*it).directory()).isWritable() ))
mlst.append(*it); mlst.append(*it);
if ( local && KDesktopFile::isDesktopFile((*it).path())) if ( local && TDEDesktopFile::isDesktopFile((*it).path()))
isDesktopFile = true; isDesktopFile = true;
if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath())) if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath()))
itemIsOnDesktop = true; itemIsOnDesktop = true;

2
libkonq/konq_settings.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include "tdeglobalsettings.h" #include "tdeglobalsettings.h"
#include <tdeglobal.h> #include <tdeglobal.h>
#include <kservicetype.h> #include <kservicetype.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdebug.h> #include <kdebug.h>
#include <assert.h> #include <assert.h>
#include <tqfontmetrics.h> #include <tqfontmetrics.h>

4
nsplugins/pluginscan.cpp
Unescape Escape View File

@ -47,7 +47,7 @@
#include <klibloader.h> #include <klibloader.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <tdecrash.h> #include <tdecrash.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kservicetype.h> #include <kservicetype.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
@ -112,7 +112,7 @@ TDEConfig *infoConfig = 0;
bool isPluginMimeType( TQString fname ) bool isPluginMimeType( TQString fname )
{ {
KDesktopFile cfg( fname, true ); TDEDesktopFile cfg( fname, true );
cfg.setDesktopGroup(); cfg.setDesktopGroup();
return cfg.hasKey( "X-TDE-nsplugin" ); return cfg.hasKey( "X-TDE-nsplugin" );
} }

4
tdeioslave/media/libmediacommon/notifierserviceaction.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdelocale.h> #include <tdelocale.h>
NotifierServiceAction::NotifierServiceAction() NotifierServiceAction::NotifierServiceAction()
@ -150,7 +150,7 @@ bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const
void NotifierServiceAction::save() const void NotifierServiceAction::save() const
{ {
TQFile::remove( m_filePath ); TQFile::remove( m_filePath );
KDesktopFile desktopFile(m_filePath); TDEDesktopFile desktopFile(m_filePath);
desktopFile.setGroup(TQString("Desktop Action ") + m_service.m_strName); desktopFile.setGroup(TQString("Desktop Action ") + m_service.m_strName);
desktopFile.writeEntry(TQString("Icon"), m_service.m_strIcon); desktopFile.writeEntry(TQString("Icon"), m_service.m_strIcon);

8
tdeioslave/media/libmediacommon/notifiersettings.cpp
Unescape Escape View File

@ -20,7 +20,7 @@
#include "notifiersettings.h" #include "notifiersettings.h"
#include <tdeglobal.h> #include <tdeglobal.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqfile.h> #include <tqfile.h>
@ -298,7 +298,7 @@ void NotifierSettings::save()
} }
} }
TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( TDEDesktopFile &desktop ) const
{ {
desktop.setDesktopGroup(); desktop.setDesktopGroup();
@ -328,7 +328,7 @@ TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile
} }
bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const bool NotifierSettings::shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const
{ {
desktop.setDesktopGroup(); desktop.setDesktopGroup();
@ -386,7 +386,7 @@ TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQStri
{ {
TQString filename = *dir_it + *entry_it; TQString filename = *dir_it + *entry_it;
KDesktopFile desktop( filename, true ); TDEDesktopFile desktop( filename, true );
if ( shouldLoadActions(desktop, mimetype) ) if ( shouldLoadActions(desktop, mimetype) )
{ {

4
tdeioslave/media/libmediacommon/notifiersettings.h
Unescape Escape View File

@ -51,8 +51,8 @@ public:
private: private:
TQValueList<NotifierServiceAction*> listServices( const TQString &mimetype = TQString() ) const; TQValueList<NotifierServiceAction*> listServices( const TQString &mimetype = TQString() ) const;
bool shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const; bool shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const;
TQValueList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const; TQValueList<NotifierServiceAction*> loadActions( TDEDesktopFile &desktop ) const;
TQStringList m_supportedMimetypes; TQStringList m_supportedMimetypes;
TQValueList<NotifierAction*> m_actions; TQValueList<NotifierAction*> m_actions;

2
tdeioslave/remote/kdedmodule/remotedirnotify.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdirnotify_stub.h> #include <kdirnotify_stub.h>

8
tdeioslave/remote/remoteimpl.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kservice.h> #include <kservice.h>
#include <tdelocale.h> #include <tdelocale.h>
@ -140,7 +140,7 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const
TQString file = findDesktopFile(filename); TQString file = findDesktopFile(filename);
if (!file.isEmpty()) if (!file.isEmpty())
{ {
KDesktopFile desktop(file, true); TDEDesktopFile desktop(file, true);
return desktop.readURL(); return desktop.readURL();
} }
@ -219,7 +219,7 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry,
kdDebug(1220) << "RemoteImpl::createEntry" << endl; kdDebug(1220) << "RemoteImpl::createEntry" << endl;
TQString desktopPath(directory + file); TQString desktopPath(directory + file);
KDesktopFile desktop(desktopPath, true); TDEDesktopFile desktop(desktopPath, true);
kdDebug(1220) << "path = " << directory << file << endl; 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"); bool res = dir.rename(src+".desktop", dest+".desktop");
if (res) if (res)
{ {
KDesktopFile desktop(directory+dest+".desktop"); TDEDesktopFile desktop(directory+dest+".desktop");
desktop.writeEntry("Name", dest); desktop.writeEntry("Name", dest);
} }
return res; return res;

4
tdeioslave/system/kdedmodule/systemdirnotify.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kdirnotify_stub.h> #include <kdirnotify_stub.h>
@ -65,7 +65,7 @@ void SystemDirNotify::init()
{ {
if (!names_found.contains(*name)) if (!names_found.contains(*name))
{ {
KDesktopFile desktop(*dirpath+*name, true); TDEDesktopFile desktop(*dirpath+*name, true);
TQString system_name = *name; TQString system_name = *name;
system_name.truncate(system_name.length()-8); system_name.truncate(system_name.length()-8);

8
tdeioslave/system/systemimpl.cpp
Unescape Escape View File

@ -22,7 +22,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqeventloop.h> #include <tqeventloop.h>
@ -169,7 +169,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const
{ {
if (*name==filename+".desktop") if (*name==filename+".desktop")
{ {
KDesktopFile desktop(*dirpath+filename+".desktop", true); TDEDesktopFile desktop(*dirpath+filename+".desktop", true);
if ( desktop.readURL().isEmpty() ) if ( desktop.readURL().isEmpty() )
{ {
KURL url; KURL url;
@ -226,7 +226,7 @@ TQString SystemImpl::readPathINL(TQString filename)
line = s.readLine(); line = s.readLine();
} }
if (isPathExpanded == false) { if (isPathExpanded == false) {
KDesktopFile desktop(filename, true); TDEDesktopFile desktop(filename, true);
return desktop.readPath(); return desktop.readPath();
} }
else { else {
@ -240,7 +240,7 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry,
{ {
kdDebug() << "SystemImpl::createEntry" << endl; kdDebug() << "SystemImpl::createEntry" << endl;
KDesktopFile desktop(directory+file, true); TDEDesktopFile desktop(directory+file, true);
kdDebug() << "path = " << directory << file << endl; kdDebug() << "path = " << directory << file << endl;

2
tdeioslave/system/systemimpl.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tdeio/global.h> #include <tdeio/global.h>
#include <tdeio/job.h> #include <tdeio/job.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kurl.h> #include <kurl.h>
#include <dcopobject.h> #include <dcopobject.h>

4
tdeioslave/trash/ktrashpropsdlgplugin.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -63,7 +63,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
if (!KPropsDlgPlugin::isDesktopFile(item)) if (!KPropsDlgPlugin::isDesktopFile(item))
return; return;
KDesktopFile deskFile( itemUrl.path(), true /* readonly */ ); TDEDesktopFile deskFile( itemUrl.path(), true /* readonly */ );
if ( deskFile.readURL() != "trash:/" ) if ( deskFile.readURL() != "trash:/" )
return; return;
} }

6
tdescreensaver/random.cpp
Unescape Escape View File

@ -25,7 +25,7 @@
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <krandomsequence.h> #include <krandomsequence.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
@ -166,7 +166,7 @@ int main(int argc, char *argv[])
howoften = 0; howoften = 0;
} }
KDesktopFile saver(tempSaverFileList[i], true); TDEDesktopFile saver(tempSaverFileList[i], true);
if (!saver.tryExec()) if (!saver.tryExec())
continue; continue;
TQString saverType = saver.readEntry("X-TDE-Type"); TQString saverType = saver.readEntry("X-TDE-Type");
@ -203,7 +203,7 @@ int main(int argc, char *argv[])
int indx = rnd.getLong(saverFileList.count()); int indx = rnd.getLong(saverFileList.count());
TQString filename = *(saverFileList.at(indx)); TQString filename = *(saverFileList.at(indx));
KDesktopFile config(filename, true); TDEDesktopFile config(filename, true);
TQString cmd; TQString cmd;
if (windowId && config.hasActionGroup("InWindow")) if (windowId && config.hasActionGroup("InWindow"))

6
twin/kcmtwin/twindecoration/twindecoration.cpp
Unescape Escape View File

@ -47,7 +47,7 @@
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <tdedesktopfile.h>
#include <tdestandarddirs.h> #include <tdestandarddirs.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
@ -409,9 +409,9 @@ void KWinDecorationModule::findDecorations()
for (TQFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) for (TQFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it)
{ {
TQString filename(it.current()->absFilePath()); 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"); TQString libName = desktopFile.readEntry("X-TDE-Library");
if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_")) if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_"))

Write Preview
Loading…
Cancel
Save