diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
| commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
| tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kmail/kmstartup.cpp | |
| parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
| download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip | |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmstartup.cpp')
| -rw-r--r-- | kmail/kmstartup.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 9007fe1a..943a3a2d 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -43,7 +43,7 @@ #include <unistd.h> #include <tqfile.h> -#undef Status // stupid X headers +#undef tqStatus // stupid X headers extern "C" { @@ -160,7 +160,7 @@ void lockOrDie() { first_instance = true; else if (hostName == oldHostName && oldPid != getpid()) { // check if the lock file is stale -#ifdef Q_OS_LINUX +#ifdef TQ_OS_LINUX if ( ::access("/proc", X_OK ) == 0 ) { // On linux with /proc we can even check that it's really kmail and not something else char path_buffer[MAXPATHLEN + 1]; @@ -200,8 +200,8 @@ void lockOrDie() { "can cause the loss of mail. You should not start %1 " "unless you are sure that it is not already running.") .arg( programName, programName ); - // TQString::arg( st ) only tqreplaces the first occurrence of %1 - // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences + // TQString::arg( st ) only replaces the first occurrence of %1 + // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't // even think about changing the above to .arg( programName ). else @@ -228,7 +228,7 @@ void lockOrDie() { KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == - KMessageBox::warningYesNo( 0, msg, TQString::null, + KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Start %1").arg( programName ), i18n("Exit") ) ) { exit(1); |