summaryrefslogtreecommitdiffstats
path: root/ktalkd
diff options
context:
space:
mode:
Diffstat (limited to 'ktalkd')
-rw-r--r--ktalkd/kcmktalkd/answmachpage.cpp4
-rw-r--r--ktalkd/kcmktalkd/answmachpage.h2
-rw-r--r--ktalkd/kcmktalkd/forwmachpage.cpp4
-rw-r--r--ktalkd/kcmktalkd/forwmachpage.h2
-rw-r--r--ktalkd/kcmktalkd/main.cpp20
-rw-r--r--ktalkd/kcmktalkd/main.h2
-rw-r--r--ktalkd/kcmktalkd/soundpage.cpp4
-rw-r--r--ktalkd/kcmktalkd/soundpage.h2
-rw-r--r--ktalkd/ktalkd/announce.cpp6
-rw-r--r--ktalkd/ktalkd/machines/forwmach.cpp16
-rw-r--r--ktalkd/ktalkd/machines/talkconn.cpp30
-rw-r--r--ktalkd/ktalkdlg/ktalkdlg.cpp4
12 files changed, 48 insertions, 48 deletions
diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp
index 19e02f60..4a3947da 100644
--- a/ktalkd/kcmktalkd/answmachpage.cpp
+++ b/ktalkd/kcmktalkd/answmachpage.cpp
@@ -29,9 +29,9 @@
#include <stdlib.h>
#include <klocale.h> // for getenv
-KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *tqparent, const char* name,
+KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config)
- : KCModule (tqparent, name)
+ : KCModule (parent, name)
{
if (!_config) {
delete_config = true;
diff --git a/ktalkd/kcmktalkd/answmachpage.h b/ktalkd/kcmktalkd/answmachpage.h
index 7a5f0cd4..6cdb4600 100644
--- a/ktalkd/kcmktalkd/answmachpage.h
+++ b/ktalkd/kcmktalkd/answmachpage.h
@@ -45,7 +45,7 @@ class KAnswmachPageConfig : public KCModule
TQ_OBJECT
public:
- KAnswmachPageConfig( TQWidget *tqparent=0, const char* name=0,
+ KAnswmachPageConfig( TQWidget *parent=0, const char* name=0,
KSimpleConfig *config=0 );
~KAnswmachPageConfig( );
diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp
index fb04bf7f..2046833d 100644
--- a/ktalkd/kcmktalkd/forwmachpage.cpp
+++ b/ktalkd/kcmktalkd/forwmachpage.cpp
@@ -26,9 +26,9 @@
#include <ksimpleconfig.h>
#include <klocale.h>
-KForwmachPageConfig::KForwmachPageConfig( TQWidget *tqparent, const char* name,
+KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config)
- : KCModule (tqparent, name)
+ : KCModule (parent, name)
{
if (!_config) {
delete_config = true;
diff --git a/ktalkd/kcmktalkd/forwmachpage.h b/ktalkd/kcmktalkd/forwmachpage.h
index 7811eb71..ccee8844 100644
--- a/ktalkd/kcmktalkd/forwmachpage.h
+++ b/ktalkd/kcmktalkd/forwmachpage.h
@@ -45,7 +45,7 @@ class KForwmachPageConfig : public KCModule
TQ_OBJECT
public:
- KForwmachPageConfig( TQWidget *tqparent=0, const char* name=0,
+ KForwmachPageConfig( TQWidget *parent=0, const char* name=0,
KSimpleConfig *config=0);
~KForwmachPageConfig( );
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index a1ff8878..bd68e17a 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -30,8 +30,8 @@
#include <tqtabwidget.h>
#include <tqlayout.h>
-KTalkdConfigModule::KTalkdConfigModule(TQWidget *tqparent, const char *name)
- : KCModule(tqparent, name)
+KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name)
+ : KCModule(parent, name)
{
config = new KSimpleConfig("ktalkdrc");
announceconfig = new KSimpleConfig("ktalkannouncerc");
@@ -88,24 +88,24 @@ void KTalkdConfigModule::resizeEvent(TQResizeEvent *)
extern "C"
{
- KDE_EXPORT KCModule *create_ktalkd(TQWidget *tqparent, const char *)
+ KDE_EXPORT KCModule *create_ktalkd(TQWidget *parent, const char *)
{
- return new KTalkdConfigModule(tqparent, "kcmktalkd");
+ return new KTalkdConfigModule(parent, "kcmktalkd");
}
- KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *tqparent, const char *)
+ KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *parent, const char *)
{
- return new KAnswmachPageConfig(tqparent, "kcmktalkd");
+ return new KAnswmachPageConfig(parent, "kcmktalkd");
}
- KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *tqparent, const char *)
+ KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *parent, const char *)
{
- return new KSoundPageConfig(tqparent, "kcmktalkd");
+ return new KSoundPageConfig(parent, "kcmktalkd");
}
- KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *tqparent, const char *)
+ KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
{
- return new KForwmachPageConfig(tqparent, "kcmktalkd");
+ return new KForwmachPageConfig(parent, "kcmktalkd");
}
}
diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h
index 1fb1c910..6d5e8f52 100644
--- a/ktalkd/kcmktalkd/main.h
+++ b/ktalkd/kcmktalkd/main.h
@@ -39,7 +39,7 @@ class KTalkdConfigModule : public KCModule
public:
- KTalkdConfigModule(TQWidget *tqparent, const char *name);
+ KTalkdConfigModule(TQWidget *parent, const char *name);
virtual ~KTalkdConfigModule();
//void init();
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index 8e812a58..26b82f59 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -44,9 +44,9 @@
/* Lots of stuff taken from syssound.cpp */
-KSoundPageConfig::KSoundPageConfig( TQWidget *tqparent, const char* name,
+KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config, KSimpleConfig *_announceconfig)
- : KCModule (tqparent, name)
+ : KCModule (parent, name)
{
if (!_config) {
delete_config = true;
diff --git a/ktalkd/kcmktalkd/soundpage.h b/ktalkd/kcmktalkd/soundpage.h
index 2c19ee66..cd07991c 100644
--- a/ktalkd/kcmktalkd/soundpage.h
+++ b/ktalkd/kcmktalkd/soundpage.h
@@ -49,7 +49,7 @@ class KSoundPageConfig : public KCModule
TQ_OBJECT
public:
- KSoundPageConfig( TQWidget *tqparent=0, const char* name=0,
+ KSoundPageConfig( TQWidget *parent=0, const char* name=0,
KSimpleConfig *config=0, KSimpleConfig *announceconfig=0);
~KSoundPageConfig( );
diff --git a/ktalkd/ktalkd/announce.cpp b/ktalkd/ktalkd/announce.cpp
index 1970b92d..d21f27f4 100644
--- a/ktalkd/ktalkd/announce.cpp
+++ b/ktalkd/ktalkd/announce.cpp
@@ -97,7 +97,7 @@ int announce(NEW_CTL_MSG *request, const char *remote_machine, char *disp, int
request->r_name, remote_machine);
} else {
if ((pid = fork())) {
- /* we are the tqparent, so wait for the child */
+ /* we are the parent, so wait for the child */
if (pid == -1) /* the fork failed */
return (FAILED);
status = wait_process(pid);
@@ -242,7 +242,7 @@ int try_Xannounce(NEW_CTL_MSG *request, const char *remote_machine,
new_process();
/*
* I don't know any way how to find that external program run ok
- * so tqparent returns always SUCCESS
+ * so parent returns always SUCCESS
* Well I know a solution - read the pipe :-) - It blocks, so
* we can't wait the reaction of the user
*
@@ -451,7 +451,7 @@ int play_sound(int usercfg)
ktalk_debug(sSoundFile);
if ((pid = fork())) {
- /* we are the tqparent, so wait for the child */
+ /* we are the parent, so wait for the child */
if (pid == -1) /* the fork failed */
{
syslog(LOG_ERR,"Fork before play_sound : FAILED.");
diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp
index f94c15d4..402e4f01 100644
--- a/ktalkd/ktalkd/machines/forwmach.cpp
+++ b/ktalkd/ktalkd/machines/forwmach.cpp
@@ -224,14 +224,14 @@ void ForwMachine::connect_FWT(TalkConnection * tcCaller)
int socktA = tcAnsw->get_sockt();
int max_sockt = (socktC>socktA) ? socktC : socktA;
unsigned char buf[BUFSIZ];
- fd_set read_tqmask;
+ fd_set read_mask;
int nb;
int nbtot = 0;
for (;;) {
- FD_ZERO(&read_tqmask);
- FD_SET(socktA, &read_tqmask); // wait on both connections
- FD_SET(socktC, &read_tqmask);
- nb = select(max_sockt+1, &read_tqmask, NULL, NULL, NULL); // no timeout
+ FD_ZERO(&read_mask);
+ FD_SET(socktA, &read_mask); // wait on both connections
+ FD_SET(socktC, &read_mask);
+ nb = select(max_sockt+1, &read_mask, NULL, NULL, NULL); // no timeout
if (nb <= 0) {
if (errno == EINTR) {
continue;
@@ -239,12 +239,12 @@ void ForwMachine::connect_FWT(TalkConnection * tcCaller)
/* panic, we don't know what happened */
TalkConnection::p_error("Unexpected error from select");
}
- if (FD_ISSET(socktA, &read_tqmask)) {
+ if (FD_ISSET(socktA, &read_mask)) {
/* There is data on sockt A */
nb = transmit_chars(socktA, socktC, buf);
if (nb==0) return ;
}
- if (FD_ISSET(socktC, &read_tqmask)) {
+ if (FD_ISSET(socktC, &read_mask)) {
/* There is data on sockt C */
nb = transmit_chars(socktC, socktA, buf);
if (nb==0) return ;
@@ -284,7 +284,7 @@ void ForwMachine::sendResponse(const struct talk_addr target, NEW_CTL_RESPONSE *
* value of answ_id_num) and waits for SIGDELETE to use this value. */
void ForwMachine::processAnnounce()
{
- if ((pid=fork())==0) // store pid in the tqparent
+ if ((pid=fork())==0) // store pid in the parent
{
// Send announce to the answerer, and wait for response
ktalk_debug("-------------- ForwMachine : sending ANNOUNCE to %s",answ_user);
diff --git a/ktalkd/ktalkd/machines/talkconn.cpp b/ktalkd/ktalkd/machines/talkconn.cpp
index c7b8e738..b2e5710a 100644
--- a/ktalkd/ktalkd/machines/talkconn.cpp
+++ b/ktalkd/ktalkd/machines/talkconn.cpp
@@ -247,13 +247,13 @@ void TalkConnection::findProtocol() {
daemon.sin_addr = his_machine_addr;
/* Prepare the variables used for reading on sockets */
- fd_set read_tqmask, ctl_tqmask;
+ fd_set read_mask, ctl_mask;
int nready=0, cc;
struct timeval wait;
- FD_ZERO(&ctl_tqmask);
- FD_SET(new_socket, &ctl_tqmask);
- FD_SET(old_socket, &ctl_tqmask);
+ FD_ZERO(&ctl_mask);
+ FD_SET(new_socket, &ctl_mask);
+ FD_SET(old_socket, &ctl_mask);
int max_socket = (new_socket > old_socket) ? new_socket : old_socket;
/* Method : we send the two packets to the two remote daemons.
@@ -279,10 +279,10 @@ void TalkConnection::findProtocol() {
do {
/* Wait for response */
- read_tqmask = ctl_tqmask;
+ read_mask = ctl_mask;
wait.tv_sec = CTL_WAIT;
wait.tv_usec = 0;
- nready = ::select(max_socket+1, &read_tqmask, 0, 0, &wait);
+ nready = ::select(max_socket+1, &read_mask, 0, 0, &wait);
if (nready < 0) {
if (errno == EINTR)
continue;
@@ -292,7 +292,7 @@ void TalkConnection::findProtocol() {
if (nready == 0) ktalk_debug("select returned 0 ! ");
/* Analyze response */
- if (FD_ISSET(old_socket, &read_tqmask)) {
+ if (FD_ISSET(old_socket, &read_mask)) {
ktalk_debug("Reading on old_socket");
cc = ::recv(old_socket, (char *)&old_resp, sizeof (old_resp), 0);
if (cc < 0) {
@@ -302,7 +302,7 @@ void TalkConnection::findProtocol() {
} else
if (old_resp.type == LOOK_UP) protocol=talkProtocol; // FOUND
}
- if (FD_ISSET(new_socket, &read_tqmask)) {
+ if (FD_ISSET(new_socket, &read_mask)) {
ktalk_debug("Reading on new_socket");
cc = ::recv(new_socket, (char *)&new_resp, sizeof (new_resp), 0);
if (cc < 0) {
@@ -364,7 +364,7 @@ void TalkConnection::ctl_transact(int type, int id_num)
* Let's check it, the way ktalk does. */
findProtocol();
- fd_set read_tqmask, ctl_tqmask;
+ fd_set read_mask, ctl_mask;
int nready=0, cc, size, ok=0;
struct timeval wait;
struct sockaddr_in daemon_addr;
@@ -386,8 +386,8 @@ void TalkConnection::ctl_transact(int type, int id_num)
daemon_addr.sin_family = AF_INET;
daemon_addr.sin_addr = his_machine_addr;
daemon_addr.sin_port = (protocol == talkProtocol) ? talkDaemonPort : ntalkDaemonPort;
- FD_ZERO(&ctl_tqmask);
- FD_SET(ctl_sockt, &ctl_tqmask);
+ FD_ZERO(&ctl_mask);
+ FD_SET(ctl_sockt, &ctl_mask);
/* Keep sending the message until a response of
* the proper type is obtained.
@@ -403,10 +403,10 @@ void TalkConnection::ctl_transact(int type, int id_num)
continue;
p_error("Error on write to talk daemon");
}
- read_tqmask = ctl_tqmask;
+ read_mask = ctl_mask;
wait.tv_sec = CTL_WAIT;
wait.tv_usec = 0;
- nready = ::select(ctl_sockt+1, &read_tqmask, 0, 0, &wait);
+ nready = ::select(ctl_sockt+1, &read_mask, 0, 0, &wait);
if (nready < 0) {
if (errno == EINTR)
continue;
@@ -429,10 +429,10 @@ void TalkConnection::ctl_transact(int type, int id_num)
continue;
p_error("Error on read from talk daemon");
}
- read_tqmask = ctl_tqmask;
+ read_mask = ctl_mask;
/* an immediate poll */
timerclear(&wait);
- nready = ::select(ctl_sockt+1, &read_tqmask, 0, 0, &wait);
+ nready = ::select(ctl_sockt+1, &read_mask, 0, 0, &wait);
if (protocol == talkProtocol) ok = (old_resp.type == type);
else ok = ((new_resp.type == type) && (new_resp.vers == TALK_VERSION));
} while (nready > 0 && (!ok));
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 3ca199fb..b7fa0684 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -47,10 +47,10 @@ class TimeoutDialog : public TQMessageBox {
TimeoutDialog (int timeout_ms,
const TQString& caption, const TQString &text, Icon icon,
int button0, int button1, int button2,
- TQWidget *tqparent=0, const char *name=0, bool modal=TRUE,
+ TQWidget *parent=0, const char *name=0, bool modal=TRUE,
WFlags f=WStyle_DialogBorder ):
TQMessageBox (caption, text, icon, button0, button1, button2,
- tqparent, name, modal, f)
+ parent, name, modal, f)
{startTimer (timeout_ms);}
~TimeoutDialog ()
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 09:21:56 +0000