diff options
| -rw-r--r-- | src/magiclabel.cpp | 16 | ||||
| -rw-r--r-- | src/thememoodin.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp index 8a6fb3f..5b30252 100644 --- a/src/magiclabel.cpp +++ b/src/magiclabel.cpp @@ -37,7 +37,7 @@ MagicLabel::MagicLabel(TQString s, bool translate) void MagicLabel::transform() { - if (mValue.tqcontains(prefix + preUSER)) + if (mValue.contains(prefix + preUSER)) getUserInfo(); else if (mValue.startsWith(prefix + preCMD)) getCommandOutput(); @@ -48,12 +48,12 @@ void MagicLabel::getUserInfo() { static KUser user; - if (mValue.tqcontains(prefix + preUSER + "loginname")) - mValue = mValue.tqreplace(prefix + preUSER + "loginname", user.loginName()); - else if (mValue.tqcontains(prefix + preUSER + "fullname")) - mValue = mValue.tqreplace(prefix + preUSER + "fullname", user.fullName()); - else if (mValue.tqcontains(prefix + preUSER + "homedir")) - mValue = mValue.tqreplace(prefix + preUSER + "homedir", user.homeDir()); + if (mValue.contains(prefix + preUSER + "loginname")) + mValue = mValue.replace(prefix + preUSER + "loginname", user.loginName()); + else if (mValue.contains(prefix + preUSER + "fullname")) + mValue = mValue.replace(prefix + preUSER + "fullname", user.fullName()); + else if (mValue.contains(prefix + preUSER + "homedir")) + mValue = mValue.replace(prefix + preUSER + "homedir", user.homeDir()); } @@ -80,7 +80,7 @@ void MagicLabel::getCommandOutput() void MagicLabel::receivedStdout(KProcess *proc, char *buffer, int buflen) { TQString buf = TQString::tqfromLatin1(buffer, buflen); - mValue += buf.tqreplace("\n", ""); + mValue += buf.replace("\n", ""); } diff --git a/src/thememoodin.cpp b/src/thememoodin.cpp index bc6547e..eac1a08 100644 --- a/src/thememoodin.cpp +++ b/src/thememoodin.cpp @@ -364,7 +364,7 @@ void ThemeMoodin::slotSetPixmap(const TQString& s) if (!mEffectWidgets.count() > 0) return; - int n = statusPixmaps().tqfindIndex(s); + int n = statusPixmaps().findIndex(s); if (n == -1) return; |