From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ktalkd/ktalkdlg/ktalkdlg.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ktalkd/ktalkdlg') diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index 336c9a04..9e2996e5 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -47,17 +47,17 @@ class TimeoutDialog : public TQMessageBox { TimeoutDialog (int timeout_ms, const TQString& caption, const TQString &text, Icon icon, int button0, int button1, int button2, - TQWidget *parent=0, const char *name=0, bool modal=TRUE, + TQWidget *tqparent=0, const char *name=0, bool modal=TRUE, WFlags f=WStyle_DialogBorder ): TQMessageBox (caption, text, icon, button0, button1, button2, - parent, name, modal, f) + tqparent, name, modal, f) {startTimer (timeout_ms);} ~TimeoutDialog () - {killTimers ();} + {TQT_TQOBJECT(this)->killTimers ();} virtual void timerEvent (TQTimerEvent *) - {killTimers (); done (Rejected);} + {TQT_TQOBJECT(this)->killTimers (); done (Rejected);} }; static KCmdLineOptions option[] = @@ -98,7 +98,7 @@ int main (int argc, char **argv) { s += '\n'; TQString callee = args->arg(1); - s += i18n ("for user %1").arg( callee.isEmpty() ? i18n("") : callee ); + s += i18n ("for user %1").tqarg( callee.isEmpty() ? i18n("") : callee ); } s += "."; @@ -135,12 +135,12 @@ int main (int argc, char **argv) int result = dialog.exec (); if (result == TQMessageBox::Yes) { - dialog.killTimers (); + TQT_TQOBJECT(&dialog)->killTimers (); kdDebug() << "Running talk client..." << endl; TQString konsole = locate("exe", "konsole"); TQString konsole_dir = konsole; - konsole_dir.truncate( konsole.findRev('/') ); + konsole_dir.truncate( konsole.tqfindRev('/') ); setenv("KDEBINDIR", TQFile::encodeName(konsole_dir).data(), 0/*don't overwrite*/); TQString cmd0 = cfg->readPathEntry ("talkprg", konsole + " -e talk"); -- cgit v1.2.1