summaryrefslogtreecommitdiffstats
path: root/kalarm/kalarmapp.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kalarm/kalarmapp.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/kalarmapp.cpp')
-rw-r--r--kalarm/kalarmapp.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 3792a580f..1d315e342 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -1697,7 +1697,7 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& event, const KAAlarm* alarm, int flags)
{
kdDebug(5950) << "KAlarmApp::doShellCommand(" << command << ", " << event.id() << ")" << endl;
- KProcess::Communication comms = KProcess::NoCommunication;
+ TDEProcess::Communication comms = TDEProcess::NoCommunication;
TQString cmd;
TQString tmpXtermFile;
if (flags & ProcData::EXEC_IN_XTERM)
@@ -1748,26 +1748,26 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
else
{
cmd = command;
- comms = KProcess::AllOutput;
+ comms = TDEProcess::AllOutput;
}
ShellProcess* proc = new ShellProcess(cmd);
connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*)));
TQGuardedPtr<ShellProcess> logproc = 0;
- if (comms == KProcess::AllOutput && !event.logFile().isEmpty())
+ if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty())
{
// Output is to be appended to a log file.
// Set up a logging process to write the command's output to.
- connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
- connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
+ connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
+ connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int)));
logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile()));
connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
- logproc->start(KProcess::Stdin);
+ logproc->start(TDEProcess::Stdin);
TQCString heading;
if (alarm && alarm->dateTime().isValid())
{
TQString dateTime = alarm->dateTime().isDateOnly()
- ? KGlobal::locale()->formatDate(alarm->dateTime().date(), true)
- : KGlobal::locale()->formatDateTime(alarm->dateTime().dateTime());
+ ? TDEGlobal::locale()->formatDate(alarm->dateTime().date(), true)
+ : TDEGlobal::locale()->formatDateTime(alarm->dateTime().dateTime());
heading.sprintf("\n******* KAlarm %s *******\n", dateTime.latin1());
}
else
@@ -1822,7 +1822,7 @@ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShe
/******************************************************************************
* Called when an executing command alarm sends output to stdout or stderr.
*/
-void KAlarmApp::slotCommandOutput(KProcess* proc, char* buffer, int bufflen)
+void KAlarmApp::slotCommandOutput(TDEProcess* proc, char* buffer, int bufflen)
{
//kdDebug(5950) << "KAlarmApp::slotCommandOutput(): '" << TQCString(buffer, bufflen+1) << "'\n";
// Find this command in the command list