TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

TQt4 port kvirc

Browse Source 
This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 12 years ago
parent 3329e5a804
commit 0a80cfd57d
953 changed files with 27802 additions and 27573 deletions
Show Stats Download Patch File Download Diff File

131
admin/acinclude.m4.in
Unescape View File

@ -1589,30 +1589,46 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
AC_SS_FIND_FILE_PATH($SS_QT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR)
if test "$SS_QT3_INCDIR" = "FAILED"; then
AC_MSG_RESULT([FAILED])
AC_SS_SET_REDINK
echo "################################################################################"
echo "### CONFIGURE ERROR:"
echo "### Can not find the qt 3.x header files."
echo "### Make sure that qt is correctly installed on your system,"
echo "### and the qt version is the one requested by this version of kvirc."
echo "### Try to run configure again, this time passing the --with-qt-include-dir"
echo "### option (see ./configure --help)."
echo "### You may also take a look at the config.log file in this directory,"
echo "### that will tell you which check has failed and maybe more about the reason"
echo "### of the failure."
echo "### If you're feeling that this may be a bug in this configure script"
echo "### and want to report this to me , please include your configure script,"
echo "### the config.log file as well as the complete configure output."
echo "################################################################################"
AC_SS_SET_NORMALINK
AC_MSG_ERROR([This was a fatal one...aborting])
dnl HACK HACK HACK
ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT4_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt"
AC_SS_FIND_FILE_PATH($SS_QT4_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT4_INCDIR)
SS_QT3_INCDIR="$SS_QT4_INCDIR -include tqt.h"
AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_INCDIR])
dnl AC_MSG_RESULT([FAILED])
dnl AC_SS_SET_REDINK
dnl echo "################################################################################"
dnl echo "### CONFIGURE ERROR:"
dnl echo "### Can not find the qt 3.x header files."
dnl echo "### Make sure that qt is correctly installed on your system,"
dnl echo "### and the qt version is the one requested by this version of kvirc."
dnl echo "### Try to run configure again, this time passing the --with-qt-include-dir"
dnl echo "### option (see ./configure --help)."
dnl echo "### You may also take a look at the config.log file in this directory,"
dnl echo "### that will tell you which check has failed and maybe more about the reason"
dnl echo "### of the failure."
dnl echo "### If you're feeling that this may be a bug in this configure script"
dnl echo "### and want to report this to me , please include your configure script,"
dnl echo "### the config.log file as well as the complete configure output."
dnl echo "################################################################################"
dnl AC_SS_SET_NORMALINK
dnl AC_MSG_ERROR([This was a fatal one...aborting])
else
AC_MSG_RESULT([found in $SS_QT3_INCDIR])
fi
else
AC_MSG_RESULT([using user supplied path for the Qt 3.x include files $SS_QT3_INCDIR])
SS_QT3_INCDIR="$SS_QT3_INCDIR -include tqt.h"
fi
])
@ -1696,27 +1712,53 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT3_LIBDIR)
if test "$SS_QT3_LIBDIR" = "FAILED"; then
AC_MSG_RESULT([FAILED])
AC_SS_SET_REDINK
echo "################################################################################"
echo "### CONFIGURE ERROR:"
echo "### Can not find the qt 3.x library file."
echo "### Make sure that qt is correctly installed on your system,"
echo "### and the qt version is the one requested by this version of kvirc."
echo "### (Usually a greater version is OK too)"
echo "### Try to run configure again, this time passing the --with-qt-library-dir"
echo "### option (see ./configure --help)."
echo "### You may also take a look at the config.log file in this directory,"
echo "### that will tell you which check has failed and maybe more about the reason"
echo "### of the failure."
echo "### If you're feeling that this may be a bug in this configure script"
echo "### and want to report this to me , please include your configure script,"
echo "### the config.log file as well as the complete configure output."
echo "################################################################################"
AC_SS_SET_NORMALINK
AC_MSG_ERROR([This was a fatal one...aborting])
dnl HACK HACK HACK
AC_MSG_CHECKING([for the Qt 4.x libraries])
ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib"
ss_qt_libs_to_find="libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.$SS_QT4_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find libQtCore.so.a"
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT4_LIBDIR)
SS_QT3_LIBDIR="$SS_QT4_LIBDIR"
SS_QTLIB_NAME="tqt"
AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_LIBDIR])
dnl AC_MSG_RESULT([FAILED])
dnl AC_SS_SET_REDINK
dnl echo "################################################################################"
dnl echo "### CONFIGURE ERROR:"
dnl echo "### Can not find the qt 3.x library file."
dnl echo "### Make sure that qt is correctly installed on your system,"
dnl echo "### and the qt version is the one requested by this version of kvirc."
dnl echo "### (Usually a greater version is OK too)"
dnl echo "### Try to run configure again, this time passing the --with-qt-library-dir"
dnl echo "### option (see ./configure --help)."
dnl echo "### You may also take a look at the config.log file in this directory,"
dnl echo "### that will tell you which check has failed and maybe more about the reason"
dnl echo "### of the failure."
dnl echo "### If you're feeling that this may be a bug in this configure script"
dnl echo "### and want to report this to me , please include your configure script,"
dnl echo "### the config.log file as well as the complete configure output."
dnl echo "################################################################################"
dnl AC_SS_SET_NORMALINK
dnl AC_MSG_ERROR([This was a fatal one...aborting])
else
AC_MSG_RESULT([found in $SS_QT3_LIBDIR])
AC_MSG_RESULT([TQt3 found in $SS_QT3_LIBDIR])
fi
else
AC_MSG_RESULT([using user supplied path for the Qt library $SS_QT3_LIBDIR])
@ -1781,7 +1823,7 @@ AC_DEFUN([AC_SS_FIND_QT3_MOC],
AC_ARG_WITH(qt-moc,[ --with-qt-moc filename of the Qt 3.x meta object compiler ],SS_QT3_MOC="$withval",SS_QT3_MOC="NOTGIVEN")
if test "$SS_QT3_MOC" = "NOTGIVEN"; then
AC_MSG_CHECKING([for the Qt 3.x moc])
AC_MSG_CHECKING([for the Qt 3.x tmoc])
unset SS_QT3_MOC
ss_moc_test_dirs="$QTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
@ -1789,7 +1831,7 @@ AC_DEFUN([AC_SS_FIND_QT3_MOC],
ss_moc_test_dirs="$SS_QT3_GENERAL_DIR/bin $ss_moc_test_dirs"
fi
AC_SS_FIND_FILE_PATH(moc,$ss_moc_test_dirs,SS_QT3_MOC)
AC_SS_FIND_FILE_PATH(tmoc,$ss_moc_test_dirs,SS_QT3_MOC)
if test "$SS_QT3_MOC" = "FAILED"; then
AC_MSG_RESULT([FAILED])
@ -1811,7 +1853,7 @@ AC_DEFUN([AC_SS_FIND_QT3_MOC],
AC_SS_SET_NORMALINK
AC_MSG_ERROR([This was a fatal one...aborting])
else
SS_QT3_MOC="$SS_QT3_MOC/moc"
SS_QT3_MOC="$SS_QT3_MOC/tmoc"
AC_MSG_RESULT([found as $SS_QT3_MOC])
fi
else
@ -1910,7 +1952,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
CPPFLAGS=""
fi
CPPFLAGS="$CPPFLAGS -I$SS_QT3_INCDIR"
CXXFLAGS="-O2 -Wall $CXXFLAGS"
CXXFLAGS="-O2 -Wall -include tqt.h $CXXFLAGS"
if test -n "$SS_X_LIBDIR"; then
LIBS="-L$SS_X_LIBDIR"
else
@ -1925,10 +1967,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
fi
LDFLAGS="-s $LDFLAGS"
AC_TRY_LINK([
#include <qglobal.h>
#if (QT_VERSION < 221)
#error "Bad qt version: too old"
#endif
#include <tqglobal.h>
],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE")
if test "$SS_QTX_LINKED_OK" = "FALSE"; then
AC_MSG_RESULT([FAILED]);

30
data/defscript/aliases.kvs
Unescape View File

@ -234,9 +234,9 @@ alias(kb)
{
if(%nick)
{
%mask = $mask(%nick,$option(uintDefaultBanType));
%tqmask = $tqmask(%nick,$option(uintDefaultBanType));
if(!%mask)%mask = %nick; # plain ban
if(!%tqmask)%tqmask = %nick; # plain ban
%reason = $1-
#if(!%reason)%reason = "You're not welcome here!"
@ -250,8 +250,8 @@ alias(kb)
# kick %nick %reason
if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %mask"
else %raw2 = "mode $target +b %mask"
if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %tqmask"
else %raw2 = "mode $target +b %tqmask"
raw -q %raw2$cr$lf%raw
}
@ -484,28 +484,28 @@ alias(awayall)
alias(notify)
{
# This one adds a registered users database entry
# For the specified nick and uses the specified mask
# If no mask is specified , a default one is constructed
# For the specified nick and uses the specified tqmask
# If no tqmask is specified , a default one is constructed
# Then the "notify" property is set for the user
if(!$0)
{
echo $tr("Usage:")
echo " /notify <nick> [mask]"
echo " /notify <nick> [tqmask]"
halt
}
# Get the mask
# Get the tqmask
%mask = $1
%tqmask = $1
# no mask specified ? build it
# no tqmask specified ? build it
if(!%mask)%mask = $0!*@*
if(!%tqmask)%tqmask = $0!*@*
# Now add the user (but do not replace old entries)
reguser.add -f -q $0 %mask
reguser.add -f -q $0 %tqmask
# Merge the notify property part with the old one (if any)
@ -526,8 +526,8 @@ alias(notify)
alias(ignore)
{
# This one adds a registered users database entry
# For the specified nick and uses the specified mask
# If no mask is specified , a default one is constructed
# For the specified nick and uses the specified tqmask
# If no tqmask is specified , a default one is constructed
# Then the "ignore" property is set for the user to 1
if(!$0)
@ -539,7 +539,7 @@ alias(ignore)
# Now add the user (but do not replace old entries)
reguser.add $0 $mask($0,15);
reguser.add $0 $tqmask($0,15);
# And finally set the property (use -n so the notify lists will be restarted)
# Check if ignore or unignore the user

6
data/defscript/installer.kvs
Unescape View File

@ -71,7 +71,7 @@ class(installer,object)
@$mkdir($2)
foreach(%file,%files)
{
$this->%lFiles <+ $str.replace($file.fixpath("$2/%file"),"\\\\","\\")
$this->%lFiles <+ $str.tqreplace($file.fixpath("$2/%file"),"\\\\","\\")
file.copy -o $file.fixpath($0/%file) $file.fixpath($2/%file)
}
}
@ -117,7 +117,7 @@ class(installer,object)
{
foreach(%file,%files)
{
$this->%lSources <+ $str.replace($file.fixpath("$0/%file"),"\\\\","\\")
$this->%lSources <+ $str.tqreplace($file.fixpath("$0/%file"),"\\\\","\\")
include $file.fixpath("$0/%file")
}
}
@ -150,7 +150,7 @@ class(installer,object)
else if($str.match("toolbar.create * *",%line,e))
%c .= " toolbar.destroy -q "$str.word(1,%line)"$lf"
else if($str.match("action.create* (*)",%line,e))
%c .= " action.destroy -q "$str.replace($str.token(1,"(,)",%line),,\")"$lf"
%c .= " action.destroy -q "$str.tqreplace($str.token(1,"(,)",%line),,\")"$lf"
else if($str.match("class(*)*",%line,e))
%c .= " objects.killclass -q "$str.token(1,"(,)",%line)"$lf"
}

178
data/defscript/popups.kvs
Unescape View File

@ -9,7 +9,7 @@ defpopup(highlight)
prologue
{
if($0!=""){
%:regName = $reguser.match($mask($0))
%:regName = $reguser.match($tqmask($0))
%:beingHl = $reguser.property(%:regName,highlight)
%:beingHlTmp = $tmphighlight.ishighlighted($0)
}
@ -27,34 +27,34 @@ defpopup(highlight)
popup($tr("Always Highlight")) (!%:beingHl && !%:regName)
{
item($tr("Highlight as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
item($tr("Highlight as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
{
reguser.add $0 $mask($0,11); reguser.setproperty $0 highlight 1;
reguser.add $0 $tqmask($0,11); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
item($tr("Highlight as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
{
reguser.add $0 $mask($0,12); reguser.setproperty $0 highlight 1;
reguser.add $0 $tqmask($0,12); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
item($tr("Highlight as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
{
reguser.add $0 $mask($0,13); reguser.setproperty $0 highlight 1;
reguser.add $0 $tqmask($0,13); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
item($tr("Highlight as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
{
reguser.add $0 $mask($0,3); reguser.setproperty $0 highlight 1;
reguser.add $0 $tqmask($0,3); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
item($tr("Highlight as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
{
reguser.add $0 $mask($0,4); reguser.setproperty $0 highlight 1;
reguser.add $0 $tqmask($0,4); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
item($tr("Highlight as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
{
reguser.add $0 $mask($0,5); reguser.setproperty $0 highlight 1;
reguser.add $0 $tqmask($0,5); reguser.setproperty $0 highlight 1;
}
}
@ -74,7 +74,7 @@ defpopup(ignore)
prologue
{
%:inIgnoreList = 0
%:regName = $reguser.match($mask($0))
%:regName = $reguser.match($tqmask($0))
%:ignLabelText = "<p><b>$0</b> "
if(%:regName)
{
@ -97,191 +97,191 @@ defpopup(ignore)
popup($tr("Ignore as..."),44) (!%:inIgnoreList)
{
item($tr("Ignore as") $0 "("$mask($0,0)")") ("$reguser.exactMatch($mask($0,0))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,0)")") ("$reguser.exactMatch($tqmask($0,0))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,0);
if(!%:regName) reguser.add $0 $tqmask($0,0);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,1)")") ("$reguser.exactMatch($mask($0,1))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,1)")") ("$reguser.exactMatch($tqmask($0,1))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,1);
if(!%:regName) reguser.add $0 $tqmask($0,1);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,2)")") ("$reguser.exactMatch($mask($0,2))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,2)")") ("$reguser.exactMatch($tqmask($0,2))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,2);
if(!%:regName) reguser.add $0 $tqmask($0,2);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,3);
if(!%:regName) reguser.add $0 $tqmask($0,3);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,4);
if(!%:regName) reguser.add $0 $tqmask($0,4);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,5);
if(!%:regName) reguser.add $0 $tqmask($0,5);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,6)")") ("$reguser.exactMatch($mask($0,6))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,6)")") ("$reguser.exactMatch($tqmask($0,6))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,6);
if(!%:regName) reguser.add $0 $tqmask($0,6);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,7)")") ("$reguser.exactMatch($mask($0,7))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,7)")") ("$reguser.exactMatch($tqmask($0,7))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,7);
if(!%:regName) reguser.add $0 $tqmask($0,7);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,8)")") ("$reguser.exactMatch($mask($0,8))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,8)")") ("$reguser.exactMatch($tqmask($0,8))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,8);
if(!%:regName) reguser.add $0 $tqmask($0,8);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,9)")") ("$reguser.exactMatch($mask($0,9))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,9)")") ("$reguser.exactMatch($tqmask($0,9))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,9);
if(!%:regName) reguser.add $0 $tqmask($0,9);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,10)")") ("$reguser.exactMatch($mask($0,10))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,10)")") ("$reguser.exactMatch($tqmask($0,10))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,10);
if(!%:regName) reguser.add $0 $tqmask($0,10);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,11);
if(!%:regName) reguser.add $0 $tqmask($0,11);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,12);
if(!%:regName) reguser.add $0 $tqmask($0,12);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,13);
if(!%:regName) reguser.add $0 $tqmask($0,13);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,14)")") ("$reguser.exactMatch($mask($0,14))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,14)")") ("$reguser.exactMatch($tqmask($0,14))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,14);
if(!%:regName) reguser.add $0 $tqmask($0,14);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,15)")") ("$reguser.exactMatch($mask($0,15))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,15)")") ("$reguser.exactMatch($tqmask($0,15))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,15);
if(!%:regName) reguser.add $0 $tqmask($0,15);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,16)")") ("$reguser.exactMatch($mask($0,16))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,16)")") ("$reguser.exactMatch($tqmask($0,16))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,16);
if(!%:regName) reguser.add $0 $tqmask($0,16);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,17)")") ("$reguser.exactMatch($mask($0,17))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,17)")") ("$reguser.exactMatch($tqmask($0,17))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,17);
if(!%:regName) reguser.add $0 $tqmask($0,17);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,18)")") ("$reguser.exactMatch($mask($0,18))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,18)")") ("$reguser.exactMatch($tqmask($0,18))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,18);
if(!%:regName) reguser.add $0 $tqmask($0,18);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,19)")") ("$reguser.exactMatch($mask($0,19))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,19)")") ("$reguser.exactMatch($tqmask($0,19))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,19);
if(!%:regName) reguser.add $0 $tqmask($0,19);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,20)")") ("$reguser.exactMatch($mask($0,20))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,20)")") ("$reguser.exactMatch($tqmask($0,20))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,20);
if(!%:regName) reguser.add $0 $tqmask($0,20);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,21)")") ("$reguser.exactMatch($mask($0,21))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,21)")") ("$reguser.exactMatch($tqmask($0,21))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,21);
if(!%:regName) reguser.add $0 $tqmask($0,21);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,22)")") ("$reguser.exactMatch($mask($0,22))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,22)")") ("$reguser.exactMatch($tqmask($0,22))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,22);
if(!%:regName) reguser.add $0 $tqmask($0,22);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,23)")") ("$reguser.exactMatch($mask($0,23))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,23)")") ("$reguser.exactMatch($tqmask($0,23))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,23);
if(!%:regName) reguser.add $0 $tqmask($0,23);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,24)")") ("$reguser.exactMatch($mask($0,24))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,24)")") ("$reguser.exactMatch($tqmask($0,24))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,24);
if(!%:regName) reguser.add $0 $tqmask($0,24);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,25)")") ("$reguser.exactMatch($mask($0,25))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,25)")") ("$reguser.exactMatch($tqmask($0,25))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,25);
if(!%:regName) reguser.add $0 $tqmask($0,25);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$mask($0,26)")") ("$reguser.exactMatch($mask($0,26))" == "")
item($tr("Ignore as") $0 "("$tqmask($0,26)")") ("$reguser.exactMatch($tqmask($0,26))" == "")
{
if(!%:regName) reguser.add $0 $mask($0,26);
if(!%:regName) reguser.add $0 $tqmask($0,26);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
@ -301,12 +301,12 @@ defpopup(registration)
# This is really smart...we are loading
# the reguser module only if this popup is being requested (the user effectively
# puts the mouse on the "Registration" item and the sub-popup is being shown)
%:regName = $reguser.match($mask($0))
%:regName = $reguser.match($tqmask($0))
%:labelText = "<p><b>$0</b>";
if(%:regName)
{
%:labelText << $tr("is registered as") ": <b>"%:regName"</b>"
# We want to display masks here!!!
# We want to display tqmasks here!!!
%:inNotifyList = $reguser.property(%:regName,notify);
if(%:inNotifyList)%:labelText << "<br><b>$0</b>" $tr("is in the notify list")
%:curAvatar = $avatar.name($0);
@ -322,39 +322,39 @@ defpopup(registration)
item($tr("Register")"...") (!%:regName)
{
reguser.wizard $mask($0)
reguser.wizard $tqmask($0)
}
popup($tr("Quick Registration")) (!%:regName)
{
item($tr("Register as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
item($tr("Register as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
{
reguser.add $0 $mask($0,11)
reguser.add $0 $tqmask($0,11)
}
item($tr("Register as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
item($tr("Register as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
{
reguser.add $0 $mask($0,12)
reguser.add $0 $tqmask($0,12)
}
item($tr("Register as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
item($tr("Register as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
{
reguser.add $0 $mask($0,13)
reguser.add $0 $tqmask($0,13)
}
item($tr("Register as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
item($tr("Register as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
{
reguser.add $0 $mask($0,3)
reguser.add $0 $tqmask($0,3)
}
item($tr("Register as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
item($tr("Register as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
{
reguser.add $0 $mask($0,4)
reguser.add $0 $tqmask($0,4)
}
item($tr("Register as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
item($tr("Register as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
{
reguser.add $0 $mask($0,5)
reguser.add $0 $tqmask($0,5)
}
}
@ -439,7 +439,7 @@ defpopup(channel)
%:itemBanMask = "*!user@*.host.tld"
%:itemBanNick = "nick"
} else {
%:itemBanMask = $mask(%:visible,$option(uintDefaultBanType))
%:itemBanMask = $tqmask(%:visible,$option(uintDefaultBanType))
if("%:itemBanMask" == "*!*@*")%:itemBanName = $tr("&Ban")
%:itemBanNick = %:visible
}
@ -498,7 +498,7 @@ defpopup(channel)
item($tr("Mask for") %:visible,75) (!%:multiple)
{
echo $mask($0,11)
echo $tqmask($0,11)
}
}
@ -576,7 +576,7 @@ defpopup(channel)
item($tr("&Ban") %:visible "("%:itemBanMask")",67) (("%:itemBanMask" != "*!*@*") && %:bCanKB)
{
ban $mask($0,$option(uintDefaultBanType))
ban $tqmask($0,$option(uintDefaultBanType))
}
item(%:itemBanName %:visible "("%:itemBanNick!*@*")",67) (%:bCanKB)
@ -601,7 +601,7 @@ defpopup(channel)
}
separator
item($tr("Configure ban mask..."),20)
item($tr("Configure ban tqmask..."),20)
{
options.edit KviChannelAdvancedOptionsWidget
}
@ -1119,7 +1119,7 @@ defpopup(querytextview)
item($tr("Mask for") $0,75) (!%:multiple)
{
echo $mask($0,11)
echo $tqmask($0,11)
}
}
@ -1159,7 +1159,7 @@ defpopup(logging)
# If this window is being logged actually , $log.file will be non empty
# and pointing to the log file actually open.
%:logfile = $str.replace($log.file,,$file.localdir)
%:logfile = $str.tqreplace($log.file,,$file.localdir)
}
label($tr("Logging to"):<br><b>%:logfile</b>) ("%:logfile" != "")

2
data/deftheme/silverirc/themedata.kvc
Unescape View File

@ -163,7 +163,7 @@ iccolor1=0,0,0
mirccolor12=15,15,255
mirccolor5=150,0,0
msgtypeChanAdmin=242,3,100,1,1
msgtypeGenericStatus=133,14,100,1,1
msgtypeGenerictqStatus=133,14,100,1,1
msgtypeHalfOp=174,3,100,1,1
msgtypeDevoice=63,3,100,1,1
msgtypeJoin=39,14,100,1,2

110
data/doctemplates/rfc2812.template
Unescape View File

@ -23,7 +23,7 @@ Category: Informational
[/td][/tr]
[tr][td]
[b]Status of this Memo[/b]
[b]tqStatus of this Memo[/b]
[/td][/tr]
[tr][td]
@ -281,7 +281,7 @@ the only restriction on a channel name is that it SHALL NOT contain
any spaces (' '), a control G (^G or ASCII 7), a comma (','). Space
is used as parameter separator and command is used as a list item
separator by the protocol). A colon (':') can also be used as a
delimiter for the channel mask. Channel names are case insensitive.
delimiter for the channel tqmask. Channel names are case insensitive.
See the protocol grammar rules (section 2.3.1) for the exact syntax
of a channel name.[br]
[p]
@ -414,7 +414,7 @@ The extracted message is parsed into the components <prefix>,
target = nickname / server
msgtarget = msgto *( "," msgto )
msgto = channel / ( user [ "%" host ] "@" servername )
msgto =/ ( user "%" host ) / targetmask
msgto =/ ( user "%" host ) / targettqmask
msgto =/ nickname / ( nickname "!" user "@" host )
channel = ( "#" / "+" / ( "!" channelid ) / "&" ) chanstring
[ ":" chanstring ]
@ -429,8 +429,8 @@ The extracted message is parsed into the components <prefix>,
ip6addr = 1*hexdigit 7( ":" 1*hexdigit )
ip6addr =/ "0:0:0:0:0:" ( "0" / "FFFF" ) ":" ip4addr
nickname = ( letter / special ) *8( letter / digit / special / "-" )
targetmask = ( "$" / "#" ) mask
; see details on allowed masks in section 3.3.1
targettqmask = ( "$" / "#" ) tqmask
; see details on allowed tqmasks in section 3.3.1
chanstring = %x01-07 / %x08-09 / %x0B-0C / %x0E-1F / %x21-2B
chanstring =/ %x2D-39 / %x3B-FF
; any octet except NUL, BELL, CR, LF, " ", "," and ":"
@ -493,7 +493,7 @@ is supplied in section 5 (Replies).
[/td][/tr]
[tr][td]
When wildcards are allowed in a string, it is referred as a "mask".
When wildcards are allowed in a string, it is referred as a "tqmask".
[p]
For string matching purposes, the protocol allows the use of two
special characters: '?' (%x3F) to match one and only one character,
@ -503,7 +503,7 @@ characters can be escaped using the character '\' (%x5C).
[pre]
The Augmented BNF syntax for this is:
mask = *( nowild / noesc wildone / noesc wildmany )
tqmask = *( nowild / noesc wildone / noesc wildmany )
wildone = %x3F
wildmany = %x2A
nowild = %x01-29 / %x2B-3E / %x40-FF
@ -638,7 +638,7 @@ the username, hostname and realname of a new user.
The <mode> parameter should be a numeric, and can be used to
automatically set user modes when registering with the server. This
parameter is a bitmask, with only 2 bits having any signification: if
parameter is a bittqmask, with only 2 bits having any signification: if
the bit 2 is set, the user mode 'w' will be set and if the bit 3 is
set, the user mode 'i' will be set. (See Section 3.1.5 "User
Modes").
@ -769,7 +769,7 @@ service. The service may only be known to servers which have a name
matching the distribution. For a matching server to have knowledge
of the service, the network path between that server and the server
on which the service is connected MUST be composed of servers which
names all match the mask.
names all match the tqmask.
The <type> parameter is currently reserved for future usage.
@ -1032,7 +1032,7 @@ command for modes that take a parameter.
the number of users on channel "#eu-
opers".
MODE &oulu +b ; Command to list ban masks set for
MODE &oulu +b ; Command to list ban tqmasks set for
the channel "&oulu".
MODE &oulu +b *!*@* ; Command to prevent all users from
@ -1048,10 +1048,10 @@ command for modes that take a parameter.
hostname matching *.edu from joining,
except if matching *.bu.edu
MODE #meditation e ; Command to list exception masks set
MODE #meditation e ; Command to list exception tqmasks set
for the channel "#meditation".
MODE #meditation I ; Command to list invitations masks
MODE #meditation I ; Command to list invitations tqmasks
set for the channel "#meditation".
MODE !12345ircd O ; Command to ask who the channel
@ -1266,9 +1266,9 @@ PRIVMSG is used to send private messages between users, as well as to
send messages to channels. <msgtarget> is usually the nickname of
the recipient of the message, or a channel name.
The <msgtarget> parameter may also be a host mask (#<mask>) or server
mask ($<mask>). In both cases the server will only send the PRIVMSG
to those who have a server or host matching the mask. The mask MUST
The <msgtarget> parameter may also be a host tqmask (#<tqmask>) or server
tqmask ($<tqmask>). In both cases the server will only send the PRIVMSG
to those who have a server or host matching the tqmask. The tqmask MUST
have at least 1 (one) "." in it and no wildcards following the last
".". This requirement exists to prevent people sending messages to
"#*" or "$*", which would broadcast to all users. Wildcards are the
@ -1357,7 +1357,7 @@ The server query group of commands has been designed to return
information about any server which is connected to the network.
In these queries, where a parameter appears as <target>, wildcard
masks are usually valid. For each parameter, however, only one query
tqmasks are usually valid. For each parameter, however, only one query
and set of replies is to be generated. In most cases, if a nickname
is given, it will mean the server to which the user is connected.
@ -1389,13 +1389,13 @@ Wildcards are allowed in the <target> parameter.
[tr][td][pre]
Command: LUSERS
Parameters: [ <mask> [ <target> ] ]
Parameters: [ <tqmask> [ <target> ] ]
The LUSERS command is used to get statistics about the size of the
IRC network. If no parameter is given, the reply will be about the
whole net. If a <mask> is specified, then the reply will only
whole net. If a <tqmask> is specified, then the reply will only
concern the part of the network formed by the servers matching the
mask. Finally, if the <target> parameter is specified, the request
tqmask. Finally, if the <target> parameter is specified, the request
is forwarded to that server which will generate the reply.
Wildcards are allowed in the <target> parameter.
@ -1486,13 +1486,13 @@ published this way.
[tr][td][pre]
Command: LINKS
Parameters: [ [ <remote server> ] <server mask> ]
Parameters: [ [ <remote server> ] <server tqmask> ]
With LINKS, a user can list all servernames, which are known by the
server answering the query. The returned list of servers MUST match
the mask, or if no mask is given, the full list is returned.
the tqmask, or if no tqmask is given, the full list is returned.
If <remote server> is given in addition to <server mask>, the LINKS
If <remote server> is given in addition to <server tqmask>, the LINKS
command is forwarded to the first server found that matches that name
(if any), and that server is then required to answer the query.
@ -1545,7 +1545,7 @@ Parameters: <target server> <port> [ <remote server> ]
The CONNECT command can be used to request a server to try to
establish a new connection to another server immediately. CONNECT is
a privileged command and SHOULD be available only to IRC Operators.
If a <remote server> is given and its mask doesn't match name of the
If a <remote server> is given and its tqmask doesn't match name of the
parsing server, the CONNECT attempt is sent to the first match of
remote server. Otherwise the CONNECT attempt is made by the server
processing the request.
@ -1698,7 +1698,7 @@ information about any service which is connected to the network.
[tr][td][pre]
Command: SERVLIST
Parameters: [ <mask> [ <type> ] ]
Parameters: [ <tqmask> [ <type> ] ]
The SERVLIST command is used to list services currently connected to
the network and visible to the user issuing the command. The
@ -1756,20 +1756,20 @@ allowed to.
[tr][td][pre]
Command: WHO
Parameters: [ <mask> [ "o" ] ]
Parameters: [ <tqmask> [ "o" ] ]
The WHO command is used by a client to generate a query which returns
a list of information which 'matches' the <mask> parameter given by
the client. In the absence of the <mask> parameter, all visible
a list of information which 'matches' the <tqmask> parameter given by
the client. In the absence of the <tqmask> parameter, all visible
(users who aren't invisible (user mode +i) and who don't have a
common channel with the requesting client) are listed. The same
result can be achieved by using a <mask> of "0" or any wildcard which
result can be achieved by using a <tqmask> of "0" or any wildcard which
will end up matching every visible user.
The <mask> passed to WHO is matched against users' host, server, real
name and nickname if the channel <mask> cannot be found.
The <tqmask> passed to WHO is matched against users' host, server, real
name and nickname if the channel <tqmask> cannot be found.
If the "o" parameter is passed only operators are returned according
to the <mask> supplied.
to the <tqmask> supplied.
Numeric Replies:
@ -1792,13 +1792,13 @@ to the <mask> supplied.
[tr][td][pre]
Command: WHOIS
Parameters: [ <target> ] <mask> *( "," <mask> )
Parameters: [ <target> ] <tqmask> *( "," <tqmask> )
This command is used to query information about particular user.
The server will answer this command with several numeric messages
indicating different statuses of each user which matches the mask (if
indicating different statuses of each user which matches the tqmask (if
you are entitled to see them). If no wildcard is present in the
<mask>, any information about that nick which you are allowed to see
<tqmask>, any information about that nick which you are allowed to see
is presented.
If the <target> parameter is specified, it sends the query to a
@ -2477,27 +2477,27 @@ to 399.
indicate that it is summoning that user.
346 RPL_INVITELIST
"<channel> <invitemask>"
"<channel> <invitetqmask>"
347 RPL_ENDOFINVITELIST
"<channel> :End of channel invite list"
- When listing the 'invitations masks' for a given channel,
- When listing the 'invitations tqmasks' for a given channel,
a server is required to send the list back using the
RPL_INVITELIST and RPL_ENDOFINVITELIST messages. A
separate RPL_INVITELIST is sent for each active mask.
After the masks have been listed (or if none present) a
separate RPL_INVITELIST is sent for each active tqmask.
After the tqmasks have been listed (or if none present) a
RPL_ENDOFINVITELIST MUST be sent.
348 RPL_EXCEPTLIST
"<channel> <exceptionmask>"
"<channel> <exceptiontqmask>"
349 RPL_ENDOFEXCEPTLIST
"<channel> :End of channel exception list"
- When listing the 'exception masks' for a given channel,
- When listing the 'exception tqmasks' for a given channel,
a server is required to send the list back using the
RPL_EXCEPTLIST and RPL_ENDOFEXCEPTLIST messages. A
separate RPL_EXCEPTLIST is sent for each active mask.
After the masks have been listed (or if none present)
separate RPL_EXCEPTLIST is sent for each active tqmask.
After the tqmasks have been listed (or if none present)
a RPL_ENDOFEXCEPTLIST MUST be sent.
351 RPL_VERSION
@ -2548,24 +2548,24 @@ to 399.
the end.
364 RPL_LINKS
"<mask> <server> :<hopcount> <server info>"
"<tqmask> <server> :<hopcount> <server info>"
365 RPL_ENDOFLINKS
"<mask> :End of LINKS list"
"<tqmask> :End of LINKS list"
- In replying to the LINKS message, a server MUST send
replies back using the RPL_LINKS numeric and mark the
end of the list using an RPL_ENDOFLINKS reply.
367 RPL_BANLIST
"<channel> <banmask>"
"<channel> <bantqmask>"
368 RPL_ENDOFBANLIST
"<channel> :End of channel ban list"
- When listing the active 'bans' for a given channel,
a server is required to send the list back using the
RPL_BANLIST and RPL_ENDOFBANLIST messages. A separate
RPL_BANLIST is sent for each active banmask. After the
banmasks have been listed (or if none present) a
RPL_BANLIST is sent for each active bantqmask. After the
bantqmasks have been listed (or if none present) a
RPL_ENDOFBANLIST MUST be sent.
371 RPL_INFO
@ -2719,7 +2719,7 @@ to 399.
- reports the server uptime.
243 RPL_STATSOLINE
"O <hostmask> * <name>"
"O <hosttqmask> * <name>"
- reports the allowed hosts from where user may become IRC
operators.
@ -2731,10 +2731,10 @@ to 399.
RPL_UMODEIS is sent back.
234 RPL_SERVLIST
"<name> <server> <mask> <type> <hopcount> <info>"
"<name> <server> <tqmask> <type> <hopcount> <info>"
235 RPL_SERVLISTEND
"<mask> <type> :End of service listing"
"<tqmask> <type> :End of service listing"
- When listing services in reply to a SERVLIST message,
a server is required to send the list back using the
@ -2869,11 +2869,11 @@ to 399.
412 ERR_NOTEXTTOSEND
":No text to send"
413 ERR_NOTOPLEVEL
"<mask> :No toplevel domain specified"
"<tqmask> :No toplevel domain specified"
414 ERR_WILDTOPLEVEL
"<mask> :Wildcard in toplevel domain"
"<tqmask> :Wildcard in toplevel domain"
415 ERR_BADMASK
"<mask> :Bad Server/host mask"
"<tqmask> :Bad Server/host tqmask"
- 412 - 415 are returned by PRIVMSG to indicate that
the message wasn't delivered for some reason.
@ -2914,7 +2914,7 @@ to 399.
432 ERR_ERRONEUSNICKNAME
"<nick> :Erroneous nickname"
- Returned after receiving a NICK message which contains
- Returned after receiving a NICK message which tqcontains
characters which do not fall in the defined set. See
section 2.3.1 for details on valid nicknames.
@ -3180,7 +3180,7 @@ both will removed by use of a server KILL (See Section 3.7.1).
[tr][td]
There is no way to escape the escape character "\" (%x5C). While
this isn't usually a problem, it makes it impossible to form a mask
this isn't usually a problem, it makes it impossible to form a tqmask
with a backslash character ("\") preceding a wildcard.
[/td][/tr]

BIN
data/resources_mac/kvirc.icns
View File

Binary file not shown.

2
src/config.h.in
Unescape View File

@ -88,7 +88,7 @@
/* define if you have libgsm and want the GSM code to be compiled */
#undef COMPILE_USE_GSM
/* define if you want to compile the Qt 4.x support */
/* define if you want to compile the TQt 4.x support */
#undef COMPILE_USE_QT4
/* define if you trust your memmove() function */

2
src/kvi_configstatus.h
Unescape View File

@ -89,7 +89,7 @@
/* define if you have libgsm and want the GSM code to be compiled */
#define COMPILE_USE_GSM 1
/* define if you want to compile the Qt 4.x support */
/* define if you want to compile the TQt 4.x support */
/* #undef COMPILE_USE_QT4 */
/* define if you trust your memmove() function */

2
src/kvilib/config/kvi_debug.h
Unescape View File

@ -25,7 +25,7 @@
//
//=============================================================================
#include <qglobal.h>
#include <tqglobal.h>
//=============================================================================
// This file contains the definition of the debug macros

4
src/kvilib/config/kvi_defaults.h
Unescape View File

@ -26,7 +26,7 @@
//=============================================================================
//=============================================================================
// This file contains (more or less) freely customizable compile time defaults
// This file tqcontains (more or less) freely customizable compile time defaults
//
// You can safely play with the ones you understand the meaning of
//=============================================================================
@ -50,7 +50,7 @@
#define KVI_DEFAULT_REALNAME "KVIrc " VERSION " '" KVI_RELEASE_NAME "' http://kvirc.net/"
#define KVI_DEFAULT_PART_MESSAGE "No matter how dark the night, somehow the Sun rises once again"
#define KVI_DEFAULT_QUIT_MESSAGE "KVIrc $version $version(r) http://www.kvirc.net/"
#define KVI_DEFAULT_TQUIT_MESSAGE "KVIrc $version $version(r) http://www.kvirc.net/"
#define KVI_DEFAULT_CTCP_USERINFO_REPLY "I'm too lazy to edit this field."
#define KVI_DEFAULT_CTCP_PAGE_REPLY "Your message has been received and logged"
#define KVI_DEFAULT_AWAY_MESSAGE "I'm off to see the wizard."

2
src/kvilib/config/kvi_settings.h
Unescape View File

@ -32,7 +32,7 @@
// Better do not touch this
//=============================================================================
#include <qglobal.h>
#include <tqglobal.h>
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32) || defined(Q_OS_WIN32_)

4
src/kvilib/config/kvi_wincfg.h
Unescape View File

@ -32,7 +32,7 @@
/* define if you want to compile with new parser */
#define COMPILE_NEW_KVS 1
/* define if you want to use the Qt 4.x support */
/* define if you want to use the TQt 4.x support */
/* #undef COMPILE_USE_QT4 */
#define COMPILE_USE_QT4
@ -132,7 +132,7 @@
/* define this if you are on a big endian machine */
/* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
/* define this if you want to use the unicode-local 8bit charset translation */
/* define this if you want to use the tqunicode-local 8bit charset translation */
/* #undef COMPILE_USE_LOCAL_8BIT */
/* define this if you want to disable the inter-process communication support */

6
src/kvilib/core/kvi_error.cpp
Unescape View File

@ -57,7 +57,7 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
__tr_no_lookup("Unexpected end of command in dictionary key"), // 006: unexpectedEndInDictionaryKey
__tr_no_lookup("Switch dash without switch letter"), // 007: switchDashWithoutSwitchLetter
__tr_no_lookup("Unknown function"), // 008: unknownFunction
__tr_no_lookup("Unexpected end of command in parenthesis"), // 009: unexpectedEndInParenthesis
__tr_no_lookup("Unexpected end of command in tqparenthesis"), // 009: unexpectedEndInParenthesis
__tr_no_lookup("Unexpected end of command in function parameters"), // 010: unexpectedEndInFunctionParams
__tr_no_lookup("Missing variable name"), // 011: missingVariableName
__tr_no_lookup("Variable or identifier expected"), // 012: variableOrIdentifierExpected
@ -112,7 +112,7 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
__tr_no_lookup("Integer parameter expected"), // 061
__tr_no_lookup("Invalid parameter"), // 062
__tr_no_lookup("No such file"), // 063
__tr_no_lookup("Open parenthesis expected"), // 064
__tr_no_lookup("Open tqparenthesis expected"), // 064
__tr_no_lookup("Open brace expected"), // 065
__tr_no_lookup("Can't kill a builtin class"), // 066
__tr_no_lookup("The SOCKSV4 protocol lacks IpV6 support"), // 067
@ -183,7 +183,7 @@ namespace KviError
return g_errorTable[KviError_unknownError];
}
QString getDescription(int iErrorCode)
TQString getDescription(int iErrorCode)
{
return __tr2qs_no_xgettext(getUntranslatedDescription(iErrorCode));
}

2
src/kvilib/core/kvi_error.h
Unescape View File

@ -180,7 +180,7 @@
namespace KviError
{
KVILIB_API QString getDescription(int iErrorCode);
KVILIB_API TQString getDescription(int iErrorCode);
KVILIB_API const char * getUntranslatedDescription(int iErrorCode);
KVILIB_API int translateSystemError(int iErrNo);
};

54
src/kvilib/core/kvi_pointerhashtable.h
Unescape View File

@ -229,25 +229,25 @@ inline void * & kvi_hash_key_default(void *)
return static_default;
}
inline unsigned int kvi_hash_hash(const QString &szKey,bool bCaseSensitive)
inline unsigned int kvi_hash_hash(const TQString &szKey,bool bCaseSensitive)
{
unsigned int uResult = 0;
const QChar * p = KviQString::nullTerminatedArray(szKey);
const TQChar * p = KviTQString::nullTerminatedArray(szKey);
if(!p)return 0;
if(bCaseSensitive)
{
while(p->unicode())
while(p->tqunicode())
{
uResult += p->unicode();
uResult += p->tqunicode();
p++;
}
} else {
while(p->unicode())
while(p->tqunicode())
{
#ifdef COMPILE_USE_QT4
uResult += p->toLower().unicode();
uResult += p->toLower().tqunicode();
#else
uResult += p->lower().unicode();
uResult += p->lower().tqunicode();
#endif
p++;
}
@ -255,25 +255,25 @@ inline unsigned int kvi_hash_hash(const QString &szKey,bool bCaseSensitive)
return uResult;
}
inline bool kvi_hash_key_equal(const QString &szKey1,const QString &szKey2,bool bCaseSensitive)
inline bool kvi_hash_key_equal(const TQString &szKey1,const TQString &szKey2,bool bCaseSensitive)
{
if(bCaseSensitive)
return KviQString::equalCS(szKey1,szKey2);
return KviQString::equalCI(szKey1,szKey2);
return KviTQString::equalCS(szKey1,szKey2);
return KviTQString::equalCI(szKey1,szKey2);
}
inline void kvi_hash_key_copy(const QString &szFrom,QString &szTo,bool)
inline void kvi_hash_key_copy(const TQString &szFrom,TQString &szTo,bool)
{
szTo = szFrom;
}
inline void kvi_hash_key_destroy(QString &szKey,bool)
inline void kvi_hash_key_destroy(TQString &szKey,bool)
{
}
inline const QString & kvi_hash_key_default(QString *)
inline const TQString & kvi_hash_key_default(TQString *)
{
return KviQString::empty;
return KviTQString::empty;
}
template<typename Key,typename T> class KviPointerHashTable;
@ -311,7 +311,7 @@ public:
/// \endverbatim
///
/// Implementations for the most likey Key data types are provided below.
/// KviPointerHashTable will automagically work with const char *,QString,KviStr
/// KviPointerHashTable will automagically work with const char *,TQString,KviStr
/// and integer types as keys.
///
/// For string Key types, the hash table may or may not be case sensitive.
@ -349,7 +349,7 @@ public:
/// Places the hash table iterator at the position
/// of the item found.
///
T * find(const Key & hKey)
T * tqfind(const Key & hKey)
{
m_uIteratorIdx = kvi_hash_hash(hKey,m_bCaseSensitive) % m_uSize;
if(!m_pDataArray[m_uIteratorIdx])return 0;
@ -364,11 +364,11 @@ public:
/// Returns the item associated to the key hKey
/// or NULL if no such item exists in the hash table.
/// Places the hash table iterator at the position
/// of the item found. This is an alias to find().
/// of the item found. This is an alias to tqfind().
///
T * operator[](const Key & hKey)
{
return find(hKey);
return tqfind(hKey);
}
///
@ -427,7 +427,7 @@ public:
/// The hash table iterator is placed at the newly inserted item.
/// This is just an alias to insert() with a different name.
///
void replace(const Key & hKey,T * pData)
void tqreplace(const Key & hKey,T * pData)
{
insert(hKey,pData);
}
@ -522,7 +522,7 @@ public:
/// it's hash table entry, if found, and NULL otherwise.
/// The hash table iterator is placed at the item found.
///
KviPointerHashTableEntry<Key,T> * findRef(const T * pRef)
KviPointerHashTableEntry<Key,T> * tqfindRef(const T * pRef)
{
for(m_uIteratorIdx = 0;m_uIteratorIdx<