From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- kicker/applets/naughty/NaughtyApplet.cpp | 2 +- kicker/applets/naughty/NaughtyProcessMonitor.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kicker/applets/naughty') diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index bf1d96232..953bcacbd 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 4bff5f851..aaca4213e 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'tdeinit:' prefix. - TQString unicode(TQString::fromLocal8Bit(s)); + TQString tqunicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) int mib[4] ; @@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'tdeinit:' prefix. - TQString unicode(TQString::fromLocal8Bit(argv[0])); + TQString tqunicode(TQString::fromLocal8Bit(argv[0])); free (argv) ; #endif - TQStringList parts(TQStringList::split(' ', unicode)); + TQStringList parts(TQStringList::split(' ', tqunicode)); TQString processName = parts[0] == "tdeinit:" ? parts[1] : parts[0]; -- cgit v1.2.3