From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/lib/shellprocess.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kalarm/lib/shellprocess.cpp') diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 1e37d2e7..209f1aad 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -31,13 +31,13 @@ #include "shellprocess.moc" -QCString ShellProcess::mShellName; -QCString ShellProcess::mShellPath; +TQCString ShellProcess::mShellName; +TQCString ShellProcess::mShellPath; bool ShellProcess::mInitialised = false; bool ShellProcess::mAuthorised = false; -ShellProcess::ShellProcess(const QString& command) +ShellProcess::ShellProcess(const TQString& command) : KShellProcess(shellName()), mCommand(command), mStatus(INACTIVE), @@ -56,8 +56,8 @@ bool ShellProcess::start(Communication comm) return false; } KShellProcess::operator<<(mCommand); - connect(this, SIGNAL(wroteStdin(KProcess*)), SLOT(writtenStdin(KProcess*))); - connect(this, SIGNAL(processExited(KProcess*)), SLOT(slotExited(KProcess*))); + connect(this, TQT_SIGNAL(wroteStdin(KProcess*)), TQT_SLOT(writtenStdin(KProcess*))); + connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*))); if (!KShellProcess::start(KProcess::NotifyOnExit, comm)) { mStatus = START_FAIL; @@ -101,7 +101,7 @@ void ShellProcess::slotExited(KProcess* proc) */ void ShellProcess::writeStdin(const char* buffer, int bufflen) { - QCString scopy(buffer, bufflen+1); // construct a deep copy + TQCString scopy(buffer, bufflen+1); // construct a deep copy bool write = mStdinQueue.isEmpty(); mStdinQueue.append(scopy); if (write) @@ -138,7 +138,7 @@ void ShellProcess::stdinExit() * Return the error message corresponding to the command exit status. * Reply = null string if not yet exited, or if command successful. */ -QString ShellProcess::errorMessage() const +TQString ShellProcess::errorMessage() const { switch (mStatus) { @@ -153,7 +153,7 @@ QString ShellProcess::errorMessage() const case RUNNING: case SUCCESS: default: - return QString::null; + return TQString::null; } } @@ -162,13 +162,13 @@ QString ShellProcess::errorMessage() const * This is a duplication of what KShellProcess does, but we need to know * which shell is used in order to decide what its exit code means. */ -const QCString& ShellProcess::shellPath() +const TQCString& ShellProcess::shellPath() { if (mShellPath.isEmpty()) { // Get the path to the shell mShellPath = "/bin/sh"; - QCString envshell = QCString(getenv("SHELL")).stripWhiteSpace(); + TQCString envshell = TQCString(getenv("SHELL")).stripWhiteSpace(); if (!envshell.isEmpty()) { struct stat fileinfo; -- cgit v1.2.3