diff options
Diffstat (limited to 'src/kvirc')
68 files changed, 309 insertions, 309 deletions
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index b548afd..4051d21 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -72,7 +72,7 @@ void register_core_actions(KviActionManager * m) { - m->registerAction(new KviConnectAction(m)); // this as tqparent will destroy it on exit! + m->registerAction(new KviConnectAction(m)); // this as parent will destroy it on exit! m->registerAction(new KviSeparatorAction(m)); m->registerAction(new KviIrcContextDisplayAction(m)); m->registerAction(new KviJoinChannelAction(m)); diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp index 376ce7a..da6246a 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -107,11 +107,11 @@ } } - Window root,tqparent; + Window root,parent; Window * tqchildren; unsigned int nChildren; - if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&tqparent,&tqchildren,&nChildren)) + if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&tqchildren,&nChildren)) { if(tqchildren)XFree((char *)tqchildren); return 0; diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index 029a962..2903a95 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -70,7 +70,7 @@ So for example, assume to register a frend of yours like Szymon:[br] [example] [cmd:reguser.add]reguser.add[/cmd] Szymon - [cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon Pragma!*@*.it + [cmd:reguser.addmask]reguser.addmask[/cmd] Szymon Pragma!*@*.it [/example] And then want it in the notify list; nothing easier, just set hist "notify" property to the nickname that you want him to be "looked for":[br] @@ -82,7 +82,7 @@ "Pragma [someuser@somehost.it] is on IRC".[br] If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br] [example] - [cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon [Pragma]*@*.it + [cmd:reguser.addmask]reguser.addmask[/cmd] Szymon [Pragma]*@*.it [cmd:reguser.setproperty]reguser.setproperty[/cmd] Szymon notify "Pragma [Pragma]" [/example] KVIrc will then look for both nicknames getting online.[br] @@ -592,7 +592,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) if(KviUserListEntry * ent = m_pConsole->notifyListView()->findEntry(*s)) { // the user was online from a previous notify session - // might the tqmask have been changed ? (heh...this is tricky, maybe too much even) + // might the mask have been changed ? (heh...this is tricky, maybe too much even) if(KVI_OPTION_BOOL(KviOption_boolNotifyListSendUserhostForOnlineUsers)) { // user wants to be sure about online users.... @@ -621,15 +621,15 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) //l.append(s); // we will remove him from the list } else { // the user was not online! - // check if we have a cached tqmask + // check if we have a cached mask if(db) { if(KviIrcUserEntry * ue = db->find(*s)) { - // already in the db... do we have a tqmask ? + // already in the db... do we have a mask ? if(ue->hasUser() && ue->hasHost()) { - // yup! we have a complete tqmask to match on + // yup! we have a complete mask to match on KviIrcMask mk(*s,ue->user(),ue->host()); // lookup the user's name in the m_pRegUserDict if(!doMatchUser(*s,mk))return true; // critical problems = have to restart!!! @@ -656,7 +656,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // FIXME: #warning "Nickname escapes (links) in the notifylist messages!" -bool KviIsOnNotifyListManager::doMatchUser(const TQString ¬ifyString,const KviIrcMask & tqmask) +bool KviIsOnNotifyListManager::doMatchUser(const TQString ¬ifyString,const KviIrcMask & mask) { TQString * nam = m_pRegUserDict->find(notifyString); if(nam) @@ -665,25 +665,25 @@ bool KviIsOnNotifyListManager::doMatchUser(const TQString ¬ifyString,const Kv if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam)) { // ok ... match the user - if(u->matchesFixed(tqmask)) + if(u->matchesFixed(mask)) { // new user online - if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick()))) + if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) { - notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host()); + notifyOnLine(mask.nick(),mask.user(),mask.host()); } // else already online , and matching...all ok } else { // not matched.... has he been online before ? - if(m_pConsole->notifyListView()->findEntry(tqmask.nick())) + if(m_pConsole->notifyListView()->findEntry(mask.nick())) { - // has been online just a sec ago , but now the tqmask does not match + // has been online just a sec ago , but now the mask does not match // either reguserdb has changed , or the user went offline and another one got his nick // in the meantime... (ugly situation anyway) - notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("registration tqmask changed, or nickname is being used by someone else")); + notifyOffLine(mask.nick(),mask.user(),mask.host(),__tr2qs("registration mask changed, or nickname is being used by someone else")); } else { // has never been online if(_OUTPUT_VERBOSE) - m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (registration tqmask does not match, or nickname is being used by someone else)"),&(tqmask.nick()),&(tqmask.user()),&(tqmask.host())); + m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (registration mask does not match, or nickname is being used by someone else)"),&(mask.nick()),&(mask.user()),&(mask.host())); } } } else { @@ -784,7 +784,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) aux = kvi_extractToken(nk,aux,' '); if(nk.hasData()) { - // split it in a tqmask + // split it in a mask KviStr nick; KviStr user; KviStr host; @@ -1146,7 +1146,7 @@ void KviWatchNotifyListManager::stop() m_pRegUserDict->clear(); } -bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString ¬ifyString,const KviIrcMask & tqmask) +bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString ¬ifyString,const KviIrcMask & mask) { TQString * nam = m_pRegUserDict->find(notifyString); @@ -1156,39 +1156,39 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString & if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam)) { // ok ... match the user - if(u->matchesFixed(tqmask)) + if(u->matchesFixed(mask)) { // new user online - if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick()))) + if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) { - notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),"watch"); + notifyOnLine(mask.nick(),mask.user(),mask.host(),"watch"); } else { // else already online , and matching...all ok if(msg->numeric() == RPL_NOWON) { // This is a reply to a /watch +something (should not happen, unless the user is messing) or to /watch l (user requested) - notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(), + notifyOnLine(mask.nick(),mask.user(),mask.host(), __tr2qs("watch entry listing requested by user"),false); } else { // This is a RPL_LOGON....we're desynched ? - notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(), + notifyOnLine(mask.nick(),mask.user(),mask.host(), __tr2qs("possible watch list desync"),false); } } } else { // not matched.... has he been online before ? - if(m_pConsole->notifyListView()->findEntry(tqmask.nick())) + if(m_pConsole->notifyListView()->findEntry(mask.nick())) { - // has been online just a sec ago , but now the tqmask does not match + // has been online just a sec ago , but now the mask does not match // prolly the reguserdb has been changed - notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(), - __tr2qs("registration tqmask changed or desync with the watch service")); + notifyOffLine(mask.nick(),mask.user(),mask.host(), + __tr2qs("registration mask changed or desync with the watch service")); } else { // has never been online if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, - __tr("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (watch: registration tqmask does not match, or nickname is being used by someone else)"), - &(tqmask.nick()),&(tqmask.user()),&(tqmask.host())); + __tr("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (watch: registration mask does not match, or nickname is being used by someone else)"), + &(mask.nick()),&(mask.user()),&(mask.host())); } } } else { @@ -1202,9 +1202,9 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString & } else { // not in our dictionary // prolly someone used /WATCH behind our back... bad boy! - if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick()))) + if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) { - notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("watch entry added by user")); + notifyOnLine(mask.nick(),mask.user(),mask.host(),__tr2qs("watch entry added by user")); } } return true; @@ -1263,7 +1263,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk); } else { - // This is a RPL_LOGOFF for an user that has not matched the reg-tqmask + // This is a RPL_LOGOFF for an user that has not matched the reg-mask notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry")); } } diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h index ebf6151..7d84ac0 100644 --- a/src/kvirc/kernel/kvi_notifylist.h +++ b/src/kvirc/kernel/kvi_notifylist.h @@ -110,7 +110,7 @@ private slots: void buildNotifyList(); void sendIsOn(); void sendUserhost(); - bool doMatchUser(const TQString ¬ifyString,const KviIrcMask & tqmask); + bool doMatchUser(const TQString ¬ifyString,const KviIrcMask & mask); }; @@ -158,7 +158,7 @@ protected: virtual void start(); virtual void stop(); virtual bool handleWatchReply(KviIrcMessage *msg); - bool doMatchUser(KviIrcMessage *msg,const TQString ¬ifyString,const KviIrcMask & tqmask); + bool doMatchUser(KviIrcMessage *msg,const TQString ¬ifyString,const KviIrcMask & mask); }; diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 602e778..d0d6db9 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -776,12 +776,12 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("MeDeVoice",__tr_no_lookup("Am devoiced"),KVI_SMALLICON_MEDEVOICE,KVI_MSGTYPE_LEVEL_5), MSGTYPE_OPTION("MeHalfOp",__tr_no_lookup("Am halfop'd"),KVI_SMALLICON_MEHALFOP,KVI_MSGTYPE_LEVEL_5), MSGTYPE_OPTION("MeDeHalfOp",__tr_no_lookup("Am de-halfop'd"),KVI_SMALLICON_MEDEHALFOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my tqmask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my tqmask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my tqmask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my tqmask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my tqmask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my tqmask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my mask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my mask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my mask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my mask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my mask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my mask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5), MSGTYPE_OPTION("Ignore",__tr_no_lookup("Ignored user message"),KVI_SMALLICON_IGNORE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("Stats",__tr_no_lookup("Server statistics"),KVI_SMALLICON_STATS,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1), diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 398fabd..2e35f75 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -618,7 +618,7 @@ namespace KviKvsCoreCallbackCommands Trigger <callback command> with "ping" events every <timeout> milliseconds. !sw: -w | --bind-to-window Kill the process if the current window is closed. In this case the - termination event is NOT triggered (since the tqparent window has been lost). + termination event is NOT triggered (since the parent window has been lost). If this switch is not used then the process is rebound to the active console window and continues running. !sw: -s=<interpreter command> | --shell=<interpreter command> diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp index 6af8b98..0610328 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp @@ -93,7 +93,7 @@ namespace KviKvsCoreFunctions _REGFNC("length",length) _REGFNC("lf",lf) // m_r - _REGFNC("tqmask",tqmask) + _REGFNC("mask",mask) _REGFNC("me",me) _REGFNC("msgtype",msgtype) _REGFNC("new",newCKEYWORDWORKAROUND) diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h index 16d281a..31a73b7 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.h +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h @@ -101,7 +101,7 @@ namespace KviKvsCoreFunctions KVSCF(length); KVSCF(lf); // m_r - KVSCF(tqmask); + KVSCF(mask); KVSCF(me); KVSCF(msgtype); KVSCF(newCKEYWORDWORKAROUND); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 4fb92ce..00d8d2d 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -48,22 +48,22 @@ namespace KviKvsCoreFunctions /////////////////////////////////////////////////////////////////////////////////////////////// /* - @doc: tqmask + @doc: mask @type: function @title: - $tqmask + $mask @short: - Retrieves the host tqmask of a user + Retrieves the host mask of a user @syntax: - $tqmask[(<nickname>[,<mask_type>])] + $mask[(<nickname>[,<mask_type>])] @description: - Returns the specified type of tqmask for the user with <nickname>.[br] - If the host or username are not known, the tqmask may contain less information + Returns the specified type of mask for the user with <nickname>.[br] + If the host or username are not known, the mask may contain less information than requested.[br] If the <nickname> is not given it is assumed to be the current nickname.[br] If <mask_type> is not given or is invalid, it is assumed to be 0.[br] - Available tqmask types:[br] + Available mask types:[br] 0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)[br] 1 : nick!user@*.abc.host.top (nick!user@XXX.XXX.XXX.*)[br] 2 : nick!user@*[br] @@ -92,17 +92,17 @@ namespace KviKvsCoreFunctions 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)[br] 26: *!*user@*.host.top (*!user@*XXX.XXX.*)[br] If some data is missing, these types may change:[br] - For example, if the hostname is missing, the tqmask type 3 or 4 may be reduced to type 5.[br] + For example, if the hostname is missing, the mask type 3 or 4 may be reduced to type 5.[br] If the user with <nickname> is not found in the current IRC context user database, an empty string is returned.[br] The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then - the XXX.XXX.* or XXX.* host tqmask is returned instead of the (wrong) *.INVALID-TOP-MASK + the XXX.XXX.* or XXX.* host mask is returned instead of the (wrong) *.INVALID-TOP-MASK @examples: @seealso: */ - KVSCF(tqmask) + KVSCF(mask) { TQString szNick; kvs_uint_t maskType; @@ -127,7 +127,7 @@ namespace KviKvsCoreFunctions u.setHost(e->host()); TQString tmp; - u.tqmask(tmp,(KviIrcMask::MaskType)maskType); + u.mask(tmp,(KviIrcMask::MaskType)maskType); KVSCF_pRetBuffer->setString(tmp); return true; } @@ -260,7 +260,7 @@ namespace KviKvsCoreFunctions $new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]]) @description: Creates a new instance of the object <class> with - the tqparent object <parent_id> and the specified <name>.[br] + the parent object <parent_id> and the specified <name>.[br] <name> and <parent_id> are optional: if not specified, <name> is assumed to be an empty string and <parent_id> default to 0 (parentless object).[br] Please see the [doc:objects]objects documentation[/doc] for more information.[br] @@ -300,7 +300,7 @@ namespace KviKvsCoreFunctions pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent); if(!pParent) { - KVSCF_pContext->error(__tr2qs("The specified tqparent object does not exist")); + KVSCF_pContext->error(__tr2qs("The specified parent object does not exist")); return false; } } else { diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index e46af6e..0a4aa54 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -328,19 +328,19 @@ namespace KviKvsCoreSimpleCommands XGetKeyboardControl(get_xdisplay(),&st); - unsigned long tqmask = KBBellPercent; + unsigned long mask = KBBellPercent; ctl.bell_percent = uVolume; if(pitch >= 0) { ctl.bell_pitch = pitch; - tqmask |= KBBellPitch; + mask |= KBBellPitch; } if(duration >= 0) { ctl.bell_duration = duration; - tqmask |= KBBellDuration; + mask |= KBBellDuration; } - XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl); + XChangeKeyboardControl(get_xdisplay(),mask,&ctl); XBell(get_xdisplay(),100); @@ -354,7 +354,7 @@ namespace KviKvsCoreSimpleCommands ctl.bell_duration = st.bell_duration; ctl.bell_percent = st.bell_percent; - XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl); + XChangeKeyboardControl(get_xdisplay(),mask,&ctl); #endif //COMPILE_NO_X_BELL #endif diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index fcb2b03..e787cf2 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -94,7 +94,7 @@ namespace KviKvsCoreSimpleCommands help run help help help index - help $tqmask + help $mask help /home/pragma/myfile.html [/example] */ @@ -674,15 +674,15 @@ try_again: @title: lusers @syntax: - lusers [ <tqmask> [ <target> ] ] + lusers [ <mask> [ <target> ] ] @short: Requests statistics about users on IRC @description: The LUSERS command is used to get statistics about the size of the IRC network.[br]If no parameter is given, the reply will be about the - whole net.[br]If a <tqmask> is specified, then the reply will only + whole net.[br]If a <mask> is specified, then the reply will only concern the part of the network formed by the servers matching the - tqmask.[br]Finally, if the <target> parameter is specified, the request + mask.[br]Finally, if the <target> parameter is specified, the request is forwarded to that server which will generate the reply.[br] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br] */ diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index 5ee31b7..acf8eec 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -445,12 +445,12 @@ namespace KviKvsCoreSimpleCommands @title: sockets @syntax: - sockets [[remote server] server tqmask] + sockets [[remote server] server mask] @short: Requests the sockets info from a server @description: Requests the sockets information from the specified server or the current server if no [remote server] is specified.[br] - The reply can be filtered by <server tqmask>.[br] + The reply can be filtered by <server mask>.[br] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br] */ // RFC2821 wrapper @@ -875,7 +875,7 @@ namespace KviKvsCoreSimpleCommands @title: who @syntax: - who {[tqmask] | [channel]} + who {[mask] | [channel]} @short: Requests WHO information @description: diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index a046dc3..55c086d 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -1035,7 +1035,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nick $1 = source username $2 = source hostname - $3 = ban tqmask + $3 = ban mask @window: Channel window @description: @@ -1043,7 +1043,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @seealso: [event:onunban]OnUnban[/event] */ - EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), + EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), /* @doc: onunban @type: @@ -1056,7 +1056,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nick $1 = source username $2 = source hostname - $3 = unban tqmask + $3 = unban mask @window: Channel window @description: @@ -1064,7 +1064,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @seealso: [event:onban]OnBan[/event] */ - EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), + EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), /* @doc: onmeban @type: @@ -1077,15 +1077,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nickname $1 = source username $2 = source hostname - $3 = ban tqmask + $3 = ban mask @window: Channel @description: - Triggered when someone has set a +b flag that matches your tqmask (bans you) in the channel.[br] + Triggered when someone has set a +b flag that matches your mask (bans you) in the channel.[br] @seealso: [event:onmeunban]OnMeUnban[/event] */ - EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), + EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), /* @doc: onmeunban @type: @@ -1098,15 +1098,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nickname $1 = source username $2 = source hostname - $3 = ban tqmask + $3 = ban mask @window: Channel @description: - Triggered when someone has set a -b flag that matches your tqmask (debans you) in the channel.[br] + Triggered when someone has set a -b flag that matches your mask (debans you) in the channel.[br] @seealso: [event:onmeban]OnMeBan[/event] */ -EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), +EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), /* @doc: onbanexception @type: @@ -1119,7 +1119,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = banexception tqmask + $3 = banexception mask @window: Channel window @description: @@ -1128,7 +1128,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ [event:onbanexceptionremove]OnBanExceptionRemove[/event] */ - EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"), + EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"), /* @doc: onbanexceptionremove @type: @@ -1141,7 +1141,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = unban tqmask + $3 = unban mask @window: Channel window @description: @@ -1149,7 +1149,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ @seealso: [event:onbanexception]OnBanException[/event] */ - EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"), + EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"), /* @doc: onmebanexception @type: @@ -1162,7 +1162,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = tqmask + $3 = mask @window: Channel window @description: @@ -1171,7 +1171,7 @@ channel @seealso: [event:onmebanexceptionremove]OnMeBanExceptionRemove[/event] */ - EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), + EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), /* @doc: onmebanexceptionremove @type: @@ -1184,7 +1184,7 @@ channel $0 = source nick $1 = source username $2 = source hostname - $3 = tqmask + $3 = mask @window: Channel window @description: @@ -1192,7 +1192,7 @@ channel @seealso: [event:onmebanexception]OnMeBanException[/event] */ - EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), + EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), /* @doc: onop @type: @@ -1622,7 +1622,7 @@ channel @short: An unhandled literal server message has been received @parameters: - $0 = source tqmask + $0 = source mask $1 = message (literal) $2- = parameters @window: @@ -1636,7 +1636,7 @@ channel raw numeric events to handle them.[br] @seealso: */ - EVENT("OnUnhandledLiteral","$0 = source tqmask\n$1 = message\n$2- parameters"), + EVENT("OnUnhandledLiteral","$0 = source mask\n$1 = message\n$2- parameters"), /* @doc: onmehalfop @type: @@ -1731,7 +1731,7 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = target tqmask + $3 = target mask @window: Channels window @description: @@ -1739,7 +1739,7 @@ channel @seealso: [event:oninviteexceptionremove]OnInviteExceptionRemove[/event] */ - EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"), + EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"), /* @doc: oninviteexceptionremove @type: @@ -1752,7 +1752,7 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = target tqmask + $3 = target mask @window: Channels window @description: @@ -1760,7 +1760,7 @@ channel @seealso: [event:oninviteexceptionremove]OnInviteExceptionRemove[/event] */ - EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"), + EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"), /* @doc: onmeinviteexception @type: @@ -1773,16 +1773,16 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = tqmask + $3 = mask @window: Channels window @description: - Someone has set mode +I on a channel with a target tqmask that matches - the local user tqmask + Someone has set mode +I on a channel with a target mask that matches + the local user mask @seealso: [event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event] */ - EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), + EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), /* @doc: onmeinviteexceptionremove @type: @@ -1795,16 +1795,16 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = tqmask + $3 = mask @window: Channels window @description: - Someone has set mode -I on a channel with a target tqmask that matches - the local user tqmask + Someone has set mode -I on a channel with a target mask that matches + the local user mask @seealso: [event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event] */ - EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), + EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), /* @doc: onaction @type: diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index c6d9fcb..677095d 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -95,7 +95,7 @@ To create an object you must use the [fnc]$new[/fnc]() function. [fnc]$new[/fnc]() requires three parameters:[br] - The object class (more about object classes later in this document)[br] - - The ID of the tqparent object , (that can be 0 for toplevel objects).[br] + - The ID of the parent object , (that can be 0 for toplevel objects).[br] - The object name (eventually empty)[br] [example] %myobject = [fnc]$new[/fnc]([class]object[/class],0,theName) @@ -113,7 +113,7 @@ [example] [cmd]if[/cmd](%myobject == %anotherobject)[cmd]echo[/cmd] "This is the same object!"; [/example] - The tqparent object id is optional, if not specified it is assumed to be 0. + The parent object id is optional, if not specified it is assumed to be 0. The object name is optional , but it may help you later in finding the object.[br][br] To destroy an object use the [cmd]delete[/cmd] command. (In previous versions @@ -242,12 +242,12 @@ [/example] In the example above four objects have been created. - A "tqparent" object named "myobject" , and three tqchildren objects. + A "parent" object named "myobject" , and three tqchildren objects. The destructor has been reimplemented for each child object, to make it "say" its name (Please note the usage of [fnc]$this[/fnc]). - In the tqparent destructor the tqchildren have been counted and listed.[br] - Then the tqparent object is destroyed causing to:[br] - - trigger the tqparent destructor.[br] + In the parent destructor the tqchildren have been counted and listed.[br] + Then the parent object is destroyed causing to:[br] + - trigger the parent destructor.[br] - destroy all the tqchildren (and conseguently trigger all the "individual" destructors).[br][br] Not all the object functions must return a value: @@ -499,8 +499,8 @@ The default implementation emits the signal "[classsignal]destroyed[/classsignal]". !fn: $name() Returns the name of this object. - !fn: $tqparent() - Returns the tqparent object of this object or 0 if this object has no tqparent. + !fn: $parent() + Returns the parent object of this object or 0 if this object has no parent. !fn: $timerEvent(<timerId>) Handler for the timer events. The default implementation does nothing. diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h index 5d16c74..a19bd5f 100644 --- a/src/kvirc/kvs/kvi_kvs_object.h +++ b/src/kvirc/kvs/kvi_kvs_object.h @@ -92,7 +92,7 @@ public: const TQString & getName(){ return m_szName; }; - KviKvsObject * parentObject(){ return (KviKvsObject *)tqparent(); }; + KviKvsObject * parentObject(){ return (KviKvsObject *)parent(); }; TQWidget * parentScriptWidget(); bool connectSignal(const TQString &sigName,KviKvsObject * target,const TQString &slotName); diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp index f995238..c0dcc49 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp @@ -79,7 +79,7 @@ KviKvsObjectClass::~KviKvsObjectClass() // then kill all objects that belong to our class KviKvsKernel::instance()->objectController()->killAllObjectsWithClass(this); // now we're quite clean: should have no object depending on us alive - // unregister from the tqparent, if any + // unregister from the parent, if any if(m_pParentClass)m_pParentClass->unregisterChildClass(this); // unregister from the object controller KviKvsKernel::instance()->objectController()->unregisterClass(this); diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h index 5815743..0aa4f83 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.h +++ b/src/kvirc/kvs/kvi_kvs_object_class.h @@ -38,7 +38,7 @@ class KviKvsRunTimeContext; class KviKvsVariantList; // Object allocation function -// parameters are: the class, the tqparent object (eventually 0), the object name (eventually empty) +// parameters are: the class, the parent object (eventually 0), the object name (eventually empty) typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const TQString &); // An object function callback @@ -53,14 +53,14 @@ class KVIRC_API KviKvsObjectClass friend class KviKvsObjectController; public: KviKvsObjectClass( - KviKvsObjectClass * pParent, // tqparent class + KviKvsObjectClass * pParent, // parent class const TQString & szName, // class name KviKvsObjectAllocateInstanceProc proc, // intance allocation proc bool bBuiltin = true // this is a builtin or script based class ? ); ~KviKvsObjectClass(); protected: - KviKvsObjectClass * m_pParentClass; // the tqparent (base) class + KviKvsObjectClass * m_pParentClass; // the parent (base) class TQString m_szName; // the class name bool m_bBuiltin; // is this a builtin or script based class ? KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp index 3ec6ea7..b2c1c8b 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp @@ -77,7 +77,7 @@ void KviKvsObjectController::init() m_pObjectClass->registerFunctionHandler("signalSender",KVI_PTR2MEMBER(KviKvsObject::function_signalSender)); m_pObjectClass->registerFunctionHandler("signalName",KVI_PTR2MEMBER(KviKvsObject::function_signalName)); m_pObjectClass->registerFunctionHandler("destructor",KVI_PTR2MEMBER(KviKvsObject::function_destructor)); - m_pObjectClass->registerFunctionHandler("tqparent",KVI_PTR2MEMBER(KviKvsObject::function_parent)); + m_pObjectClass->registerFunctionHandler("parent",KVI_PTR2MEMBER(KviKvsObject::function_parent)); m_pObjectClass->registerFunctionHandler("property",KVI_PTR2MEMBER(KviKvsObject::function_property)); m_pObjectClass->registerFunctionHandler("setProperty",KVI_PTR2MEMBER(KviKvsObject::function_setProperty)); m_pObjectClass->registerFunctionHandler("listProperties",KVI_PTR2MEMBER(KviKvsObject::function_listProperties)); @@ -145,13 +145,13 @@ void KviKvsObjectController::unregisterClass(KviKvsObjectClass *pClass) void KviKvsObjectController::registerObject(KviKvsObject *pObject) { m_pObjectDict->insert(pObject->handle(),pObject); - if(pObject->tqparent() == 0)m_pTopLevelObjectList->append(pObject); + if(pObject->parent() == 0)m_pTopLevelObjectList->append(pObject); } void KviKvsObjectController::unregisterObject(KviKvsObject *pObject) { m_pObjectDict->remove(pObject->handle()); - if(pObject->tqparent() == 0)m_pTopLevelObjectList->removeRef(pObject); + if(pObject->parent() == 0)m_pTopLevelObjectList->removeRef(pObject); } void KviKvsObjectController::flushUserClasses() diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h index 70e353a..43105e8 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.h +++ b/src/kvirc/kvs/kvi_kvs_parser.h @@ -68,7 +68,7 @@ private: int m_iFlags; // the current parsing flags bool m_bError; // error(..) was called ? // this stuff is used only for reporting errors and warnings - KviKvsScript * m_pScript; // tqparent script + KviKvsScript * m_pScript; // parent script KviWindow * m_pWindow; // output window public: // public interface enum Flags { AssumeLocals = 1, Pedantic = 2 }; diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp index a1f4c56..a2d6516 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp @@ -302,7 +302,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) if(bInObjScope) { - // object function call (our tqparent will be a scope operator) + // object function call (our parent will be a scope operator) if(pId2) { // base class object function call diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp index 6f78ad1..95eca6a 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -332,7 +332,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() of an expression, so it is terminated by a closed parenthesis. It's rather dangerous to use this command inside an object function handler: if the class definition <class> was already - existing and it is a tqparent of the object's class, you might + existing and it is a parent of the object's class, you might end up executing "inexisting" code.[br] As a thumb rule, use this command only outside object function handlers.[br] [br][br] diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp index 5442aa2..664403f 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp @@ -132,7 +132,7 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const TQStr } pCallStack->append(pString); iFrame++; - pNode = pNode->tqparent(); + pNode = pNode->parent(); } if(pNode) pCallStack->append(new TQString("#12 ...")); diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h index 50ee147..373eb39 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h @@ -153,7 +153,7 @@ public: KviKvsVariantList * parameterList() { return m_pParameterList; }; - // tqparent script, may be 0! + // parent script, may be 0! KviKvsScript * script() { return m_pScript; }; diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h index 8eabc15..6934692 100644 --- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h +++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h @@ -30,7 +30,7 @@ class KVIRC_API KviKvsRWEvaluationResult { public: - // this result becomes the owner of the tqparent result!!!! + // this result becomes the owner of the parent result!!!! KviKvsRWEvaluationResult(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant); // the destructor must do (in order): // check if variant is empty and if it is then remove it from the container (destroy it) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h index 2057e38..62f5314 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h @@ -42,7 +42,7 @@ protected: // this is called only by KviKvsParser void setLocation(const TQChar * pLocation){ m_pLocation = pLocation; }; public: - KviKvsTreeNode * tqparent(){ return m_pParent; }; + KviKvsTreeNode * parent(){ return m_pParent; }; const TQChar * location(){ return m_pLocation; }; virtual void dump(const char * prefix) = 0; virtual void contextDescription(TQString &szBuffer) = 0; diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/kvi_ircmessage.h index e2bf17d..b040f86 100644 --- a/src/kvirc/sparser/kvi_ircmessage.h +++ b/src/kvirc/sparser/kvi_ircmessage.h @@ -100,7 +100,7 @@ public: bool unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); }; void decodeAndSplitPrefix(TQString &szNick,TQString &szUser,TQString &szHost); - void decodeAndSplitMask(char * tqmask,TQString &szNick,TQString &szUser,TQString &szHost); + void decodeAndSplitMask(char * mask,TQString &szNick,TQString &szUser,TQString &szHost); }; #endif //_KVI_IRCMESSAGE_H_ diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/kvi_numeric.h index 41d246f..0c72407 100644 --- a/src/kvirc/sparser/kvi_numeric.h +++ b/src/kvirc/sparser/kvi_numeric.h @@ -61,7 +61,7 @@ #define RPL_MAPEND 7 /* :End of /MAP [U] # */ //[03:45:18] [dune.webchat.org][007] newbie dune.webchat.org 1037760291 :Tue, 19 Nov 2002 18:44:51 -0800 -#define RPL_SNOMASK 8 /* %d :: Server notice tqmask (%#x) [U] # */ +#define RPL_SNOMASK 8 /* %d :: Server notice mask (%#x) [U] # */ //[03:45:18] [dune.webchat.org][008] newbie -/NAJgAxq7HTQPwnkK^ 124963541 :This is your Session ID and Session Key. #define RPL_STATMEMTOT 9 /* %u %u :Bytes Blocks [U] # */ @@ -216,9 +216,9 @@ #define RPL_INVITING 341 /* [I,E,U,D] */ #define RPL_SUMMONING 342 /* [I,E,D] */ // RPL_????????? 343-345 -#define RPL_INVITELIST 346 /* "<channel> <exceptiontqmask>" [I] # */ +#define RPL_INVITELIST 346 /* "<channel> <exceptionmask>" [I] # */ #define RPL_ENDOFINVITELIST 347 /* "<channel> :End of Channel Invite List" [I] # */ -#define RPL_EXCEPTLIST 348 /* "<channel> <exceptiontqmask>" [I] # */ +#define RPL_EXCEPTLIST 348 /* "<channel> <exceptionmask>" [I] # */ #define RPL_ENDOFEXCEPTLIST 349 /* "<channel> :End of Channel Exception List" [I] # */ // RPL_?????????? 350 #define RPL_VERSION 351 /* "%s.%s %s :%s" [I,E,U,D] # */ @@ -229,10 +229,10 @@ #define RPL_KILLDONE 361 /* [I,E,U,D] */ #define RPL_CLOSING 362 /* [I,E,U,D] */ #define RPL_CLOSEEND 363 /* [I,E,U,D] */ -#define RPL_LINKS 364 /* "<host> <tqparent> :<hops> <description>" [I,E,U,D] # */ +#define RPL_LINKS 364 /* "<host> <parent> :<hops> <description>" [I,E,U,D] # */ #define RPL_ENDOFLINKS 365 /* %s :End of /LINKS" [I,E,U,D] # */ #define RPL_ENDOFNAMES 366 /* "%s :End of /NAMES list." [I,E,U,D] # */ -#define RPL_BANLIST 367 /* "<channel> <bantqmask>" [I,E,U,D] # */ +#define RPL_BANLIST 367 /* "<channel> <banmask>" [I,E,U,D] # */ #define RPL_ENDOFBANLIST 368 /* "<channel> :End of channel Ban List" [I,E,U,D] # */ #define RPL_ENDOFWHOWAS 369 /* "%s :END of /WHOWAS" [I,E,U,D] # */ #define RPL_INFO 371 /* ":%s" [I,E,U,D] # */ diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 10c5ac1..b92afd9 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -97,8 +97,8 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; use the symbol <0x01> for this delimiter. You may receive a CTCP message from server in one of the following two ways:[br] - [b]:<source_tqmask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br] - [b]:<source_tqmask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br] + [b]:<source_mask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br] + [b]:<source_mask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br] The PRIVMSG is used for CTCP REQUESTS, the NOTICE for CTCP REPLIES. The NOTICE form should never generate an automatic reply.[br] The two delimiters were used to begin and terminate the @@ -1506,7 +1506,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) { // FIXME: #warning "OPTION FOR SETTING A FIXED BIND ADDRESS FOR OUTGOING DCC OFFERS" TQString szUserMask; - msg->pSource->tqmask(szUserMask); + msg->pSource->mask(szUserMask); TQString szReply,szFileName; szFileName=a->name(); diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index 34989db..155a734 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -167,7 +167,7 @@ void KviServerParser::parseLiteralError(KviIrcMessage *msg) void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) { // JOIN - // :<joiner_tqmask> JOIN :<channel> + // :<joiner_mask> JOIN :<channel> TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); @@ -345,7 +345,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) void KviServerParser::parseLiteralPart(KviIrcMessage *msg) { // PART - // :<source_tqmask> PART <channel> :<part message> + // :<source_mask> PART <channel> :<part message> TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); @@ -444,7 +444,7 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg) void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) { // TQUIT - // :<source_tqmask> TQUIT :<quit message> + // :<source_mask> TQUIT :<quit message> TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); @@ -580,7 +580,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) void KviServerParser::parseLiteralKick(KviIrcMessage *msg) { // KICK - // :<source_tqmask> KICK <channel> <nick> :<kick message> + // :<source_mask> KICK <channel> <nick> :<kick message> TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); @@ -1381,7 +1381,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) void KviServerParser::parseLiteralTopic(KviIrcMessage *msg) { // TOPIC - // :<source_tqmask> TOPIC <channel> :<topic> + // :<source_mask> TOPIC <channel> :<topic> TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); TQString szTarget = msg->connection()->decodeText(msg->safeParam(0)); @@ -1666,9 +1666,9 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz // FIXME: freenode has two ugly incompatible extensions: // mode e: that is NOT viewable (???) // mode q that stands for "quiet-ban" - // mode #chan +q tqmask - // adds tqmask to the banlist with the prefix % - // and doesn't allow the users matching the tqmask to talk to the channel + // mode #chan +q mask + // adds mask to the banlist with the prefix % + // and doesn't allow the users matching the mask to talk to the channel bool bSet = true; const char * aux = modefl.ptr(); diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index 802cc60..265432f 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -72,7 +72,7 @@ void KviServerParser::parseNumeric001(KviIrcMessage *msg) { // 001: RPL_WELCOME - // :prefix 001 target :Welcome to the Internet Relay Network <usertqmask> + // :prefix 001 target :Welcome to the Internet Relay Network <usermask> // FIXME: #warning "SET THE USERMASK FROM SERVER" TQString szText = msg->connection()->decodeText(msg->safeTrailing()); TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" ); @@ -442,11 +442,11 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) char save = *aux; *aux = 0; // NAMESX + UHNAMES support - KviIrcMask tqmask(msg->connection()->decodeText(begin)); + KviIrcMask mask(msg->connection()->decodeText(begin)); // and make it join - if(!tqmask.nick().isEmpty())chan->join(tqmask.nick(), - tqmask.hasUser() ? tqmask.user() : TQString(), - tqmask.hasHost() ? tqmask.host() : TQString(), + if(!mask.nick().isEmpty())chan->join(mask.nick(), + mask.hasUser() ? mask.user() : TQString(), + mask.hasHost() ? mask.host() : TQString(), iFlags); *aux = ' '; *aux = save; @@ -640,7 +640,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB void KviServerParser::__funcname(KviIrcMessage *msg) \ { \ TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ - TQString bantqmask = msg->connection()->decodeText(msg->safeParam(2)); \ + TQString banmask = msg->connection()->decodeText(msg->safeParam(2)); \ TQString bansetby = msg->connection()->decodeText(msg->safeParam(3)); \ TQString bansetat; \ getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \ @@ -648,7 +648,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB KviChannel * chan = msg->connection()->findChannel(szChan); \ if(chan) \ { \ - chan->setMask(__modechar,bantqmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \ + chan->setMask(__modechar,banmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \ if(chan->__sentRequest())return; \ } \ if(!msg->haltOutput()) \ @@ -656,18 +656,18 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \ msg->console()->activeWindow() : (KviWindow *)(msg->console()); \ pOut->output(__ico,__tr2qs("%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"), \ - &(__szWhatTQString),&szChan,__modechar,&bantqmask,&bansetby,&bansetat); \ + &(__szWhatTQString),&szChan,__modechar,&banmask,&bansetby,&bansetat); \ } \ } // 367: RPL_BANLIST [I,E,U,D] -// :prefix 367 target <channel> <bantqmask> [bansetby] [bansetat] +// :prefix 367 target <channel> <banmask> [bansetby] [bansetat] PARSE_NUMERIC_LIST(parseNumericBanList,'b',sentBanListRequest,KVI_OUT_BAN,__tr2qs("Ban listing")) // 346: RPL_INVITELIST [I,E,U,D] -// :prefix 346 target <channel> <invitetqmask> [invitesetby] [invitesetat] +// :prefix 346 target <channel> <invitemask> [invitesetby] [invitesetat] PARSE_NUMERIC_LIST(parseNumericInviteList,'I',sentInviteListRequest,KVI_OUT_INVITEEXCEPT,__tr2qs("Invite listing")) // 346: RPL_EXCEPTLIST [I,E,U,D] -// :prefix 346 target <channel> <bantqmask> [bansetby] [bansetat] +// :prefix 346 target <channel> <banmask> [bansetby] [bansetat] PARSE_NUMERIC_LIST(parseNumericExceptList,'e',sentBanExceptionListRequest,KVI_OUT_BANEXCEPT,__tr2qs("Ban exception listing")); @@ -1578,7 +1578,7 @@ void KviServerParser::parseNumericListEnd(KviIrcMessage *msg) void KviServerParser::parseNumericLinks(KviIrcMessage *msg) { // 364: RPL_LINKS [I,E,U,D] - // :prefix 364 <target> <host> <tqparent> :<hops> <description> + // :prefix 364 <target> <host> <parent> :<hops> <description> if(!(msg->console()->ircContext()->linksWindow())) { // attempt to load the module... diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index 1c01b23..b9e2f2b 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -209,7 +209,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // m_pEditorsContainer->raiseWidget(m_pUserListView); // And finally the input line on the bottom m_pInput = new KviInput(this,m_pUserListView); - // no tqmask editors yet + // no mask editors yet m_pBanEditor = 0; m_pBanExceptionEditor = 0; m_pInviteEditor = 0; @@ -1424,7 +1424,7 @@ int KviChannel::myFlags() } -void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt) +void KviChannel::setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt) { if(!connection())return; KviPointerList<KviMaskEntry> * list = m_pBanList; @@ -1446,21 +1446,21 @@ void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQStr break; } - internalMask(tqmask,bAdd,setBy,setAt,list,&editor); + internalMask(mask,bAdd,setBy,setAt,list,&editor); m_pUserListView->setMaskEntries(flag,(int)list->count()); } -void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) +void KviChannel::internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) { KviMaskEntry * e = 0; if(bAdd) { for(e = l->first();e;e = l->next()) { - if(KviTQString::equalCI(e->szMask,tqmask))return; //already there + if(KviTQString::equalCI(e->szMask,mask))return; //already there } e = new KviMaskEntry; - e->szMask = tqmask; + e->szMask = mask; e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)"); e->uSetAt = setAt; l->append(e); @@ -1468,7 +1468,7 @@ void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &s } else { for(e = l->first();e;e = l->next()) { - if(KviTQString::equalCI(e->szMask,tqmask))break; + if(KviTQString::equalCI(e->szMask,mask))break; } if(e) { diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index f1d1732..45a4801 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -160,7 +160,7 @@ protected: virtual void getBaseLogFileName(TQString &buffer); virtual void triggerCreationEvents(); void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName); - void internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); + void internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); void checkChannelSync(); void showDoubleView(bool bShow); void fixActionHistory(); @@ -192,7 +192,7 @@ public: const TQString & nameWithUserFlag(){ return m_szNameWithUserFlag; }; virtual const TQString & target(){ return windowName(); }; // void appendSelectedNicknames(KviStr &buffer); - void setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt); + void setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt); kvi_time_t lastReceivedWhoReply(){ return m_tLastReceivedWhoReply; }; void setLastReceivedWhoReply(kvi_time_t tTime){ m_tLastReceivedWhoReply = tTime; }; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 0b08447..fdce502 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString if(u) { - TQString tqmask; - u->tqmask()->tqmask(tqmask); + TQString mask; + u->mask()->mask(mask); buffer += "<tr bgcolor=\"#F0F0F0\"><td>"; buffer += __tr2qs("Registered as"); buffer += " <b>"; @@ -385,7 +385,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">"; buffer += __tr2qs("(Matched by"); buffer += " "; - buffer += tqmask; + buffer += mask; buffer += ")</td></tr>"; } diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index 17e26a4..0be14a2 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -76,7 +76,7 @@ Q_OBJECT TQ_OBJECT public: - KviCryptController(TQWidget * tqparent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); + KviCryptController(TQWidget * parent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); ~KviCryptController(); protected: KviWindow * m_pWindow; diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp index fe67619..2e1dad1 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.cpp +++ b/src/kvirc/ui/kvi_dynamictooltip.cpp @@ -22,8 +22,8 @@ #define __KVIRC__ #include "kvi_dynamictooltip.h" -KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip) -: KviTalToolTip(tqparent) +KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip) +: KviTalToolTip(parent) { m_pParentToolTip = parToolTip; } @@ -37,10 +37,10 @@ void KviDynamicToolTipHelper::maybeTip(const TQPoint & pnt) m_pParentToolTip->maybeTip(pnt); } -KviDynamicToolTip::KviDynamicToolTip(TQWidget * tqparent,const char * name) -: TQObject(tqparent,name) +KviDynamicToolTip::KviDynamicToolTip(TQWidget * parent,const char * name) +: TQObject(parent,name) { - m_pHelper = new KviDynamicToolTipHelper(tqparent,this); + m_pHelper = new KviDynamicToolTipHelper(parent,this); } KviDynamicToolTip::~KviDynamicToolTip() diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h index d6a6adf..d57902c 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.h +++ b/src/kvirc/ui/kvi_dynamictooltip.h @@ -33,7 +33,7 @@ class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip { friend class KviDynamicToolTip; protected: - KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip); + KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip); virtual ~KviDynamicToolTipHelper(); protected: KviDynamicToolTip * m_pParentToolTip; @@ -47,7 +47,7 @@ class KVIRC_API KviDynamicToolTip : public TQObject Q_OBJECT TQ_OBJECT public: - KviDynamicToolTip(TQWidget * tqparent,const char * name = 0); + KviDynamicToolTip(TQWidget * parent,const char * name = 0); virtual ~KviDynamicToolTip(); protected: KviDynamicToolTipHelper * m_pHelper; diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 2dfba50..2660a52 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -37,8 +37,8 @@ extern KviMediaManager * g_pMediaManager; KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter, - TQWidget *tqparent, const char *name, bool modal) -: KviTalFileDialog(dirName,filter,tqparent,name,modal) + TQWidget *parent, const char *name, bool modal) +: KviTalFileDialog(dirName,filter,parent,name,modal) { setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); @@ -70,17 +70,17 @@ void KviFileDialog::goHome() -bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer=TQFileDialog::getOpenFileName(initial,filter,tqparent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); return !buffer.isEmpty(); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"open_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,parent,"open_file_name_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::ExistingFile); //d->setShowHiddenFiles(showHidden); @@ -96,14 +96,14 @@ bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption, } -bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { while (1) { - buffer=TQFileDialog::getSaveFileName(initial,filter,tqparent,"save_file_name_dialog",caption); + buffer=TQFileDialog::getSaveFileName(initial,filter,parent,"save_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); //return !buffer.isEmpty(); if(buffer.isEmpty()) return false; @@ -112,7 +112,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption if(!KviFileUtils::fileExists(buffer)) return true; TQString tmp; KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); - switch(TQMessageBox::information(tqparent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) + switch(TQMessageBox::information(parent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) { case TQMessageBox::Cancel: return false; break; case TQMessageBox::Yes: return true; break; @@ -125,7 +125,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption #endif - KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"save_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::AnyFile); //d->setShowHiddenFiles(showHidden); @@ -167,24 +167,24 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption } -bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer = TQFileDialog::getExistingDirectory(initial,tqparent,"open_file_name_dialog",caption); + buffer = TQFileDialog::getExistingDirectory(initial,parent,"open_file_name_dialog",caption); return !buffer.isEmpty(); } #else #ifdef COMPILE_KDE_SUPPORT // the KDE based dir selection dialog is now quite nice - buffer = KFileDialog::getExistingDirectory(initial,tqparent,caption); + buffer = KFileDialog::getExistingDirectory(initial,parent,caption); return !buffer.isEmpty(); #endif #endif KviFileDialog * d = new KviFileDialog(initial, - filter,tqparent,"directory_name_dialog",true); + filter,parent,"directory_name_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::Directory); //d->setShowHiddenFiles(showHidden); @@ -201,17 +201,17 @@ bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & captio } -bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) +bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { - buffer=TQFileDialog::getOpenFileNames(filter,initial,tqparent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption); return (buffer.count()>0); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),tqparent,"open_file_names_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),parent,"open_file_names_dialog",true); d->setCaption(caption); d->setMode(TQFileDialog::ExistingFiles); //d->setShowHiddenFiles(showHidden); diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h index 0bb03f6..03fea70 100644 --- a/src/kvirc/ui/kvi_filedialog.h +++ b/src/kvirc/ui/kvi_filedialog.h @@ -41,14 +41,14 @@ class KVIRC_API KviFileDialog : public KviTalFileDialog TQ_OBJECT public: KviFileDialog(const TQString &dirName, const TQString &filter=TQString(), - TQWidget *tqparent=0, const char *name=0, bool modal=false); + TQWidget *parent=0, const char *name=0, bool modal=false); ~KviFileDialog(); public: - static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* tqparent=0); - static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* tqparent=0); + static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* parent=0); + static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* parent=0); - static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0); - static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0); + static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0); + static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0); }; diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index dfae586..db5efa8 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -1176,9 +1176,9 @@ bool KviFrame::focusNextPrevChild(bool next) //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->tqparent()) + if(w->parent()) { - TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner"); + TQVariant v = w->parent()->property("KviProperty_ChildFocusOwner"); if(v.isValid())return false; // Do NOT change the focus widget! } } diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 1a255fc..5258577 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -2274,7 +2274,7 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) Ctrl+Shift+CursorLeft: Moves the selection one word left<br> Ctrl+Shift+CursorRight: Moves the selection one word right<br> Tab: Nickname, function/command, or filename completion (see below)<br> - Shift+Tab: Hosttqmask or function/command completion (see below)<br> + Shift+Tab: Hostmask or function/command completion (see below)<br> Alt+<numeric_sequence>: Inserts the character by ASCII/Unicode code<br> <example> Alt+32: Inserts ASCII/Unicode character 32: ' ' (a space) diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 9d1b363..0e12d2d 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -33,8 +33,8 @@ // FIXME: #warning "THIS COULD GO INTO libkvioptions ?" -KviIpEditor::KviIpEditor(TQWidget * tqparent,AddressType addrType,const TQString &ipAddr,const char *name) -:TQFrame(tqparent,name) +KviIpEditor::KviIpEditor(TQWidget * parent,AddressType addrType,const TQString &ipAddr,const char *name) +:TQFrame(parent,name) { for(int i=0;i<7;i++) diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 3a39841..19e2a3c 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -38,7 +38,7 @@ class KVIRC_API KviIpEditor : public TQFrame TQ_OBJECT public: enum AddressType { IpV4 , IpV6 }; - KviIpEditor(TQWidget * tqparent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0); + KviIpEditor(TQWidget * parent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0); ~KviIpEditor(); private: TQLabel * m_pLabel[7]; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 25be1cc..a500c46 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -281,8 +281,8 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t * // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd) -: TQWidget(tqparent,"irc_view") +KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) +: TQWidget(parent,"irc_view") { // Ok...here we go // initialize the initializable @@ -2920,7 +2920,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p) //Calculate the position of the image //imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) ); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the tqmask if needed + //Set the mask if needed int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId(); if(iPixId > 0) pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId))); @@ -3263,7 +3263,7 @@ no_selection_paint: int wdth = block->block_width; if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the tqmask if needed + //Set the mask if needed if(curBack != KVI_TRANSPARENT && curBack < 16) { pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack)); @@ -4429,7 +4429,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect These links are used internally in KVIrc , but you can use them too.[br] The <escape_command> is a single letter this time: it defines the type of the link.[br] Currently KVIrc uses six types of builtin links : 'n' for nickname links, 'u' for url links, - 'c' for channel links, 'h' for hostname links, 'm' for tqmask links and 's' for server links.[br] + 'c' for channel links, 'h' for hostname links, 'm' for mask links and 's' for server links.[br] Theoretically you can also use your own link types: just use any other letter or digit (you can't use ']' and <cr>), but probably you will prefer a completely user defined link in that case anyway.[br] Once the user interacts with the link , kvirc executes the predefined events:[br] diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 26912ef..092d5ed 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -62,7 +62,7 @@ public: friend class KviIrcViewToolTip; friend class KviIrcViewToolWidget; public: - KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd); + KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd); ~KviIrcView(); public: int dummyRead() const { return 0; }; diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index d1605e9..c0dd4ba 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -32,8 +32,8 @@ #include "kvi_doublebuffer.h" -KviListView::KviListView( TQWidget * tqparent, const char * name) -:KviTalListView(tqparent) +KviListView::KviListView( TQWidget * parent, const char * name) +:KviTalListView(parent) { m_pBackgroundOverlayPixmap=0; m_iBackgroundOverlayAlignment=TQt::AlignAuto; diff --git a/src/kvirc/ui/kvi_listview.h b/src/kvirc/ui/kvi_listview.h index 6f86d80..c4f0888 100644 --- a/src/kvirc/ui/kvi_listview.h +++ b/src/kvirc/ui/kvi_listview.h @@ -37,7 +37,7 @@ class KVIRC_API KviListView : public KviTalListView Q_OBJECT TQ_OBJECT public: - KviListView( TQWidget * tqparent = 0, const char * name = 0); + KviListView( TQWidget * parent = 0, const char * name = 0); ~KviListView(); protected: TQPixmap * m_pBackgroundOverlayPixmap; diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index f0040a1..21921b5 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -36,13 +36,13 @@ #include <tqlabel.h> #include <tqvalidator.h> -KviMaskItem::KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry) -:KviTalListViewItem(tqparent), m_Mask(*entry) +KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry) +:KviTalListViewItem(parent), m_Mask(*entry) { TQDateTime date; - date.setTime_t(tqmask()->uSetAt); - setText(0,tqmask()->szMask); - setText(1,tqmask()->szSetBy); + date.setTime_t(mask()->uSetAt); + setText(0,mask()->szMask); + setText(1,mask()->szSetBy); setText(2,date.toString()); } @@ -57,9 +57,9 @@ int KviMaskItem::compare ( TQListViewItem * i, int col, bool ascending ) const { if(col==2) { - if( ((KviMaskItem*)i)->tqmask()->uSetAt > m_Mask.uSetAt ) return -1; - if( ((KviMaskItem*)i)->tqmask()->uSetAt == m_Mask.uSetAt ) return 0; - if( ((KviMaskItem*)i)->tqmask()->uSetAt < m_Mask.uSetAt ) return 1; + if( ((KviMaskItem*)i)->mask()->uSetAt > m_Mask.uSetAt ) return -1; + if( ((KviMaskItem*)i)->mask()->uSetAt == m_Mask.uSetAt ) return 0; + if( ((KviMaskItem*)i)->mask()->uSetAt < m_Mask.uSetAt ) return 1; } return KviTalListViewItem::compare(i,col,ascending); } @@ -76,7 +76,7 @@ KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEd TQGridLayout * g = new TQGridLayout(this,2,3,5,5); - TQLabel * tl = new TQLabel(__tr2qs("New tqmask must match an *!*@* expression"),this); + TQLabel * tl = new TQLabel(__tr2qs("New mask must match an *!*@* expression"),this); g->addMultiCellWidget(tl,0,0,0,3); m_pEdit=new TQLineEdit(szMask,this); @@ -128,7 +128,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP { bool isEnabled=1; - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -137,7 +137,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->tqparent(); + w = w->parent(); } #ifdef COMPILE_USE_QT4 @@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const TQString & text) { pMaskItem->setVisible(true); } else { - if(pMaskItem->tqmask()->szMask.contains(text)) + if(pMaskItem->mask()->szMask.contains(text)) pMaskItem->setVisible(true); else pMaskItem->setVisible(false); @@ -273,9 +273,9 @@ void KviMaskEditor::removeClicked() if(it->isSelected()) { KviMaskEntry * e = new KviMaskEntry; - e->szMask = it->tqmask()->szMask; - e->szSetBy = it->tqmask()->szSetBy; - e->uSetAt = it->tqmask()->uSetAt; + e->szMask = it->mask()->szMask; + e->szSetBy = it->mask()->szSetBy; + e->uSetAt = it->mask()->uSetAt; l->append(e); } it = (KviMaskItem *)(it->nextSibling()); @@ -286,7 +286,7 @@ void KviMaskEditor::removeClicked() void KviMaskEditor::addClicked() { - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -299,7 +299,7 @@ void KviMaskEditor::addClicked() } break; } - w = w->tqparent(); + w = w->parent(); } } @@ -316,7 +316,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e) KviMaskItem * it =(KviMaskItem *)(m_pMaskBox->firstChild()); while(it) { - if(KviTQString::equalCI(it->tqmask()->szMask,e->szMask)) + if(KviTQString::equalCI(it->mask()->szMask,e->szMask)) { delete it; return; @@ -329,7 +329,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) { if(pItem) { - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -342,7 +342,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) } break; } - w = w->tqparent(); + w = w->parent(); } } } diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h index 47a53e8..71baadf 100644 --- a/src/kvirc/ui/kvi_maskeditor.h +++ b/src/kvirc/ui/kvi_maskeditor.h @@ -47,10 +47,10 @@ typedef struct _KviMaskEntry class KviMaskItem: public KviTalListViewItem { public: - KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry); + KviMaskItem(KviTalListView* parent,KviMaskEntry* entry); ~KviMaskItem(); - KviMaskEntry* tqmask() { return &m_Mask; }; + KviMaskEntry* mask() { return &m_Mask; }; #ifdef COMPILE_USE_QT4 virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const; #else diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index 80d0cac..f1d47c9 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -55,8 +55,8 @@ #include <tqdrawutil.h> #include <tqevent.h> -KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name) -: TQToolButton(tqparent,name) +KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name) +: TQToolButton(parent,name) { setPixmap(pix); //setAutoRaise(true); @@ -104,17 +104,17 @@ void KviMdiCaptionButton::drawButton(TQPainter *p) -KviMdiCaption::KviMdiCaption(KviMdiChild * tqparent,const char * name) -: TQWidget(tqparent,name) +KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name) +: TQWidget(parent,name) { m_pMaximizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button"); - connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(maximize())); + connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(maximize())); m_pMinimizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button"); - connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(minimize())); + connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(minimize())); m_pCloseButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button"); - connect(m_pCloseButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(closeRequest())); + connect(m_pCloseButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(closeRequest())); m_pSystemButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button"); - connect(m_pSystemButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(systemPopupSlot())); + connect(m_pSystemButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(systemPopupSlot())); m_lastMousePos = TQPoint(-1,-1); m_bMouseGrabbed = true; @@ -165,7 +165,7 @@ void KviMdiCaption::fontChange(const TQFont &old) { calcLineSpacing(); TQWidget::fontChange(old); - ((KviMdiChild *)tqparent())->resizeEvent(0); + ((KviMdiChild *)parent())->resizeEvent(0); } void KviMdiCaption::mousePressEvent(TQMouseEvent *e) @@ -177,7 +177,7 @@ void KviMdiCaption::mousePressEvent(TQMouseEvent *e) #else setCursor(TQCursor::sizeAllCursor); #endif - ((KviMdiChild *)tqparent())->activate(true); + ((KviMdiChild *)parent())->activate(true); } void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) @@ -187,7 +187,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) TQPoint p = TQCursor::pos(); int dx = m_lastMousePos.x() - p.x(); int dy = m_lastMousePos.y() - p.y(); - KviMdiChild * c = (KviMdiChild *)tqparent(); + KviMdiChild * c = (KviMdiChild *)parent(); int nx = c->manager()->childX(c) - dx; int ny = c->manager()->childY(c) - dy; @@ -220,7 +220,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) void KviMdiCaption::mouseDoubleClickEvent(TQMouseEvent *e) { - ((KviMdiChild *)tqparent())->maximize(); + ((KviMdiChild *)parent())->maximize(); } void KviMdiCaption::paintEvent(TQPaintEvent * e) @@ -228,7 +228,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e) TQRect r = e->rect(); TQPainter p(this); p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); - TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)tqparent())->xmlActiveCaption() : ((KviMdiChild *)tqparent())->xmlInactiveCaption(),font()); + TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup()); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index d070e19..c46572a 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -39,7 +39,7 @@ class KVIRC_API KviMdiCaptionButton : public TQToolButton Q_OBJECT TQ_OBJECT public: - KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name); + KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name); ~KviMdiCaptionButton(); protected: virtual void drawButton(TQPainter * p); @@ -67,7 +67,7 @@ class KVIRC_API KviMdiCaption : public TQWidget Q_OBJECT TQ_OBJECT public: - KviMdiCaption(KviMdiChild * tqparent,const char * name); + KviMdiCaption(KviMdiChild * parent,const char * name); ~KviMdiCaption(); protected: TQPoint m_lastMousePos; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index b559be8..2bf0130 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -490,8 +490,8 @@ void KviMdiChild::setClient(TQWidget *w) int clientYPos=m_pCaption->heightHint()+KVI_MDICHILD_SPACING+KVI_MDICHILD_BORDER; resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos); - //Retqparent if needed - if(TQT_BASE_OBJECT(w->tqparent())!=TQT_BASE_OBJECT(this)){ + //Reparent if needed + if(TQT_BASE_OBJECT(w->parent())!=TQT_BASE_OBJECT(this)){ //reparent to this widget , no flags , point , show it TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); w->reparent(this,pnt2,true); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 7d4a9b6..9163595 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -57,8 +57,8 @@ -KviMdiManager::KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name) -: KviTalScrollView(tqparent) +KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name) +: KviTalScrollView(parent) { setFrameShape(NoFrame); m_pZ = new KviPointerList<KviMdiChild>; diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h index 9577ef6..e4093d6 100644 --- a/src/kvirc/ui/kvi_mdimanager.h +++ b/src/kvirc/ui/kvi_mdimanager.h @@ -61,7 +61,7 @@ class KVIRC_API KviMdiManager : public KviTalScrollView Q_OBJECT TQ_OBJECT public: - KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name); + KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name); ~KviMdiManager(); public: KviMdiChild * topChild(){ return m_pZ->last(); }; diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 9407131..18ce661 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -54,7 +54,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons m_szLimit = limit; bool isEnabled=1; - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviChannel")) @@ -63,7 +63,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->tqparent(); + w = w->parent(); } TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2); diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 28d986f..8b959a7 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -41,8 +41,8 @@ TQString KviOptionsWidget::m_szBasicTipStart; // empty decl TQString KviOptionsWidget::m_szBasicTipEnd; -KviOptionsWidget::KviOptionsWidget(TQWidget * tqparent,const char * name,bool bSunken) -: TQFrame(tqparent,name), KviSelectorInterface() +KviOptionsWidget::KviOptionsWidget(TQWidget * parent,const char * name,bool bSunken) +: TQFrame(parent,name), KviSelectorInterface() { if(m_szBasicTipStart.isEmpty()) { diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 463cc82..5e397f1 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -41,7 +41,7 @@ class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface Q_OBJECT TQ_OBJECT public: - KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true); + KviOptionsWidget(TQWidget * parent,const char * name = 0,bool bSunken = true); ~KviOptionsWidget(); private: TQGridLayout * m_pLayout; diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 17a9ddf..c3e5473 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -735,9 +735,9 @@ KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,TQString szChan,T :KviTalListViewItem(pList,szChan) { m_szPass=szPass; - TQString tqmask; - tqmask.fill('*',szPass.length()); - setText(1,tqmask); + TQString mask; + mask.fill('*',szPass.length()); + setText(1,mask); } KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled) diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index e81376e..629fae9 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -142,15 +142,15 @@ void KviStyledControl::leaveEvent ( TQEvent * ) } -KviStyledCheckBox::KviStyledCheckBox ( TQWidget * tqparent, const char * name ) -: TQCheckBox(tqparent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( TQWidget * parent, const char * name ) +: TQCheckBox(parent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } -KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name ) -: TQCheckBox(text,tqparent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name ) +: TQCheckBox(text,parent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } @@ -234,15 +234,15 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event) TQCheckBox::paintEvent(event); } -KviStyledToolButton::KviStyledToolButton( TQWidget * tqparent, const char * name ) -: TQToolButton(tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton( TQWidget * parent, const char * name ) +: TQToolButton(parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); } -KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name ) -: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name ) +: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h index f7e6641..0a7ed59 100644 --- a/src/kvirc/ui/kvi_styled_controls.h +++ b/src/kvirc/ui/kvi_styled_controls.h @@ -87,8 +87,8 @@ class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl Q_OBJECT TQ_OBJECT public: - KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 ); - KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 ); + KviStyledCheckBox ( TQWidget * parent, const char * name = 0 ); + KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name = 0 ); ~KviStyledCheckBox(); protected: virtual void paintEvent ( TQPaintEvent * ); @@ -101,8 +101,8 @@ class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledContr private: bool bShowSubmenuIndicator; public: - KviStyledToolButton ( TQWidget * tqparent, const char * name = 0 ); - KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name = 0 ); + KviStyledToolButton ( TQWidget * parent, const char * name = 0 ); + KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name = 0 ); ~KviStyledToolButton(); void setShowSubmenuIndicator(bool bShow); diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 37bb7a8..ad47661 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -1373,9 +1373,9 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it) { cur->setActive(false); } - if(((KviTreeTaskBarItem *)it)->tqparent()) + if(((KviTreeTaskBarItem *)it)->parent()) { - if(!((KviTreeTaskBarItem *)it)->tqparent()->isOpen())((KviTreeTaskBarItem *)it)->tqparent()->setOpen(true); + if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true); } ((KviTreeTaskBarItem *)it)->setActive(true); m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive() @@ -1410,10 +1410,10 @@ KviTaskBarItem * KviTreeTaskBar::nextItem() { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling(); } else { - if(m_pCurrentItem->tqparent()) + if(m_pCurrentItem->parent()) { - // child with not siblings : try the sibling of the tqparent - m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->nextSibling(); + // child with not siblings : try the sibling of the parent + m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->nextSibling(); } else { m_pCurrentItem = 0; // toplevel with no siblings } @@ -1428,10 +1428,10 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() if(!m_pCurrentItem)return 0; - if(m_pCurrentItem->tqparent()) + if(m_pCurrentItem->parent()) { // a child item - it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->firstChild(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->firstChild(); while(it) { @@ -1440,7 +1440,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() } if(!it) { - it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->parent(); } } else { diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index 4d4243c..1f57db0 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -59,7 +59,7 @@ void KviThemedLabel::setText(const char * text) { int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); + //g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize)); } update(); } @@ -71,7 +71,7 @@ void KviThemedLabel::setText(const TQString& text) { int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); + //g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize)); } update(); } diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index bd424fe..65c6dec 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -13,10 +13,10 @@ #include "kvi_iconmanager.h" -KviWindowToolWidget::KviWindowToolWidget(TQWidget * tqparent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) -:TQWidget(tqparent/*,name,f*/) +KviWindowToolWidget::KviWindowToolWidget(TQWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) +:TQWidget(parent/*,name,f*/) { -// m_pContainer=tqparent; +// m_pContainer=parent; m_pButton=button; m_bAutoDelete=1; m_bHidden=0; @@ -77,8 +77,8 @@ void KviWindowToolWidget::unregisterSelf() m_bHidden=0; }*/ -KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn, const char * name ) -:TOOL_PAGE_PARENT(tqparent) +KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn, const char * name ) +:TOOL_PAGE_PARENT(parent) { #ifdef COMPILE_USE_QT4 setFlat(true); diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h index 7b43af3..456418e 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.h +++ b/src/kvirc/ui/kvi_toolwindows_container.h @@ -26,7 +26,7 @@ class KVIRC_API KviWindowToolWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KviWindowToolWidget( TQWidget * tqparent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); + KviWindowToolWidget( TQWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); ~KviWindowToolWidget(); void setAutoDelete(bool b) { m_bAutoDelete=b; }; @@ -58,7 +58,7 @@ class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT Q_OBJECT TQ_OBJECT public: - KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn=0,const char * name = 0 ); + KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn=0,const char * name = 0 ); ~KviWindowToolPageButton(); /*protected: virtual void drawButton ( TQPainter * painter);*/ diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index d4a3ecd..fe9011e 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -553,7 +553,7 @@ TQSize KviTopicWidget::tqsizeHint() const void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) { int maxlen=-1; - TQObject * w = tqparent(); + TQObject * w = parent(); TQString szModes; bool bCanEdit = TRUE; while(w) @@ -568,7 +568,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) } break; } - w = w->tqparent(); + w = w->parent(); } if(m_pInput == 0) { @@ -728,9 +728,9 @@ void KviTopicWidget::deactivate() m_pDiscard = 0; } - // try to find a KviWindow tqparent and give it the focus + // try to find a KviWindow parent and give it the focus - TQObject * w = tqparent(); + TQObject * w = parent(); while(w) { if(w->inherits("KviWindow")) @@ -738,11 +738,11 @@ void KviTopicWidget::deactivate() ((KviWindow *)w)->setFocus(); return; } - w = w->tqparent(); + w = w->parent(); } // no KviWindow on the path - w = tqparent(); + w = parent(); if(w) { if(w->inherits(TQWIDGET_OBJECT_NAME_STRING)) diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 1b55386..d504915 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -91,10 +91,10 @@ void KviUserListToolTip::maybeTip(const TQPoint &pnt) -KviUserListEntry::KviUserListEntry(KviUserListView * tqparent,const TQString &nick, +KviUserListEntry::KviUserListEntry(KviUserListView * parent,const TQString &nick, KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown) { - m_pListView = tqparent; + m_pListView = parent; m_szNick = nick; m_pGlobalData = e; m_iFlags = iFlags; @@ -184,8 +184,8 @@ void KviUserListEntry::recalcSize() -KviUserListView::KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name) -: KviWindowToolWidget(tqparent,button) +KviUserListView::KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name) +: KviWindowToolWidget(parent,button) { setAutoDelete(0); m_pKviWindow = pWnd; @@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) // FIXME: // // this is slow... VERY slow when one has a lot of registered users. - // (this is NOT a simple lookup in the user db... it is a tqmask match) + // (this is NOT a simple lookup in the user db... it is a mask match) // if we REALLY need to use custom colors for regged users then // they should be updated ONCE and stored (cached) in the KviUserListEntry structure // diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index a666d33..b275126 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -74,7 +74,7 @@ class KVIRC_API KviUserListEntry friend class KviUserListView; friend class KviUserListViewArea; public: - KviUserListEntry(KviUserListView * tqparent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); + KviUserListEntry(KviUserListView * parent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); ~KviUserListEntry(); protected: KviUserListView * m_pListView; @@ -128,7 +128,7 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget Q_OBJECT TQ_OBJECT public: - KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0); + KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0); ~KviUserListView(); protected: KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index d7f141a..352c0cf 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -296,12 +296,12 @@ bool KviWindow::focusNextPrevChild(bool next) //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->tqparent()) + if(w->parent()) { #ifdef COMPILE_USE_QT4 - if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->tqparent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) + if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } @@ -936,9 +936,9 @@ void KviWindow::closeEvent(TQCloseEvent *e) void KviWindow::updateIcon() { - if(tqparent()) + if(parent()) { - ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); + ((KviMdiChild *)parent())->setIcon(*myIconPtr()); } else { setIcon(*myIconPtr()); } @@ -951,9 +951,9 @@ void KviWindow::youAreDocked() delete m_pAccel; m_pAccel = 0; } - ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); + ((KviMdiChild *)parent())->setIcon(*myIconPtr()); updateCaption(); - connect(((KviMdiChild *)tqparent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); + connect(((KviMdiChild *)parent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); } void KviWindow::youAreUndocked() diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index 7cc410b..a044bae 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -206,7 +206,7 @@ public: // The KviIrcView of this window: may be NULL if the window has no KviIrcView (and thus supports no direct output) KviIrcView * view() const { return m_pIrcView; }; // The mdiParent widget: may be nulll if the window is undocked - KviMdiChild * mdiParent(){ return (KviMdiChild *)tqparent(); }; + KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); }; // The console that this window belongs to: may be null for windows that aren't bound to irc contexts KviConsole * console(){ return m_pConsole; }; // same as above |