diff options
| author | Timothy Pearson <[email protected]> | 2014-10-11 17:20:38 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-11 17:20:38 -0500 |
| commit | ff57382179e9b49b5b80872d237603611ff5ac13 (patch) | |
| tree | 0248c85e56e25f88cf916e9bb363c362ee7afcb3 | |
| parent | d46b1b9c643c4694ae5c58d38bf90d2578cc72d7 (diff) | |
| download | tdelibs-ff57382179e9b49b5b80872d237603611ff5ac13.tar.gz tdelibs-ff57382179e9b49b5b80872d237603611ff5ac13.zip | |
Second part of prior commit
| -rw-r--r-- | tdeio/tdefile/kopenwith.cpp | 2 | ||||
| -rw-r--r-- | tdeio/tdefile/kpropertiesdialog.cpp | 4 | ||||
| -rw-r--r-- | tdeio/tdeio/kservice.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 5db8b79d9..6688fc387 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -754,7 +754,7 @@ void KOpenWithDlg::slotOK() { desktop->writeEntry("Terminal", false); } - desktop->writeEntry("InitialPreference", maxPreference + 1); + desktop->writeEntry("X-TDE-InitialPreference", maxPreference + 1); if (bRemember || d->saveNewApps) diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index 8302f3080..0d2df33e0 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -4077,7 +4077,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props TQString commentStr = config.readComment(); TQString genNameStr = config.readGenericName(); - TQStringList selectedTypes = config.readListEntry( "ServiceTypes" ); + TQStringList selectedTypes = config.readListEntry( "X-TDE-ServiceTypes" ); // For compatibility with KDE 1.x selectedTypes += config.readListEntry( "MimeType", ';' ); @@ -4195,7 +4195,7 @@ void TDEApplicationPropsPlugin::applyChanges() selectedTypes.append( extensionsList->text( i ) ); config.writeEntry( "MimeType", selectedTypes, ';' ); - config.writeEntry( "ServiceTypes", "" ); + config.writeEntry( "X-TDE-ServiceTypes", "" ); // hmm, actually it should probably be the contrary (but see also typeslistitem.cpp) TQString nameStr = nameEdit ? nameEdit->text() : TQString::null; diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 4b30e82c7..f0c114e77 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -267,8 +267,8 @@ KService::init( KDesktopFile *config ) m_strInit = config->readEntry("X-TDE-Init" ); entryMap.remove("X-TDE-Init"); - m_lstServiceTypes = config->readListEntry( "ServiceTypes" ); - entryMap.remove("ServiceTypes"); + m_lstServiceTypes = config->readListEntry( "X-TDE-ServiceTypes" ); + entryMap.remove("X-TDE-ServiceTypes"); // For compatibility with KDE 1.x if (!kde4application) m_lstServiceTypes += config->readListEntry( "MimeType", ';' ); @@ -299,8 +299,8 @@ KService::init( KDesktopFile *config ) m_initialPreference = config->readNumEntry( "X-TDE-InitialPreference", 1 ); entryMap.remove("X-TDE-InitialPreference"); if ( m_initialPreference == 1 ) - m_initialPreference = config->readNumEntry( "InitialPreference", 1 ); - entryMap.remove("InitialPreference"); + m_initialPreference = config->readNumEntry( "X-TDE-InitialPreference", 1 ); + entryMap.remove("X-TDE-InitialPreference"); // Store all additional entries in the property map. // A TQMap<TQString,TQString> would be easier for this but we can't |