diff options
Diffstat (limited to 'kalarm/kalarmapp.cpp')
| -rw-r--r-- | kalarm/kalarmapp.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index d37e0dcda..775821c5e 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -475,7 +475,7 @@ int KAlarmApp::newInstance() TQCString colourText = args->getOption("color"); if (static_cast<const char*>(colourText)[0] == '0' && tolower(static_cast<const char*>(colourText)[1]) == 'x') - colourText.tqreplace(0, 2, "#"); + colourText.replace(0, 2, "#"); bgColour.setNamedColor(colourText); if (!bgColour.isValid()) USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--color"))) @@ -486,7 +486,7 @@ int KAlarmApp::newInstance() TQCString colourText = args->getOption("colorfg"); if (static_cast<const char*>(colourText)[0] == '0' && tolower(static_cast<const char*>(colourText)[1]) == 'x') - colourText.tqreplace(0, 2, "#"); + colourText.replace(0, 2, "#"); fgColour.setNamedColor(colourText); if (!fgColour.isValid()) USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--colorfg"))) @@ -1704,43 +1704,43 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& { // Execute the command in a terminal window. cmd = Preferences::cmdXTermCommand(); - cmd.tqreplace("%t", aboutData()->programName()); // set the terminal window title - if (cmd.tqfind("%C") >= 0) + cmd.replace("%t", aboutData()->programName()); // set the terminal window title + if (cmd.find("%C") >= 0) { // Execute the command from a temporary script file if (flags & ProcData::TEMP_FILE) - cmd.tqreplace("%C", command); // the command is already calling a temporary file + cmd.replace("%C", command); // the command is already calling a temporary file else { tmpXtermFile = createTempScriptFile(command, true, event, *alarm); if (tmpXtermFile.isEmpty()) return 0; - cmd.tqreplace("%C", tmpXtermFile); // %C indicates where to insert the command + cmd.replace("%C", tmpXtermFile); // %C indicates where to insert the command } } - else if (cmd.tqfind("%W") >= 0) + else if (cmd.find("%W") >= 0) { // Execute the command from a temporary script file, // with a sleep after the command is executed tmpXtermFile = createTempScriptFile(command + TQString::tqfromLatin1("\nsleep 86400\n"), true, event, *alarm); if (tmpXtermFile.isEmpty()) return 0; - cmd.tqreplace("%W", tmpXtermFile); // %w indicates where to insert the command + cmd.replace("%W", tmpXtermFile); // %w indicates where to insert the command } - else if (cmd.tqfind("%w") >= 0) + else if (cmd.find("%w") >= 0) { // Append a sleep to the command. // Quote the command in case it contains characters such as [>|;]. TQString exec = KShellProcess::quote(command + TQString::tqfromLatin1("; sleep 86400")); - cmd.tqreplace("%w", exec); // %w indicates where to insert the command string + cmd.replace("%w", exec); // %w indicates where to insert the command string } else { // Set the command to execute. // Put it in quotes in case it contains characters such as [>|;]. TQString exec = KShellProcess::quote(command); - if (cmd.tqfind("%c") >= 0) - cmd.tqreplace("%c", exec); // %c indicates where to insert the command string + if (cmd.find("%c") >= 0) + cmd.replace("%c", exec); // %c indicates where to insert the command string else cmd.append(exec); // otherwise, simply append the command string } @@ -2118,7 +2118,7 @@ static bool convInterval(const TQCString& timeParam, KARecurrence::Type& recurTy break; case 'M': { - int i = timeString.tqfind('H'); + int i = timeString.find('H'); if (i < 0) { if (!allowMonthYear) |