diff options
Diffstat (limited to 'krfb')
| -rw-r--r-- | krfb/kinetd/kinetd.cpp | 10 | ||||
| -rw-r--r-- | krfb/krfb/trayicon.cpp | 2 | ||||
| -rw-r--r-- | krfb/libvncserver/fontsel.c | 2 | ||||
| -rw-r--r-- | krfb/libvncserver/rfb.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index 5e12ca08..f20076de 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -257,11 +257,11 @@ TQStringList PortListener::processServiceTemplate(const TQString &a) { TQString hostName = address->nodeName(); KUser u; TQString x = a; // replace does not work in const TQString. Why?? - l.append(x.tqreplace(TQRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName)) - .tqreplace(TQRegExp("%p"), TQString::number(m_port)) - .tqreplace(TQRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName())) - .tqreplace(TQRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid)) - .tqreplace(TQRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName()))); + l.append(x.replace(TQRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName)) + .replace(TQRegExp("%p"), TQString::number(m_port)) + .replace(TQRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName())) + .replace(TQRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid)) + .replace(TQRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName()))); } return l; } diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index c9215d46..d4b520d6 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -124,7 +124,7 @@ void TrayIcon::setDesktopControlSetting(bool b) { void TrayIcon::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) return; if (e->button() == Qt::LeftButton) { diff --git a/krfb/libvncserver/fontsel.c b/krfb/libvncserver/fontsel.c index 5d7664de..100db817 100644 --- a/krfb/libvncserver/fontsel.c +++ b/krfb/libvncserver/fontsel.c @@ -54,7 +54,7 @@ int main(int argc,char** argv) rfbScreen = s; font=rfbLoadConsoleFont(DEFAULTFONT); if(!font) { - fprintf(stderr,"Couldn't tqfind %s\n",DEFAULTFONT); + fprintf(stderr,"Couldn't find %s\n",DEFAULTFONT); exit(1); } diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index 55051819..ef79227c 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -263,7 +263,7 @@ typedef struct _rfbScreenInfo themselves end up invoking drawing routines. Removing the cursor (rfbUndrawCursor) is eventually achieved by - doing a CopyArea from a pixmap to the screen, where the pixmap tqcontains + doing a CopyArea from a pixmap to the screen, where the pixmap contains the saved contents of the screen under the cursor. Before doing this, however, we set cursorIsDrawn to FALSE. Then, when CopyArea is called, it sees that cursorIsDrawn is FALSE and so doesn't feel the need to |