diff options
| author |  Szymon Tomasz Stefanek | 2010-12-27 02:18:43 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2010-12-27 02:18:43 +0000 |
| commit | 26ef0cff00c368487a8a95a5c66dc2b0a85f1efa (patch) | |
| tree | 2202884c2789c5eb543993ef0885c4fee37a8d90 | |
| parent | Kill system memmove, ix86 asm and kvi_memmove stuff: modern gcc coupled to gl... (diff) | |
| download | KVIrc-26ef0cff00c368487a8a95a5c66dc2b0a85f1efa.tar.gz KVIrc-26ef0cff00c368487a8a95a5c66dc2b0a85f1efa.tar.bz2 KVIrc-26ef0cff00c368487a8a95a5c66dc2b0a85f1efa.zip | |
Yet more renaming and cleanup
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5236 17fca916-40b9-46aa-a4ea-0a15b648b75c
130 files changed, 954 insertions, 1006 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 3aec39b9b..d247f6676 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -55,8 +55,8 @@ ENDIF() # Please note that the sources have alphabetic order here SET(kvilib_SRCS - config/kvi_buildinfo.cpp - core/kvi_error.cpp + config/KviBuildInfo.cpp + core/KviError.cpp core/KviHeapObject.cpp core/kvi_hstrEqualCIN.cpp core/KviMemory.cpp @@ -92,7 +92,7 @@ SET(kvilib_SRCS irc/KviIrcServerDataBase.cpp irc/KviIrcUserDataBase.cpp irc/KviMircCntrl.cpp - irc/KviNetwork.cpp + irc/KviIrcNetwork.cpp irc/KviNickServRuleSet.cpp irc/KviUserIdentity.cpp net/KviDnsResolver.cpp diff --git a/src/kvilib/config/kvi_buildinfo.cpp b/src/kvilib/config/KviBuildInfo.cpp index 4ea7a19de..e4064b8f1 100644 --- a/src/kvilib/config/kvi_buildinfo.cpp +++ b/src/kvilib/config/KviBuildInfo.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_buildinfo.cpp +// File : KviBuildInfo.cpp // Creation date : Sat 19 Apr 2008 17:01:57 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #include "kvi_sourcesdate.h" #include "kvi_sysbuildinfo.h" diff --git a/src/kvilib/config/kvi_buildinfo.h b/src/kvilib/config/KviBuildInfo.h index b1450ee2f..12299ebde 100644 --- a/src/kvilib/config/kvi_buildinfo.h +++ b/src/kvilib/config/KviBuildInfo.h @@ -2,7 +2,7 @@ #define _KVI_BUILDINFO_H_ //============================================================================= // -// File : kvi_buildinfo.h +// File : KviBuildInfo.h // Creation date : Sat 19 Apr 2008 17:01:57 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution @@ -26,7 +26,7 @@ //============================================================================= /** -* \file kvi_buildinfo.h +* \file KviBuildInfo.h * \author Szymon Stefanek * \brief Useful functions which returns compilation and runtime info */ diff --git a/src/kvilib/config/kvi_debug.h b/src/kvilib/config/kvi_debug.h index 1b03dfdae..8919ad909 100644 --- a/src/kvilib/config/kvi_debug.h +++ b/src/kvilib/config/kvi_debug.h @@ -33,43 +33,8 @@ * \file kvi_debug.h * \author Szymon Stefanek * \brief This file contains the definition of the debug macros; -* You can enable ALL the debugging output by uncommenting the line that defines _KVI_DEBUG_CHECK_RANGE_ */ -#if 0 - -//============================================================================= -// -// You can enable ALL the debugging output by uncommenting the next line -// #define _KVI_DEBUG_CHECK_RANGE_ -// -//============================================================================= - -/** -* \brief Debug macros -* -* \def KVI_ASSERT Assert that ensures that its parameter is true -* \def __range_invalid Assert that ensures that its parameter is false -* \def __ASSERT Assert that ensures that its parameter is true; enabled only if _KVI_DEBUG_or __KVI_DEBUG__ is defined -*/ - -#ifdef _KVI_DEBUG_CHECK_RANGE_ - #define KVI_ASSERT(_expr) if(!(_expr))qDebug("[kvirc]: ASSERT FAILED: \"%s\" is false in %s (%d)",#_expr,__FILE__,__LINE__) - #define __range_invalid(_expr) if(_expr)qDebug("[kvirc]: ASSERT FAILED: \"%s\" is true in %s (%d)",#_expr,__FILE__,__LINE__) -#else - #define KVI_ASSERT(_expr) - #define __range_invalid(_expr) -#endif - -#if defined(_KVI_DEBUG_) || defined(__KVI_DEBUG__) - #define __ASSERT(_expr) if(!(_expr))qDebug("[kvirc]: ASSERT FAILED: \"%s\" is false in %s (%d)",#_expr,__FILE__,__LINE__) -#else - #define __ASSERT(_expr) -#endif - -#endif - - #include <stdlib.h> // abort #ifdef __GNUC__ @@ -90,7 +55,6 @@ #endif //!__GNUC__ - #ifdef COMPILE_DEBUG_MODE #define KVI_ASSERT(__condition__) \ diff --git a/src/kvilib/core/KviCString.h b/src/kvilib/core/KviCString.h index c226d295c..ccc114e5b 100644 --- a/src/kvilib/core/KviCString.h +++ b/src/kvilib/core/KviCString.h @@ -61,20 +61,17 @@ __KVI_EXTERN KVILIB_API bool kvi_qstringEqualCI(const QString &s1,const QString // Include inlined assembly implementations if required -#ifdef COMPILE_ix86_ASM - #include "kvi_strasm.h" -#else - // Returns true if the string str1 is equal to str2. case sensitive. - __KVI_EXTERN KVILIB_API bool kvi_strEqualCS(const char *str1,const char *str2); - // Returns true if the forst len characters of string str1 are equal to str2. - // case sensitive. - // Note that if str1 or str2 are shorter than len characters then are considered as NOT equal! - __KVI_EXTERN KVILIB_API bool kvi_strEqualCSN(const char *str1,const char *str2,int len); - // no such tricks in non-asm - #define kvi_strEqualNoLocaleCI(str1,str2) kvi_strEqualCI(str1,str2) - #define kvi_strEqualNoLocaleCIN(str1,str2,len) kvi_strEqualCIN(str1,str2,len) - #define kvi_strLen(str) strlen(str) -#endif + +// Returns true if the string str1 is equal to str2. case sensitive. +__KVI_EXTERN KVILIB_API bool kvi_strEqualCS(const char *str1,const char *str2); +// Returns true if the forst len characters of string str1 are equal to str2. +// case sensitive. +// Note that if str1 or str2 are shorter than len characters then are considered as NOT equal! +__KVI_EXTERN KVILIB_API bool kvi_strEqualCSN(const char *str1,const char *str2,int len); +// no such tricks in non-asm +#define kvi_strEqualNoLocaleCI(str1,str2) kvi_strEqualCI(str1,str2) +#define kvi_strEqualNoLocaleCIN(str1,str2,len) kvi_strEqualCIN(str1,str2,len) +#define kvi_strLen(str) strlen(str) // Returns true if the string str1 is equal to str2. // case insensitive. diff --git a/src/kvilib/core/kvi_error.cpp b/src/kvilib/core/KviError.cpp index 83e84f4f7..599c990ec 100644 --- a/src/kvilib/core/kvi_error.cpp +++ b/src/kvilib/core/KviError.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_error.cpp +// File : KviError.cpp // Creation date : Sun Jul 02 2000 18:37:02 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -26,7 +26,7 @@ #define _KVI_ERROR_CPP_ #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_settings.h" diff --git a/src/kvilib/core/kvi_error.h b/src/kvilib/core/KviError.h index a103f34fe..849dcde52 100644 --- a/src/kvilib/core/kvi_error.h +++ b/src/kvilib/core/KviError.h @@ -2,7 +2,7 @@ #define _KVI_ERROR_H_ //============================================================================= // -// File : kvi_error.h +// File : KviError.h // Creation date : Sun Jul 02 2000 18:35:56 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -25,7 +25,7 @@ //============================================================================= /** -* \file kvi_error.h +* \file KviError.h * \author Szymon Stefanek * \brief Error List */ diff --git a/src/kvilib/core/KviMemory.cpp b/src/kvilib/core/KviMemory.cpp index e4fc98f59..25426280e 100644 --- a/src/kvilib/core/KviMemory.cpp +++ b/src/kvilib/core/KviMemory.cpp @@ -208,10 +208,11 @@ namespace KviMemory // memmove and memcpy implementations. // // Modern compilers coupled with decent C library implementations we have these days - // can do better than plain assembler. The glibc memcpy implementation, for instance, - // can copy entire pages of memory at very low cost by using virtual address manipulation - // tricks. 64bit architectures can move bytes in larger chunks too. - + // can do better than plain assembler. The i586 glibc memcpy implementation, for instance, + // will keep the cache well-filled and both pipelines of the pentium busy at the same time + // while the mach implementation can even copy entire pages of memory at very low cost by + // using virtual address manipulationtricks. 64bit architectures can move bytes in larger + // chunks and there are MXX and SSE optimisations available. #ifdef COMPILE_ix86_ASM @@ -396,6 +397,196 @@ namespace KviMemory return dst_ptr; } + //============================================================================= + // + // File : kvi_strasm.h + // Creation date : Sun Jun 18 2000 18:38:26 by Szymon Stefanek + // + // This file is part of the KVirc irc client distribution + // Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) + // + // This program is FREE software. You can redistribute it and/or + // modify it under the terms of the GNU General Public License + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your opinion) any later version. + // + // This program is distributed in the HOPE that it will be USEFUL, + // but WITHOUT ANY WARRANTY; without even the implied warranty of + // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + // See the GNU General Public License for more details. + // + // You should have received a copy of the GNU General Public License + // along with this program. If not, write to the Free Software Foundation, + // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + // + //============================================================================= + + //============================================================================= + // + // Inline assembly implementations of the commonly used string functions + // These will work only on i386 based machines and can be compiled + // only by gcc + // + //============================================================================= + + inline bool kvi_strEqualCS(const char * pcStr1, const char * pcStr2) + { + // An instruction pattern is really useful in this case. + // When inlining, GCC can optimize to load esi and edi + // directly with the strings, without pushing and getting it + // from the stack... + register bool bEax; + __asm__ __volatile__ ( + " cld\n" + "1:\n" + " lodsb %%ds:(%%esi),%%al\n" + " scasb %%es:(%%edi),%%al\n" + " jne 2f\n" + " testb %%al,%%al\n" + " jne 1b\n" + " movl $0x1,%%eax\n" + " jmp 3f\n" + "2:\n" + " xorl %%eax,%%eax\n" + "3:" + : "=a" (bEax), "=&S" (pcStr1), "=&D" (pcStr2) + : "1" (pcStr1), "2" (pcStr2) + ); + return bEax; + } + + inline bool kvi_strEqualCSN(const char * pcStr1, const char * pcStr2, int iLen) + { + register bool bEax; + __asm__ __volatile__ ( + "1:\n" + " decl %3\n" + " js 2f\n" + " movb (%1),%%al\n" + " incl %1\n" + " cmpb %%al,(%2)\n" + " jne 3f\n" + " incl %2\n" + " testb %%al,%%al\n" + " jne 1b\n" + "2:\n" + " movl $0x1,%%eax\n" + " jmp 4f\n" + "3:\n" + " xorl %%eax,%%eax\n" + "4:\n" + : "=a" (bEax), "=r" (pcStr1), "=r" (pcStr2), "=r" (iLen) + : "1" (pcStr1), "2" (pcStr2), "3" (iLen) + ); + return bEax; + } + + // OPTIMIZATION + // The following two functions are used to compare a variable string with one in that + // only A-Z<->a-z case insensivity is significant. + // For example + // kvi_strEqualNoLocalCI("a string that does not contain any strange char",str2) + // will always give the correct result + // These will NOT work with localizable characters: + // 'a' with umlaut will be not equal to 'A' with umlaut + + inline bool kvi_strEqualNoLocaleCI(const char * pcStr1, const char * pcStr2) + { + // Trivial implementation + // Ignores completely locales....only A-Z chars are transformed to a-z + // Anyway...it will work for IRC :) + register int iReg; + register bool bEax; + __asm__ __volatile__ ( + "1:\n" + " movb (%2),%%al\n" + " cmpb $65,%%al\n" + " jb 2f\n" + " cmpb $90,%%al\n" + " ja 2f\n" + " addb $32,%%al\n" + "2:\n" + " movb (%3),%b1\n" + " cmpb $65,%b1\n" + " jb 3f\n" + " cmpb $90,%b1\n" + " ja 3f\n" + " addb $32,%b1\n" + "3:\n" + " cmpb %%al,%b1\n" + " jne 4f\n" + " incl %2\n" + " incl %3\n" + " testb %%al,%%al\n" + " jne 1b\n" + " movl $1,%%eax\n" + " jmp 5f\n" + "4:\n" + " xorl %%eax,%%eax\n" + "5:\n" + : "=a" (bEax), "=q" (iReg), "=r" (pcStr1), "=r" (pcStr2) + : "2" (pcStr1), "3" (pcStr2) + ); + return bEax; + } + + inline bool kvi_strEqualNoLocaleCIN(const char * pcStr1, const char * pcStr2, int iLen) + { + + register int iReg; + register bool bEax; + __asm__ __volatile__ ( + "1:\n" + " decl %4\n" + " js 4f\n" + " movb (%2),%%al\n" + " cmpb $65,%%al\n" + " jb 2f\n" + " cmpb $90,%%al\n" + " ja 2f\n" + " addb $32,%%al\n" + "2:\n" + " movb (%3),%b1\n" + " cmpb $65,%b1\n" + " jb 3f\n" + " cmpb $90,%b1\n" + " ja 3f\n" + " addb $32,%b1\n" + "3:\n" + " cmpb %%al,%b1\n" + " jne 5f\n" + " incl %2\n" + " incl %3\n" + " testb %%al,%%al\n" + " jne 1b\n" + "4:\n" + " movl $1,%%eax\n" + " jmp 6f\n" + "5:\n" + " xorl %%eax,%%eax\n" + "6:\n" + : "=a" (bEax), "=q" (iReg), "=r" (pcStr1), "=r" (pcStr2), "=r" (iLen) + : "2" (pcStr1), "3" (pcStr2), "4" (iLen) + ); + return bEax; + } + + inline int kvi_strLen(const char * pcStr) + { + register int iEcx; + __asm__ __volatile__( + " cld\n" + " repne\n" + " scasb\n" + " notl %0\n" + " decl %0" + : "=c" (iEcx), "=&D" (pcStr) + : "0" (0xffffffff), "1" (pcStr), "a" (0) + ); + return iEcx; + } + + #endif //0 } diff --git a/src/kvilib/core/kvi_bswap.h b/src/kvilib/core/kvi_bswap.h deleted file mode 100644 index 0f6060481..000000000 --- a/src/kvilib/core/kvi_bswap.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef _KVI_BSWAP_H_ -#define _KVI_BSWAP_H_ - -//============================================================================= -// -// File : kvi_bswap.h -// Creation date : Fri Mar 19 1999 03:15:21 CEST by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2010 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -/** -* \file kvi_bswap.h -* \author Szymon Stefanek -* \brief Bit Swap functions -*/ - -#include "kvi_settings.h" -#include "kvi_inttypes.h" - -// KVILIB_API has been removed from these two functions -// these should always go inlined - -/** -* \brief Swaps the endianess of a kvi_u64_t -* -* \param i the original value -* \return kvi_u64_t -*/ -inline kvi_u64_t kvi_swap64(kvi_u64_t i) -{ - // abcdefgh to hgfedcba - return ((i << 56) | /* h to a */ - ((i & 0xff00) << 40) | /* g to b */ - ((i & 0xff0000) << 24) | /* f to c */ - ((i & 0xff000000) << 8) | /* e to d */ - ((i >> 8) & 0xff000000) | /* d to e */ - ((i >> 24) & 0xff0000) | /* c to f */ - ((i >> 40) & 0xff00) | /* b to g */ - (i >> 56)); /* a to h */ -} - -/** -* \brief Swaps the endianess of a kvi_u32_t -* -* \param i the original value -* \return kvi_u32_t -*/ -inline kvi_u32_t kvi_swap32(kvi_u32_t i) -{ - // abcd to dcba - return ((i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24)); -} - -/** -* \brief Swaps the endianess of a kvi_u16_t -* -* \param i the original value -* \return kvi_u16_t -*/ -inline kvi_u16_t kvi_swap16(kvi_u16_t i) -{ - // ab to ba - return ((i << 8) | (i >> 8)); -} - -#endif // !_KVI_BSWAP_H_ diff --git a/src/kvilib/core/kvi_strasm.h b/src/kvilib/core/kvi_strasm.h deleted file mode 100644 index a248deca1..000000000 --- a/src/kvilib/core/kvi_strasm.h +++ /dev/null @@ -1,194 +0,0 @@ -#ifndef _KVI_STRASM_H_ -#define _KVI_STRASM_H_ - -//============================================================================= -// -// File : kvi_strasm.h -// Creation date : Sun Jun 18 2000 18:38:26 by Szymon Stefanek -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -//============================================================================= -// -// Inline assembly implementations of the commonly used string functions -// These will work only on i386 based machines and can be compiled -// only by gcc -// -//============================================================================= - -extern inline bool kvi_strEqualCS(const char * pcStr1, const char * pcStr2) -{ - // An instruction pattern is really useful in this case. - // When inlining, GCC can optimize to load esi and edi - // directly with the strings, without pushing and getting it - // from the stack... - register bool bEax; - __asm__ __volatile__ ( - " cld\n" - "1:\n" - " lodsb %%ds:(%%esi),%%al\n" - " scasb %%es:(%%edi),%%al\n" - " jne 2f\n" - " testb %%al,%%al\n" - " jne 1b\n" - " movl $0x1,%%eax\n" - " jmp 3f\n" - "2:\n" - " xorl %%eax,%%eax\n" - "3:" - : "=a" (bEax), "=&S" (pcStr1), "=&D" (pcStr2) - : "1" (pcStr1), "2" (pcStr2) - ); - return bEax; -} - -extern inline bool kvi_strEqualCSN(const char * pcStr1, const char * pcStr2, int iLen) -{ - register bool bEax; - __asm__ __volatile__ ( - "1:\n" - " decl %3\n" - " js 2f\n" - " movb (%1),%%al\n" - " incl %1\n" - " cmpb %%al,(%2)\n" - " jne 3f\n" - " incl %2\n" - " testb %%al,%%al\n" - " jne 1b\n" - "2:\n" - " movl $0x1,%%eax\n" - " jmp 4f\n" - "3:\n" - " xorl %%eax,%%eax\n" - "4:\n" - : "=a" (bEax), "=r" (pcStr1), "=r" (pcStr2), "=r" (iLen) - : "1" (pcStr1), "2" (pcStr2), "3" (iLen) - ); - return bEax; -} - -// OPTIMIZATION -// The following two functions are used to compare a variable string with one in that -// only A-Z<->a-z case insensivity is significant. -// For example -// kvi_strEqualNoLocalCI("a string that does not contain any strange char",str2) -// will always give the correct result -// These will NOT work with localizable characters: -// 'a' with umlaut will be not equal to 'A' with umlaut - -extern inline bool kvi_strEqualNoLocaleCI(const char * pcStr1, const char * pcStr2) -{ - // Trivial implementation - // Ignores completely locales....only A-Z chars are transformed to a-z - // Anyway...it will work for IRC :) - register int iReg; - register bool bEax; - __asm__ __volatile__ ( - "1:\n" - " movb (%2),%%al\n" - " cmpb $65,%%al\n" - " jb 2f\n" - " cmpb $90,%%al\n" - " ja 2f\n" - " addb $32,%%al\n" - "2:\n" - " movb (%3),%b1\n" - " cmpb $65,%b1\n" - " jb 3f\n" - " cmpb $90,%b1\n" - " ja 3f\n" - " addb $32,%b1\n" - "3:\n" - " cmpb %%al,%b1\n" - " jne 4f\n" - " incl %2\n" - " incl %3\n" - " testb %%al,%%al\n" - " jne 1b\n" - " movl $1,%%eax\n" - " jmp 5f\n" - "4:\n" - " xorl %%eax,%%eax\n" - "5:\n" - : "=a" (bEax), "=q" (iReg), "=r" (pcStr1), "=r" (pcStr2) - : "2" (pcStr1), "3" (pcStr2) - ); - return bEax; -} - -extern inline bool kvi_strEqualNoLocaleCIN(const char * pcStr1, const char * pcStr2, int iLen) -{ - - register int iReg; - register bool bEax; - __asm__ __volatile__ ( - "1:\n" - " decl %4\n" - " js 4f\n" - " movb (%2),%%al\n" - " cmpb $65,%%al\n" - " jb 2f\n" - " cmpb $90,%%al\n" - " ja 2f\n" - " addb $32,%%al\n" - "2:\n" - " movb (%3),%b1\n" - " cmpb $65,%b1\n" - " jb 3f\n" - " cmpb $90,%b1\n" - " ja 3f\n" - " addb $32,%b1\n" - "3:\n" - " cmpb %%al,%b1\n" - " jne 5f\n" - " incl %2\n" - " incl %3\n" - " testb %%al,%%al\n" - " jne 1b\n" - "4:\n" - " movl $1,%%eax\n" - " jmp 6f\n" - "5:\n" - " xorl %%eax,%%eax\n" - "6:\n" - : "=a" (bEax), "=q" (iReg), "=r" (pcStr1), "=r" (pcStr2), "=r" (iLen) - : "2" (pcStr1), "3" (pcStr2), "4" (iLen) - ); - return bEax; -} - - -extern inline int kvi_strLen(const char * pcStr) -{ - register int iEcx; - __asm__ __volatile__( - " cld\n" - " repne\n" - " scasb\n" - " notl %0\n" - " decl %0" - : "=c" (iEcx), "=&D" (pcStr) - : "0" (0xffffffff), "1" (pcStr), "a" (0) - ); - return iEcx; -} - -#endif //_KVI_STRASM_H_ diff --git a/src/kvilib/irc/KviNetwork.cpp b/src/kvilib/irc/KviIrcNetwork.cpp index 6457b93b0..498a90746 100644 --- a/src/kvilib/irc/KviNetwork.cpp +++ b/src/kvilib/irc/KviIrcNetwork.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviNetwork.cpp +// File : KviIrcNetwork.cpp // Creation date : Wed Aug 27 2008 17:44:56 by Alexey Uzhva // // This file is part of the KVirc irc client distribution @@ -22,44 +22,44 @@ // //============================================================================= -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "KviIrcServer.h" #include "KviNickServRuleSet.h" -KviNetwork::KviNetwork(const KviNetwork &src) +KviIrcNetwork::KviIrcNetwork(const KviIrcNetwork &src) { m_pChannelList = 0; m_pNickServRuleSet = 0; - m_pServerList = new KviPointerList<KviServer>; + m_pServerList = new KviPointerList<KviIrcServer>; m_pServerList->setAutoDelete(true); copyFrom(src); } -KviNetwork::KviNetwork(const QString &name) +KviIrcNetwork::KviIrcNetwork(const QString &name) { m_szName = name; m_pChannelList = 0; m_pNickServRuleSet = 0; m_bAutoConnect = false; - m_pServerList = new KviPointerList<KviServer>; + m_pServerList = new KviPointerList<KviIrcServer>; m_pServerList->setAutoDelete(true); m_pCurrentServer = 0; } -KviNetwork::~KviNetwork() +KviIrcNetwork::~KviIrcNetwork() { if(m_pChannelList)delete m_pChannelList; if(m_pNickServRuleSet)delete m_pNickServRuleSet; delete m_pServerList; } -void KviNetwork::setAutoJoinChannelList(QStringList * pNewChannelList) +void KviIrcNetwork::setAutoJoinChannelList(QStringList * pNewChannelList) { if(m_pChannelList)delete m_pChannelList; m_pChannelList = pNewChannelList; } -void KviNetwork::setAutoJoinChannelList(const QString & szNewChannelList) +void KviIrcNetwork::setAutoJoinChannelList(const QString & szNewChannelList) { if(m_pChannelList) delete m_pChannelList; @@ -70,13 +70,13 @@ void KviNetwork::setAutoJoinChannelList(const QString & szNewChannelList) m_pChannelList = new QStringList(lChans); } -void KviNetwork::setNickServRuleSet(KviNickServRuleSet * s) +void KviIrcNetwork::setNickServRuleSet(KviNickServRuleSet * s) { if(m_pNickServRuleSet)delete m_pNickServRuleSet; m_pNickServRuleSet = s; } -void KviNetwork::copyFrom(const KviNetwork &src) +void KviIrcNetwork::copyFrom(const KviIrcNetwork &src) { m_szName = src.m_szName; m_szEncoding = src.m_szEncoding; @@ -97,24 +97,24 @@ void KviNetwork::copyFrom(const KviNetwork &src) if(src.m_pNickServRuleSet)m_pNickServRuleSet = new KviNickServRuleSet(*(src.m_pNickServRuleSet)); else m_pNickServRuleSet = 0; /* - // We don't copy the server list, since this function is called in KviServerOptionsWidget::commit() + // We don't copy the server list, since this function is called in KviIrcServerOptionsWidget::commit() // to recreate the server list from scratch; copying the original servers will mean duplicate servers // (see bug ticket #300) - for (KviServer *s = src.m_pServerList->first(); s; s = src.m_pServerList->next()) + for (KviIrcServer *s = src.m_pServerList->first(); s; s = src.m_pServerList->next()) { - m_pServerList->append(new KviServer(*s)); + m_pServerList->append(new KviIrcServer(*s)); } */ } -void KviNetwork::insertServer(KviServer *srv) +void KviIrcNetwork::insertServer(KviIrcServer *srv) { m_pServerList->append(srv); } -KviServer * KviNetwork::findServer(const QString & szHostname) +KviIrcServer * KviIrcNetwork::findServer(const QString & szHostname) { - for (KviServer *s = m_pServerList->first(); s; s = m_pServerList->next()) + for (KviIrcServer *s = m_pServerList->first(); s; s = m_pServerList->next()) { if (KviQString::equalCI(s->m_szHostname, szHostname)) return s; @@ -122,9 +122,9 @@ KviServer * KviNetwork::findServer(const QString & szHostname) return 0; } -KviServer * KviNetwork::findServer(const KviServer * pServer) +KviIrcServer * KviIrcNetwork::findServer(const KviIrcServer * pServer) { - for (KviServer *s = m_pServerList->first(); s; s = m_pServerList->next()) + for (KviIrcServer *s = m_pServerList->first(); s; s = m_pServerList->next()) { // we better go with the unique id first if(!s->m_szId.isEmpty()) @@ -144,12 +144,12 @@ KviServer * KviNetwork::findServer(const KviServer * pServer) return 0; } -void KviNetwork::setCurrentServer(KviServer *srv) +void KviIrcNetwork::setCurrentServer(KviIrcServer *srv) { if(m_pServerList->findRef(srv) != -1)m_pCurrentServer = srv; } -KviServer * KviNetwork::currentServer() +KviIrcServer * KviIrcNetwork::currentServer() { if(m_pCurrentServer)return m_pCurrentServer; m_pCurrentServer = m_pServerList->first(); diff --git a/src/kvilib/irc/KviNetwork.h b/src/kvilib/irc/KviIrcNetwork.h index bf71a968c..06fd1fdce 100644 --- a/src/kvilib/irc/KviNetwork.h +++ b/src/kvilib/irc/KviIrcNetwork.h @@ -2,7 +2,7 @@ #define KVI_NETWORK_H_ //============================================================================= // -// File : KviNetwork.cpp +// File : KviIrcNetwork.cpp // Creation date : Wed Aug 27 2008 17:44:56 by Alexey Uzhva // // This file is part of the KVirc irc client distribution @@ -25,7 +25,7 @@ //============================================================================= /** -* \file KviNetwork.cpp +* \file KviIrcNetwork.cpp * \author Alexey Uzhva * \brief Network handling */ @@ -38,35 +38,35 @@ #include <QStringList> class KviNickServRuleSet; -class KviServer; +class KviIrcServer; class QStringList; /** -* \class KviNetwork +* \class KviIrcNetwork * \brief Network handling class */ -class KVILIB_API KviNetwork : public KviHeapObject +class KVILIB_API KviIrcNetwork : public KviHeapObject { - friend class KviServerDataBase; + friend class KviIrcServerDataBase; public: /** * \brief Construct the network object * \param name The name of the network - * \return KviNetwork + * \return KviIrcNetwork */ - KviNetwork(const QString & name); + KviIrcNetwork(const QString & name); /** * \brief Carbon copy * \param src The source network - * \return KviNetwork + * \return KviIrcNetwork */ - KviNetwork(const KviNetwork & src); + KviIrcNetwork(const KviIrcNetwork & src); /** * \brief Destroys the network object */ - ~KviNetwork(); + ~KviIrcNetwork(); protected: QString m_szName; QString m_szDescription; @@ -83,9 +83,9 @@ protected: bool m_bAutoConnect; // autoconnect QString m_szUserIdentityId; // The user identity to use for this server: if empty // Then use the global primary identity - //moved from KviServerDataBaseRecord - KviPointerList<KviServer> * m_pServerList; - KviServer * m_pCurrentServer; + //moved from KviIrcServerDataBaseRecord + KviPointerList<KviIrcServer> * m_pServerList; + KviIrcServer * m_pCurrentServer; public: /** * \brief Returns the name of the network @@ -194,7 +194,7 @@ public: * \param d The source network to copy from * \return void */ - void copyFrom(const KviNetwork & d); + void copyFrom(const KviIrcNetwork & d); /** * \brief Sets the name of the network @@ -300,43 +300,43 @@ public: /** * \brief Returns a list of servers associated to the network - * \return KviPointerList<KviServer> * + * \return KviPointerList<KviIrcServer> * */ - inline KviPointerList<KviServer> * serverList(){ return m_pServerList; }; + inline KviPointerList<KviIrcServer> * serverList(){ return m_pServerList; }; /** * \brief Returns the current server - * \return KviServer + * \return KviIrcServer */ - KviServer * currentServer(); + KviIrcServer * currentServer(); /** * \brief Adds a new server to the network * \param srv The source server to add * \return void */ - void insertServer(KviServer * srv); + void insertServer(KviIrcServer * srv); /** * \brief Searches for a server in the network * \param szHostname The hostname of the server to find - * \return KviServer + * \return KviIrcServer */ - KviServer * findServer(const QString & szHostname); + KviIrcServer * findServer(const QString & szHostname); /** * \brief Searches for a server in the network * \param pServer The server to find - * \return KviServer + * \return KviIrcServer */ - KviServer * findServer(const KviServer * pServer); + KviIrcServer * findServer(const KviIrcServer * pServer); /** * \brief Sets the current server * \param srv The source server * \return void */ - void setCurrentServer(KviServer * srv); + void setCurrentServer(KviIrcServer * srv); }; #endif // KVI_NETWORK_H_ diff --git a/src/kvilib/irc/KviIrcServer.cpp b/src/kvilib/irc/KviIrcServer.cpp index 0456a67e7..c036cedb0 100644 --- a/src/kvilib/irc/KviIrcServer.cpp +++ b/src/kvilib/irc/KviIrcServer.cpp @@ -43,7 +43,7 @@ //extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; -KviServer::KviServer() +KviIrcServer::KviIrcServer() { m_pReconnectInfo = 0; m_uFlags = 0; @@ -53,7 +53,7 @@ KviServer::KviServer() m_iProxy = -1; } -KviProxy * KviServer::proxyServer(KviProxyDataBase * pDb) +KviProxy * KviIrcServer::proxyServer(KviProxyDataBase * pDb) { int i = 0; if(proxy() < 0) return 0; @@ -66,7 +66,7 @@ KviProxy * KviServer::proxyServer(KviProxyDataBase * pDb) return 0; } -KviServer::KviServer(const KviServer & serv) +KviIrcServer::KviIrcServer(const KviIrcServer & serv) { m_szHostname = serv.m_szHostname; m_szIp = serv.m_szIp; @@ -95,11 +95,11 @@ KviServer::KviServer(const KviServer & serv) else m_pAutoJoinChannelList = 0; if(serv.m_pReconnectInfo) - m_pReconnectInfo = new KviServerReconnectInfo(*(serv.m_pReconnectInfo)); + m_pReconnectInfo = new KviIrcServerReconnectInfo(*(serv.m_pReconnectInfo)); else m_pReconnectInfo = 0; } -void KviServer::operator=(const KviServer & serv) +void KviIrcServer::operator=(const KviIrcServer & serv) { m_szHostname = serv.m_szHostname; m_szIp = serv.m_szIp; @@ -130,11 +130,11 @@ void KviServer::operator=(const KviServer & serv) if(m_pReconnectInfo) delete m_pReconnectInfo; if(serv.m_pReconnectInfo) - m_pReconnectInfo = new KviServerReconnectInfo(*(serv.m_pReconnectInfo)); + m_pReconnectInfo = new KviIrcServerReconnectInfo(*(serv.m_pReconnectInfo)); else m_pReconnectInfo = 0; } -KviServer::~KviServer() +KviIrcServer::~KviIrcServer() { if(m_pAutoJoinChannelList) { @@ -148,14 +148,14 @@ KviServer::~KviServer() } } -void KviServer::generateUniqueId() +void KviIrcServer::generateUniqueId() { struct timeval tv; kvi_gettimeofday(&tv,0); KviQString::sprintf(m_szId,"myserver%d%d%d",tv.tv_usec,rand() % 1000,rand() % 1000); } -QString KviServer::ircUri() +QString KviIrcServer::ircUri() { QString szUri("irc"); if(useSSL()) szUri += "s"; @@ -173,14 +173,14 @@ QString KviServer::ircUri() return szUri; } -void KviServer::setAutoJoinChannelList(QStringList * pNewChannelList) +void KviIrcServer::setAutoJoinChannelList(QStringList * pNewChannelList) { if(m_pAutoJoinChannelList) delete m_pAutoJoinChannelList; m_pAutoJoinChannelList = pNewChannelList; } -void KviServer::setAutoJoinChannelList(const QString & szNewChannelList) +void KviIrcServer::setAutoJoinChannelList(const QString & szNewChannelList) { if(m_pAutoJoinChannelList) delete m_pAutoJoinChannelList; @@ -191,7 +191,7 @@ void KviServer::setAutoJoinChannelList(const QString & szNewChannelList) m_pAutoJoinChannelList = new QStringList(lChans); } -bool KviServer::load(KviConfigurationFile * cfg, const QString & szPrefix) +bool KviIrcServer::load(KviConfigurationFile * cfg, const QString & szPrefix) { QString szTmp; KviQString::sprintf(szTmp,"%QHostname",&szPrefix); @@ -257,7 +257,7 @@ bool KviServer::load(KviConfigurationFile * cfg, const QString & szPrefix) return true; } -void KviServer::save(KviConfigurationFile * cfg, const QString & szPrefix) +void KviIrcServer::save(KviConfigurationFile * cfg, const QString & szPrefix) { QString szTmp; KviQString::sprintf(szTmp,"%QHostname",&szPrefix); @@ -392,16 +392,16 @@ void KviServer::save(KviConfigurationFile * cfg, const QString & szPrefix) } -KviServerReconnectInfo::KviServerReconnectInfo() +KviIrcServerReconnectInfo::KviIrcServerReconnectInfo() { m_bIsAway = false; } -KviServerReconnectInfo::~KviServerReconnectInfo() +KviIrcServerReconnectInfo::~KviIrcServerReconnectInfo() { } -KviServerReconnectInfo::KviServerReconnectInfo(const KviServerReconnectInfo & info) +KviIrcServerReconnectInfo::KviIrcServerReconnectInfo(const KviIrcServerReconnectInfo & info) { m_szNick = info.m_szNick; m_szPass = info.m_szPass; diff --git a/src/kvilib/irc/KviIrcServer.h b/src/kvilib/irc/KviIrcServer.h index 73d260def..f3633dba7 100644 --- a/src/kvilib/irc/KviIrcServer.h +++ b/src/kvilib/irc/KviIrcServer.h @@ -47,7 +47,7 @@ class KviConfigurationFile; class KviNickServRuleSet; class KviProxy; class KviProxyDataBase; -class KviServer; +class KviIrcServer; #define KVI_IRCSERVER_FLAG_IPV6 1 #define KVI_IRCSERVER_FLAG_CACHEIP 2 @@ -57,29 +57,29 @@ class KviServer; #define KVI_IRCSERVER_FLAG_CAP 32 /** -* \class KviServerReconnectInfo +* \class KviIrcServerReconnectInfo * \brief A class for reconnecting purposes */ -class KVILIB_API KviServerReconnectInfo +class KVILIB_API KviIrcServerReconnectInfo { public: /** * \brief Constructs the server reconnect info object - * \return KviServerReconnectInfo + * \return KviIrcServerReconnectInfo */ - KviServerReconnectInfo(); + KviIrcServerReconnectInfo(); /** * \brief Carbon copy * \param info The object to copy the info from - * \return KviServerReconnectInfo + * \return KviIrcServerReconnectInfo */ - KviServerReconnectInfo(const KviServerReconnectInfo & info); + KviIrcServerReconnectInfo(const KviIrcServerReconnectInfo & info); /** * \brief Destroys the server reconnect info object */ - ~KviServerReconnectInfo(); + ~KviIrcServerReconnectInfo(); public: QString m_szNick; QString m_szPass; @@ -90,31 +90,31 @@ public: }; /** -* \class KviServer +* \class KviIrcServer * \brief The class which manages the irc servers */ -class KVILIB_API KviServer : public KviHeapObject +class KVILIB_API KviIrcServer : public KviHeapObject { public: /** * \brief Constructs the server object - * \return KviServer + * \return KviIrcServer */ - KviServer(); + KviIrcServer(); /** * \brief Carbon copy * \param serv The irc server - * \return KviServer + * \return KviIrcServer */ - KviServer(const KviServer & serv); + KviIrcServer(const KviIrcServer & serv); /** * \brief Destroys the server object */ - ~KviServer(); + ~KviIrcServer(); public: - KviServerReconnectInfo * m_pReconnectInfo; + KviIrcServerReconnectInfo * m_pReconnectInfo; QString m_szHostname; // the server hostname (or ip eventually) QString m_szIp; // the server's cached ip (if we're caching) QString m_szDescription; // the server description @@ -580,7 +580,7 @@ public: * \param s The server to copy * \return void */ - void operator=(const KviServer & s); + void operator=(const KviIrcServer & s); }; #endif //_KVI_IRCSERVER_H_ diff --git a/src/kvilib/irc/KviIrcServerDataBase.cpp b/src/kvilib/irc/KviIrcServerDataBase.cpp index 5aae7b1d8..b3de29559 100644 --- a/src/kvilib/irc/KviIrcServerDataBase.cpp +++ b/src/kvilib/irc/KviIrcServerDataBase.cpp @@ -34,15 +34,15 @@ #include <QMessageBox> #include <QCheckBox> -KviServerDataBase::KviServerDataBase() +KviIrcServerDataBase::KviIrcServerDataBase() { - m_pRecords = new KviPointerHashTable<QString,KviNetwork>(17,false); + m_pRecords = new KviPointerHashTable<QString,KviIrcNetwork>(17,false); m_pRecords->setAutoDelete(true); m_pAutoConnectOnStartupServers = 0; m_pAutoConnectOnStartupNetworks = 0; } -KviServerDataBase::~KviServerDataBase() +KviIrcServerDataBase::~KviIrcServerDataBase() { delete m_pRecords; if(m_pAutoConnectOnStartupServers) @@ -51,7 +51,7 @@ KviServerDataBase::~KviServerDataBase() delete m_pAutoConnectOnStartupNetworks; } -void KviServerDataBase::clearAutoConnectOnStartupServers() +void KviIrcServerDataBase::clearAutoConnectOnStartupServers() { if(!m_pAutoConnectOnStartupServers) return; @@ -60,7 +60,7 @@ void KviServerDataBase::clearAutoConnectOnStartupServers() m_pAutoConnectOnStartupServers = 0; } -void KviServerDataBase::clearAutoConnectOnStartupNetworks() +void KviIrcServerDataBase::clearAutoConnectOnStartupNetworks() { if(!m_pAutoConnectOnStartupNetworks) return; @@ -69,32 +69,32 @@ void KviServerDataBase::clearAutoConnectOnStartupNetworks() m_pAutoConnectOnStartupNetworks = 0; } -void KviServerDataBase::clear() +void KviIrcServerDataBase::clear() { m_pRecords->clear(); m_szCurrentNetwork = ""; } -void KviServerDataBase::addNetwork(KviNetwork * n) +void KviIrcServerDataBase::addNetwork(KviIrcNetwork * n) { m_pRecords->replace(n->name(),n); } -KviNetwork * KviServerDataBase::findNetwork(const QString & szName) +KviIrcNetwork * KviIrcServerDataBase::findNetwork(const QString & szName) { - KviNetwork * r = m_pRecords->find(szName); + KviIrcNetwork * r = m_pRecords->find(szName); return r; } -unsigned int KviServerDataBase::networkCount() const +unsigned int KviIrcServerDataBase::networkCount() const { return m_pRecords->count(); } -KviNetwork * KviServerDataBase::currentNetwork() +KviIrcNetwork * KviIrcServerDataBase::currentNetwork() { - KviNetwork * r = 0; + KviIrcNetwork * r = 0; if(!m_szCurrentNetwork.isEmpty()) r = m_pRecords->find(m_szCurrentNetwork); if(r) @@ -103,7 +103,7 @@ KviNetwork * KviServerDataBase::currentNetwork() return 0; } -bool KviServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetName, KviNetwork * r, QString & szError) +bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetName, KviIrcNetwork * r, QString & szError) { m_szCurrentNetwork = szNetName; // find a round-robin server in that network @@ -114,7 +114,7 @@ bool KviServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetName return false; } - for(KviServer * s = r->m_pServerList->first(); s; s = r->m_pServerList->next()) + for(KviIrcServer * s = r->m_pServerList->first(); s; s = r->m_pServerList->next()) { if(s->m_szDescription.contains("random",Qt::CaseInsensitive) || (s->m_szDescription.contains("round",Qt::CaseInsensitive) && @@ -133,7 +133,7 @@ bool KviServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetName KviQString::sprintf(szTryAlso2,"irc.%Q.net",&szNetName); KviQString::sprintf(szTryAlso3,"irc.%Q.com",&szNetName); - for(KviServer * ss = r->m_pServerList->first(); ss; ss = r->m_pServerList->next()) + for(KviIrcServer * ss = r->m_pServerList->first(); ss; ss = r->m_pServerList->next()) { if(KviQString::equalCI(ss->m_szHostname,szTryAlso1) || KviQString::equalCI(ss->m_szHostname,szTryAlso2) || @@ -148,20 +148,20 @@ bool KviServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetName return true; } -bool KviServerDataBase::makeCurrentServer(KviServerDefinition * d, QString & szError) +bool KviIrcServerDataBase::makeCurrentServer(KviIrcServerDefinition * d, QString & szError) { - KviServer * pServer = 0; + KviIrcServer * pServer = 0; - KviPointerHashTableIterator<QString,KviNetwork> it(*m_pRecords); - KviNetwork * r = 0; - KviServer * srv; + KviPointerHashTableIterator<QString,KviIrcNetwork> it(*m_pRecords); + KviIrcNetwork * r = 0; + KviIrcServer * srv; if(KviQString::equalCIN(d->szServer,"net:",4)) { // net:networkname form QString szNet = d->szServer; szNet.remove(0,4); - KviNetwork * r = m_pRecords->find(szNet); + KviIrcNetwork * r = m_pRecords->find(szNet); if(r)return makeCurrentBestServerInNetwork(szNet,r,szError); szError = __tr2qs("The server specification seems to be in the net:<string> but the network couln't be found in the database"); return false; @@ -272,7 +272,7 @@ search_finished: if(!d->szServer.contains('.')) { // assume it is a network name! - KviNetwork * r = m_pRecords->find(d->szServer); + KviIrcNetwork * r = m_pRecords->find(d->szServer); if(r)return makeCurrentBestServerInNetwork(d->szServer,r,szError); // else probably not a network name } @@ -283,11 +283,11 @@ search_finished: r = m_pRecords->find(__tr2qs("Standalone Servers")); if(!r) { - r = new KviNetwork(__tr2qs("Standalone Servers")); + r = new KviIrcNetwork(__tr2qs("Standalone Servers")); m_pRecords->replace(r->name(),r); } - KviServer * s = new KviServer(); + KviIrcServer * s = new KviIrcServer(); s->m_szHostname = d->szServer; if(bIsValidIPv4) { @@ -354,7 +354,7 @@ QString & szDescription,QString & szHost,QString & szPort,bool & bSsl,kvi_u32_t } } -void KviServerDataBase::importFromMircIni(const QString & filename, const QString & szMircIni, QStringList & recentServers) +void KviIrcServerDataBase::importFromMircIni(const QString & filename, const QString & szMircIni, QStringList & recentServers) { clear(); recentServers.clear(); @@ -418,14 +418,14 @@ void KviServerDataBase::importFromMircIni(const QString & filename, const QStrin parseMircServerRecord(entry,szNet, szDescription,szHost,szPort,bSsl,uPort); - KviNetwork * r = findNetwork(szNet); + KviIrcNetwork * r = findNetwork(szNet); if(!r) { - r = new KviNetwork(szNet); + r = new KviIrcNetwork(szNet); addNetwork(r); } - KviServer *s = new KviServer(); + KviIrcServer *s = new KviIrcServer(); s->m_szHostname = szHost; s->m_szDescription = szDescription; s->m_uPort = uPort; @@ -442,7 +442,7 @@ void KviServerDataBase::importFromMircIni(const QString & filename, const QStrin } } -void KviServerDataBase::load(const QString & filename) +void KviIrcServerDataBase::load(const QString & filename) { clear(); KviConfigurationFile cfg(filename,KviConfigurationFile::Read); @@ -455,7 +455,7 @@ void KviServerDataBase::load(const QString & filename) { if(it.current()->count() > 0) { - KviNetwork * pNewNet = new KviNetwork(it.currentKey()); + KviIrcNetwork * pNewNet = new KviIrcNetwork(it.currentKey()); addNetwork(pNewNet); cfg.setGroup(it.currentKey()); pNewNet->m_szEncoding = cfg.readEntry("Encoding"); @@ -474,7 +474,7 @@ void KviServerDataBase::load(const QString & filename) { if(!m_pAutoConnectOnStartupNetworks) { - m_pAutoConnectOnStartupNetworks = new KviPointerList<KviNetwork>; + m_pAutoConnectOnStartupNetworks = new KviPointerList<KviIrcNetwork>; m_pAutoConnectOnStartupNetworks->setAutoDelete(false); } m_pAutoConnectOnStartupNetworks->append(pNewNet); @@ -487,7 +487,7 @@ void KviServerDataBase::load(const QString & filename) int nServers = cfg.readIntEntry("NServers",0); for(int i=0;i < nServers;i++) { - KviServer *s = new KviServer(); + KviIrcServer *s = new KviIrcServer(); KviQString::sprintf(tmp,"%d_",i); if(s->load(&cfg,tmp)) { @@ -498,7 +498,7 @@ void KviServerDataBase::load(const QString & filename) { if(!m_pAutoConnectOnStartupServers) { - m_pAutoConnectOnStartupServers = new KviPointerList<KviServer>; + m_pAutoConnectOnStartupServers = new KviPointerList<KviIrcServer>; m_pAutoConnectOnStartupServers->setAutoDelete(false); } m_pAutoConnectOnStartupServers->append(s); @@ -511,17 +511,17 @@ void KviServerDataBase::load(const QString & filename) } } -void KviServerDataBase::save(const QString &filename) +void KviIrcServerDataBase::save(const QString &filename) { KviConfigurationFile cfg(filename,KviConfigurationFile::Write); cfg.clear(); // clear any old entry - KviPointerHashTableIterator<QString,KviNetwork> it(*m_pRecords); + KviPointerHashTableIterator<QString,KviIrcNetwork> it(*m_pRecords); QString tmp; - while(KviNetwork * pNetwork = it.current()) + while(KviIrcNetwork * pNetwork = it.current()) { cfg.setGroup(pNetwork->name()); cfg.writeEntry("NServers",pNetwork->m_pServerList->count()); @@ -552,7 +552,7 @@ void KviServerDataBase::save(const QString &filename) if(!pNetwork->m_szUserIdentityId.isEmpty()) cfg.writeEntry("UserIdentityId",pNetwork->m_szUserIdentityId); int i=0; - for(KviServer *s = pNetwork->m_pServerList->first();s;s = pNetwork->m_pServerList->next()) + for(KviIrcServer *s = pNetwork->m_pServerList->first();s;s = pNetwork->m_pServerList->next()) { KviQString::sprintf(tmp,"%d_",i); s->save(&cfg,tmp); diff --git a/src/kvilib/irc/KviIrcServerDataBase.h b/src/kvilib/irc/KviIrcServerDataBase.h index cf542e130..a2c2d04dd 100644 --- a/src/kvilib/irc/KviIrcServerDataBase.h +++ b/src/kvilib/irc/KviIrcServerDataBase.h @@ -33,15 +33,15 @@ #include "kvi_settings.h" #include "KviQString.h" #include "KviIrcServer.h" -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "KviPointerHashTable.h" /** -* \typedef KviServerDefinition -* \struct _KviServerDefinition +* \typedef KviIrcServerDefinition +* \struct _KviIrcServerDefinition * \brief Server definition */ -typedef struct _KviServerDefinition +typedef struct _KviIrcServerDefinition { QString szServer; kvi_u32_t uPort; @@ -54,30 +54,30 @@ typedef struct _KviServerDefinition QString szNick; QString szInitUMode; QString szId; -} KviServerDefinition; +} KviIrcServerDefinition; /** -* \class KviServerDataBase +* \class KviIrcServerDataBase * \brief Irc server database handling class */ -class KVILIB_API KviServerDataBase +class KVILIB_API KviIrcServerDataBase { public: /** * \brief Constructs the server database object - * \return KviServerDataBase + * \return KviIrcServerDataBase */ - KviServerDataBase(); + KviIrcServerDataBase(); /** * \brief Destroys the server database object */ - ~KviServerDataBase(); + ~KviIrcServerDataBase(); private: - KviPointerHashTable<QString,KviNetwork> * m_pRecords; + KviPointerHashTable<QString,KviIrcNetwork> * m_pRecords; QString m_szCurrentNetwork; - KviPointerList<KviServer> * m_pAutoConnectOnStartupServers; - KviPointerList<KviNetwork> * m_pAutoConnectOnStartupNetworks; + KviPointerList<KviIrcServer> * m_pAutoConnectOnStartupServers; + KviPointerList<KviIrcNetwork> * m_pAutoConnectOnStartupNetworks; public: /** * \brief Deletes the database @@ -87,9 +87,9 @@ public: /** * \brief Returns the record dictionary of the database - * \return KviPointerHashTable<QString,KviNetwork> * + * \return KviPointerHashTable<QString,KviIrcNetwork> * */ - inline KviPointerHashTable<QString,KviNetwork> * recordDict(){ return m_pRecords; }; + inline KviPointerHashTable<QString,KviIrcNetwork> * recordDict(){ return m_pRecords; }; /** * \brief Returns a list of servers to connect on startup @@ -99,9 +99,9 @@ public: * only during the startup phase because it contains shallow pointers to the * servers really contained in the server/network list and it is never updated * later. - * \return KviPointerList<KviServer> * + * \return KviPointerList<KviIrcServer> * */ - inline KviPointerList<KviServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; }; + inline KviPointerList<KviIrcServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; }; /** * \brief Returns a list of networks to connect on startup @@ -111,9 +111,9 @@ public: * only during the startup phase because it contains shallow pointers to the * networks really contained in the server/network list and it is never * updated later. - * \return KviPointerList<KviNetwork> * + * \return KviPointerList<KviIrcNetwork> * */ - inline KviPointerList<KviNetwork> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; }; + inline KviPointerList<KviIrcNetwork> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; }; /** * \brief Deletes the list of autoconnect servers @@ -142,23 +142,23 @@ public: /** * \brief Returns the current network - * \return KviNetwork + * \return KviIrcNetwork */ - KviNetwork * currentNetwork(); + KviIrcNetwork * currentNetwork(); /** * \brief Adds a network to the database * \param n The source network * \return void */ - void addNetwork(KviNetwork * n); + void addNetwork(KviIrcNetwork * n); /** * \brief Searches for a network * \param name The name of the network to find - * \return KviNetwork + * \return KviIrcNetwork */ - KviNetwork * findNetwork(const QString & name); + KviIrcNetwork * findNetwork(const QString & name); /** * \brief Returns the number of networks @@ -195,7 +195,7 @@ public: * \param szError The container for a possible error * \return bool */ - bool makeCurrentServer(KviServerDefinition * d, QString & szError); + bool makeCurrentServer(KviIrcServerDefinition * d, QString & szError); /** * \brief Marks the current servers as the best in the network @@ -204,7 +204,7 @@ public: * \param szError The container for a possible error * \return bool */ - bool makeCurrentBestServerInNetwork(const QString & szNetName, KviNetwork * d, QString & szError); + bool makeCurrentBestServerInNetwork(const QString & szNetName, KviIrcNetwork * d, QString & szError); }; #endif //_KVI_IRCSERVERDB_H_ diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp index ef4cfcefb..8004633e6 100644 --- a/src/kvilib/net/KviDnsResolver.cpp +++ b/src/kvilib/net/KviDnsResolver.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "KviDnsResolver.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include <errno.h> diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h index bf3552179..9de5a1726 100644 --- a/src/kvilib/net/KviDnsResolver.h +++ b/src/kvilib/net/KviDnsResolver.h @@ -30,8 +30,7 @@ #include "KviThread.h" #include "KviQString.h" - -class KviDnsResolverThread; // not part of the API +class KviDnsResolverThread; class KVILIB_API KviDnsResolverResult : public KviHeapObject @@ -43,20 +42,44 @@ protected: public: ~KviDnsResolverResult(); protected: - int m_iError; + int m_iError; KviPointerList<QString> * m_pHostnameList; KviPointerList<QString> * m_pIpAddressList; - QString m_szQuery; + QString m_szQuery; public: - int error(){ return m_iError; }; + int error() + { + return m_iError; + } + // never store nor delete these pointers! // (these are NEVER 0) - KviPointerList<QString> * hostnameList(){ return m_pHostnameList; }; - KviPointerList<QString> * ipAddressList(){ return m_pIpAddressList; }; - const QString &query(){ return m_szQuery; }; + KviPointerList<QString> * hostnameList() + { + return m_pHostnameList; + } + + KviPointerList<QString> * ipAddressList() + { + return m_pIpAddressList; + } + + const QString &query() + { + return m_szQuery; + } + protected: - void setError(int iError){ m_iError = iError; }; - void setQuery(const QString &query){ m_szQuery = query; }; + void setError(int iError) + { + m_iError = iError; + } + + void setQuery(const QString &query) + { + m_szQuery = query; + } + void appendHostname(const QString &host); void appendAddress(const QString &addr); }; @@ -69,15 +92,15 @@ class KVILIB_API KviDnsResolver : public QObject, public KviHeapObject Q_PROPERTY(bool blockingDelete READ isRunning) public: KviDnsResolver(); - ~KviDnsResolver(); + virtual ~KviDnsResolver(); public: enum QueryType { IPv4, IPv6, Any }; enum State { Idle, Busy, Failure, Success }; protected: - void * m_pAuxData; + void * m_pAuxData; KviDnsResolverThread * m_pSlaveThread; KviDnsResolverResult * m_pDnsResult; - State m_state; + State m_state; public: ///////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -125,7 +148,7 @@ class KviDnsResolverThread : public KviThread friend class KviDnsResolver; protected: KviDnsResolverThread(KviDnsResolver * pDns); - ~KviDnsResolverThread(); + virtual ~KviDnsResolverThread(); protected: QString m_szQuery; KviDnsResolver::QueryType m_queryType; diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp index 1dfd59acc..3dd84ebfb 100644 --- a/src/kvilib/net/KviHttpRequest.cpp +++ b/src/kvilib/net/KviHttpRequest.cpp @@ -32,7 +32,7 @@ #include "KviLocale.h" #include "KviNetUtils.h" #include "KviDnsResolver.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "kvi_socket.h" #include "KviTimeUtils.h" diff --git a/src/kvilib/net/kvi_socket.h b/src/kvilib/net/kvi_socket.h index d0f3067d7..8c0f61ba8 100644 --- a/src/kvilib/net/kvi_socket.h +++ b/src/kvilib/net/kvi_socket.h @@ -46,22 +46,23 @@ #define KVI_INVALID_SOCKET INVALID_SOCKET - //every decent win version should contain IPPROTO_IPV6 + //every decent win version should contain IPPROTO_IPV6 - //old mingw win32 headers doesn't contain this - #ifndef IPV6_PROTECTION_LEVEL - # define IPV6_PROTECTION_LEVEL 23 - # define PROTECTION_LEVEL_UNRESTRICTED 10 /* for peer-to-peer apps */ - # define PROTECTION_LEVEL_DEFAULT 20 /* default level */ - # define PROTECTION_LEVEL_RESTRICTED 30 /* for Intranet apps */ - #endif + //old mingw win32 headers doesn't contain this + #ifndef IPV6_PROTECTION_LEVEL + #define IPV6_PROTECTION_LEVEL 23 + #define PROTECTION_LEVEL_UNRESTRICTED 10 /* for peer-to-peer apps */ + #define PROTECTION_LEVEL_DEFAULT 20 /* default level */ + #define PROTECTION_LEVEL_RESTRICTED 30 /* for Intranet apps */ + #endif #define KVI_IPV6_PROTECTION_LEVEL IPV6_PROTECTION_LEVEL #define KVI_PROTECTION_LEVEL_RESTRICTED PROTECTION_LEVEL_RESTRICTED #define KVI_PROTECTION_LEVEL_DEFAULT PROTECTION_LEVEL_DEFAULT #define KVI_PROTECTION_LEVEL_UNRESTRICTED PROTECTION_LEVEL_UNRESTRICTED - #define KVI_IPPROTO_IPV6 IPPROTO_IPV6 -#else + #define KVI_IPPROTO_IPV6 IPPROTO_IPV6 + +#else //!(defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)) #include <sys/time.h> #include <sys/types.h> @@ -72,14 +73,12 @@ #include <unistd.h> #define KVI_INVALID_SOCKET (-1) -#endif +#endif //!(defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)) #ifndef MSG_NOSIGNAL // At least solaris seems to not have it #define MSG_NOSIGNAL 0 -#endif - -//#include "kvi_socketcalls.h" +#endif //!MSG_NOSIGNAL //================================================================================================ diff --git a/src/kvilib/system/KviByteOrder.h b/src/kvilib/system/KviByteOrder.h index c7d1b56d6..6fcc50308 100644 --- a/src/kvilib/system/KviByteOrder.h +++ b/src/kvilib/system/KviByteOrder.h @@ -5,9 +5,11 @@ // // File : KviByteOrder.h // Creation date : Mon Dec 25 2006 19:56:16 CEST by Szymon Stefanek +// Based on file : kvi_bswap.h +// Creation date : Fri Mar 19 1999 03:15:21 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2006-2010 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 1999-2010 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -26,57 +28,100 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_bswap.h" #include "kvi_inttypes.h" namespace KviByteOrder { + /** + * \brief Swaps the endianess of a kvi_u64_t + * + * \param i the original value + * \return kvi_u64_t + */ + inline kvi_u64_t swap64(kvi_u64_t i) + { + // abcdefgh to hgfedcba + return ((i << 56) | /* h to a */ + ((i & 0xff00) << 40) | /* g to b */ + ((i & 0xff0000) << 24) | /* f to c */ + ((i & 0xff000000) << 8) | /* e to d */ + ((i >> 8) & 0xff000000) | /* d to e */ + ((i >> 24) & 0xff0000) | /* c to f */ + ((i >> 40) & 0xff00) | /* b to g */ + (i >> 56)); /* a to h */ + } + + /** + * \brief Swaps the endianess of a kvi_u32_t + * + * \param i the original value + * \return kvi_u32_t + */ + inline kvi_u32_t swap32(kvi_u32_t i) + { + // abcd to dcba + return ((i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24)); + } + + /** + * \brief Swaps the endianess of a kvi_u16_t + * + * \param i the original value + * \return kvi_u16_t + */ + inline kvi_u16_t swap16(kvi_u16_t i) + { + // ab to ba + return ((i << 8) | (i >> 8)); + } + -// -// Byte Orders Reminder -// Number 0xaabbccdd -// Little Endian Stores 0xdd 0xcc 0xbb 0xaa -// Big Endian Stores 0xaa 0xbb 0xcc 0xdd -// Perverse Middle Endian 0xbb 0xaa 0xdd 0xcc or another braindamaged combination (unsupported) -// Network Byte Order is Big Endian -// Intel Stuff uses Little Endian -// PPC is Big Endian -// Universal binaries on MacOSX use both Big and Little Endian -// + // + // Byte Orders Reminder + // Number 0xaabbccdd + // Little Endian Stores 0xdd 0xcc 0xbb 0xaa + // Big Endian Stores 0xaa 0xbb 0xcc 0xdd + // Perverse Middle Endian 0xbb 0xaa 0xdd 0xcc or another braindamaged combination (unsupported) + // Network Byte Order is Big Endian + // Intel Stuff uses Little Endian + // PPC is Big Endian + // Universal binaries on MacOSX use both Big and Little Endian + // #ifdef BIG_ENDIAN_MACHINE_BYTE_ORDER inline kvi_u16_t localCpuToLittleEndian16(kvi_u16_t u) { - return kvi_swap16(u); + return swap16(u); } inline kvi_u32_t localCpuToLittleEndian32(kvi_u32_t u) { - return kvi_swap32(u); + return swap32(u); } inline kvi_u64_t localCpuToLittleEndian64(kvi_u64_t u) { - return kvi_swap64(u); + return swap64(u); } inline kvi_u16_t littleEndianToLocalCpu16(kvi_u16_t u) { - return kvi_swap16(u); + return swap16(u); } inline kvi_u32_t littleEndianToLocalCpu32(kvi_u32_t u) { - return kvi_swap32(u); + return swap32(u); } inline kvi_u64_t littleEndianToLocalCpu64(kvi_u64_t u) { - return kvi_swap64(u); + return swap64(u); } -#else +#else //!BIG_ENDIAN_MACHINE_BYTE_ORDER + // We ASSUME that the local cpu is little endian.. if it isn't.. well :) #define LOCAL_CPU_LITTLE_ENDIAN 1 @@ -110,9 +155,14 @@ namespace KviByteOrder return u; } -#endif +#endif //!BIG_ENDIAN_MACHINE_BYTE_ORDER } // namespace KviByteOrder + + + + + #endif // !_KVI_BYTEORDER_H_ diff --git a/src/kvilib/system/KviLocale.cpp b/src/kvilib/system/KviLocale.cpp index 5fff1d47c..5399a6f5d 100644 --- a/src/kvilib/system/KviLocale.cpp +++ b/src/kvilib/system/KviLocale.cpp @@ -27,7 +27,7 @@ //#define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" #include "KviMemory.h" -#include "kvi_bswap.h" +#include "KviByteOrder.h" #define _KVI_LOCALE_CPP_ #include "KviLocale.h" @@ -367,7 +367,7 @@ struct GnuMoStringDescriptor kvi_u32_t offset; }; -#define KVI_SWAP_IF_NEEDED(flag,value) (flag ? kvi_swap32(value) : (value)) +#define KVI_SWAP_IF_NEEDED(flag,value) (flag ? KviByteOrder::swap32(value) : (value)) //////////////////////////////////////////////////////////////////////////////////////// End of gettext.h & gettextP.h ////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp index 17506a1b0..f44453d96 100644 --- a/src/kvilib/system/KviThread.cpp +++ b/src/kvilib/system/KviThread.cpp @@ -43,7 +43,7 @@ #include "KviCString.h" #include "kvi_settings.h" -#include "kvi_error.h" +#include "KviError.h" #include <QApplication> diff --git a/src/kvilib/system/KviTimeUtils.h b/src/kvilib/system/KviTimeUtils.h index 98c82e4fb..d84a6a121 100644 --- a/src/kvilib/system/KviTimeUtils.h +++ b/src/kvilib/system/KviTimeUtils.h @@ -105,18 +105,11 @@ public: */ namespace KviTimeUtils { - /** \enum FormatTimeSpanFlags */ - enum FormatTimeSpanFlags { - NoLeadingEmptyIntervals = 1, /**< Causes the leading empty intervals to be omitted */ - NoLeadingZeroes = 2, /**< No leading zeroes are printed in hours and seconds */ - FillWithHypens = 4 /**< Uses only -- %d -- %h -- etc.. discards all other flags */ - }; - /** * \brief Returns the current time mills * \return long long */ - long long getCurrentTimeMills(); + KVILIB_API long long getCurrentTimeMills(); /** * \brief Splits the time span uSecs in days, hours, minutes and seconds @@ -130,6 +123,14 @@ namespace KviTimeUtils KVILIB_API void secondsToDaysHoursMinsSecs(unsigned int uSecs, unsigned int * uD, unsigned int * uH, unsigned int * uM, unsigned int * uS); + /** \enum FormatTimeSpanFlags */ + enum FormatTimeSpanFlags + { + NoLeadingEmptyIntervals = 1, /**< Causes the leading empty intervals to be omitted */ + NoLeadingZeroes = 2, /**< No leading zeroes are printed in hours and seconds */ + FillWithHypens = 4 /**< Uses only -- %d -- %h -- etc.. discards all other flags */ + }; + /** * \brief Returns a string formatted like x d x h xx m xx s * \param uSeconds The number of seconds to format diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index e891e8ca8..b1ec41346 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -131,7 +131,7 @@ DO NOT REMOVE THEM EVEN IF THEY ARE DEFINED ALSO IN kvi_app.h KVIRC_API KviApp * g_pApp = 0; KviConfigurationFile * g_pWinPropertiesConfig = 0; -KVIRC_API KviServerDataBase * g_pServerDataBase = 0; +KVIRC_API KviIrcServerDataBase * g_pServerDataBase = 0; KVIRC_API KviProxyDataBase * g_pProxyDataBase = 0; // Global windows @@ -363,7 +363,7 @@ void KviApp::setup() KVI_SPLASH_SET_PROGRESS(50) // Load the server database - g_pServerDataBase = new KviServerDataBase(); + g_pServerDataBase = new KviIrcServerDataBase(); if(getReadOnlyConfigPath(szTmp,KVI_CONFIGFILE_SERVERDB)) g_pServerDataBase->load(szTmp); @@ -497,7 +497,7 @@ void KviApp::setup() g_pInputPopup = new KviTalPopupMenu(); // create the server parser - g_pServerParser = new KviServerParser(); + g_pServerParser = new KviIrcServerParser(); KVI_SPLASH_SET_PROGRESS(91) @@ -1495,10 +1495,10 @@ void KviApp::saveConfiguration() void KviApp::autoConnectToServers() { - KviPointerList<KviServer> * pList = g_pServerDataBase->autoConnectOnStartupServers(); + KviPointerList<KviIrcServer> * pList = g_pServerDataBase->autoConnectOnStartupServers(); if(pList) { - for(KviServer * pServer = pList->first(); pServer; pServer = pList->next()) + for(KviIrcServer * pServer = pList->first(); pServer; pServer = pList->next()) { QString szCommand = "server -u \"id:"; if(pServer->id().isEmpty()) @@ -1510,10 +1510,10 @@ void KviApp::autoConnectToServers() g_pServerDataBase->clearAutoConnectOnStartupServers(); } - KviPointerList<KviNetwork> * pListNet = g_pServerDataBase->autoConnectOnStartupNetworks(); + KviPointerList<KviIrcNetwork> * pListNet = g_pServerDataBase->autoConnectOnStartupNetworks(); if(pListNet) { - for(KviNetwork * pNetwork = pListNet->first(); pNetwork; pNetwork = pListNet->next()) + for(KviIrcNetwork * pNetwork = pListNet->first(); pNetwork; pNetwork = pListNet->next()) { QString szCommandx = "server -u \"net:"; szCommandx += pNetwork->name(); diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 9f3eac555..01f898507 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -59,7 +59,7 @@ class KviConsole; class KviConfigurationFile; class KviRegisteredUser; class KviIrcConnection; -class KviServerDataBase; +class KviIrcServerDataBase; class QPixmap; class QTextCodec; class QDomElement; @@ -377,7 +377,7 @@ signals: #ifndef _KVI_APP_CPP_ extern KVIRC_API KviApp * g_pApp; - extern KVIRC_API KviServerDataBase * g_pServerDataBase; + extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; #endif #endif //_KVI_APP_H_ diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h index c4ede9212..a863f2679 100644 --- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h +++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h @@ -50,7 +50,7 @@ public: QString szNick; QString szInitUMode; QString szServerId; - KviServerReconnectInfo * m_pReconnectInfo; + KviIrcServerReconnectInfo * m_pReconnectInfo; }; #endif //!_KVI_ASYNCHRONOUSCONNECTIONDATA_H_ diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 44e5f9569..231098808 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -91,7 +91,7 @@ void register_core_actions(KviActionManager * m) SCRIPT_ACTION( KVI_COREACTION_SERVEROPTIONS, - "options.edit -t KviServerOptionsWidget", + "options.edit -t KviIrcServerOptionsWidget", __tr2qs("Configure Servers..."), __tr2qs("Allows you to configure the servers and eventually to connect to them"), KviActionManager::categorySettings(), @@ -857,7 +857,7 @@ KviConnectToServerAction::KviConnectToServerAction(QObject * pParent) : KviSubmenuAction( pParent, QString(KVI_COREACTION_SERVERMENU), - QString("options.edit KviServerOptionsWidget"), + QString("options.edit KviIrcServerOptionsWidget"), __tr2qs("Connect To"), __tr2qs("Shows a popup menu that allows quickly connecting to a server"), KviActionManager::categoryIrc(), diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp index 0adb76c33..548c75bdc 100644 --- a/src/kvirc/kernel/kvi_internalcmd.cpp +++ b/src/kvirc/kernel/kvi_internalcmd.cpp @@ -53,7 +53,7 @@ static const char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]= "openurl http://www.kvirc.net", "list.open", "if($option(boolShowChannelsJoinDialogAsToplevel))channelsjoin.open -t;else channelsjoin.open", - "if($option(boolShowServersConnectDialogAsToplevel))options.edit -t KviServerOptionsWidget;else options.edit KviServerOptionsWidget", + "if($option(boolShowServersConnectDialogAsToplevel))options.edit -t KviIrcServerOptionsWidget;else options.edit KviIrcServerOptionsWidget", "url.list", "openurl http://www.kvirc.net/?id=themes", "openurl http://www.kvirc.net/?id=mailinglist", diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 12a007f9a..f3e25eecc 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -41,7 +41,7 @@ #include "KviLocale.h" #include "KviIrcServerDataBase.h" #include "KviProxyDataBase.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_options.h" #include "kvi_console.h" @@ -74,7 +74,7 @@ #include <QTimer> #include <QTextCodec> -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarget * pTarget,KviUserIdentity * pIdentity) @@ -1146,8 +1146,8 @@ void KviIrcConnection::useProfileData(KviIdentityProfileSet * pSet, const QStrin void KviIrcConnection::loginToIrcServer() { - KviServer * pServer = target()->server(); - KviNetwork * pNet = target()->network(); + KviIrcServer * pServer = target()->server(); + KviIrcNetwork * pNet = target()->network(); // For now this is the only we know m_pServerInfo->setName(pServer->m_szHostname); diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h index e89eff30f..19f6e3111 100644 --- a/src/kvirc/kernel/kvi_ircconnection.h +++ b/src/kvirc/kernel/kvi_ircconnection.h @@ -41,8 +41,8 @@ class QTimer; class QTextCodec; class KviConsole; -class KviNetworkData; -class KviServer; +class KviIrcNetworkData; +class KviIrcServer; class KviProxy; class KviIrcSocket; class KviIrcLink; @@ -95,7 +95,7 @@ class KVIRC_API KviIrcConnection : public QObject friend class KviConsole; friend class KviIrcContext; friend class KviIrcLink; - friend class KviServerParser; + friend class KviIrcServerParser; Q_OBJECT protected: /** @@ -723,7 +723,7 @@ protected: void loginToIrcServer(); // - // KviServerParser interface + // KviIrcServerParser interface // /** diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h index a11f48243..e61841155 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h @@ -158,7 +158,7 @@ public: class KVIRC_API KviIrcConnectionServerInfo { friend class KviConsole; // for now - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviIrcConnection; protected: KviIrcConnectionServerInfo(); diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.h b/src/kvirc/kernel/kvi_ircconnectionstatedata.h index 2fe613b99..3a8f6507a 100644 --- a/src/kvirc/kernel/kvi_ircconnectionstatedata.h +++ b/src/kvirc/kernel/kvi_ircconnectionstatedata.h @@ -40,7 +40,7 @@ class KVIRC_API KviIrcConnectionStateData { friend class KviIrcConnection; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviUserParser; public: KviIrcConnectionStateData(); diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp index fdcf9a2e6..344ba1b37 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp @@ -26,18 +26,18 @@ #include "kvi_ircconnectiontarget.h" #include "KviIrcServer.h" -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "KviProxyDataBase.h" KviIrcConnectionTarget::KviIrcConnectionTarget( - const KviNetwork * pNetwork, - const KviServer * pServer, + const KviIrcNetwork * pNetwork, + const KviIrcServer * pServer, const KviProxy * pProxy, const QString &szBindAddress ) { - m_pNetwork = new KviNetwork(*pNetwork); - m_pServer = new KviServer(*pServer); + m_pNetwork = new KviIrcNetwork(*pNetwork); + m_pServer = new KviIrcServer(*pServer); m_pProxy = pProxy ? new KviProxy(*pProxy) : NULL; m_szBindAddress = szBindAddress; } diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.h b/src/kvirc/kernel/kvi_ircconnectiontarget.h index 6db18e7b5..bc9b537b0 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontarget.h +++ b/src/kvirc/kernel/kvi_ircconnectiontarget.h @@ -28,8 +28,8 @@ #include "KviQString.h" #include "KviHeapObject.h" -class KviNetwork; -class KviServer; +class KviIrcNetwork; +class KviIrcServer; class KviProxy; class KVIRC_API KviIrcConnectionTarget : public KviHeapObject @@ -39,26 +39,26 @@ public: // pServer is a shallow pointer: this class makes a copy of it internally, must NOT be null // pProxy may be null if a proxy is not desired. this class makes a copy of it internally KviIrcConnectionTarget( - const KviNetwork * pNetwork, - const KviServer * pServer, + const KviIrcNetwork * pNetwork, + const KviIrcServer * pServer, const KviProxy * pProxy = 0, const QString &szBindAddress = QString() ); ~KviIrcConnectionTarget(); private: - KviNetwork * m_pNetwork; // owned, never null, it's a COPY of the entry in the db - KviServer * m_pServer; // owned, never null, it's a COPY of the entry in the db + KviIrcNetwork * m_pNetwork; // owned, never null, it's a COPY of the entry in the db + KviIrcServer * m_pServer; // owned, never null, it's a COPY of the entry in the db KviProxy * m_pProxy; // owned, may be null, it's a COPY of the entry in the db QString m_szBindAddress; // forced bind address public: - KviServer * server() + KviIrcServer * server() { return m_pServer; } - KviNetwork * network() + KviIrcNetwork * network() { return m_pNetwork; } @@ -82,7 +82,7 @@ public: const QString & networkName(); // this allows to force the network name: it should be used only by KviConsole - // but it's KviServerParser (kvi_sp_numeric.cpp) that first + // but it's KviIrcServerParser (kvi_sp_numeric.cpp) that first // gets the new network name... thus we make it public // to remove one level of indirection. void setNetworkName(const QString &szNetName); diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 8185436d7..438f6d471 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -29,7 +29,7 @@ #include "KviLocale.h" #include "KviIrcServerDataBase.h" #include "KviProxyDataBase.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_options.h" #include "kvi_ircsocket.h" @@ -45,14 +45,14 @@ #include "kvi_ircconnection.h" #include "kvi_ircconnectiontarget.h" #include "kvi_ircsocket.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include <stdlib.h> #include <QTimer> -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; //extern KVIRC_API KviGarbageCollector * g_pGarbageCollector; diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h index 694c33359..ab4a707f2 100644 --- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h @@ -31,7 +31,7 @@ class KVIRC_API KviIrcConnectionUserInfo { friend class KviIrcConnection; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviConsole; protected: KviIrcConnectionUserInfo(); diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index fb453d711..ca69c1c1c 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -45,7 +45,7 @@ #include "kvi_options.h" #include "KviLocale.h" #include "kvi_ircdatastreammonitor.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviThread.h" // for KviThread::msleep() #include "kvi_app.h" #include "kvi_kvs_eventtriggers.h" @@ -63,7 +63,7 @@ // the irc context identifiers start from 1 static unsigned int g_uNextIrcContextId = 1; -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; @@ -435,7 +435,7 @@ void KviIrcContext::connectToCurrentServer() m_pAsynchronousConnectionData->bUseSSL = m_pSavedAsynchronousConnectionData->bUseSSL; m_pAsynchronousConnectionData->bSTARTTLS = m_pSavedAsynchronousConnectionData->bSTARTTLS; if(m_pSavedAsynchronousConnectionData->m_pReconnectInfo) - m_pAsynchronousConnectionData->m_pReconnectInfo = new KviServerReconnectInfo(*(m_pSavedAsynchronousConnectionData->m_pReconnectInfo)); + m_pAsynchronousConnectionData->m_pReconnectInfo = new KviIrcServerReconnectInfo(*(m_pSavedAsynchronousConnectionData->m_pReconnectInfo)); else m_pAsynchronousConnectionData->m_pReconnectInfo = 0; // and the other info, only if not overridden by the user @@ -458,7 +458,7 @@ void KviIrcContext::connectToCurrentServer() // !m_pAsynchronousConnectionData->szServer.isEmpty() // ok, have a server to look for in the db // FIXME: this is a bit ugly... could it be managed in some completly different and nicer way ? - KviServerDefinition d; + KviIrcServerDefinition d; d.szServer = m_pAsynchronousConnectionData->szServer; d.bPortIsValid = m_pAsynchronousConnectionData->bPortIsOk; d.uPort = m_pAsynchronousConnectionData->uPort; @@ -480,15 +480,15 @@ void KviIrcContext::connectToCurrentServer() } // else we just connect to the globally selected irc server in the options dialog } - KviNetwork * net = g_pServerDataBase->currentNetwork(); - KviServer * srv = net ? net->currentServer() : 0; + KviIrcNetwork * net = g_pServerDataBase->currentNetwork(); + KviIrcServer * srv = net ? net->currentServer() : 0; KviProxy * prx = 0; if(!srv) { if(g_pServerDataBase->networkCount()) - KviKvsScript::run("options.edit KviServerOptionsWidget",m_pConsole); + KviKvsScript::run("options.edit KviIrcServerOptionsWidget",m_pConsole); else m_pConsole->outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("No servers available. Check the options dialog or use the /SERVER command")); destroyAsynchronousConnectionData(); @@ -522,7 +522,7 @@ void KviIrcContext::connectToCurrentServer() { szBindAddress = m_pAsynchronousConnectionData->szBindAddress; if(m_pAsynchronousConnectionData->m_pReconnectInfo) - srv->m_pReconnectInfo = new KviServerReconnectInfo(*(m_pAsynchronousConnectionData->m_pReconnectInfo)); + srv->m_pReconnectInfo = new KviIrcServerReconnectInfo(*(m_pAsynchronousConnectionData->m_pReconnectInfo)); } // Find out the identity we'll be using in this connection @@ -581,7 +581,7 @@ void KviIrcContext::connectToCurrentServer() m_pSavedAsynchronousConnectionData->szServerId = srv->id(); m_pSavedAsynchronousConnectionData->szInitUMode = srv->m_szInitUMode; if(srv->m_pReconnectInfo) - m_pSavedAsynchronousConnectionData->m_pReconnectInfo = new KviServerReconnectInfo(*(srv->m_pReconnectInfo)); + m_pSavedAsynchronousConnectionData->m_pReconnectInfo = new KviIrcServerReconnectInfo(*(srv->m_pReconnectInfo)); else m_pSavedAsynchronousConnectionData->m_pReconnectInfo = 0; // this never fails! @@ -623,7 +623,7 @@ void KviIrcContext::connectionFailed(int iError) m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,tmp); } - KviServer oldServer(*(connection()->target()->server())); + KviIrcServer oldServer(*(connection()->target()->server())); QString oldNickname = connection()->userInfo()->isAway() ? connection()->userInfo()->nickNameBeforeAway() : connection()->userInfo()->nickName(); KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); @@ -701,22 +701,22 @@ void KviIrcContext::connectionEstabilished() // save the last server this console used //if(m_pLastIrcServer)delete m_pLastIrcServer; - //m_pLastIrcServer = new KviServer(*(connection()->server())); + //m_pLastIrcServer = new KviIrcServer(*(connection()->server())); } void KviIrcContext::connectionTerminated() { if(!m_pConnection)return; // this may happen in the destructor! - KviServer oldServer(*(connection()->target()->server())); + KviIrcServer oldServer(*(connection()->target()->server())); if(oldServer.m_pReconnectInfo) { - KviServerReconnectInfo *pOldInfo = oldServer.m_pReconnectInfo; + KviIrcServerReconnectInfo *pOldInfo = oldServer.m_pReconnectInfo; oldServer.m_pReconnectInfo = 0; delete pOldInfo; } - KviServerReconnectInfo info, *pInfo(&info); + KviIrcServerReconnectInfo info, *pInfo(&info); pInfo->m_szNick = connection()->userInfo()->isAway() ? connection()->userInfo()->nickNameBeforeAway() : connection()->userInfo()->nickName(); pInfo->m_szPass = connection()->userInfo()->password(); pInfo->m_bIsAway = connection()->userInfo()->isAway(); @@ -821,7 +821,7 @@ void KviIrcContext::connectionTerminated() d->bSTARTTLS = oldServer.enabledSTARTTLS(); d->szPass = oldServer.password(); d->szInitUMode = oldServer.m_szInitUMode; - d->m_pReconnectInfo = new KviServerReconnectInfo(*(pInfo)); + d->m_pReconnectInfo = new KviIrcServerReconnectInfo(*(pInfo)); setAsynchronousConnectionData(d); beginAsynchronousConnect(1000 * KVI_OPTION_UINT(KviOption_uintAutoReconnectDelay)); diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h index 49d354b14..581b02d16 100644 --- a/src/kvirc/kernel/kvi_irccontext.h +++ b/src/kvirc/kernel/kvi_irccontext.h @@ -39,8 +39,8 @@ class KviIrcDataStreamMonitor; class KviWindow; class QTimer; class KviConsole; -class KviNetwork; -class KviServer; +class KviIrcNetwork; +class KviIrcServer; /* KviIrcContext is the structure that groups the objects and resources usable for a single irc connection: a console, a set of channels and queries, diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 331b2cc12..4c7b77d63 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "KviIrcServerDataBase.h" #include "KviProxyDataBase.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_options.h" #include "kvi_ircsocket.h" @@ -49,7 +49,7 @@ #include <QTimer> -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; //extern KVIRC_API KviGarbageCollector * g_pGarbageCollector; diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/kvi_irclink.h index 9989fd81b..719006778 100644 --- a/src/kvirc/kernel/kvi_irclink.h +++ b/src/kvirc/kernel/kvi_irclink.h @@ -36,7 +36,7 @@ #include <QObject> class KviConsole; -class KviServer; +class KviIrcServer; class KviProxy; class KviIrcSocket; class KviDnsResolver; diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index 7e42e2f71..55ab56cf1 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -28,7 +28,7 @@ #include "KviProxyDataBase.h" #include "KviNetUtils.h" #include "kvi_settings.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "KviMemory.h" #include "kvi_debug.h" @@ -251,7 +251,7 @@ void KviIrcSocket::raiseError(int iError) outputSocketError(KviError::getDescription(iError)); } -int KviIrcSocket::startConnection(KviServer * pServer, KviProxy * pProxy, const char * pcBindAddress) +int KviIrcSocket::startConnection(KviIrcServer * pServer, KviProxy * pProxy, const char * pcBindAddress) { // Attempts to estabilish an IRC connection // to the server specified by *srv. @@ -270,7 +270,7 @@ int KviIrcSocket::startConnection(KviServer * pServer, KviProxy * pProxy, const } // Copy the server - m_pIrcServer = new KviServer(*pServer); + m_pIrcServer = new KviIrcServer(*pServer); bool bTargetIPv6 = false; bool bNeedServerIp = !pProxy; diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h index a7a185d3e..face64d84 100644 --- a/src/kvirc/kernel/kvi_ircsocket.h +++ b/src/kvirc/kernel/kvi_ircsocket.h @@ -40,7 +40,7 @@ class QTimer; class QSocketNotifier; -class KviServer; +class KviIrcServer; class KviProxy; class KviIrcConnection; class KviIrcConnectionTarget; @@ -107,7 +107,7 @@ protected: SocketState m_state; QSocketNotifier * m_pWsn; QSocketNotifier * m_pRsn; - KviServer * m_pIrcServer; + KviIrcServer * m_pIrcServer; KviProxy * m_pProxy; QTimer * m_pTimeoutTimer; unsigned int m_uReadBytes; @@ -195,7 +195,7 @@ public: * \param pcBindAddress The address to bind the connection to * \return int */ - int startConnection(KviServer * pServer, KviProxy * pProxy = 0, const char * pcBindAddress = 0); + int startConnection(KviIrcServer * pServer, KviProxy * pProxy = 0, const char * pcBindAddress = 0); #ifdef COMPILE_SSL_SUPPORT /** diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp index 3cbbba160..f227f4b09 100644 --- a/src/kvirc/kernel/kvi_ircurl.cpp +++ b/src/kvirc/kernel/kvi_ircurl.cpp @@ -212,7 +212,7 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) } -void KviIrcUrl::join(QString &uri, KviServer* server) +void KviIrcUrl::join(QString &uri, KviIrcServer* server) { if(server) { @@ -314,7 +314,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) szCommand.append(QString("%1 %2 ").arg(parts.szHost).arg(parts.iPort)); if(pConsole->connection()) { - KviServer* server = pConsole->connection()->target()->server(); + KviIrcServer* server = pConsole->connection()->target()->server(); if( ( server->hostName() != parts.szHost ) || ( server->port() != parts.iPort ) || diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h index e6a8c3647..ddf281134 100644 --- a/src/kvirc/kernel/kvi_ircurl.h +++ b/src/kvirc/kernel/kvi_ircurl.h @@ -28,7 +28,7 @@ #include "KviCString.h" #include "kvi_inttypes.h" -class KviServer; +class KviIrcServer; class KviConsole; #include <QStringList> @@ -72,7 +72,7 @@ namespace KviIrcUrl extern KVIRC_API int run(const QString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0); extern KVIRC_API void split(QString url, KviIrcUrlParts& parts); - extern KVIRC_API void join(QString &url, KviServer* server); + extern KVIRC_API void join(QString &url, KviIrcServer* server); extern KVIRC_API void makeJoinCmd(const QStringList& chans, QString& szJoinCommand); } diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index a4dddd253..03bcc75c1 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -31,7 +31,7 @@ #include "kvi_defaults.h" #include "kvi_sourcesdate.h" #include "kvi_msgbox.h" -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #ifdef COMPILE_DBUS_SUPPORT #ifndef COMPILE_KDE_SUPPORT // 'cause kde adds an interface itself #include "KviDbusAdaptor.h" diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h index f3a2e09ee..01ac0963c 100644 --- a/src/kvirc/kernel/kvi_notifylist.h +++ b/src/kvirc/kernel/kvi_notifylist.h @@ -43,7 +43,7 @@ class KVIRC_API KviNotifyListManager : public QObject { friend class KviConsole; friend class KviConnectionInfo; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviIrcConnection; Q_OBJECT protected: @@ -67,7 +67,7 @@ public: class KVIRC_API KviIsOnNotifyListManager : public KviNotifyListManager { friend class KviConsole; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviIrcConnection; Q_OBJECT protected: @@ -115,7 +115,7 @@ private slots: class KVIRC_API KviStupidNotifyListManager : public KviNotifyListManager { friend class KviConsole; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviIrcConnection; Q_OBJECT protected: @@ -140,7 +140,7 @@ private: class KVIRC_API KviWatchNotifyListManager : public KviNotifyListManager { friend class KviConsole; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviIrcConnection; Q_OBJECT public: diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index c06bb0c9d..98b6afe3c 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -31,7 +31,7 @@ #include "kvi_app.h" #include "kvi_out.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_kvs_variantlist.h" #include <QTimer> diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index 0217b3f3c..b3b95de72 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -43,7 +43,7 @@ #include "KviMircCntrl.h" #include "kvi_sourcesdate.h" #include "kvi_socket.h" -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #include <stdlib.h> // rand & srand diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index ec63ba773..c28fea954 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -278,7 +278,7 @@ namespace KviKvsCoreSimpleCommands d->szNick = szNick; d->szLinkFilter = szSocketFilter; - d->m_pReconnectInfo = new KviServerReconnectInfo(); + d->m_pReconnectInfo = new KviIrcServerReconnectInfo(); d->m_pReconnectInfo->m_szNick = szNick; d->m_pReconnectInfo->m_szPass = szPassword; @@ -304,7 +304,7 @@ namespace KviKvsCoreSimpleCommands d->szPass = szPassword; d->szNick = szNick; - d->m_pReconnectInfo = new KviServerReconnectInfo(); + d->m_pReconnectInfo = new KviIrcServerReconnectInfo(); d->m_pReconnectInfo->m_szNick = szNick; d->m_pReconnectInfo->m_szPass = szPassword; diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index 217b18fec..6debb72eb 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -32,7 +32,7 @@ #include "kvi_kvs_variantlist.h" #include "KviCString.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0; diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 0cc0247b7..356919a49 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -31,7 +31,7 @@ #include "kvi_modulemanager.h" #include "kvi_console.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "KviMircCntrl.h" #include "kvi_iconmanager.h" diff --git a/src/kvirc/module/kvi_mexserverimport.h b/src/kvirc/module/kvi_mexserverimport.h index 07a458e38..d096ed5fc 100644 --- a/src/kvirc/module/kvi_mexserverimport.h +++ b/src/kvirc/module/kvi_mexserverimport.h @@ -40,7 +40,7 @@ public: virtual void start() = 0; virtual void die() = 0; signals: - void server(const KviServer &s,const QString &network); + void server(const KviIrcServer &s,const QString &network); }; #endif //!_KVI_MEXSERVERIMPORT_H_ diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 33bad23a1..62eae4f44 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -55,7 +55,7 @@ #include "kvi_kvs_script.h" #include "kvi_sourcesdate.h" #include "KviRegisteredUserDataBase.h" -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #include <stdlib.h> @@ -384,7 +384,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; -void KviServerParser::encodeCtcpParameter(const char * param,KviCString &buffer,bool bSpaceBreaks) +void KviIrcServerParser::encodeCtcpParameter(const char * param,KviCString &buffer,bool bSpaceBreaks) { // // This one encodes a single ctcp parameter with the simplest @@ -455,7 +455,7 @@ void KviServerParser::encodeCtcpParameter(const char * param,KviCString &buffer, if(param != begin)buffer.append(begin,param - begin); } -void KviServerParser::encodeCtcpParameter(const char * parametr,QString &resultBuffer,bool bSpaceBreaks) +void KviIrcServerParser::encodeCtcpParameter(const char * parametr,QString &resultBuffer,bool bSpaceBreaks) { // // This one encodes a single ctcp parameter with the simplest @@ -522,7 +522,7 @@ void KviServerParser::encodeCtcpParameter(const char * parametr,QString &resultB -const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviCString &buffer) +const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr,KviCString &buffer) { // // This one decodes an octal sequence @@ -574,7 +574,7 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviCString & } -const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,QByteArray &buffer) +const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr,QByteArray &buffer) { // // This one decodes an octal sequence @@ -624,7 +624,7 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,QByteArray & } -const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviCString &buffer,bool bSpaceBreaks, bool bSafeOnly) +const char * KviIrcServerParser::extractCtcpParameter(const char * msg_ptr,KviCString &buffer,bool bSpaceBreaks, bool bSafeOnly) { // // This one extracts the "next" ctcp parameter in msg_ptr @@ -712,7 +712,7 @@ const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviCStri return msg_ptr; } -const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QString &resultBuffer,bool bSpaceBreaks, bool bSafeOnly) +const char * KviIrcServerParser::extractCtcpParameter(const char * p_msg_ptr,QString &resultBuffer,bool bSpaceBreaks, bool bSafeOnly) { // // This one extracts the "next" ctcp parameter in p_msg_ptr @@ -803,7 +803,7 @@ const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QStrin } -void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequest(KviCtcpMessage *msg) { msg->pData = extractCtcpParameter(msg->pData,msg->szTag); @@ -892,7 +892,7 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpReply(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpReply(KviCtcpMessage *msg) { msg->pData = extractCtcpParameter(msg->pData,msg->szTag); @@ -926,7 +926,7 @@ void KviServerParser::parseCtcpReply(KviCtcpMessage *msg) // Ctcp message handlers -bool KviServerParser::checkCtcpFlood(KviCtcpMessage *msg) +bool KviIrcServerParser::checkCtcpFlood(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection))return false; @@ -953,7 +953,7 @@ bool KviServerParser::checkCtcpFlood(KviCtcpMessage *msg) } -void KviServerParser::replyCtcp(KviCtcpMessage *msg,const QString &data) +void KviIrcServerParser::replyCtcp(KviCtcpMessage *msg,const QString &data) { QByteArray szNick = msg->msg->connection()->encodeText(msg->pSource->nick()); msg->msg->connection()->sendFmtData( @@ -966,7 +966,7 @@ void KviServerParser::replyCtcp(KviCtcpMessage *msg,const QString &data) ); } -void KviServerParser::echoCtcpReply(KviCtcpMessage * msg) +void KviIrcServerParser::echoCtcpReply(KviCtcpMessage * msg) { if(!msg->msg->haltOutput()) { @@ -999,7 +999,7 @@ void KviServerParser::echoCtcpReply(KviCtcpMessage * msg) } -void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg) +void KviIrcServerParser::echoCtcpRequest(KviCtcpMessage *msg) { // FIXME: #warning "DEDICATED CTCP WINDOW...MINIMIZED ?" if(!msg->msg->haltOutput()) @@ -1054,7 +1054,7 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg) -void KviServerParser::parseCtcpRequestPing(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestPing(KviCtcpMessage *msg) { if(!checkCtcpFlood(msg)) { @@ -1067,7 +1067,7 @@ void KviServerParser::parseCtcpRequestPing(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg) +void KviIrcServerParser::parseCtcpReplyPing(KviCtcpMessage * msg) { if(!msg->msg->haltOutput()) { @@ -1143,7 +1143,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg) } -void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) { if(!checkCtcpFlood(msg)) { @@ -1182,7 +1182,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpRequestUserinfo(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestUserinfo(KviCtcpMessage *msg) { if(!checkCtcpFlood(msg)) { @@ -1246,7 +1246,7 @@ static const char * ctcpTagTable[][2]= { 0 , 0 } }; -void KviServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg) { // this is completely latin1 if(!checkCtcpFlood(msg)) @@ -1291,7 +1291,7 @@ void KviServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpRequestFinger(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestFinger(KviCtcpMessage *msg) { // completely latin1 atm if(!checkCtcpFlood(msg)) @@ -1310,7 +1310,7 @@ void KviServerParser::parseCtcpRequestFinger(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpRequestSource(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestSource(KviCtcpMessage *msg) { if(!checkCtcpFlood(msg)) { @@ -1329,7 +1329,7 @@ void KviServerParser::parseCtcpRequestSource(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestTime(KviCtcpMessage *msg) { if(!checkCtcpFlood(msg)) { @@ -1356,7 +1356,7 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestPage(KviCtcpMessage *msg) { if(!checkCtcpFlood(msg)) { @@ -1383,7 +1383,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg) echoCtcpRequest(msg); } -void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) { KviCString szData8; // CTCP ACTION is a special exception... most clients do not encode/decode it. @@ -1503,7 +1503,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) // FIXME: #warning "UTSNAME ?...AND OTHER INFO ?...SYSTEM IDLE TIME ?...KVIRC IDLE TIME ?" -void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) { // AVATAR if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpAvatar)) @@ -1567,7 +1567,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) } -void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) { QString szRemoteFile; QString szGender; @@ -1714,7 +1714,7 @@ typedef void (*dccModuleCtcpDccParseRoutine)(KviDccRequest *par); -void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) { KviDccRequest p; KviCString aux = msg->pData; @@ -1807,7 +1807,7 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) } } -void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) { QString szRemoteFile; QString szGender; @@ -1850,13 +1850,13 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) echoCtcpReply(msg); } -void KviServerParser::parseCtcpReplyGeneric(KviCtcpMessage *msg) +void KviIrcServerParser::parseCtcpReplyGeneric(KviCtcpMessage *msg) { echoCtcpReply(msg); } -void KviServerParser::parseCtcpReplyLagcheck(KviCtcpMessage * msg) +void KviIrcServerParser::parseCtcpReplyLagcheck(KviCtcpMessage * msg) { // this is an internal CTCP used for checking lag KviCString szTag; diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index b173bd266..54fda159c 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -59,7 +59,7 @@ #include "kvi_lagmeter.h" #include "KviIrcServer.h" #include "kvi_kvs_eventtriggers.h" -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "kvi_settings.h" #ifdef COMPILE_CRYPT_SUPPORT @@ -83,7 +83,7 @@ extern KviNickServRuleSet * g_pNickServRuleSet; // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralPing(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralPing(KviIrcMessage *msg) { // PING // <optional_prefix> PING :<argument> @@ -108,7 +108,7 @@ void KviServerParser::parseLiteralPing(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralPong(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralPong(KviIrcMessage *msg) { QString szPrefix = msg->connection()->decodeText(msg->safePrefix()); QString szAllParams = msg->connection()->decodeText(msg->allParams()); @@ -136,7 +136,7 @@ void KviServerParser::parseLiteralPong(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralError(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralError(KviIrcMessage *msg) { // ERROR // <optional_prefix> ERROR :<argument> @@ -161,7 +161,7 @@ void KviServerParser::parseLiteralError(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralJoin(KviIrcMessage *msg) { // JOIN // :<joiner_mask> JOIN :<channel> @@ -302,7 +302,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralPart(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralPart(KviIrcMessage *msg) { // PART // :<source_mask> PART <channel> :<part message> @@ -401,7 +401,7 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralQuit(KviIrcMessage *msg) { // QUIT // :<source_mask> QUIT :<quit message> @@ -543,7 +543,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralKick(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralKick(KviIrcMessage *msg) { // KICK // :<source_mask> KICK <channel> <nick> :<kick message> @@ -701,7 +701,7 @@ enum PrivmsgIdentifyMsgCapState }; -void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) { // PRIVMSG // :source PRIVMSG <target> :<message> @@ -1063,7 +1063,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) } -void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg) { // NOTICE // :source NOTICE <target> :<message> @@ -1407,7 +1407,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviServerParser::parseLiteralTopic(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralTopic(KviIrcMessage *msg) { // TOPIC // :<source_mask> TOPIC <channel> :<topic> @@ -1458,7 +1458,7 @@ void KviServerParser::parseLiteralTopic(KviIrcMessage *msg) } } -void KviServerParser::parseLiteralNick(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg) { // NICK // :source NICK <newnick> @@ -1578,7 +1578,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) // FIXME: #warning "UPDATE ALL THE OTHER CONNECTION RELATED WINDOW CAPTIONS WHEN bIsMe!!" } -void KviServerParser::parseLiteralInvite(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralInvite(KviIrcMessage *msg) { // INVITE // :source INVITE <target> <channel> @@ -1625,7 +1625,7 @@ void KviServerParser::parseLiteralInvite(KviIrcMessage *msg) } } -void KviServerParser::parseLiteralWallops(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralWallops(KviIrcMessage *msg) { // WALLOPS // :source WALLOPS :msg @@ -1646,7 +1646,7 @@ void KviServerParser::parseLiteralWallops(KviIrcMessage *msg) } } -void KviServerParser::parseUserMode(KviIrcMessage *msg,const char * modeflptr) +void KviIrcServerParser::parseUserMode(KviIrcMessage *msg,const char * modeflptr) { // changed my user mode bool bSet = true; @@ -1682,7 +1682,7 @@ void KviServerParser::parseUserMode(KviIrcMessage *msg,const char * modeflptr) -void KviServerParser::parseLiteralMode(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralMode(KviIrcMessage *msg) { // MODE // :source MODE target <params> @@ -1721,7 +1721,7 @@ void KviServerParser::parseLiteralMode(KviIrcMessage *msg) } } -void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviCString &modefl,KviIrcMessage *msg,int curParam) +void KviIrcServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviCString &modefl,KviIrcMessage *msg,int curParam) { bool bSet = true; // bIsMultiMode: +snt @@ -2136,7 +2136,7 @@ void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUs } } -void KviServerParser::parseLiteralCap(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralCap(KviIrcMessage *msg) { // CAP // CAP LS @@ -2235,7 +2235,7 @@ void KviServerParser::parseLiteralCap(KviIrcMessage *msg) msg->console()->output(KVI_OUT_CAP,__tr2qs("Received unknown extended capability message: %Q %Q"),&szCmd,&szProtocols); } -void KviServerParser::parseLiteralAuthenticate(KviIrcMessage *msg) +void KviIrcServerParser::parseLiteralAuthenticate(KviIrcMessage *msg) { // :AUTHENTICATE + KviCString szAuth(msg->safeParam(0)); diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index 1c01fc4ca..d09294576 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -71,7 +71,7 @@ // FIXME: #warning "IN ALL OUTPUT ADD ESCAPE SEQUENCES!!!!" // FIXME: #warning "parseErrorUnknownModeChar() for modes e and I, parseErrorUnknownCommand for WATCH" -void KviServerParser::parseNumeric001(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric001(KviIrcMessage *msg) { // 001: RPL_WELCOME // :prefix 001 target :Welcome to the Internet Relay Network <usermask> @@ -90,7 +90,7 @@ void KviServerParser::parseNumeric001(KviIrcMessage *msg) msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,szText); } -void KviServerParser::parseNumeric002(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric002(KviIrcMessage *msg) { // 002: RPL_YOURHOST [I,E,U,D] // :prefix 002 target :Your host is <server name>, running version <server version> @@ -99,7 +99,7 @@ void KviServerParser::parseNumeric002(KviIrcMessage *msg) if(!msg->haltOutput())msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,msg->connection()->decodeText(msg->safeTrailing())); } -void KviServerParser::parseNumeric003(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric003(KviIrcMessage *msg) { // 003: RPL_CREATED [I,E,U,D] // :prefix 003 target :This server was created <date> @@ -108,7 +108,7 @@ void KviServerParser::parseNumeric003(KviIrcMessage *msg) if(!msg->haltOutput())msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,msg->connection()->decodeText(msg->safeTrailing())); } -void KviServerParser::parseNumeric004(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric004(KviIrcMessage *msg) { // 004: RPL_MYINFO [I,E,U,D] // :prefix 004 target <server_name> <srv_version> <u_modes> <ch_modes> @@ -201,7 +201,7 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg) } } -void KviServerParser::parseNumeric005(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric005(KviIrcMessage *msg) { // 005: RPL_PROTOCTL [D] // :prefix 005 target <proto> <proto> .... :are available/supported on this server @@ -376,7 +376,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) // } } -void KviServerParser::parseNumericMotd(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericMotd(KviIrcMessage *msg) { // 372: RPL_MOTD [I,E,U,D] // :prefix 372 target : - <motd> @@ -396,7 +396,7 @@ void KviServerParser::parseNumericMotd(KviIrcMessage *msg) } } -void KviServerParser::parseNumericEndOfNames(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericEndOfNames(KviIrcMessage *msg) { // 366: RPL_ENDOFNAMES [I,E,U,D] // :prefix 366 target <channel> :End of /NAMES list. @@ -420,7 +420,7 @@ void KviServerParser::parseNumericEndOfNames(KviIrcMessage *msg) } } -void KviServerParser::parseNumeric020(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric020(KviIrcMessage *msg) { // 020: RPL_CONNECTING //:irc.dotsrc.org 020 * :Please wait while we process your connection. @@ -434,7 +434,7 @@ void KviServerParser::parseNumeric020(KviIrcMessage *msg) } } -void KviServerParser::parseNumericNames(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericNames(KviIrcMessage *msg) { // 353: RPL_NAMREPLY [I,E,U,D] // :prefix 353 target [=|*|@] <channel> :<space_separated_list_of_nicks> @@ -515,7 +515,7 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) } } -void KviServerParser::parseNumericTopic(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericTopic(KviIrcMessage *msg) { // 332: RPL_TOPIC [I,E,U,D] // :prefix 332 target <channel> :<topic> @@ -543,7 +543,7 @@ void KviServerParser::parseNumericTopic(KviIrcMessage *msg) } -void KviServerParser::parseNumericNoTopic(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericNoTopic(KviIrcMessage *msg) { // 331: RPL_NOTOPIC [I,E,U,D] // :prefix 331 target <channel> :No topic is set @@ -565,7 +565,7 @@ void KviServerParser::parseNumericNoTopic(KviIrcMessage *msg) } } -void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg) { // 333: RPL_TOPICWHOTIME [e,U,D] // :prefix 333 target <channel> <whoset> <time> @@ -630,7 +630,7 @@ void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg) } } -void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericChannelModeIs(KviIrcMessage *msg) { // 324: RPL_CHANNELMODEIS [I,E,U,D] // :prefix 324 target <channel> +<chanmode> @@ -679,7 +679,7 @@ void getDateTimeStringFromCharTimeT(QString & szBuffer, const char * time_t_stri } // Freenode likes it hard, so it's using the same numeric for bans and quiet bans -void KviServerParser::parseNumeric367(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric367(KviIrcMessage *msg) { // 367: RPL_BANLIST [I,E,U,D] // :prefix 367 target <channel> <banmask> [bansetby] [bansetat] @@ -712,7 +712,7 @@ void KviServerParser::parseNumeric367(KviIrcMessage *msg) } } -void KviServerParser::parseNumeric368(KviIrcMessage *msg) +void KviIrcServerParser::parseNumeric368(KviIrcMessage *msg) { QString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); @@ -738,7 +738,7 @@ void KviServerParser::parseNumeric368(KviIrcMessage *msg) } #define PARSE_NUMERIC_ENDOFLIST(__funcname,__modechar,__daicon,__szWhatQString) \ - void KviServerParser::__funcname(KviIrcMessage *msg) \ + void KviIrcServerParser::__funcname(KviIrcMessage *msg) \ { \ QString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ KviChannel * chan = msg->connection()->findChannel(szChan); \ @@ -766,7 +766,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfAList,'a',KVI_OUT_BAN,__tr2qs("protecte PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfReopList,'R',KVI_OUT_BAN,__tr2qs("reop list")) #define PARSE_NUMERIC_LIST(__funcname,__modechar,__ico,__szWhatQString) \ - void KviServerParser::__funcname(KviIrcMessage *msg) \ + void KviIrcServerParser::__funcname(KviIrcMessage *msg) \ { \ QString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ QString banmask = msg->connection()->decodeText(msg->safeParam(2)); \ @@ -797,7 +797,7 @@ PARSE_NUMERIC_LIST(parseNumericQList,'q',KVI_OUT_BAN,__tr2qs("Owner listing")); PARSE_NUMERIC_LIST(parseNumericAList,'a',KVI_OUT_BAN,__tr2qs("Admin/protected nicks listing")); PARSE_NUMERIC_LIST(parseNumericReopList,'R',KVI_OUT_BAN,__tr2qs("Reop masks listing")); -void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoReply(KviIrcMessage *msg) { // 352: RPL_WHOREPLY [I,E,U,D] // :prefix 352 target <chan> <usr> <hst> <srv> <nck> <stat> :<hops> <real> @@ -905,7 +905,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg) } -void KviServerParser::parseNumericEndOfWho(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericEndOfWho(KviIrcMessage *msg) { // 315: RPL_ENDOFWHO [I,E,U,D] // :prefix 315 target <channel/nick> :End of /WHO List. @@ -952,7 +952,7 @@ void KviServerParser::parseNumericEndOfWho(KviIrcMessage *msg) } } -void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) +void KviIrcServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) { // ops...not logged in yet... QString szNextNick; @@ -1045,7 +1045,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) msg->connection()->sendFmtData("NICK %s",d.data()); } -void KviServerParser::parseNumericUnavailResource(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericUnavailResource(KviIrcMessage *msg) { // 437: ERR_UNAVAILRESOURCE [I] // :prefix 437 <target> <nick/channel> :Nick/Channel is temporairly unavailable @@ -1063,7 +1063,7 @@ void KviServerParser::parseNumericUnavailResource(KviIrcMessage *msg) } } -void KviServerParser::parseNumericCantJoinChannel(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericCantJoinChannel(KviIrcMessage *msg) { // 471: ERR_CHANNELISFULL [I,E,U,D] // 473: ERR_INVITEONLYCHAN [I,E,U,D] @@ -1083,7 +1083,7 @@ void KviServerParser::parseNumericCantJoinChannel(KviIrcMessage *msg) // Keep the source ordered: this should be named "parseOtherChannelError" -void KviServerParser::otherChannelError(KviIrcMessage *msg) +void KviIrcServerParser::otherChannelError(KviIrcMessage *msg) { // 482: ERR_CHANOPRIVSNEEDED // 467: ERR_KEYSET @@ -1099,7 +1099,7 @@ void KviServerParser::otherChannelError(KviIrcMessage *msg) } } -void KviServerParser::parseCommandSyntaxHelp(KviIrcMessage *msg) +void KviIrcServerParser::parseCommandSyntaxHelp(KviIrcMessage *msg) { // 704 RPL_COMMANDSYNTAX // :prefix 704 <target> <command> :text @@ -1113,7 +1113,7 @@ void KviServerParser::parseCommandSyntaxHelp(KviIrcMessage *msg) } } -void KviServerParser::parseCommandHelp(KviIrcMessage *msg) +void KviIrcServerParser::parseCommandHelp(KviIrcMessage *msg) { // 705 RPL_COMMANDHELP // :prefix 705 <target> <command> :text @@ -1126,7 +1126,7 @@ void KviServerParser::parseCommandHelp(KviIrcMessage *msg) } } -void KviServerParser::parseChannelHelp(KviIrcMessage *msg) +void KviIrcServerParser::parseChannelHelp(KviIrcMessage *msg) { // 477 RPL_CHANNELHELP (freenode) // :prefix 477 <target> <channel> :text @@ -1147,7 +1147,7 @@ void KviServerParser::parseChannelHelp(KviIrcMessage *msg) } -void KviServerParser::parseCommandEndOfHelp(KviIrcMessage *msg) +void KviIrcServerParser::parseCommandEndOfHelp(KviIrcMessage *msg) { // 704 RPL_COMMANDSYNTAX // 705 RPL_COMMANDHELP @@ -1161,7 +1161,7 @@ void KviServerParser::parseCommandEndOfHelp(KviIrcMessage *msg) } } -void KviServerParser::parseNumericNicknameProblem(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericNicknameProblem(KviIrcMessage *msg) { // 433: ERR_NICKNAMEINUSE [I,E,U,D] // :prefix 433 <target> <nick> :Nickname is already in use. @@ -1183,7 +1183,7 @@ void KviServerParser::parseNumericNicknameProblem(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhoisAway(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericWhoisAway(KviIrcMessage * msg) { // FIXME: #warning "Need an icon here too: sth like KVI_OUT_WHOISSERVER, but with 'A' letter" msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); @@ -1216,7 +1216,7 @@ void KviServerParser::parseNumericWhoisAway(KviIrcMessage * msg) } } -void KviServerParser::parseNumericWhoisUser(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisUser(KviIrcMessage *msg) { // 311: RPL_WHOISUSER [I,E,U,D] // :prefix 311 <target> <nick> <user> <host> * :<real_name> @@ -1282,7 +1282,7 @@ void KviServerParser::parseNumericWhoisUser(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhowasUser(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericWhowasUser(KviIrcMessage * msg) { // 314: RPL_WHOWASUSER [I,E,U,D] // :prefix 314 <target> <nick> <user> <host> * :<real_name> @@ -1307,7 +1307,7 @@ void KviServerParser::parseNumericWhowasUser(KviIrcMessage * msg) } -void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisChannels(KviIrcMessage *msg) { // 319: RPL_WHOISCHANNELS [I,E,U,D] // :prefix 319 <target> <nick> :<channel list> @@ -1370,7 +1370,7 @@ void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisIdle(KviIrcMessage *msg) { // 317: RPL_WHOISIDLE [I,E,U,D] // :prefix 317 <target> <nick> <number> <number> :seconds idle, signon time @@ -1442,7 +1442,7 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhoisServer(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisServer(KviIrcMessage *msg) { // 312: RPL_WHOISSERVER [I,E,U,D] (sent also in response to WHOWAS) // :prefix 312 <target> <nick> <server> :<server description / last whowas date> @@ -1479,7 +1479,7 @@ void KviServerParser::parseNumericWhoisServer(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhoisAuth(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisAuth(KviIrcMessage *msg) { // 330 RPL_WHOISAUTH // :prefix RPL_WHOISAUTH <target> <nick> <nick>:is authed as @@ -1508,7 +1508,7 @@ void KviServerParser::parseNumericWhoisAuth(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhoisActually(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisActually(KviIrcMessage *msg) { // 338: RPL_WHOISACTUALLY // u2 (irc-hispano) @@ -1550,7 +1550,7 @@ void KviServerParser::parseNumericWhoisActually(KviIrcMessage *msg) } } -void KviServerParser::parseNumericWhoisOther(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWhoisOther(KviIrcMessage *msg) { // *: RPL_WHOIS* [?] // :prefix * <target> <nick> :<description> @@ -1585,7 +1585,7 @@ void KviServerParser::parseNumericWhoisOther(KviIrcMessage *msg) // FIXME: #warning "WHOWAS MISSING" -void KviServerParser::parseNumericEndOfWhois(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericEndOfWhois(KviIrcMessage *msg) { // 318: RPL_ENDOFWHOIS [I,E,U,D] // :prefix 318 <target> <nick> :End of /WHOIS list @@ -1633,7 +1633,7 @@ void KviServerParser::parseNumericEndOfWhois(KviIrcMessage *msg) } -void KviServerParser::parseNumericEndOfWhowas(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericEndOfWhowas(KviIrcMessage *msg) { // 369: RPL_ENDOFWHOWAS [I,E,U,D] // :prefix 369 <target> <nick> :End of /WHOWAS list @@ -1649,7 +1649,7 @@ void KviServerParser::parseNumericEndOfWhowas(KviIrcMessage *msg) } } -void KviServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) { // 401: ERR_NOSUCHNICK [I,E,U,D] // 406: ERR_WASNOSUCHNICK [I,E,U,D] @@ -1700,7 +1700,7 @@ void KviServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) } } -void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericCreationTime(KviIrcMessage *msg) { // 329: RPL_CREATIONTIME // :prefix 329 <target> <channel> <creation_time> @@ -1744,7 +1744,7 @@ void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg) } } -void KviServerParser::parseNumericIsOn(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericIsOn(KviIrcMessage *msg) { // 303: RPL_ISON // :prefix 303 <target> :<ison replies> @@ -1766,7 +1766,7 @@ void KviServerParser::parseNumericIsOn(KviIrcMessage *msg) } } -void KviServerParser::parseNumericUserhost(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericUserhost(KviIrcMessage *msg) { // 302: RPL_USERHOST // :prefix 302 <target> :<userhost replies> @@ -1784,7 +1784,7 @@ void KviServerParser::parseNumericUserhost(KviIrcMessage *msg) } } -void KviServerParser::parseNumericListStart(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericListStart(KviIrcMessage *msg) { // 321: RPL_LISTSTART [I,E,U,D] // :prefix 321 <target> :Channel users name @@ -1805,7 +1805,7 @@ void KviServerParser::parseNumericListStart(KviIrcMessage *msg) } } -void KviServerParser::parseNumericList(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericList(KviIrcMessage *msg) { // 322: RPL_LIST [I,E,U,D] // :prefix 364 <target> <channel> <users> :<topic> @@ -1832,7 +1832,7 @@ void KviServerParser::parseNumericList(KviIrcMessage *msg) } } -void KviServerParser::parseNumericListEnd(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericListEnd(KviIrcMessage *msg) { // 323: RPL_LISTEND [I,E,U,D] // :prefix 323 <target> :End of /LIST @@ -1847,7 +1847,7 @@ void KviServerParser::parseNumericListEnd(KviIrcMessage *msg) } -void KviServerParser::parseNumericLinks(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericLinks(KviIrcMessage *msg) { // 364: RPL_LINKS [I,E,U,D] // :prefix 364 <target> <host> <parent> :<hops> <description> @@ -1871,7 +1871,7 @@ void KviServerParser::parseNumericLinks(KviIrcMessage *msg) } } -void KviServerParser::parseNumericEndOfLinks(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericEndOfLinks(KviIrcMessage *msg) { // 365: RPL_ENDOFLINKS [I,E,U,D] // :prefix 365 <target> :End of /LINKS @@ -1886,7 +1886,7 @@ void KviServerParser::parseNumericEndOfLinks(KviIrcMessage *msg) } } -void KviServerParser::parseNumericBackFromAway(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericBackFromAway(KviIrcMessage * msg) { // 305: RPL_UNAWAY [I,E,U,D] // :prefix 305 <target> :You are no longer away @@ -1928,7 +1928,7 @@ void KviServerParser::parseNumericBackFromAway(KviIrcMessage * msg) } -void KviServerParser::parseNumericAway(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericAway(KviIrcMessage * msg) { // 306: RPL_NOWAWAY [I,E,U,D] // :prefix 305 <target> :You're away man @@ -1965,7 +1965,7 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg) } } -void KviServerParser::parseNumericWatch(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericWatch(KviIrcMessage *msg) { // 600: RPL_LOGON // :prefix 600 <target> <nick> <user> <host> <logintime> :logged online @@ -1994,7 +1994,7 @@ void KviServerParser::parseNumericWatch(KviIrcMessage *msg) } } -void KviServerParser::parseNumericStats(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericStats(KviIrcMessage * msg) { if(!msg->haltOutput()) { @@ -2015,7 +2015,7 @@ void KviServerParser::parseNumericStats(KviIrcMessage * msg) } } -void KviServerParser::parseNumericServerAdminInfoTitle(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericServerAdminInfoTitle(KviIrcMessage * msg) { //RPL_ADMINME 256 if(!msg->haltOutput()) @@ -2024,7 +2024,7 @@ void KviServerParser::parseNumericServerAdminInfoTitle(KviIrcMessage * msg) pOut->outputNoFmt(KVI_OUT_SERVERINFO,msg->connection()->decodeText(msg->safeTrailing()).toUtf8().data()); } } -void KviServerParser::parseNumericServerAdminInfoServerName(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericServerAdminInfoServerName(KviIrcMessage * msg) { //RPL_ADMINLOC1 257 if(!msg->haltOutput()) @@ -2035,7 +2035,7 @@ void KviServerParser::parseNumericServerAdminInfoServerName(KviIrcMessage * msg) } } -void KviServerParser::parseNumericServerAdminInfoAdminName(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericServerAdminInfoAdminName(KviIrcMessage * msg) { //RPL_ADMINLOC2 258 if(!msg->haltOutput()) @@ -2046,7 +2046,7 @@ void KviServerParser::parseNumericServerAdminInfoAdminName(KviIrcMessage * msg) } } -void KviServerParser::parseNumericServerAdminInfoAdminContact(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericServerAdminInfoAdminContact(KviIrcMessage * msg) { //RPL_ADMINEMAIL 259 if(!msg->haltOutput()) @@ -2057,7 +2057,7 @@ void KviServerParser::parseNumericServerAdminInfoAdminContact(KviIrcMessage * ms } } -void KviServerParser::parseNumericCommandSyntax(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericCommandSyntax(KviIrcMessage * msg) { //RPL_COMMANDSYNTAX 334 if(!msg->haltOutput()) @@ -2067,7 +2067,7 @@ void KviServerParser::parseNumericCommandSyntax(KviIrcMessage * msg) } } -void KviServerParser::parseNumericInviting(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericInviting(KviIrcMessage * msg) { //RPL_INVITING 341 if(!msg->haltOutput()) @@ -2086,7 +2086,7 @@ void KviServerParser::parseNumericInviting(KviIrcMessage * msg) } } -void KviServerParser::parseNumericInfo(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericInfo(KviIrcMessage * msg) { //RPL_INFO 371 if(!msg->haltOutput()) @@ -2097,7 +2097,7 @@ void KviServerParser::parseNumericInfo(KviIrcMessage * msg) } } -void KviServerParser::parseNumericInfoStart(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericInfoStart(KviIrcMessage * msg) { //RPL_INFOSTART 373 if(!msg->haltOutput()) @@ -2107,7 +2107,7 @@ void KviServerParser::parseNumericInfoStart(KviIrcMessage * msg) } } -void KviServerParser::parseNumericInfoEnd(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericInfoEnd(KviIrcMessage * msg) { //RPL_ENDOFINFO 374 if(!msg->haltOutput()) @@ -2117,7 +2117,7 @@ void KviServerParser::parseNumericInfoEnd(KviIrcMessage * msg) } } -void KviServerParser::parseNumericTime(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericTime(KviIrcMessage * msg) { //RPL_TIME 391 if(!msg->haltOutput()) @@ -2128,7 +2128,7 @@ void KviServerParser::parseNumericTime(KviIrcMessage * msg) } } -void KviServerParser::parseNumericNoSuchServer(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericNoSuchServer(KviIrcMessage * msg) { //ERR_NOSUCHSERVER 402 @@ -2166,7 +2166,7 @@ void KviServerParser::parseNumericNoSuchServer(KviIrcMessage * msg) } } -void KviServerParser::parseNumericNoSuchChannel(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericNoSuchChannel(KviIrcMessage * msg) { // ERR_NOSUCHCHANNEL 403 if(!msg->haltOutput()) @@ -2177,7 +2177,7 @@ void KviServerParser::parseNumericNoSuchChannel(KviIrcMessage * msg) } } -void KviServerParser::parseNumericCannotSendColor(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericCannotSendColor(KviIrcMessage * msg) { // ERR_NOCOLORSONCHAN 408 if(!msg->haltOutput()) @@ -2195,7 +2195,7 @@ void KviServerParser::parseNumericCannotSendColor(KviIrcMessage * msg) } } -void KviServerParser::parseNumericCannotSend(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericCannotSend(KviIrcMessage * msg) { // ERR_CANNOTSENDTOCHAN 404 if(!msg->haltOutput()) @@ -2213,7 +2213,7 @@ void KviServerParser::parseNumericCannotSend(KviIrcMessage * msg) } } -void KviServerParser::parseNumericCodePageSet(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericCodePageSet(KviIrcMessage *msg) { // a nice extension for irc.wenet.ru // 700: RPL_CODEPAGESET @@ -2243,7 +2243,7 @@ void KviServerParser::parseNumericCodePageSet(KviIrcMessage *msg) } } -void KviServerParser::parseNumericCodePageScheme(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericCodePageScheme(KviIrcMessage *msg) { // a nice extension for irc.wenet.ru // 703: RPL_WHOISSCHEME @@ -2276,7 +2276,7 @@ void KviServerParser::parseNumericCodePageScheme(KviIrcMessage *msg) } } -void KviServerParser::parseNumericUserMode(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericUserMode(KviIrcMessage *msg) { // 321: RPL_UMODEIS [I,E,U,D] // :prefix 221 <target> <modeflags> @@ -2290,7 +2290,7 @@ void KviServerParser::parseNumericUserMode(KviIrcMessage *msg) } } -void KviServerParser::parseNumericEndOfStats(KviIrcMessage *msg) +void KviIrcServerParser::parseNumericEndOfStats(KviIrcMessage *msg) { // 219: RPL_ENDOFSTATS [I,E,U,D] if(!msg->haltOutput()) @@ -2302,7 +2302,7 @@ void KviServerParser::parseNumericEndOfStats(KviIrcMessage *msg) } // STARTTLS support -void KviServerParser::parseNumericStartTls(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericStartTls(KviIrcMessage * msg) { // 670: RPL_STARTTLSOK // :prefix 670 <nickname> :STARTTLS successful, go ahead with TLS handshake @@ -2336,7 +2336,7 @@ void KviServerParser::parseNumericStartTls(KviIrcMessage * msg) #endif //!COMPILE_SSL_SUPPORT } -void KviServerParser::parseNumericNotRegistered(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericNotRegistered(KviIrcMessage * msg) { // 451: ERR_NOTREGISTERED // :prefix 451 PING :You have not registered @@ -2366,7 +2366,7 @@ void KviServerParser::parseNumericNotRegistered(KviIrcMessage * msg) } // SASL support -void KviServerParser::parseNumericSaslLogin(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericSaslLogin(KviIrcMessage * msg) { // 900: RPL_SASLLOGIN // :prefix 900 <nickname> <usermask> <authuser>: You are now logged in as <authuser> @@ -2382,7 +2382,7 @@ void KviServerParser::parseNumericSaslLogin(KviIrcMessage * msg) msg->connection()->endInitialCapNegotiation(); } -void KviServerParser::parseNumericSaslSuccess(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericSaslSuccess(KviIrcMessage * msg) { // 903: RPL_SASLSUCCESS // :prefix 903 <nickname> :SASL authentication successful @@ -2397,7 +2397,7 @@ void KviServerParser::parseNumericSaslSuccess(KviIrcMessage * msg) msg->connection()->endInitialCapNegotiation(); } -void KviServerParser::parseNumericSaslFail(KviIrcMessage * msg) +void KviIrcServerParser::parseNumericSaslFail(KviIrcMessage * msg) { // 904: RPL_SASLFAILED // :prefix 904 * :SASL authentication failed diff --git a/src/kvirc/sparser/kvi_sp_tables.cpp b/src/kvirc/sparser/kvi_sp_tables.cpp index 607a8143f..c73c58bfb 100644 --- a/src/kvirc/sparser/kvi_sp_tables.cpp +++ b/src/kvirc/sparser/kvi_sp_tables.cpp @@ -25,9 +25,9 @@ #include "kvi_sparser.h" -#define PTM(__m) KVI_PTR2MEMBER(KviServerParser::__m) +#define PTM(__m) KVI_PTR2MEMBER(KviIrcServerParser::__m) -KviLiteralMessageParseStruct KviServerParser::m_literalParseProcTable[]= +KviLiteralMessageParseStruct KviIrcServerParser::m_literalParseProcTable[]= { { "AUTHENTICATE" , PTM(parseLiteralAuthenticate) }, { "CAP" , PTM(parseLiteralCap) }, @@ -49,7 +49,7 @@ KviLiteralMessageParseStruct KviServerParser::m_literalParseProcTable[]= }; // FIXME: #warning "Merge these two tables into one" -KviCtcpMessageParseStruct KviServerParser::m_ctcpRequestParseProcTable[]= +KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpRequestParseProcTable[]= { { "ACTION" , PTM(parseCtcpRequestAction) , 0 }, { "AVATAR" , PTM(parseCtcpRequestAvatar) , 0 }, @@ -67,7 +67,7 @@ KviCtcpMessageParseStruct KviServerParser::m_ctcpRequestParseProcTable[]= { 0 , 0 , 0 } }; -KviCtcpMessageParseStruct KviServerParser::m_ctcpReplyParseProcTable[]= +KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpReplyParseProcTable[]= { { "ACTION" , PTM(parseCtcpRequestAction) , 0 }, { "AVATAR" , PTM(parseCtcpReplyAvatar) , 0 }, @@ -86,7 +86,7 @@ KviCtcpMessageParseStruct KviServerParser::m_ctcpReplyParseProcTable[]= { 0 , 0 , 0 } }; -messageParseProc KviServerParser::m_numericParseProcTable[1000]= +messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]= { 0, // 000 PTM(parseNumeric001) , // 001 RPL_WELCOME diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp index 38393c7bb..c4950c041 100644 --- a/src/kvirc/sparser/kvi_sparser.cpp +++ b/src/kvirc/sparser/kvi_sparser.cpp @@ -34,20 +34,20 @@ #include "kvi_kvs_eventtriggers.h" #include "kvi_ircconnectionstatedata.h" -KviServerParser * g_pServerParser = 0; +KviIrcServerParser * g_pServerParser = 0; -KviServerParser::KviServerParser() +KviIrcServerParser::KviIrcServerParser() : QObject(0) { setObjectName("server_parser"); } -KviServerParser::~KviServerParser() +KviIrcServerParser::~KviIrcServerParser() { } -void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConnection) +void KviIrcServerParser::parseMessage(const char * message,KviIrcConnection * pConnection) { if(*message != 0 ) { diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h index 15e499bfc..b56e3ed40 100644 --- a/src/kvirc/sparser/kvi_sparser.h +++ b/src/kvirc/sparser/kvi_sparser.h @@ -39,7 +39,7 @@ class KviWindow; class KviChannel; -class KviServerParser; +class KviIrcServerParser; class KviFrame; class KviIrcConnection; @@ -51,7 +51,7 @@ class KviIrcConnection; #define IS_ME(_msg,_nick) KviQString::equalCI(_msg->connection()->currentNickName(),_nick) -typedef void (KviServerParser::*messageParseProc)(KviIrcMessage *); +typedef void (KviIrcServerParser::*messageParseProc)(KviIrcMessage *); typedef struct _KviLiteralMessageParseStruct { @@ -87,7 +87,7 @@ typedef struct _KviDccRequest KviConsole * pConsole; } KviDccRequest; -typedef void (KviServerParser::*ctcpParseProc)(KviCtcpMessage *); +typedef void (KviIrcServerParser::*ctcpParseProc)(KviCtcpMessage *); #define KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT 1 @@ -115,12 +115,12 @@ public: }; -class KVIRC_API KviServerParser : public QObject +class KVIRC_API KviIrcServerParser : public QObject { Q_OBJECT public: - KviServerParser(); - ~KviServerParser(); + KviIrcServerParser(); + ~KviIrcServerParser(); private: static messageParseProc m_numericParseProcTable[1000]; static KviLiteralMessageParseStruct m_literalParseProcTable[]; @@ -272,7 +272,7 @@ public: }; #ifndef _KVI_SPARSER_CPP_ - extern KVIRC_API KviServerParser * g_pServerParser; + extern KVIRC_API KviIrcServerParser * g_pServerParser; #endif diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 6866982a0..8c8d266e1 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -34,7 +34,7 @@ #include "kvi_ircview.h" #include "KviMircCntrl.h" #include "kvi_input.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviProxyDataBase.h" #include "KviNetUtils.h" #include "KviIrcServer.h" @@ -89,7 +89,7 @@ #define __KVI_DEBUG__ #include "kvi_debug.h" -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) @@ -431,7 +431,7 @@ void KviConsole::updateUri() QString uri; if(connection()) { - KviServer* server = connection()->target()->server(); + KviIrcServer* server = connection()->target()->server(); if(server) { KviIrcUrl::join(uri,server); diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index 1dc43dcd9..ff7def250 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -46,8 +46,8 @@ class KviAvatar; class KviDnsResolver; class KviIrcUserDataBase; class KviIrcUserEntry; -class KviServer; -class KviNetwork; +class KviIrcServer; +class KviIrcNetwork; class KviProxy; class KviUserListView; class KviNotifyListManager; diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index d3eade256..3cc55bd3e 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -80,7 +80,7 @@ class KVIRC_API KviFrame : public KviTalMainWindow //, public KviIrcContextManag friend class KviWindow; friend class KviConsole; friend class KviApp; - friend class KviServerParser; + friend class KviIrcServerParser; friend class KviMexToolBar; friend class KviMdiManager; friend class KviIrcContext; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 4c3418eb8..b84bc75b6 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -42,7 +42,7 @@ #include "kvi_ircconnection.h" #include "kvi_ircconnectiontarget.h" #include "kvi_irccontext.h" -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "kvi_kvs_eventtriggers.h" #ifdef COMPILE_ON_MAC diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 5554023ad..20d9b50e0 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -253,7 +253,7 @@ void KviMenuBar::newConnectionToServer(int id) { if(text == __tr2qs("&Other...")) { - KviKvsScript::run("options.edit KviServerOptionsWidget",m_pFrm->firstConsole()); + KviKvsScript::run("options.edit KviIrcServerOptionsWidget",m_pFrm->firstConsole()); } else { text.replace(QString("&"),QString("")); KviCString szCommand; diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 0f70ee8d1..50d0cd4fa 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -43,7 +43,7 @@ #include "kvi_kvs_script.h" #include "KviTimeUtils.h" #include "KviQString.h" -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #include "kvi_settings.h" #include "KviMiscUtils.h" #include "KviHttpRequest.h" diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 24da5a91b..b7ba364b6 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -30,7 +30,7 @@ #include "kvi_app.h" #include "KviFileUtils.h" #include "kvi_sourcesdate.h" -#include "kvi_buildinfo.h" +#include "KviBuildInfo.h" #include "KviOsInfo.h" #include <QTextEdit> diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index 632daffcf..860775b2e 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -30,7 +30,7 @@ #include "KviParameterList.h" #include "KviCommandFormatter.h" #include "KviQString.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_iconmanager.h" #include "KviMircCntrl.h" diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 58941263c..c9edaa3a1 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -31,7 +31,7 @@ #include "KviQString.h" #include "KviParameterList.h" #include "KviCommandFormatter.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_iconmanager.h" #include "KviMircCntrl.h" diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index 6b9fef501..ff6f38952 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -380,7 +380,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c) szTmp.replace(" ","_"); // escape the spaces with the right octal code - KviServerParser::encodeCtcpParameter(szTmp.toUtf8().data(),avatar); + KviIrcServerParser::encodeCtcpParameter(szTmp.toUtf8().data(),avatar); } KviSharedFile * o = 0; diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp index 6e174fde1..3338be28f 100644 --- a/src/modules/context/libkvicontext.cpp +++ b/src/modules/context/libkvicontext.cpp @@ -32,7 +32,7 @@ #include "kvi_console.h" #include "kvi_app.h" #include "KviIrcServer.h" -#include "KviNetwork.h" +#include "KviIrcNetwork.h" #include "kvi_irccontext.h" #include "kvi_ircconnection.h" #include "kvi_ircconnectionserverinfo.h" diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 5d4c8c4f8..d0934cc0f 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -968,7 +968,7 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename t->m_uResumePosition = filePos; KviCString szBuffy; - KviServerParser::encodeCtcpParameter(filename,szBuffy); + KviIrcServerParser::encodeCtcpParameter(filename,szBuffy); dcc->ctcpMsg->msg->console()->connection()->sendFmtData( "PRIVMSG %s :%cDCC ACCEPT %s %s %u %s%c", diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index 4beb89436..c7524883d 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -39,7 +39,7 @@ #include "kvi_ircview.h" #include "kvi_iconmanager.h" #include "KviLocale.h" - #include "kvi_error.h" + #include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" #include "kvi_console.h" diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index f34a45579..5e8f6bcf1 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -37,7 +37,7 @@ #include "kvi_ircview.h" #include "kvi_iconmanager.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" #include "kvi_console.h" diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index b3ca78111..a2437ba2d 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -41,7 +41,7 @@ #include "KviNetUtils.h" #include "kvi_frame.h" #include "kvi_console.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_options.h" #include "kvi_defaults.h" #include "KviMircCntrl.h" diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 843eb1d83..0c3c28a00 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -26,7 +26,7 @@ #include "kvi_settings.h" #include "KviNetUtils.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_options.h" #include "KviLocale.h" #include "KviMemory.h" diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index d550c114c..60dd742f1 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -46,7 +46,7 @@ #include "KviNetUtils.h" #include "kvi_frame.h" #include "kvi_console.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_options.h" #include "kvi_defaults.h" #include "KviSharedFilesManager.h" diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 9aa155b74..9ea1dd74e 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -36,7 +36,7 @@ #include "kvi_ircview.h" #include "kvi_iconmanager.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" #include "kvi_console.h" @@ -1100,7 +1100,7 @@ void KviDccFileTransfer::startConnection() if(m_pDescriptor->bResume && m_pDescriptor->bRecvFile) { QString fName; - KviServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName); + KviIrcServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName); if(m_pDescriptor->isZeroPortRequest()) { m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC RESUME %s %s %s %s%c", @@ -1808,7 +1808,7 @@ void KviDccFileTransfer::connectionInProgress() if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores)) tmp.replace(" ","_"); - KviServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName); + KviIrcServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName); // Zero port requests want DCC SEND as back-request KviCString szReq; @@ -2143,7 +2143,7 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,quint6 m_pDescriptor->szFileSize.setNum(filePos); KviCString szBuffy; - KviServerParser::encodeCtcpParameter(filename,szBuffy); + KviIrcServerParser::encodeCtcpParameter(filename,szBuffy); m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC ACCEPT %s %s %u%c", m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(), diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp index 61cb2f1eb..e10113d8a 100644 --- a/src/modules/dcc/thread.cpp +++ b/src/modules/dcc/thread.cpp @@ -26,7 +26,7 @@ #include "kvi_debug.h" #include "kvi_window.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviMemory.h" #include "KviMemory.h" #include "KviNetUtils.h" diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp index d7cb7e65b..d5f02b2ee 100644 --- a/src/modules/dcc/video.cpp +++ b/src/modules/dcc/video.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_eventtriggers.h" #include "KviLocale.h" #include "kvi_out.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include "kvi_options.h" #include "kvi_console.h" diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index df84c9127..315ae0f05 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -33,7 +33,7 @@ #include "kvi_ircview.h" #include "KviLocale.h" #include "kvi_out.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include "kvi_options.h" #include "kvi_console.h" @@ -52,7 +52,7 @@ #include <unistd.h> #include <errno.h> #include <fcntl.h> - //#include "kvi_error.h" + //#include "KviError.h" #include <sys/stat.h> // for open() #include <sys/ioctl.h> // for ioctl() #endif diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 7e85774b5..2f7c69589 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -28,7 +28,7 @@ #include "KviLocale.h" #include "kvi_module.h" #include "kvi_modulemanager.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_app.h" #include "kvi_iconmanager.h" #include "kvi_console.h" diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp index 1abcba578..8b58da69d 100644 --- a/src/modules/http/libkvihttp.cpp +++ b/src/modules/http/libkvihttp.cpp @@ -30,7 +30,7 @@ #include "KviLocale.h" #include "kvi_filedialog.h" #include "kvi_window.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviCommandFormatter.h" static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback) diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 3b30d6a62..00444cf42 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -100,7 +100,7 @@ int KviMircServersIniImport::doImport(const QString& filename) if(entry.isEmpty())entry = __tr2qs("Standalone Servers"); if(!serv.isEmpty()) { - KviServer s; + KviIrcServer s; s.m_szHostname = serv; s.m_szDescription = description; s.m_uPort = uPort; @@ -350,7 +350,7 @@ static bool mircimport_module_can_unload(KviModule *) } /* -KVIMODULEEXPORTFUNC KviServerImport * mircimport_module_createIrcServerImport(const char *filterName) +KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName) { if(kvi_strEqualCI(filterName,__tr("Import from servers.ini"))) { diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index e65b6b1b9..539217a34 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -25,7 +25,7 @@ #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviFile.h" diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index dfa633eef..3c2aadf14 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -25,7 +25,7 @@ #include "class_buttongroup.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 656eebefc..6220c51c1 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -24,7 +24,7 @@ //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "class_checkbox.h" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 6624e9544..9718024a7 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -24,7 +24,7 @@ //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "kvi_debug.h" #include "class_list.h" diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp index c877c8e71..41a2f6e26 100644 --- a/src/modules/objects/class_datetimeedit.cpp +++ b/src/modules/objects/class_datetimeedit.cpp @@ -24,7 +24,7 @@ #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviFile.h" diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp index b8a665c71..bf9834a03 100644 --- a/src/modules/objects/class_dialog.cpp +++ b/src/modules/objects/class_dialog.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "class_dialog.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_frame.h" diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 2af376f64..0ffaeb329 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -27,7 +27,7 @@ #include "class_file.h" #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviFile.h" #include "KviFileUtils.h" #include "class_memorybuffer.h" diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index 08a946a5a..625633ff8 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "class_ftp.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 6633bbad6..c7e684de1 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -25,7 +25,7 @@ #include <KviTalGroupBox.h> #include "class_groupbox.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index a0b682963..f8db5efb3 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -25,7 +25,7 @@ #include "class_http.h" #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include <QHttp> diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 891cb6e63..821afc6b2 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "class_label.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index e1f570bfc..36f675dce 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_lcd.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 59b20760e..bddb38300 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "class_lineedit.h" diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp index a3e7819aa..19e698a28 100644 --- a/src/modules/objects/class_listwidget.cpp +++ b/src/modules/objects/class_listwidget.cpp @@ -22,7 +22,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "kvi_debug.h" #include "class_list.h" diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index c1a58580d..76d278c6d 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -25,7 +25,7 @@ #include "KviTalMainWindow.h" #include "class_mainwindow.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 22836afa7..d03322ece 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -25,7 +25,7 @@ #include "class_memorybuffer.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "kvi_settings.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index 85468613f..2d4b4c1d2 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -24,7 +24,7 @@ #include "class_menubar.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index cbb235efb..aefbc53a7 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -23,7 +23,7 @@ // //============================================================================= -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "KviMemory.h" diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 0bc604595..e2a392b08 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -30,7 +30,7 @@ #include "kvi_debug.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviMemory.h" #include <QPrintDialog> diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 6c1b78fa7..f9c87722c 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -26,7 +26,7 @@ #include "class_popupmenu.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index b150fa8af..7b8af14ba 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_process.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "kvi_settings.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index e88e9f8d1..31588f0ae 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_progressbar.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index e3287184f..442e32558 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_radiobutton.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index caca558a6..07dc6f82e 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_slider.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 6ef5cf3ea..c280b30b2 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -35,10 +35,10 @@ #include "KviFile.h" #include "KviFileUtils.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviNetUtils.h" #include "KviDnsResolver.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_socket.h" #include "KviMemory.h" #include "KviMemory.h" diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 3c27baa08..16d27b85e 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_spinbox.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp index c8862cb4a..b74825c49 100644 --- a/src/modules/objects/class_tablewidget.cpp +++ b/src/modules/objects/class_tablewidget.cpp @@ -29,7 +29,7 @@ #include "kvi_debug.h" #include "kvi_app.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_iconmanager.h" #include "KviFile.h" #include "kvi_kvs_arraycast.h" diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 40041e02c..000f22b03 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_tabwidget.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index f781b68bd..b0fc19ab0 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -25,7 +25,7 @@ #include "class_tbrowser.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index b572bbb08..e3927da9d 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_toolbar.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviTalToolBar.h" #include "KviTalMainWindow.h" diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 4e44c8efa..3d1eb5fda 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_toolbutton.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/class_trayicon.cpp index 9f6b563ca..9463230ba 100644 --- a/src/modules/objects/class_trayicon.cpp +++ b/src/modules/objects/class_trayicon.cpp @@ -26,7 +26,7 @@ #include "class_popupmenu.h" #include "kvi_iconmanager.h" #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include <QSystemTrayIcon> diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp index 1a0a21973..34e7bb837 100644 --- a/src/modules/objects/class_treewidget.cpp +++ b/src/modules/objects/class_treewidget.cpp @@ -25,7 +25,7 @@ #include "class_treewidget.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp index 62e1a2b54..63922f1f5 100644 --- a/src/modules/objects/class_treewidgetitem.cpp +++ b/src/modules/objects/class_treewidgetitem.cpp @@ -26,7 +26,7 @@ #include "class_treewidgetitem.h" #include "class_pixmap.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index d6bda1561..32006fefe 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -28,7 +28,7 @@ #include "KviMemory.h" #include "kvi_debug.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviLocale.h" #include "kvi_iconmanager.h" #include "kvi_window.h" diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 9c1dfc57d..2988ff28a 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -25,7 +25,7 @@ #include "class_window.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index b2b5b2127..ab32cc9dd 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -26,7 +26,7 @@ #include <KviTalWizard.h> #include "class_wizard.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 926731fc3..d6f6b7262 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -25,7 +25,7 @@ #include "class_workspace.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" #include "kvi_iconmanager.h" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 3c48afb82..d943621b6 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -24,7 +24,7 @@ //============================================================================= #include "class_wrapper.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_debug.h" #include "KviLocale.h" diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 32014b689..87ebcba25 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -78,7 +78,7 @@ #include "kvi_app.h" #include "kvi_module.h" #include "KviLocale.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviCommandFormatter.h" #include "kvi_out.h" #include "kvi_app.h" diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index 415d90a5a..f311d07d6 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -381,9 +381,9 @@ KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(QWidget * paren return new KviQueryOptionsWidget(parent); } -KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(QWidget * parent) +KviOptionsWidget * classKviIrcServerOptionsWidget_createInstanceProc(QWidget * parent) { - return new KviServerOptionsWidget(parent); + return new KviIrcServerOptionsWidget(parent); } KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(QWidget * parent) @@ -615,8 +615,8 @@ static const char * g_szName_KviProxyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_Kvi static const char * g_szClassName_KviProxyOptionsWidget = "KviProxyOptionsWidget"; static const char * g_szName_KviQueryOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget; static const char * g_szClassName_KviQueryOptionsWidget = "KviQueryOptionsWidget"; -static const char * g_szName_KviServerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviServerOptionsWidget; -static const char * g_szClassName_KviServerOptionsWidget = "KviServerOptionsWidget"; +static const char * g_szName_KviIrcServerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget; +static const char * g_szClassName_KviIrcServerOptionsWidget = "KviIrcServerOptionsWidget"; static const char * g_szName_KviSoundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget; static const char * g_szClassName_KviSoundOptionsWidget = "KviSoundOptionsWidget"; static const char * g_szName_KviSoundGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget; @@ -3085,36 +3085,36 @@ KviOptionsInstanceManager::KviOptionsInstanceManager() e0->pChildList = 0; e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviServerOptionsWidget_createInstanceProc; + e0->createProc = &classKviIrcServerOptionsWidget_createInstanceProc; e0->pWidget = 0; - e0->szClassName = g_szClassName_KviServerOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviServerOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviServerOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviServerOptionsWidget; + e0->szClassName = g_szClassName_KviIrcServerOptionsWidget; + e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget + e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget; #else e0->iPriority = 0; #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget; e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");; #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcServerOptionsWidget + e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcServerOptionsWidget; #else e0->szGroup = "general"; #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviServerOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcServerOptionsWidget + e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcServerOptionsWidget; #else e0->bIsContainer = false; #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviServerOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviServerOptionsWidget; + #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcServerOptionsWidget + e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcServerOptionsWidget; #else e0->bIsNotContained = false; #endif - e0->szNameNoLocale = g_szName_KviServerOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviServerOptionsWidget,"options"); + e0->szNameNoLocale = g_szName_KviIrcServerOptionsWidget; + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcServerOptionsWidget,"options"); m_pInstanceTree->append(e0); e0->pChildList = 0; diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index e742cfa9d..7439c5bf4 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -70,7 +70,7 @@ #include <QWindowsStyle> #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW -KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n) +KviIrcNetworkDetailsWidget::KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n) : QDialog(par) { setModal(true); @@ -381,13 +381,13 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n) } -KviNetworkDetailsWidget::~KviNetworkDetailsWidget() +KviIrcNetworkDetailsWidget::~KviIrcNetworkDetailsWidget() { if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor); if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor); } -void KviNetworkDetailsWidget::editNickServRule() +void KviIrcNetworkDetailsWidget::editNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem(); if(!it)return; @@ -402,7 +402,7 @@ void KviNetworkDetailsWidget::editNickServRule() } } -void KviNetworkDetailsWidget::addNickServRule() +void KviIrcNetworkDetailsWidget::addNickServRule() { KviNickServRule r; KviNickServRuleEditor ed(this,false); @@ -416,7 +416,7 @@ void KviNetworkDetailsWidget::addNickServRule() } } -void KviNetworkDetailsWidget::delNickServRule() +void KviIrcNetworkDetailsWidget::delNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem(); if(!it)return; @@ -424,7 +424,7 @@ void KviNetworkDetailsWidget::delNickServRule() enableDisableNickServControls(); } -void KviNetworkDetailsWidget::enableDisableNickServControls() +void KviIrcNetworkDetailsWidget::enableDisableNickServControls() { bool bEnabled = m_pNickServCheck->isChecked(); m_pNickServTreeWidget->setEnabled(bEnabled); @@ -434,7 +434,7 @@ void KviNetworkDetailsWidget::enableDisableNickServControls() m_pEditRuleButton->setEnabled(bEnabled); } -void KviNetworkDetailsWidget::fillData(KviNetwork * n) +void KviIrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) { n->setUserName(m_pUserEditor->text()); n->setPassword(m_pPassEditor->text()); @@ -497,7 +497,7 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n) } -KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s) +KviIrcServerDetailsWidget::KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s) : QDialog(par) { setModal(true); @@ -993,13 +993,13 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s) setHeaderLabelText(); } -KviServerDetailsWidget::~KviServerDetailsWidget() +KviIrcServerDetailsWidget::~KviIrcServerDetailsWidget() { if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor); if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor); } -void KviServerDetailsWidget::useIPV6CheckToggled(bool) +void KviIrcServerDetailsWidget::useIPV6CheckToggled(bool) { #ifdef COMPILE_IPV6_SUPPORT m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IPv6 : KviIpEditor::IPv4); @@ -1009,12 +1009,12 @@ void KviServerDetailsWidget::useIPV6CheckToggled(bool) setHeaderLabelText(); } -void KviServerDetailsWidget::portEditorTextChanged(const QString &) +void KviIrcServerDetailsWidget::portEditorTextChanged(const QString &) { setHeaderLabelText(); } -void KviServerDetailsWidget::setHeaderLabelText() +void KviIrcServerDetailsWidget::setHeaderLabelText() { QString szTmp = "<font size=\"+1\"><b>irc"; if(m_pUseIPV6Check->isChecked())szTmp += "6"; @@ -1034,7 +1034,7 @@ void KviServerDetailsWidget::setHeaderLabelText() m_pHeaderLabel->setText(szTmp); } -void KviServerDetailsWidget::fillData(KviServer * s) +void KviIrcServerDetailsWidget::fillData(KviIrcServer * s) { s->setUserName(m_pUserEditor->text()); s->setPassword(m_pPassEditor->text()); @@ -1164,7 +1164,7 @@ void KviServerDetailsWidget::fillData(KviServer * s) s->setProxy(m_pProxyEditor->currentIndex()-2); } -void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b) +void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b) { m_pIMode->setEnabled(!b); m_pWMode->setEnabled(!b); @@ -1172,35 +1172,35 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b) } // kvi_app.cpp -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; -KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n) +KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n) : QTreeWidgetItem(parent) { setIcon(0,QIcon(pm)); m_pServerData = 0; - m_pNetworkData = new KviNetwork(*n); + m_pNetworkData = new KviIrcNetwork(*n); setText(0,n->name()); setText(1,n->description()); } -KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s) +KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s) : QTreeWidgetItem(parent) { setIcon(0,QIcon(pm)); - m_pServerData = new KviServer(*s); + m_pServerData = new KviIrcServer(*s); setText(0,s->hostName()); setText(1,s->description()); m_pNetworkData = 0; } -KviServerOptionsTreeWidgetItem::~KviServerOptionsTreeWidgetItem() +KviIrcServerOptionsTreeWidgetItem::~KviIrcServerOptionsTreeWidgetItem() { if(m_pServerData)delete m_pServerData; if(m_pNetworkData)delete m_pNetworkData; } -void KviServerOptionsTreeWidgetItem::updateVisibleStrings() +void KviIrcServerOptionsTreeWidgetItem::updateVisibleStrings() { if(m_pNetworkData) { @@ -1216,7 +1216,7 @@ void KviServerOptionsTreeWidgetItem::updateVisibleStrings() } -KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) +KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent) : KviOptionsWidget(parent) { setObjectName("server_options_widget"); @@ -1401,7 +1401,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) setMinimumWidth(600); } -KviServerOptionsWidget::~KviServerOptionsWidget() +KviIrcServerOptionsWidget::~KviIrcServerOptionsWidget() { if(m_pImportFilter) { @@ -1418,7 +1418,7 @@ KviServerOptionsWidget::~KviServerOptionsWidget() delete m_pNetworkDetailsDialog; } -void KviServerOptionsWidget::recentServersPopupAboutToShow() +void KviIrcServerOptionsWidget::recentServersPopupAboutToShow() { g_pApp->fillRecentServersPopup(m_pRecentPopup); @@ -1426,7 +1426,7 @@ void KviServerOptionsWidget::recentServersPopupAboutToShow() m_pRecentPopup->insertItem(__tr2qs("Clear Recent Servers List")); } -void KviServerOptionsWidget::recentServersPopupClicked(int id) +void KviIrcServerOptionsWidget::recentServersPopupClicked(int id) { KviConsole * c = g_pActiveWindow->console(); if(!c) @@ -1445,7 +1445,7 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id) selectBestServerByUrl(szItemText); } -void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) +void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) { if(szUrl.isEmpty()) return; @@ -1457,12 +1457,12 @@ void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) int uCount = m_pTreeWidget->topLevelItemCount(); int uIdx = 0; - KviServerOptionsTreeWidgetItem * pBestCandidate = NULL; + KviIrcServerOptionsTreeWidgetItem * pBestCandidate = NULL; kvi_u32_t uBestCandidateScore = 0; while(uIdx < uCount) { - KviServerOptionsTreeWidgetItem * pNet = static_cast<KviServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx)); + KviIrcServerOptionsTreeWidgetItem * pNet = static_cast<KviIrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx)); uIdx++; @@ -1473,13 +1473,13 @@ void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) int uChildIdx = 0; while(uChildIdx < uServerCount) { - KviServerOptionsTreeWidgetItem * pServer = static_cast<KviServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx)); + KviIrcServerOptionsTreeWidgetItem * pServer = static_cast<KviIrcServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx)); uChildIdx++; if(!pServer) continue; // huh ? - KviServer * pServerData = pServer->serverData(); + KviIrcServer * pServerData = pServer->serverData(); if(!pServerData) continue; // umphf... @@ -1514,7 +1514,7 @@ void KviServerOptionsWidget::selectBestServerByUrl(const QString &szUrl) } -void KviServerOptionsWidget::connectCurrentClicked() +void KviIrcServerOptionsWidget::connectCurrentClicked() { saveLastItem(); commit(); @@ -1523,26 +1523,26 @@ void KviServerOptionsWidget::connectCurrentClicked() KviKvsScript::run("server -u",g_pApp->activeConsole()); } -void KviServerOptionsWidget::fillServerList() +void KviIrcServerOptionsWidget::fillServerList() { - KviServerOptionsTreeWidgetItem * net; - KviServerOptionsTreeWidgetItem * srv; - KviServerOptionsTreeWidgetItem * cur = 0; + KviIrcServerOptionsTreeWidgetItem * net; + KviIrcServerOptionsTreeWidgetItem * srv; + KviIrcServerOptionsTreeWidgetItem * cur = 0; - KviPointerHashTableIterator<QString,KviNetwork> it(*(g_pServerDataBase->recordDict())); + KviPointerHashTableIterator<QString,KviIrcNetwork> it(*(g_pServerDataBase->recordDict())); if(m_pConnectCurrent) m_pConnectCurrent->setEnabled(false); - while(KviNetwork * r = it.current()) + while(KviIrcNetwork * r = it.current()) { - net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r); - KviPointerList<KviServer> * sl = r->serverList(); + net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r); + KviPointerList<KviIrcServer> * sl = r->serverList(); bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data(); net->setExpanded(bCurrent); - for(KviServer * s = sl->first();s;s = sl->next()) + for(KviIrcServer * s = sl->first();s;s = sl->next()) { - srv = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s); + srv = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s); if((s == r->currentServer()) && bCurrent) { @@ -1562,15 +1562,15 @@ void KviServerOptionsWidget::fillServerList() } } -void KviServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int ) +void KviIrcServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int ) { detailsClicked(); } -void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) +void KviIrcServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) { saveLastItem(); - m_pLastEditedItem = (KviServerOptionsTreeWidgetItem *)it; + m_pLastEditedItem = (KviIrcServerOptionsTreeWidgetItem *)it; if(m_pLastEditedItem) { @@ -1604,7 +1604,7 @@ void KviServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetI } } -void KviServerOptionsWidget::serverNetworkEditTextEdited(const QString &) +void KviIrcServerOptionsWidget::serverNetworkEditTextEdited(const QString &) { if(!m_pLastEditedItem) return; @@ -1617,7 +1617,7 @@ void KviServerOptionsWidget::serverNetworkEditTextEdited(const QString &) } -void KviServerOptionsWidget::saveLastItem() +void KviIrcServerOptionsWidget::saveLastItem() { if(!m_pLastEditedItem) return; @@ -1639,32 +1639,32 @@ void KviServerOptionsWidget::saveLastItem() } } -void KviServerOptionsWidget::commit() +void KviIrcServerOptionsWidget::commit() { saveLastItem(); g_pServerDataBase->clear(); - KviServerOptionsTreeWidgetItem * network; + KviIrcServerOptionsTreeWidgetItem * network; for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - network=(KviServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); + network=(KviIrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); QString tmp = network->m_pNetworkData->name(); - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp); + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp); if(pNetwork) { pNetwork->copyFrom(*(network->m_pNetworkData)); } else { - pNetwork = new KviNetwork(tmp); + pNetwork = new KviIrcNetwork(tmp); pNetwork->copyFrom(*(network->m_pNetworkData)); g_pServerDataBase->addNetwork(pNetwork); } if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(pNetwork->name()); - KviServerOptionsTreeWidgetItem * ch; + KviIrcServerOptionsTreeWidgetItem * ch; for (int j=0;j<network->childCount();j++) { - KviServer *srv; - ch=(KviServerOptionsTreeWidgetItem *)network->child(j); + KviIrcServer *srv; + ch=(KviIrcServerOptionsTreeWidgetItem *)network->child(j); if(ch->m_pServerData) { if(!ch->m_pServerData->m_szHostname.isEmpty()) @@ -1672,7 +1672,7 @@ void KviServerOptionsWidget::commit() srv = pNetwork->findServer(ch->m_pServerData); if(!srv) { - srv = new KviServer(*(ch->m_pServerData)); + srv = new KviIrcServer(*(ch->m_pServerData)); pNetwork->insertServer(srv); } else *srv = *(ch->m_pServerData); if(srv->id().isEmpty())srv->generateUniqueId(); @@ -1693,11 +1693,11 @@ void KviServerOptionsWidget::commit() g_pApp->saveIrcServerDataBase(); } -void KviServerOptionsWidget::customContextMenuRequested(const QPoint &pnt) +void KviIrcServerOptionsWidget::customContextMenuRequested(const QPoint &pnt) { int id; QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt); - bool bServer = (it && ((KviServerOptionsTreeWidgetItem *)it)->m_pServerData); + bool bServer = (it && ((KviIrcServerOptionsTreeWidgetItem *)it)->m_pServerData); m_pContextPopup->clear(); m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork())); id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent())); @@ -1719,7 +1719,7 @@ void KviServerOptionsWidget::customContextMenuRequested(const QPoint &pnt) m_pContextPopup->popup(QCursor::pos()); } -void KviServerOptionsWidget::importPopupAboutToShow() +void KviIrcServerOptionsWidget::importPopupAboutToShow() { g_pModuleManager->loadModulesByCaps("serverimport"); m_pImportPopup->clear(); @@ -1740,7 +1740,7 @@ void KviServerOptionsWidget::importPopupAboutToShow() } } -void KviServerOptionsWidget::importPopupActivated(int id) +void KviIrcServerOptionsWidget::importPopupActivated(int id) { // ensure that we have all the modules : they could have been unloaded while the popup was displayed g_pModuleManager->loadModulesByCaps("serverimport"); @@ -1773,31 +1773,31 @@ void KviServerOptionsWidget::importPopupActivated(int id) return; } - connect(m_pImportFilter,SIGNAL(server(const KviServer &,const QString&)),this,SLOT(importServer(const KviServer &,const QString&))); + connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const QString&)),this,SLOT(importServer(const KviIrcServer &,const QString&))); connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead())); m_pImportFilter->start(); } -void KviServerOptionsWidget::importerDead() +void KviIrcServerOptionsWidget::importerDead() { m_pImportFilter = 0; } -void KviServerOptionsWidget::importServer(const KviServer &s,const QString &network) +void KviIrcServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network) { - KviServerOptionsTreeWidgetItem * net = findNetItem(network); + KviIrcServerOptionsTreeWidgetItem * net = findNetItem(network); if(!net) { - KviNetwork d(network); - net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); + KviIrcNetwork d(network); + net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); net->setExpanded(true); } - KviServerOptionsTreeWidgetItem * srv ; + KviIrcServerOptionsTreeWidgetItem * srv ; for(int i=0;i<net->childCount();i++) { - srv=(KviServerOptionsTreeWidgetItem *) net->child(i); + srv=(KviIrcServerOptionsTreeWidgetItem *) net->child(i); if((srv)->m_pServerData->useSSL() == s.useSSL()) { if(srv->m_pServerData->isIPv6() == s.isIPv6()) @@ -1818,39 +1818,39 @@ void KviServerOptionsWidget::importServer(const KviServer &s,const QString &netw } // not found : add it! - KviServerOptionsTreeWidgetItem * newServer = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s); + KviIrcServerOptionsTreeWidgetItem * newServer = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s); m_pTreeWidget->setCurrentItem(newServer); m_pTreeWidget->scrollToItem(newServer); } -void KviServerOptionsWidget::newNetwork() +void KviIrcServerOptionsWidget::newNetwork() { - KviNetwork d(__tr2qs_ctx("New Network","options")); - KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); + KviIrcNetwork d(__tr2qs_ctx("New Network","options")); + KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); it->setExpanded(true); it->setSelected(true); m_pTreeWidget->setCurrentItem(it); m_pTreeWidget->scrollToItem(it); } -void KviServerOptionsWidget::newServer() +void KviIrcServerOptionsWidget::newServer() { if(m_pLastEditedItem) { - KviServerOptionsTreeWidgetItem * net; + KviIrcServerOptionsTreeWidgetItem * net; if(m_pLastEditedItem->m_pServerData) { - net = (KviServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); + net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); if(!net)return; } else net = m_pLastEditedItem; - KviServer tmp; + KviIrcServer tmp; tmp.m_szHostname = __tr2qs_ctx("irc.unknown.net","options"); tmp.setCacheIp(false); tmp.generateUniqueId(); - KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp); + KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp); net->setExpanded(true); @@ -1860,34 +1860,34 @@ void KviServerOptionsWidget::newServer() } } -void KviServerOptionsWidget::copyServer() +void KviIrcServerOptionsWidget::copyServer() { if(m_pLastEditedItem) { if(m_pLastEditedItem->m_pServerData) { - if(!m_pClipboard)m_pClipboard = new KviServer(); + if(!m_pClipboard)m_pClipboard = new KviIrcServer(); *m_pClipboard = *(m_pLastEditedItem->m_pServerData); m_pPasteServerButton->setEnabled(true); } } } -void KviServerOptionsWidget::pasteServer() +void KviIrcServerOptionsWidget::pasteServer() { if(m_pClipboard) { if(m_pLastEditedItem) { - KviServerOptionsTreeWidgetItem * net; + KviIrcServerOptionsTreeWidgetItem * net; if(m_pLastEditedItem->m_pServerData) { - net = (KviServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); + net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); if(!net)return; } else net = m_pLastEditedItem; - KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(net, + KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net, *(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),m_pClipboard); net->setExpanded(true); @@ -1899,7 +1899,7 @@ void KviServerOptionsWidget::pasteServer() } } -void KviServerOptionsWidget::removeCurrent() +void KviIrcServerOptionsWidget::removeCurrent() { if(m_pLastEditedItem) { @@ -1926,33 +1926,33 @@ void KviServerOptionsWidget::removeCurrent() } } -KviServerOptionsTreeWidgetItem * KviServerOptionsWidget::findNetItem(const QString &netname) +KviIrcServerOptionsTreeWidgetItem * KviIrcServerOptionsWidget::findNetItem(const QString &netname) { - KviServerOptionsTreeWidgetItem * it; + KviIrcServerOptionsTreeWidgetItem * it; for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - it=(KviServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + it=(KviIrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); if(KviQString::equalCI(it->text(0),netname))return it; } return 0; } -void KviServerOptionsWidget::clearList() +void KviIrcServerOptionsWidget::clearList() { m_pTreeWidget->clear(); m_pLastEditedItem = 0; currentItemChanged(0,0); } -void KviServerOptionsWidget::detailsClicked() +void KviIrcServerOptionsWidget::detailsClicked() { if(!m_pLastEditedItem)return; if(m_pLastEditedItem->m_pServerData) { saveLastItem(); - m_pServerDetailsDialog = new KviServerDetailsWidget(this,m_pLastEditedItem->m_pServerData); + m_pServerDetailsDialog = new KviIrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData); int retCode = m_pServerDetailsDialog->exec(); if(retCode == QDialog::Accepted) @@ -1975,7 +1975,7 @@ void KviServerOptionsWidget::detailsClicked() { saveLastItem(); - m_pNetworkDetailsDialog = new KviNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData); + m_pNetworkDetailsDialog = new KviIrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData); int retCode = m_pNetworkDetailsDialog->exec(); if(retCode == QDialog::Accepted) diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h index 68e018167..1ee0a1fac 100644 --- a/src/modules/options/optw_servers.h +++ b/src/modules/options/optw_servers.h @@ -39,33 +39,33 @@ class QLineEdit; class QComboBox; class QPushButton; class KviIpEditor; -class KviServer; +class KviIrcServer; class KviTalPopupMenu; class KviScriptEditor; class KviNickServRule; class KviNickServRuleEditor; -class KviServer; -class KviNetwork; -class KviNetworkData; +class KviIrcServer; +class KviIrcNetwork; +class KviIrcNetworkData; class KviMexServerImport; -class KviServerOptionsTreeWidgetItem : public QTreeWidgetItem +class KviIrcServerOptionsTreeWidgetItem : public QTreeWidgetItem { public: - KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n); - KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s); - ~KviServerOptionsTreeWidgetItem(); + KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n); + KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s); + ~KviIrcServerOptionsTreeWidgetItem(); public: - KviServer * m_pServerData; - KviNetwork * m_pNetworkData; + KviIrcServer * m_pServerData; + KviIrcNetwork * m_pNetworkData; public: - KviServer * serverData() const + KviIrcServer * serverData() const { return m_pServerData; } - KviNetwork * networkData() const + KviIrcNetwork * networkData() const { return m_pNetworkData; } @@ -74,12 +74,12 @@ public: }; -class KviNetworkDetailsWidget : public QDialog +class KviIrcNetworkDetailsWidget : public QDialog { Q_OBJECT public: - KviNetworkDetailsWidget(QWidget * par,KviNetwork * d); - ~KviNetworkDetailsWidget(); + KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d); + ~KviIrcNetworkDetailsWidget(); protected: KviScriptEditor * m_pOnConnectEditor; KviScriptEditor * m_pOnLoginEditor; @@ -104,7 +104,7 @@ protected: QStringList m_lstChannels; KviChannelListSelector * m_pChannelListSelector; public: - void fillData(KviNetwork * d); + void fillData(KviIrcNetwork * d); protected slots: void enableDisableNickServControls(); void addNickServRule(); @@ -112,12 +112,12 @@ protected slots: void editNickServRule(); }; -class KviServerDetailsWidget : public QDialog +class KviIrcServerDetailsWidget : public QDialog { Q_OBJECT public: - KviServerDetailsWidget(QWidget * par,KviServer * s); - ~KviServerDetailsWidget(); + KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s); + ~KviIrcServerDetailsWidget(); protected: QString m_szHostname; QLabel * m_pHeaderLabel; @@ -157,22 +157,22 @@ protected slots: void useIPV6CheckToggled(bool); public: void setHeaderLabelText(); - void fillData(KviServer *s); + void fillData(KviIrcServer *s); }; -#define KVI_OPTIONS_WIDGET_ICON_KviServerOptionsWidget KVI_SMALLICON_SERVER -#define KVI_OPTIONS_WIDGET_NAME_KviServerOptionsWidget __tr2qs_no_lookup("Servers") -#define KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget __tr2qs_no_lookup("connection") -//#define KVI_OPTIONS_WIDGET_NOPARENT_KviServerOptionsWidget KviConnectionOptionsWidget -#define KVI_OPTIONS_WIDGET_PRIORITY_KviServerOptionsWidget 99000 +#define KVI_OPTIONS_WIDGET_ICON_KviIrcServerOptionsWidget KVI_SMALLICON_SERVER +#define KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget __tr2qs_no_lookup("Servers") +#define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget __tr2qs_no_lookup("connection") +//#define KVI_OPTIONS_WIDGET_NOPARENT_KviIrcServerOptionsWidget KviConnectionOptionsWidget +#define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget 99000 -class KviServerOptionsWidget : public KviOptionsWidget +class KviIrcServerOptionsWidget : public KviOptionsWidget { Q_OBJECT public: - KviServerOptionsWidget(QWidget * parent); - ~KviServerOptionsWidget(); + KviIrcServerOptionsWidget(QWidget * parent); + ~KviIrcServerOptionsWidget(); protected: QTreeWidget * m_pTreeWidget; QLabel * m_pSrvNetLabel; @@ -183,13 +183,13 @@ protected: KviTalPopupMenu * m_pRecentPopup; KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pImportPopup; - KviServer * m_pClipboard; + KviIrcServer * m_pClipboard; //QCheckBox * m_pIPv6Check; QPushButton * m_pConnectCurrent; QPushButton * m_pConnectNew; - KviServerOptionsTreeWidgetItem * m_pLastEditedItem; - KviServerDetailsWidget * m_pServerDetailsDialog; - KviNetworkDetailsWidget * m_pNetworkDetailsDialog; + KviIrcServerOptionsTreeWidgetItem * m_pLastEditedItem; + KviIrcServerDetailsWidget * m_pServerDetailsDialog; + KviIrcNetworkDetailsWidget * m_pNetworkDetailsDialog; KviMexServerImport * m_pImportFilter; QToolButton * m_pNewServerButton; @@ -201,11 +201,11 @@ protected: private: void fillServerList(); void saveLastItem(); - KviServerOptionsTreeWidgetItem * findNetItem(const QString &netname); + KviIrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname); void selectBestServerByUrl(const QString &szUrl); protected slots: void importerDead(); - void importServer(const KviServer & s,const QString &network); + void importServer(const KviIrcServer & s,const QString &network); void importPopupAboutToShow(); void currentItemChanged(QTreeWidgetItem *cur,QTreeWidgetItem *prev); void customContextMenuRequested(const QPoint &pnt); diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp index 76f1014f6..196c300a0 100644 --- a/src/modules/serverdb/libkviserverdb.cpp +++ b/src/modules/serverdb/libkviserverdb.cpp @@ -30,7 +30,7 @@ #include <QString> -extern KVIRC_API KviServerDataBase * g_pServerDataBase; +extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; /* @doc: serverdb @@ -126,7 +126,7 @@ static bool serverdb_kvs_fnc_networkExists(KviKvsModuleFunctionCall * c) return false; } - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetwork); + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetwork); if(!pNetwork) { c->returnValue()->setBoolean(false); @@ -172,14 +172,14 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) if(!szNetwork.isEmpty()) { // Check in the given network - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); if(!pRecord) { c->returnValue()->setBoolean(false); return true; } - KviServer * pCheckServer = pRecord->findServer(szServer); + KviIrcServer * pCheckServer = pRecord->findServer(szServer); if(!pCheckServer) { c->returnValue()->setBoolean(false); @@ -189,13 +189,13 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) c->returnValue()->setBoolean(true); } else { // Check through all networks - KviPointerHashTableIterator<QString,KviNetwork> it(*(g_pServerDataBase->recordDict())); + KviPointerHashTableIterator<QString,KviIrcNetwork> it(*(g_pServerDataBase->recordDict())); - while(KviNetwork * r = it.current()) + while(KviIrcNetwork * r = it.current()) { - KviPointerList<KviServer> * sl = r->serverList(); + KviPointerList<KviIrcServer> * sl = r->serverList(); - for(KviServer * s = sl->first(); s; s = sl->next()) + for(KviIrcServer * s = sl->first(); s; s = sl->next()) { if(QString::compare(s->hostName().toUtf8().data(),szServer,Qt::CaseInsensitive)==0) { @@ -227,7 +227,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) return false; \ } \ \ - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ if(!pNetwork) \ { \ c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \ @@ -268,14 +268,14 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) return false; \ } \ \ - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ if(!pRecord) \ { \ c->error(__tr2qs_ctx("The specified network does not exist","serverdb")); \ return false; \ } \ \ - KviServer * pServer = pRecord->findServer(szServName); \ + KviIrcServer * pServer = pRecord->findServer(szServName); \ if(!pServer) \ { \ c->error(__tr2qs_ctx("The specified server does not exist","serverdb")); \ @@ -826,7 +826,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c) return false; } - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetName); + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szNetName); if(pNetwork) { if(c->switches()->find('q',"quiet")) return true; @@ -834,7 +834,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c) return false; } - pNetwork = new KviNetwork(szNetName); + pNetwork = new KviIrcNetwork(szNetName); if(c->switches()->find('a',"autoconnect")) pNetwork->setAutoConnect(true); g_pServerDataBase->addNetwork(pNetwork); @@ -903,7 +903,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; } - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); if(!pRecord) { // FIXME: default to orphan servers @@ -911,10 +911,10 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; } - KviServer * pServer = new KviServer(); + KviIrcServer * pServer = new KviIrcServer(); pServer->setHostName(szServer); - KviServer * pServerRecord = pRecord->findServer(pServer); + KviIrcServer * pServerRecord = pRecord->findServer(pServer); if(pServerRecord) { if(c->switches()->find('q',"quiet")) return true; @@ -960,7 +960,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ + KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(szName); \ if(!pNetwork) \ { \ if(c->switches()->find('q',"quiet")) return true; \ @@ -996,7 +996,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ + KviIrcNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ if(!pRecord) \ { \ if(c->switches()->find('q',"quiet")) return true; \ @@ -1004,7 +1004,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviServer * pServer = pRecord->findServer(szServName); \ + KviIrcServer * pServer = pRecord->findServer(szServName); \ if(!pServer) \ { \ if(c->switches()->find('q',"quiet")) return true; \ diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp index 2ba30a640..200338068 100644 --- a/src/modules/theme/libkvitheme.cpp +++ b/src/modules/theme/libkvitheme.cpp @@ -31,7 +31,7 @@ #include "KviQString.h" #include "KviParameterList.h" #include "KviCommandFormatter.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_out.h" #include "kvi_iconmanager.h" #include "KviMircCntrl.h" diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp index 66a70c8b8..ac8266cfe 100644 --- a/src/modules/toolbar/libkvitoolbar.cpp +++ b/src/modules/toolbar/libkvitoolbar.cpp @@ -26,7 +26,7 @@ #include "KviLocale.h" #include "kvi_window.h" #include "kvi_app.h" -#include "kvi_error.h" +#include "KviError.h" #include "KviCommandFormatter.h" #include "kvi_customtoolbar.h" #include "kvi_customtoolbardescriptor.h" diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 5b7bf103c..e5f622110 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -31,7 +31,7 @@ #include "kvi_frame.h" #include "KviLocale.h" #include "kvi_app.h" -#include "kvi_error.h" +#include "KviError.h" #include "kvi_ircview.h" #include "kvi_input.h" #include "kvi_iconmanager.h" |