diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
| commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
| tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /klinkstatus/src/global.cpp | |
| parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
| download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip | |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'klinkstatus/src/global.cpp')
| -rw-r--r-- | klinkstatus/src/global.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index cfbfe910..9fe9d96d 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -40,8 +40,8 @@ Global* Global::self() return m_self_; } -Global::Global(TQObject *parent, const char *name) - : TQObject(parent, name), loop_started_(false) +Global::Global(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), loop_started_(false) { m_self_ = this; dcop_client_ = kapp->dcopClient(); @@ -176,7 +176,7 @@ void Global::execCommand(TQString const& command) void Global::slotGetScriptOutput(KProcess* /*process*/, char* buf, int buflen) { TQCString tmp( buf, buflen + 1 ); - script_output_ = TQString::null; + script_output_ = TQString(); script_output_ = TQString::fromLocal8Bit(tmp).remove(" "); } |