summaryrefslogtreecommitdiffstats
path: root/tdecore/kdesktopfile.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdecore/kdesktopfile.cpp
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdecore/kdesktopfile.cpp')
-rw-r--r--tdecore/kdesktopfile.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 31654134c..431a65578 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -26,7 +26,7 @@
#include <tqfile.h>
#include <tqdir.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include "kurl.h"
@@ -42,7 +42,7 @@
KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly,
const char * resType)
- : KConfig(TQString::fromLatin1(""), bReadOnly, false)
+ : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
{
// KConfigBackEnd will try to locate the filename that is provided
// based on the resource type specified, _only_ if the filename
@@ -114,9 +114,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path)
{
int len = path.length();
- if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop"))
+ if(len > 8 && path.right(8) == TQString::tqfromLatin1(".desktop"))
return true;
- else if(len > 7 && path.right(7) == TQString::fromLatin1(".kdelnk"))
+ else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk"))
return true;
else
return false;
@@ -156,7 +156,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const
TQString value = readEntryUntranslated(key);
TQString fName = fileName();
fName = fName.mid(fName.findRev('/')+1);
- TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value;
+ TQString po_lookup_key = TQString::tqfromLatin1(key) + "(" + fName + "): " + value;
TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data());
if (po_value == po_lookup_key)
@@ -241,33 +241,33 @@ TQStringList KDesktopFile::readActions() const
void KDesktopFile::setActionGroup(const TQString &group)
{
- setGroup(TQString::fromLatin1("Desktop Action ") + group);
+ setGroup(TQString::tqfromLatin1("Desktop Action ") + group);
}
bool KDesktopFile::hasActionGroup(const TQString &group) const
{
- return hasGroup(TQString::fromLatin1("Desktop Action ") + group);
+ return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group);
}
bool KDesktopFile::hasLinkType() const
{
- return readEntry("Type") == TQString::fromLatin1("Link");
+ return readEntry("Type") == TQString::tqfromLatin1("Link");
}
bool KDesktopFile::hasApplicationType() const
{
- return readEntry("Type") == TQString::fromLatin1("Application");
+ return readEntry("Type") == TQString::tqfromLatin1("Application");
}
bool KDesktopFile::hasMimeTypeType() const
{
- return readEntry("Type") == TQString::fromLatin1("MimeType");
+ return readEntry("Type") == TQString::tqfromLatin1("MimeType");
}
bool KDesktopFile::hasDeviceType() const
{
- return readEntry("Type") == TQString::fromLatin1("FSDev") ||
- readEntry("Type") == TQString::fromLatin1("FSDevice");
+ return readEntry("Type") == TQString::tqfromLatin1("FSDev") ||
+ readEntry("Type") == TQString::tqfromLatin1("FSDevice");
}
bool KDesktopFile::tryExec() const