diff options
Diffstat (limited to 'src')
448 files changed, 1925 insertions, 6312 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6cbcb8f2..22c92d3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,9 +2,9 @@ # KVirc IRC client Makefile - 16.12.98 Szymon Stefanek <stefanek@tin.it> ############################################################################### -SUBDIRS = kvilib kvirc modules tdeconf_update +SUBDIRS = kvilib kvirc modules scripts tdeconf_update headers_HEADERS=kvi_configstatus.h -kvi_configstatus.h: config.h - cp -f config.h kvi_configstatus.h +kvi_configstatus.h: $(top_builddir)/config.h + cp -f $(top_builddir)/config.h kvi_configstatus.h diff --git a/src/config.h.in b/src/config.h.in deleted file mode 100644 index c19a4ad1..00000000 --- a/src/config.h.in +++ /dev/null @@ -1,272 +0,0 @@ -/* src/config.h.in. Generated from configure.in by autoheader. */ - -/* define this to the number of average channel users */ -#undef AVERAGE_CHANNEL_USERS - -/* define this if you are on a big endian machine */ -#undef BIG_ENDIAN_MACHINE_BYTE_ORDER - -/* this is the build date (configure date rather) */ -#undef BUILD_DATE - -/* these are the build flags */ -#undef BUILD_FLAGS - -/* define if you want to enable the Arts daemon support */ -#undef COMPILE_ARTS_SUPPORT - -/* define if you want to enable the Audiofile library support */ -#undef COMPILE_AUDIOFILE_SUPPORT - -/* define if you want to compile the crypt support */ -#undef COMPILE_CRYPT_SUPPORT - -/* define if you want to disable DCC VOICE sound support */ -#undef COMPILE_DISABLE_DCC_VOICE - -/* define if you want to enable the Esound daemon support */ -#undef COMPILE_ESD_SUPPORT - -/* define if you have the SIOCGIFADDR ioctl and the related headers */ -#undef COMPILE_GET_INTERFACE_ADDRESS - -/* define this if you want to ignore the SIGALARM signal */ -#undef COMPILE_IGNORE_SIGALARM - -/* define if you want the info tips to be compiled in */ -#undef COMPILE_INFO_TIPS - -/* define if you want the IpV6 support */ -#undef COMPILE_IPV6_SUPPORT - -/* define if you want to compile the TDE support */ -#undef COMPILE_TDE_SUPPORT - -/* define if you want the memory checks */ -#undef COMPILE_MEMORY_CHECKS - -/* define if you want the gcc memory profile */ -#undef COMPILE_MEMORY_PROFILE - -/* define if you want to enable the new KVS parser */ -#undef COMPILE_NEW_KVS - -/* define this if you want to disable the inter-process communication support - */ -#undef COMPILE_NO_IPC - -/* define if you want to ignore X Windows completely */ -#undef COMPILE_NO_X - -/* define if you want to disable the X bell support */ -#undef COMPILE_NO_X_BELL - -/* define if you want to use only the new KVS parser */ -#undef COMPILE_ONLY_NEW_KVS - -/* define if you want to enable OSS sound support */ -#undef COMPILE_OSS_SUPPORT - -/* define if you have perl and want the perl scripting support in kvirc */ -#undef COMPILE_PERL_SUPPORT - -/* define if you have the KDE support and want the pseudo transparency */ -#undef COMPILE_PSEUDO_TRANSPARENCY - -/* define if you have openssl and want the ssl support in kvirc */ -#undef COMPILE_SSL_SUPPORT - -/* define if you want to use the pthreads library */ -#undef COMPILE_THREADS_USE_POSIX - -/* define if you want to use the solaris libthread */ -#undef COMPILE_THREADS_USE_SOLARIS_LIBTHREAD - -/* define if your compiler supports gotos do dynamic labels */ -#undef COMPILE_USE_DYNAMIC_LABELS - -/* define if you have libgsm and want the GSM code to be compiled */ -#undef COMPILE_USE_GSM - -/* define if you trust your memmove() function */ -#undef COMPILE_WITH_SYSTEM_MEMMOVE - -/* define if you want to enable the ZLib library support */ -#undef COMPILE_XSS_SUPPORT - -/* define if you want to enable the ZLib library support */ -#undef COMPILE_ZLIB_SUPPORT - -/* define if you want the i386 asm code */ -#undef COMPILE_ix86_ASM - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `getenv' function. */ -#undef HAVE_GETENV - -/* Define to 1 if you have the `getnameinfo' function. */ -#undef HAVE_GETNAMEINFO - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the `inet_ntoa' function. */ -#undef HAVE_INET_NTOA - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <linux/soundcard.h> header file. */ -#undef HAVE_LINUX_SOUNDCARD_H - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `putenv' function. */ -#undef HAVE_PUTENV - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define to 1 if you have the <soundcard.h> header file. */ -#undef HAVE_SOUNDCARD_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the <sys/soundcard.h> header file. */ -#undef HAVE_SYS_SOUNDCARD_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `unsetenv' function. */ -#undef HAVE_UNSETENV - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT - -/* The size of `long int', as computed by sizeof. */ -#undef SIZEOF_LONG_INT - -/* The size of `long long int', as computed by sizeof. */ -#undef SIZEOF_LONG_LONG_INT - -/* The size of `short int', as computed by sizeof. */ -#undef SIZEOF_SHORT_INT - -/* The size of `unsigned int', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_INT - -/* The size of `unsigned long int', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG_INT - -/* The size of `unsigned long long int', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG_LONG_INT - -/* The size of `unsigned short int', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_SHORT_INT - -/* The size of `void *', as computed by sizeof. */ -#undef SIZEOF_VOID_P - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Version number of package */ -#undef VERSION - -/* MAJOR.MINOR part of version */ -#undef VERSION_BRANCH - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - -/* TDE directory */ -#undef TDE_DIR - -/* TDE Library directory */ -#undef TDE_LIBDIR diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h deleted file mode 100644 index 022bf91a..00000000 --- a/src/kvi_configstatus.h +++ /dev/null @@ -1,267 +0,0 @@ -/* src/config.h. Generated from config.h.in by configure. */ -/* src/config.h.in. Generated from configure.in by autoheader. */ - -/* define this to the number of average channel users */ -#define AVERAGE_CHANNEL_USERS 349 - -/* define this if you are on a big endian machine */ -/* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */ - -/* this is the build date (configure date rather) */ -#define BUILD_DATE "Thu Aug 18 18:45:24 UTC 2011" - -/* these are the build flags */ -#define BUILD_FLAGS "i686-bcefiopsxAGTZ" - -/* define if you want to enable the Arts daemon support */ -/* #undef COMPILE_ARTS_SUPPORT */ - -/* define if you want to enable the Audiofile library support */ -#define COMPILE_AUDIOFILE_SUPPORT 1 - -/* define if you want to compile the crypt support */ -#define COMPILE_CRYPT_SUPPORT 1 - -/* define if you want to disable DCC VOICE sound support */ -/* #undef COMPILE_DISABLE_DCC_VOICE */ - -/* define if you want to enable the Esound daemon support */ -#define COMPILE_ESD_SUPPORT 1 - -/* define if you have the SIOCGIFADDR ioctl and the related headers */ -#define COMPILE_GET_INTERFACE_ADDRESS 1 - -/* define this if you want to ignore the SIGALARM signal */ -/* #undef COMPILE_IGNORE_SIGALARM */ - -/* define if you want the info tips to be compiled in */ -#define COMPILE_INFO_TIPS 1 - -/* define if you want the IpV6 support */ -#define COMPILE_IPV6_SUPPORT 1 - -/* define if you want to compile the TDE support */ -/* #undef COMPILE_TDE_SUPPORT */ - -/* define if you want the memory checks */ -/* #undef COMPILE_MEMORY_CHECKS */ - -/* define if you want the gcc memory profile */ -/* #undef COMPILE_MEMORY_PROFILE */ - -/* define if you want to enable the new KVS parser */ -#define COMPILE_NEW_KVS 1 - -/* define this if you want to disable the inter-process communication support - */ -/* #undef COMPILE_NO_IPC */ - -/* define if you want to ignore X Windows completely */ -/* #undef COMPILE_NO_X */ - -/* define if you want to disable the X bell support */ -/* #undef COMPILE_NO_X_BELL */ - -/* define if you want to use only the new KVS parser */ -#define COMPILE_ONLY_NEW_KVS 1 - -/* define if you want to enable OSS sound support */ -#define COMPILE_OSS_SUPPORT 1 - -/* define if you have perl and want the perl scripting support in kvirc */ -#define COMPILE_PERL_SUPPORT 1 - -/* define if you have the KDE support and want the pseudo transparency */ -#define COMPILE_PSEUDO_TRANSPARENCY 1 - -/* define if you have openssl and want the ssl support in kvirc */ -#define COMPILE_SSL_SUPPORT 1 - -/* define if you want to use the pthreads library */ -#define COMPILE_THREADS_USE_POSIX 1 - -/* define if you want to use the solaris libthread */ -/* #undef COMPILE_THREADS_USE_SOLARIS_LIBTHREAD */ - -/* define if your compiler supports gotos do dynamic labels */ -#define COMPILE_USE_DYNAMIC_LABELS 1 - -/* define if you have libgsm and want the GSM code to be compiled */ -#define COMPILE_USE_GSM 1 - -/* define if you trust your memmove() function */ -#define COMPILE_WITH_SYSTEM_MEMMOVE 1 - -/* define if you want to enable the ZLib library support */ -#define COMPILE_XSS_SUPPORT 1 - -/* define if you want to enable the ZLib library support */ -#define COMPILE_ZLIB_SUPPORT 1 - -/* define if you want the i386 asm code */ -#define COMPILE_ix86_ASM 1 - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the `getenv' function. */ -#define HAVE_GETENV 1 - -/* Define to 1 if you have the `getnameinfo' function. */ -#define HAVE_GETNAMEINFO 1 - -/* Define to 1 if you have the `gmtime_r' function. */ -#define HAVE_GMTIME_R 1 - -/* Define to 1 if you have the `inet_aton' function. */ -#define HAVE_INET_ATON 1 - -/* Define to 1 if you have the `inet_ntoa' function. */ -#define HAVE_INET_NTOA 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the <linux/soundcard.h> header file. */ -#define HAVE_LINUX_SOUNDCARD_H 1 - -/* Define to 1 if you have the `localtime_r' function. */ -#define HAVE_LOCALTIME_R 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the <soundcard.h> header file. */ -/* #undef HAVE_SOUNDCARD_H */ - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the <sys/soundcard.h> header file. */ -#define HAVE_SYS_SOUNDCARD_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `unsetenv' function. */ -#define HAVE_UNSETENV 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "kvirc" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT 4 - -/* The size of `long long int', as computed by sizeof. */ -#define SIZEOF_LONG_LONG_INT 8 - -/* The size of `short int', as computed by sizeof. */ -#define SIZEOF_SHORT_INT 2 - -/* The size of `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The size of `unsigned long int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_INT 4 - -/* The size of `unsigned long long int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG_INT 8 - -/* The size of `unsigned short int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_SHORT_INT 2 - -/* The size of `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Version number of package */ -#define VERSION "3.4.0" - -/* MAJOR.MINOR part of version */ -#define VERSION_BRANCH "3.4" - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am index e96d1517..ffc99f47 100644 --- a/src/kvilib/build/Makefile.am +++ b/src/kvilib/build/Makefile.am @@ -22,18 +22,6 @@ libkvilib_la_LIBADD = $(SS_LIBLINK) # echo $SRC # -nodist_libkvilib_la_SOURCES = \ - ../ext/moc_kvi_crypt.cpp \ - ../ext/moc_kvi_garbage.cpp \ - ../ext/moc_kvi_regusersdb.cpp \ - ../ext/moc_kvi_sharedfiles.cpp \ - ../irc/moc_kvi_ircuserdb.cpp \ - ../net/moc_kvi_dns.cpp \ - ../net/moc_kvi_http.cpp \ - ../system/moc_kvi_locale.cpp \ - ../system/moc_kvi_thread.cpp \ - ../tal/moc_kvi_tal_wizard.cpp - libkvilib_la_SOURCES = \ ../core/kvi_error.cpp \ ../core/kvi_heapobject.cpp \ @@ -227,41 +215,43 @@ headers_HEADERS = \ ../tal/kvi_tal_windowstate.h -../ext/moc_%.cpp: ../ext/%.h +../ext/%.moc: ../ext/%.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ -../file/moc_%.cpp: ../file/%.h +../file/%.moc: ../file/%.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ -../irc/moc_%.cpp: ../irc/%.h +../irc/%.moc: ../irc/%.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ -../net/moc_%.cpp: ../net/%.h +../net/%.moc: ../net/%.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ -../system/moc_%.cpp: ../system/%.h +../system/%.moc: ../system/%.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ -../tal/moc_%.cpp: ../tal/%.h +../tal/%.moc: ../tal/%.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ - %.moc: %.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ -#%.h.gch: %.h -# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c $< -o $@ - -#PRECOMPILED_HDRS = \ -# ../config/kvi_confignames.h.gch \ -# ... - # # Command useful to find the moc dependancies # grep "\.moc" ../*/*.cpp | sort | sed -e 's/[[:space:]]*#include//' | sed -e 's/\"//g' # needs to be modified by hand then to add the moc file path... :) # +../ext/kvi_crypt.cpp: ../ext/kvi_crypt.moc +../ext/kvi_garbage.cpp: ../ext/kvi_garbage.moc +../ext/kvi_regusersdb.cpp: ../ext/kvi_regusersdb.moc +../ext/kvi_sharedfiles.cpp: ../ext/kvi_sharedfiles.moc +../irc/kvi_ircuserdb.cpp: ../irc/kvi_ircuserdb.moc +../net/kvi_dns.cpp: ../net/kvi_dns.moc +../net/kvi_http.cpp: ../net/kvi_http.moc +../system/kvi_locale.cpp: ../system/kvi_locale.moc +../system/kvi_thread.cpp: ../system/kvi_thread.moc +../tal/kvi_tal_wizard.cpp: ../tal/kvi_tal_wizard.moc ../tal/kvi_tal_application.cpp: ../tal/kvi_tal_application_kde.moc ../tal/kvi_tal_application.cpp: ../tal/kvi_tal_application_qt.moc ../tal/kvi_tal_mainwindow.cpp: ../tal/kvi_tal_mainwindow_kde.moc @@ -302,13 +292,4 @@ symlinks: ../config/*.h ../core/*.h ../ext/*.h ../file/*.h ../irc/*.h ../net/*.h cd ../include; for i in kvi_*.h; do if [ ! -f $$i ]; then rm -f $$i; fi; done; for i in $(SS_TOPSRCDIR)/src/kvilib/*/kvi_*.h; do $(LN_S) $$i . >/dev/null 2>&1; echo "Created link to $$i"; done; touch symlinks -# gchsymlinks: ../config/*.h ../core/*.h ../ext/*.h ../file/*.h ../irc/*.h ../net/*.h ../system/*.h ../tal/*.h -# cd ../include; for i in kvi_*.gch; do if [ ! -f $$i ]; then rm -f $$i; fi; done; for i in $(SS_TOPSRCDIR)/src/kvilib/*/kvi_*.h.gch; do $(LN_S) $$i . >/dev/null 2>&1; echo "Created link to $$i"; done; -# touch gchsymlinks - -# -# When cleaning...remove also the symlinks, gchsymlinks and gch headers -# - -#CLEANFILES = ../include/*.h ../include/*.gch symlinks gchsymlinks ../*/*.moc ../*/moc_kvi_*.cpp ../*/*.gch -CLEANFILES = ../include/*.h symlinks ../*/*.moc ../*/moc_kvi_*.cpp +CLEANFILES = ../include/*.h symlinks ../*/*.moc diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index c9baf3a6..beb87def 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -69,28 +69,21 @@ #endif #endif - #define KVILIB_API - #define KVIRC_API + #ifdef __TDE_HAVE_GCC_VISIBILITY + #define KVILIB_API __attribute__ ((visibility("default"))) + #define KVIRC_API __attribute__ ((visibility("default"))) + #else + #define KVILIB_API + #define KVIRC_API + #endif #ifndef VERSION #define VERSION "?.?.?" #endif - #ifndef BUILD_DATE - #define BUILD_DATE "?" - #endif - - #ifndef BUILD_FLAGS - #define BUILD_FLAGS "?" - #endif - #endif #define KVI_VERSION VERSION -#define KVI_VERSION_BRANCH VERSION_BRANCH -#define KVI_BUILD_DATE BUILD_DATE -#define KVI_BUILD_FLAGS BUILD_FLAGS - #define KVI_RELEASE_NAME "Virgo" // We want _GNU_SOURCE features diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h index 062aa81e..84f590a3 100644 --- a/src/kvilib/config/kvi_wincfg.h +++ b/src/kvilib/config/kvi_wincfg.h @@ -32,9 +32,6 @@ /* define if you want to compile with new parser */ #define COMPILE_NEW_KVS 1 -/* define if you want to use only the new KVS parser */ -#define COMPILE_ONLY_NEW_KVS 1 - /* define if you want to disable DCC VOICE sound support */ /* #undef COMPILE_WITH_NO_SOUND */ @@ -74,32 +71,11 @@ /* define if you want zlib support */ #define COMPILE_ZLIB_SUPPORT 1 -/* define if you want to use the pthreads library */ -/* #undef COMPILE_THREADS_USE_POSIX */ - -/* define if you want to use the solaris libthread */ -/* #undef COMPILE_THREADS_USE_SOLARIS_LIBTHREAD */ - #define COMPILE_PSEUDO_TRANSPARENCY /* define if you have the SIOCGIFADDR ioctl and the related headers */ /* #undef COMPILE_GET_INTERFACE_ADDRESS */ -/* this is the build date (configure date rather) */ -#define BUILD_DATE __DATE__" "__TIME__ - -/* these are the build flags */ -#define BUILD_FLAGS "win32" - -/* define if you have strings.h */ -/* #undef HAVE_STRINGS_H */ - -/* define if you have the getenv function */ -/* #undef HAVE_GETENV */ - -/* define if you have the strerror function */ -#define HAVE_STRERROR 1 - /* define if you have the inet_aton function */ /* #define HAVE_INET_ATON 1 */ @@ -112,9 +88,6 @@ /* define if you have the inet_ntop function */ /* #undef HAVE_INET_NTOP */ -/* define if you have the getnameinfo function */ -#define HAVE_GETNAMEINFO - /* define if you have the getaddrinfo function */ #define HAVE_GETADDRINFO @@ -133,9 +106,6 @@ /* define this if you want to disable the inter-process communication support */ /* #undef COMPILE_NO_IPC */ -/* Define if you have the `getenv' function. */ -/* #undef HAVE_GETENV */ - /* Define if you have the <linux/soundcard.h> header file. */ /* #undef HAVE_LINUX_SOUNDCARD_H */ @@ -145,22 +115,9 @@ /* Define if you have the <sys/soundcard.h> header file. */ /* #undef HAVE_SYS_SOUNDCARD_H */ -/* Name of package */ -#define PACKAGE "kvirc" - /* Version number of package */ #define VERSION "3.4.0" -#define VERSION_BRANCH "3.4" - - -/* Define if the system does not provide POSIX.1 features except with this - defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - // for now we need this....dcc voice is not ported yet #define COMPILE_WITH_NO_SOUND @@ -190,16 +147,4 @@ /* The size of a `short int', as computed by sizeof. */ #define SIZEOF_SHORT_INT 2 -/* The size of a `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The size of a `unsigned long int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_INT 4 - -/* The size of a `unsigned long long int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG_INT 8 - -/* The size of a `unsigned short int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_SHORT_INT 2 - #endif //_KVI_WINCFG_H_ diff --git a/src/kvilib/core/kvi_error.cpp b/src/kvilib/core/kvi_error.cpp index 2786984b..fa4af021 100644 --- a/src/kvilib/core/kvi_error.cpp +++ b/src/kvilib/core/kvi_error.cpp @@ -36,10 +36,7 @@ #endif #include <errno.h> - -#ifdef HAVE_STRERROR -#include <string.h> // for strerror() -#endif +#include <string.h> // FIXME: This stuff should basically die and be eventually replaced with some // helper functions for handling ONLY system errors. @@ -177,9 +174,7 @@ namespace KviError { if((iErrorCode < KVI_NUM_ERRORS) && (iErrorCode >= 0)) return g_errorTable[iErrorCode]; -#ifdef HAVE_STRERROR if(iErrorCode < 0)return strerror(-iErrorCode); -#endif return g_errorTable[KviError_unknownError]; } diff --git a/src/kvilib/core/kvi_memmove.cpp b/src/kvilib/core/kvi_memmove.cpp index 504cf6c8..1d477a26 100644 --- a/src/kvilib/core/kvi_memmove.cpp +++ b/src/kvilib/core/kvi_memmove.cpp @@ -37,7 +37,7 @@ #ifdef COMPILE_ix86_ASM - void *kvi_memmove(void * dst_ptr,const void *src_ptr,int len) + KVILIB_API void *kvi_memmove(void * dst_ptr,const void *src_ptr,int len) { __range_valid(dst_ptr); __range_valid(src_ptr); @@ -98,7 +98,7 @@ return dst_ptr; //asm(" movl 8(%ebp),%eax"); <-- gcc will put that (AFTER THE OPTIMISATION PASS!) } - void *kvi_memmoveodd(void * dst_ptr,const void *src_ptr,int len) + KVILIB_API void *kvi_memmoveodd(void * dst_ptr,const void *src_ptr,int len) { __range_valid(dst_ptr); __range_valid(src_ptr); @@ -169,7 +169,7 @@ // // - void *kvi_memmove(void *dst_ptr,const void *src_ptr,int len) + KVILIB_API void *kvi_memmove(void *dst_ptr,const void *src_ptr,int len) { __range_valid(dst_ptr); __range_valid(src_ptr); @@ -188,7 +188,7 @@ return dst_ptr; } - void *kvi_memmoveodd(void *dst_ptr,const void *src_ptr,int len) + KVILIB_API void *kvi_memmoveodd(void *dst_ptr,const void *src_ptr,int len) { __range_valid(dst_ptr); __range_valid(src_ptr); @@ -216,7 +216,7 @@ return dst_ptr; } - void kvi_fastmove(void *dst_ptr,const void *src_ptr,int len) + KVILIB_API void kvi_fastmove(void *dst_ptr,const void *src_ptr,int len) { __range_valid(dst_ptr); __range_valid(src_ptr); @@ -226,7 +226,7 @@ while(len--)*dst++ = *src++; } - void kvi_fastmoveodd(void *dst_ptr,const void *src_ptr,int len) + KVILIB_API void kvi_fastmoveodd(void *dst_ptr,const void *src_ptr,int len) { __range_valid(dst_ptr); __range_valid(src_ptr); @@ -242,7 +242,7 @@ #endif // !COMPILE_ix86_ASM - void kvi_memset(void *dst_ptr,char c,int len) + KVILIB_API void kvi_memset(void *dst_ptr,char c,int len) { __range_valid(dst_ptr); __range_valid(len >= 0); diff --git a/src/kvilib/core/kvi_memmove.h b/src/kvilib/core/kvi_memmove.h index d1319a41..d04cd6f6 100644 --- a/src/kvilib/core/kvi_memmove.h +++ b/src/kvilib/core/kvi_memmove.h @@ -59,7 +59,7 @@ // WE WANT repnz; movsq\n"!!! - inline void kvi_fastmove(void * dst_ptr,const void *src_ptr,int len) + KVILIB_API inline void kvi_fastmove(void * dst_ptr,const void *src_ptr,int len) { __asm__ __volatile__( " cld\n" @@ -77,7 +77,7 @@ ); } - inline void kvi_fastmoveodd(void * dst_ptr,const void *src_ptr,int len) + KVILIB_API inline void kvi_fastmoveodd(void * dst_ptr,const void *src_ptr,int len) { __asm__ __volatile__( " cld\n" diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/kvi_pointerlist.h index b46343c3..35abaa76 100644 --- a/src/kvilib/core/kvi_pointerlist.h +++ b/src/kvilib/core/kvi_pointerlist.h @@ -1036,7 +1036,7 @@ public: /// /// creates a template list /// - KviPointerList<T>(bool bAutoDelete = true) + KviPointerList(bool bAutoDelete = true) { m_bAutoDelete = bAutoDelete; m_pHead = NULL; @@ -1049,7 +1049,7 @@ public: /// destroys the list /// if autoDelete() is set to true, all the items are deleted /// - virtual ~KviPointerList<T>() + virtual ~KviPointerList() { clear(); }; diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index a477527b..6f7e8f79 100644 --- a/src/kvilib/core/kvi_qstring.cpp +++ b/src/kvilib/core/kvi_qstring.cpp @@ -51,7 +51,7 @@ namespace KviTQString // The global empty (and null) string const TQString empty; - bool equalCSN(const TQString &sz1,const TQString &sz2,unsigned int len) + KVILIB_API bool equalCSN(const TQString &sz1,const TQString &sz2,unsigned int len) { if(len == 0)return true; // assume equal const TQChar * c1 = sz1.unicode(); @@ -71,7 +71,7 @@ namespace KviTQString return (c1 == c1e); } - bool equalCIN(const TQString &sz1,const TQString &sz2,unsigned int len) + KVILIB_API bool equalCIN(const TQString &sz1,const TQString &sz2,unsigned int len) { if(len == 0)return true; // assume equal const TQChar * c1 = sz1.unicode(); @@ -91,7 +91,7 @@ namespace KviTQString return (c1 == c1e); } - bool equalCSN(const TQString &sz1,const char * sz2,unsigned int len) + KVILIB_API bool equalCSN(const TQString &sz1,const char * sz2,unsigned int len) { if(len == 0)return true; // assume equal const TQChar * c1 = sz1.unicode(); @@ -110,7 +110,7 @@ namespace KviTQString return (c1 == c1e); } - bool equalCIN(const TQString &sz1,const char * sz2,unsigned int len) + KVILIB_API bool equalCIN(const TQString &sz1,const char * sz2,unsigned int len) { if(len == 0)return true; // assume equal const TQChar * c1 = sz1.unicode(); @@ -130,7 +130,7 @@ namespace KviTQString } // sz2 is assumed to be null terminated, sz1 is not! - bool equalCIN(const TQString &sz1,const TQChar *sz2,unsigned int len) + KVILIB_API bool equalCIN(const TQString &sz1,const TQChar *sz2,unsigned int len) { if(len == 0)return true; // assume equal const TQChar * c1 = sz1.unicode(); @@ -149,7 +149,7 @@ namespace KviTQString return (c1 == c1e); } - TQString makeSizeReadable(size_t bytes) + KVILIB_API TQString makeSizeReadable(size_t bytes) { double size = bytes; if(size<900) @@ -173,7 +173,7 @@ namespace KviTQString return TQString(__tr2qs("%1 TB")).arg(size,0,'f',3); } - bool equalCS(const TQString &sz1,const TQString &sz2) + KVILIB_API bool equalCS(const TQString &sz1,const TQString &sz2) { if(sz1.length() != sz2.length())return false; @@ -192,7 +192,7 @@ namespace KviTQString return (c1 == c1e); } - bool equalCI(const TQString &sz1,const TQString &sz2) + KVILIB_API bool equalCI(const TQString &sz1,const TQString &sz2) { if(sz1.length() != sz2.length())return false; @@ -212,7 +212,7 @@ namespace KviTQString } // sz2 is assumed to be null terminated, sz1 is not! - bool equalCI(const TQString &sz1,const TQChar *sz2) + KVILIB_API bool equalCI(const TQString &sz1,const TQChar *sz2) { const TQChar * c1 = sz1.unicode(); const TQChar * c1e = c1 + sz1.length(); @@ -229,7 +229,7 @@ namespace KviTQString return (c1 == c1e) && (!sz2->unicode()); } - bool equalCS(const TQString &sz1,const char * sz2) + KVILIB_API bool equalCS(const TQString &sz1,const char * sz2) { const TQChar * c1 = sz1.unicode(); const TQChar * c1e = c1 + sz1.length(); @@ -245,7 +245,7 @@ namespace KviTQString return ((c1 == c1e) && (*sz2 == '\0')); } - bool equalCI(const TQString &sz1,const char * sz2) + KVILIB_API bool equalCI(const TQString &sz1,const char * sz2) { const TQChar * c1 = sz1.unicode(); const TQChar * c1e = c1 + sz1.length(); @@ -261,7 +261,7 @@ namespace KviTQString return ((c1 == c1e) && (*sz2 == '\0')); } - int cmpCS(const TQString &sz1,const TQString &sz2) + KVILIB_API int cmpCS(const TQString &sz1,const TQString &sz2) { const TQChar * c1 = sz1.unicode(); const TQChar * c2 = sz2.unicode(); @@ -295,7 +295,7 @@ namespace KviTQString return 0; // never here } - int cmpCI(const TQString &sz1,const TQString &sz2) + KVILIB_API int cmpCI(const TQString &sz1,const TQString &sz2) { const TQChar * c1 = sz1.unicode(); const TQChar * c2 = sz2.unicode(); @@ -328,7 +328,7 @@ namespace KviTQString return 0; // never here } - int cmpCIN(const TQString &sz1,const TQString &sz2,unsigned int len) + KVILIB_API int cmpCIN(const TQString &sz1,const TQString &sz2,unsigned int len) { if(len == 0)return 0; // assume equal unsigned int l1 = MY_MIN(len,sz1.length()); @@ -356,14 +356,14 @@ namespace KviTQString return diff; } - void ensureLastCharIs(TQString &szString,const TQChar &c) + KVILIB_API void ensureLastCharIs(TQString &szString,const TQChar &c) { if(!lastCharIs(szString,c))szString.append(c); } - TQString getToken(TQString &szString,const TQChar &sep) + KVILIB_API TQString getToken(TQString &szString,const TQChar &sep) { - int i=0; + unsigned int i=0; while(i < szString.length()) { if(szString[i] == sep)break; @@ -387,9 +387,9 @@ namespace KviTQString return ret; } - void stripRightWhiteSpace(TQString &s) + KVILIB_API void stripRightWhiteSpace(TQString &s) { - int iRemove = 0; + unsigned int iRemove = 0; while(iRemove < s.length()) { if(s.at(s.length() - (iRemove + 1)).isSpace())iRemove++; @@ -398,9 +398,9 @@ namespace KviTQString if(iRemove > 0)s.remove(s.length() - iRemove,iRemove); } - void stripRight(TQString &s,const TQChar &c) + KVILIB_API void stripRight(TQString &s,const TQChar &c) { - int iRemove = 0; + unsigned int iRemove = 0; while(iRemove < s.length()) { if(s.at(s.length() - (iRemove + 1)) == c)iRemove++; @@ -409,9 +409,9 @@ namespace KviTQString if(iRemove > 0)s.remove(s.length() - iRemove,iRemove); } - void stripLeft(TQString &s,const TQChar &c) + KVILIB_API void stripLeft(TQString &s,const TQChar &c) { - int iRemove = 0; + unsigned int iRemove = 0; while(iRemove < s.length()) { if(s[iRemove] == c) @@ -422,53 +422,53 @@ namespace KviTQString if(iRemove > 0)s.remove(0,iRemove); } - void detach(TQString &sz) + KVILIB_API void detach(TQString &sz) { sz.setLength(sz.length()); } - const TQChar * nullTerminatedArray(const TQString &sz) + KVILIB_API const TQChar * nullTerminatedArray(const TQString &sz) { //sz.setLength(sz.length()); // detach! return (const TQChar *)sz.ucs2(); // MAY BE NULL! } - void appendNumber(TQString &s,double dReal) + KVILIB_API void appendNumber(TQString &s,double dReal) { char buffer[512]; ::sprintf(buffer,"%f",dReal); s.append(buffer); } - void appendNumber(TQString &s,int iInteger) + KVILIB_API void appendNumber(TQString &s,int iInteger) { char buffer[64]; ::sprintf(buffer,"%d",iInteger); s.append(buffer); } - void appendNumber(TQString &s,kvi_i64_t iInteger) + KVILIB_API void appendNumber(TQString &s,kvi_i64_t iInteger) { char buffer[64]; ::sprintf(buffer,"%ld",iInteger); s.append(buffer); } - void appendNumber(TQString &s,kvi_u64_t uInteger) + KVILIB_API void appendNumber(TQString &s,kvi_u64_t uInteger) { char buffer[64]; ::sprintf(buffer,"%lu",uInteger); s.append(buffer); } - void appendNumber(TQString &s,unsigned int uInteger) + KVILIB_API void appendNumber(TQString &s,unsigned int uInteger) { char buffer[64]; ::sprintf(buffer,"%u",uInteger); s.append(buffer); } - void vsprintf(TQString &s,const TQString &szFmt,kvi_va_list list) + KVILIB_API void vsprintf(TQString &s,const TQString &szFmt,kvi_va_list list) { #define MEMINCREMENT 32 @@ -487,7 +487,7 @@ namespace KviTQString TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize); //TQChar * p = (TQChar *)s.unicode(); - char *argString; + const char *argString; long argValue; unsigned long argUValue; @@ -690,7 +690,7 @@ namespace KviTQString } - TQString & sprintf(TQString &s,const TQString &szFmt,...) + KVILIB_API TQString & sprintf(TQString &s,const TQString &szFmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,szFmt); @@ -700,7 +700,7 @@ namespace KviTQString return s; } - void appendFormatted(TQString &s,const TQString &szFmt,...) + KVILIB_API void appendFormatted(TQString &s,const TQString &szFmt,...) { TQString tmp; kvi_va_list list; @@ -711,7 +711,7 @@ namespace KviTQString s.append(tmp); } - bool matchWildExpressionsCI(const TQString &szM1,const TQString &szM2) + KVILIB_API bool matchWildExpressionsCI(const TQString &szM1,const TQString &szM2) { //Matches two regular expressions containging wildcards (* and ?) @@ -804,7 +804,7 @@ namespace KviTQString return (!(m2->unicode())); //m1 surely finished , so for the match , m2 must be finished too } - bool matchStringCI(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact) + KVILIB_API bool matchStringCI(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact) { TQString szWildcard; TQChar* ptr=(TQChar*)szExp.ucs2(); @@ -826,7 +826,7 @@ namespace KviTQString return re.search(szStr) != -1; } - bool matchStringCS(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact) + KVILIB_API bool matchStringCS(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact) { TQString szWildcard; TQChar* ptr=(TQChar*)szExp.ucs2(); @@ -848,21 +848,21 @@ namespace KviTQString return re.search(szStr) != -1; } - void cutFromFirst(TQString &s,const TQChar &c,bool bIncluded) + KVILIB_API void cutFromFirst(TQString &s,const TQChar &c,bool bIncluded) { int idx = s.find(c); if(idx == -1)return; s.truncate(bIncluded ? idx : idx + 1); } - void cutFromLast(TQString &s,const TQChar &c,bool bIncluded) + KVILIB_API void cutFromLast(TQString &s,const TQChar &c,bool bIncluded) { int idx = s.findRev(c); if(idx == -1)return; s.truncate(bIncluded ? idx : idx + 1); } - void cutToFirst(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound) + KVILIB_API void cutToFirst(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound) { int idx = s.find(c); if(idx == -1) @@ -873,7 +873,7 @@ namespace KviTQString s.remove(0,bIncluded ? idx + 1 : idx); } - void cutToLast(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound) + KVILIB_API void cutToLast(TQString &s,const TQChar &c,bool bIncluded,bool bClearIfNotFound) { int idx = s.findRev(c); if(idx == -1) @@ -884,21 +884,21 @@ namespace KviTQString s.remove(0,bIncluded ? idx + 1 : idx); } - void cutFromFirst(TQString &s,const TQString &c,bool bIncluded) + KVILIB_API void cutFromFirst(TQString &s,const TQString &c,bool bIncluded) { int idx = s.find(c); if(idx == -1)return; s.truncate(bIncluded ? idx : idx + c.length()); } - void cutFromLast(TQString &s,const TQString &c,bool bIncluded) + KVILIB_API void cutFromLast(TQString &s,const TQString &c,bool bIncluded) { int idx = s.findRev(c); if(idx == -1)return; s.truncate(bIncluded ? idx : idx + c.length()); } - void cutToFirst(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound) + KVILIB_API void cutToFirst(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound) { int idx = s.find(c); if(idx == -1) @@ -909,7 +909,7 @@ namespace KviTQString s.remove(0,bIncluded ? idx + c.length() : idx); } - void cutToLast(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound) + KVILIB_API void cutToLast(TQString &s,const TQString &c,bool bIncluded,bool bClearIfNotFound) { int idx = s.findRev(c); if(idx == -1) @@ -920,7 +920,7 @@ namespace KviTQString s.remove(0,bIncluded ? idx + c.length() : idx); } - TQString upperISO88591(const TQString &szSrc) + KVILIB_API TQString upperISO88591(const TQString &szSrc) { const TQChar * c = nullTerminatedArray(szSrc); if(!c) @@ -946,7 +946,7 @@ namespace KviTQString return ret; } - TQString lowerISO88591(const TQString &szSrc) + KVILIB_API TQString lowerISO88591(const TQString &szSrc) { const TQChar * c = nullTerminatedArray(szSrc); if(!c) @@ -973,7 +973,7 @@ namespace KviTQString return ret; } - void transliterate(TQString &s,const TQString &szToFind,const TQString &szReplacement) + KVILIB_API void transliterate(TQString &s,const TQString &szToFind,const TQString &szReplacement) { int i=0; int il = MY_MIN(szToFind.length(),szReplacement.length()); @@ -992,7 +992,7 @@ namespace KviTQString static char hexdigits[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' }; - void bufferToHex(TQString &szRetBuffer,const unsigned char * buffer,unsigned int len) + KVILIB_API void bufferToHex(TQString &szRetBuffer,const unsigned char * buffer,unsigned int len) { szRetBuffer.setLength(len * 2); unsigned int i=0; diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp index 9e491ccb..0d0b1750 100644 --- a/src/kvilib/core/kvi_string.cpp +++ b/src/kvilib/core/kvi_string.cpp @@ -98,7 +98,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str) { \ KviStr * pString = kvi_va_arg(list,KviStr *); \ char * argString = pString->ptr(); \ - if(len <= ((int)(pString->len())))return (-1); \ + if(len <= static_cast<kvi_wslen_t>(pString->len()))return (-1); \ while(*argString)*p++ = *argString++; \ len -= pString->len(); \ } \ @@ -108,7 +108,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str) TQString * pString = kvi_va_arg(list,TQString *); \ if(pString->length() > 0) \ { \ - if(len <= ((int)(pString->length())))return (-1); \ + if(len <= static_cast<kvi_wslen_t>(pString->length()))return (-1); \ _WSTRING_WMEMCPY(p,pString->unicode(),pString->length()); \ p += pString->length(); \ len -= pString->length(); \ @@ -711,7 +711,7 @@ int kvi_vsnprintf(char *buffer,int len,const char *fmt,kvi_va_list list) } while((argValue = tmp)); //copy now.... argUValue = pNumBuf - numberBuffer; //length of the number string - if(((uint)len) <= argUValue)return (-1); //not enough space for number and terminator + if(((unsigned int)len) <= argUValue)return (-1); //not enough space for number and terminator do { *p++ = *--pNumBuf; } while(pNumBuf != numberBuffer); len -= argUValue; continue; @@ -2118,7 +2118,7 @@ KviStr & KviStr::replaceAll(char c,const char *str) return (*this); } -KviStr & KviStr::replaceAll(char *toFind,const char *str,bool bCaseS) +KviStr & KviStr::replaceAll(const char *toFind,const char *str,bool bCaseS) { int len = (int)strlen(toFind); int idx = findFirstIdx(toFind,bCaseS); diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h index a42f6e22..b9ebc1f8 100644 --- a/src/kvilib/core/kvi_string.h +++ b/src/kvilib/core/kvi_string.h @@ -30,21 +30,14 @@ #include <string.h> #include <ctype.h> -#ifdef HAVE_STRINGS_H - #include <strings.h> // useless ? -#endif - #include <tqglobal.h> #include <tqstring.h> - #include "kvi_qcstring.h" #include "kvi_inttypes.h" #include "kvi_heapobject.h" #include "kvi_stdarg.h" - - // // sigh... // IRC is not UNICODE ...(yet) :( @@ -314,7 +307,7 @@ public: //Replaces all occurences of char c with the string str KviStr & replaceAll(char c,const char *str); //same as above but with a string - KviStr & replaceAll(char *toFind,const char *str,bool bCaseS = true); + KviStr & replaceAll(const char *toFind,const char *str,bool bCaseS = true); KviStr & transliterate(const char * szToFind,const char * szReplacement); diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp index bbeffa22..4ed8fc77 100644 --- a/src/kvilib/ext/kvi_crypt.cpp +++ b/src/kvilib/ext/kvi_crypt.cpp @@ -238,3 +238,5 @@ } #endif //COMPILE_CRYPT_SUPPORT + +#include "kvi_crypt.moc" diff --git a/src/kvilib/ext/kvi_doublebuffer.cpp b/src/kvilib/ext/kvi_doublebuffer.cpp index 0f15dca3..cea8268f 100644 --- a/src/kvilib/ext/kvi_doublebuffer.cpp +++ b/src/kvilib/ext/kvi_doublebuffer.cpp @@ -32,12 +32,14 @@ static unsigned int g_uMaxRequestedHeight = 0; KviDoubleBuffer::KviDoubleBuffer(unsigned int uWidth,unsigned int uHeight) { - if((g_pMemoryPixmap->width() < uWidth) || (g_pMemoryPixmap->height() < uHeight)) + unsigned int uPixmapWidth = static_cast<unsigned int>(g_pMemoryPixmap->width()); + unsigned int uPixmapHeight = static_cast<unsigned int>(g_pMemoryPixmap->height()); + if(uPixmapWidth < uWidth || uPixmapHeight < uHeight) { // The memory buffer is too small // There is either no such user requirement or it has grown by the meantime - unsigned int uMaxW = uWidth > g_pMemoryPixmap->width() ? uWidth : g_pMemoryPixmap->width(); - unsigned int uMaxH = uHeight > g_pMemoryPixmap->height() ? uHeight : g_pMemoryPixmap->height(); + unsigned int uMaxW = uWidth > uPixmapWidth ? uWidth : uPixmapWidth; + unsigned int uMaxH = uHeight > uPixmapHeight ? uHeight : uPixmapHeight; g_pMemoryPixmap->resize(uMaxW,uMaxH); } @@ -70,7 +72,7 @@ void KviDoubleBuffer::done() void KviDoubleBuffer::heartbeat() { - if(((g_uMaxRequestedHeight + 64) < g_pMemoryPixmap->height()) || ((g_uMaxRequestedWidth + 64) < g_pMemoryPixmap->width())) + if((g_uMaxRequestedHeight + 64) < static_cast<unsigned int>(g_pMemoryPixmap->height()) || (g_uMaxRequestedWidth + 64) < static_cast<unsigned int>(g_pMemoryPixmap->width())) { // do shrink :) g_pMemoryPixmap->resize(g_uMaxRequestedWidth,g_uMaxRequestedHeight); diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp index 4d79b488..56f65571 100644 --- a/src/kvilib/ext/kvi_garbage.cpp +++ b/src/kvilib/ext/kvi_garbage.cpp @@ -146,3 +146,4 @@ void KviGarbageCollector::cleanup() } } +#include "kvi_garbage.moc" diff --git a/src/kvilib/ext/kvi_imagelib.cpp b/src/kvilib/ext/kvi_imagelib.cpp index 8c0b6b43..bc5b581d 100644 --- a/src/kvilib/ext/kvi_imagelib.cpp +++ b/src/kvilib/ext/kvi_imagelib.cpp @@ -86,7 +86,7 @@ bool KviImageLibrary::loadLibrary(const TQString &path) { delete m_pLibrary; m_pLibrary=0; - tqDebug("WARNING : Can not load image library %s",KviTQString::toUtf8(path).data()); + tqDebug("WARNING : Can not load image library %s",path.local8Bit().data()); } return (m_pLibrary != 0); } diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp index 7631e36c..f7c226b9 100644 --- a/src/kvilib/ext/kvi_mediatype.cpp +++ b/src/kvilib/ext/kvi_mediatype.cpp @@ -233,7 +233,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m) } -KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckMagic) +KviMediaType * KviMediaManager::findMediaType(const TQString &filename,bool bCheckMagic) { // FIXME: This should be ported at least to TQString.... __range_valid(locked()); @@ -452,7 +452,7 @@ static KviDefaultMediaType g_defMediaTypes[]= { 0,0,0,0,0 } }; -void KviMediaManager::load(const char * filename) +void KviMediaManager::load(const TQString &filename) { __range_valid(locked()); @@ -497,7 +497,7 @@ void KviMediaManager::load(const char * filename) } -void KviMediaManager::save(const char * filename) +void KviMediaManager::save(const TQString &filename) { __range_valid(locked()); KviConfig cfg(filename,KviConfig::Write); diff --git a/src/kvilib/ext/kvi_mediatype.h b/src/kvilib/ext/kvi_mediatype.h index 77e96594..8d07e230 100644 --- a/src/kvilib/ext/kvi_mediatype.h +++ b/src/kvilib/ext/kvi_mediatype.h @@ -72,11 +72,11 @@ public: bool removeMediaType(KviMediaType * t){ return m_pMediaTypeList->removeRef(t); }; void clear(){ m_pMediaTypeList->clear(); }; void insertMediaType(KviMediaType * t); - KviMediaType * findMediaType(const char * filename,bool bCheckMagic = true); + KviMediaType * findMediaType(const TQString &filename,bool bCheckMagic = true); static void copyMediaType(KviMediaType * dst,KviMediaType * src); - void load(const char * filename); - void save(const char * filename); + void load(const TQString &filename); + void save(const TQString &filename); }; diff --git a/src/kvilib/ext/kvi_pixmap.cpp b/src/kvilib/ext/kvi_pixmap.cpp index c5877300..add446f2 100644 --- a/src/kvilib/ext/kvi_pixmap.cpp +++ b/src/kvilib/ext/kvi_pixmap.cpp @@ -37,7 +37,7 @@ KviPixmap::KviPixmap() m_pPix = 0; } -KviPixmap::KviPixmap(const char * path) +KviPixmap::KviPixmap(const TQString &path) { m_pPix = 0; load(path); diff --git a/src/kvilib/ext/kvi_pixmap.h b/src/kvilib/ext/kvi_pixmap.h index 9f92e456..5307f5dd 100644 --- a/src/kvilib/ext/kvi_pixmap.h +++ b/src/kvilib/ext/kvi_pixmap.h @@ -34,7 +34,7 @@ class KVILIB_API KviPixmap { public: KviPixmap(); - KviPixmap(const char * path); + KviPixmap(const TQString &path); KviPixmap(const KviPixmap &pix); ~KviPixmap(); private: diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/kvi_proxydb.cpp index 95bf66a4..2238bb50 100644 --- a/src/kvilib/ext/kvi_proxydb.cpp +++ b/src/kvilib/ext/kvi_proxydb.cpp @@ -94,7 +94,7 @@ KviProxyDataBase::~KviProxyDataBase() delete m_pProxyList; } -void KviProxyDataBase::updateProxyIp(const char * proxy,const char * ip) +void KviProxyDataBase::updateProxyIp(const char * proxy,const TQString &ip) { for(KviProxy * prx = m_pProxyList->first();prx;prx = m_pProxyList->next()) { @@ -114,7 +114,7 @@ void KviProxyDataBase::clear() m_pCurrentProxy = 0; } -void KviProxyDataBase::load(const char * filename) +void KviProxyDataBase::load(const TQString &filename) { clear(); KviConfig cfg(filename,KviConfig::Read); @@ -149,7 +149,7 @@ void KviProxyDataBase::load(const char * filename) if(!m_pCurrentProxy)m_pCurrentProxy = m_pProxyList->first(); } -void KviProxyDataBase::save(const char * filename) +void KviProxyDataBase::save(const TQString &filename) { KviConfig cfg(filename,KviConfig::Write); diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/kvi_proxydb.h index 0ab18f5e..a35a726d 100644 --- a/src/kvilib/ext/kvi_proxydb.h +++ b/src/kvilib/ext/kvi_proxydb.h @@ -76,11 +76,11 @@ public: void clear(); KviPointerList<KviProxy> * proxyList(){ return m_pProxyList; }; KviProxy * currentProxy(){ return m_pCurrentProxy; }; - void updateProxyIp(const char * proxy,const char * ip); + void updateProxyIp(const char * proxy,const TQString &ip); void setCurrentProxy(KviProxy * prx){ m_pCurrentProxy = prx; }; void insertProxy(KviProxy * prx){ m_pProxyList->append(prx); }; - void load(const char * filename); - void save(const char * filename); + void load(const TQString &filename); + void save(const TQString &filename); }; #endif //_KVI_PROXYDB_H_ diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp index 9cddac5c..8f37b8b2 100644 --- a/src/kvilib/ext/kvi_regchan.cpp +++ b/src/kvilib/ext/kvi_regchan.cpp @@ -32,7 +32,7 @@ KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &netm { m_szName = name; m_szNetMask = netmask; - m_pPropertyDict = new KviPointerHashTable<const char *,KviStr>(7,false,true); + m_pPropertyDict = new KviPointerHashTable<TQString,KviStr>(7,false,true); m_pPropertyDict->setAutoDelete(true); } @@ -45,7 +45,7 @@ KviRegisteredChannel::~KviRegisteredChannel() KviRegisteredChannelDataBase::KviRegisteredChannelDataBase() { - m_pChannelDict = new KviPointerHashTable<const char *,KviRegisteredChannelList>(17,false,true); + m_pChannelDict = new KviPointerHashTable<TQString,KviRegisteredChannelList>(17,false,true); m_pChannelDict->setAutoDelete(true); } @@ -54,7 +54,7 @@ KviRegisteredChannelDataBase::~KviRegisteredChannelDataBase() delete m_pChannelDict; } -void KviRegisteredChannelDataBase::load(const char * filename) +void KviRegisteredChannelDataBase::load(const TQString &filename) { KviConfig cfg(filename,KviConfig::Read); m_pChannelDict->clear(); @@ -69,26 +69,26 @@ void KviRegisteredChannelDataBase::load(const char * filename) KviConfigGroupIterator sit(*d); while(TQString * s = sit.current()) { - c->setProperty(KviTQString::toUtf8(sit.currentKey()).data(),new KviStr(*s)); + c->setProperty(sit.currentKey(),new KviStr(*s)); ++sit; } ++it; } } -void KviRegisteredChannelDataBase::save(const char * filename) +void KviRegisteredChannelDataBase::save(const TQString &filename) { KviConfig cfg(filename,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*m_pChannelDict); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*m_pChannelDict); while(KviRegisteredChannelList * l = it.current()) { for(KviRegisteredChannel * c = l->first();c;c = l->next()) { KviStr szGrp(KviStr::Format,"%s@%s",c->name().ptr(),c->netMask().ptr()); cfg.setGroup(szGrp.ptr()); - KviPointerHashTableIterator<const char *,KviStr> pit(*(c->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(c->propertyDict())); while(KviStr * s = pit.current()) { cfg.writeEntry(pit.currentKey(),s->ptr()); @@ -99,25 +99,25 @@ void KviRegisteredChannelDataBase::save(const char * filename) } } -KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,const char * net) +KviRegisteredChannel * KviRegisteredChannelDataBase::find(const TQString &name,const TQString &net) { KviRegisteredChannelList * l = m_pChannelDict->find(name); if(!l)return 0; for(KviRegisteredChannel * c = l->first();c;c = l->next()) { - if(kvi_matchString(c->netMask().ptr(),net))return c; + if(kvi_matchString(c->netMask().ptr(),net.utf8().data()))return c; } return 0; } -KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * netmask) +KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const TQString &name,const TQString &netmask) { KviRegisteredChannelList * l = m_pChannelDict->find(name); if(!l)return 0; for(KviRegisteredChannel * c = l->first();c;c = l->next()) { - if(kvi_strEqualCI(c->netMask().ptr(),netmask))return c; + if(kvi_strEqualCI(c->netMask().ptr(),netmask.utf8().data()))return c; } return 0; } @@ -147,7 +147,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c) KviRegisteredChannel * old = findExact(c->name().ptr(),c->netMask().ptr()); if(old) { - KviPointerHashTableIterator<const char *,KviStr> pit(*(old->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(old->propertyDict())); while(KviStr *s = pit.current()) { if(!c->property(pit.currentKey())) diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h index f447c313..10d49aee 100644 --- a/src/kvilib/ext/kvi_regchan.h +++ b/src/kvilib/ext/kvi_regchan.h @@ -40,18 +40,18 @@ public: protected: KviStr m_szName; KviStr m_szNetMask; - KviPointerHashTable<const char *,KviStr> * m_pPropertyDict; + KviPointerHashTable<TQString,KviStr> * m_pPropertyDict; public: - KviPointerHashTable<const char *,KviStr> * propertyDict(){ return m_pPropertyDict; }; + KviPointerHashTable<TQString,KviStr> * propertyDict(){ return m_pPropertyDict; }; const KviStr & name(){ return m_szName; }; const KviStr & netMask(){ return m_szNetMask; }; - KviStr * property(const char * name){ return m_pPropertyDict->find(name); }; + KviStr * property(const TQString &name){ return m_pPropertyDict->find(name); }; // val must be allocated with NEW! - void setProperty(const char * name,KviStr * val){ m_pPropertyDict->replace(name,val); }; - void removeProperty(const char * name){ m_pPropertyDict->remove(name); }; + void setProperty(const TQString &name,KviStr * val){ m_pPropertyDict->replace(name,val); }; + void removeProperty(const TQString &name){ m_pPropertyDict->remove(name); }; }; -typedef KVILIB_API KviPointerList<KviRegisteredChannel> KviRegisteredChannelList; +typedef KviPointerList<KviRegisteredChannel> KviRegisteredChannelList; class KVILIB_API KviRegisteredChannelDataBase { @@ -59,15 +59,15 @@ public: KviRegisteredChannelDataBase(); ~KviRegisteredChannelDataBase(); protected: - KviPointerHashTable<const char *,KviRegisteredChannelList> * m_pChannelDict; + KviPointerHashTable<TQString,KviRegisteredChannelList> * m_pChannelDict; public: - KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; }; - KviRegisteredChannel * find(const char * name,const char * net); - KviRegisteredChannel * findExact(const char * name,const char * netmask); + KviPointerHashTable<TQString,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; }; + KviRegisteredChannel * find(const TQString &name,const TQString &net); + KviRegisteredChannel * findExact(const TQString &name,const TQString &netmask); void remove(KviRegisteredChannel * c); void add(KviRegisteredChannel * c); - void load(const char * filename); - void save(const char * filename); + void load(const TQString &filename); + void save(const TQString &filename); }; diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp index 87ce9b6a..eff602df 100644 --- a/src/kvilib/ext/kvi_regusersdb.cpp +++ b/src/kvilib/ext/kvi_regusersdb.cpp @@ -487,7 +487,7 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name) while(KviIrcMask * mask = u->maskList()->first()) { if(!removeMaskByPointer(mask)) - tqDebug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data()); + tqDebug("Ops... removeMaskByPointer(%s) failed ?",name.local8Bit().data()); } emit(userRemoved(name)); m_pUserDict->remove(name); @@ -737,3 +737,5 @@ void KviRegisteredUserDataBase::save(const TQString & filename) } } + +#include "kvi_regusersdb.moc" diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp index 69a25250..f2066b2e 100644 --- a/src/kvilib/ext/kvi_sharedfiles.cpp +++ b/src/kvilib/ext/kvi_sharedfiles.cpp @@ -265,7 +265,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons return o; } else { - tqDebug("File %s unreadable: can't add offer",KviTQString::toUtf8(szAbsPath).data()); + tqDebug("File %s unreadable: can't add offer",szAbsPath.local8Bit().data()); return 0; } } @@ -384,3 +384,4 @@ void KviSharedFilesManager::save(const TQString &filename) cfg.writeEntry("NEntries",idx); } +#include "kvi_sharedfiles.moc" diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index 9bea5c96..2a7d9021 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -122,7 +122,7 @@ namespace KviFileUtils { if(!d.mkdir(createdDir)) { - tqDebug("Can't create directory %s",KviTQString::toUtf8(createdDir).data()); + tqDebug("Can't create directory %s",createdDir.local8Bit().data()); return false; } } @@ -441,7 +441,7 @@ void kvi_encodeFileName(TQString & path) { TQString src(path); path=""; - for(int i=0;i<src.length();i++) + for(unsigned int i=0;i<src.length();i++) { TQChar cur=src[i]; if( ! (cur.isLetter() || cur.isDigit() || cur==' ' || cur=='_' || cur=='.' || cur=='#' || cur=='%') ) @@ -466,12 +466,12 @@ void kvi_encodeFileName(TQString & path) //================ kvi_isAbsolutePath ===============// -bool kvi_isAbsolutePath(const char *path) +bool kvi_isAbsolutePath(const TQString &path) { - if(*path == '/')return true; - if(isalpha(*path)) + if(path[0] == '/')return true; + if(isalpha(path[0])) { - if((*(path + 1)) == ':')return true; + if(path[1] == ':')return true; } return false; } diff --git a/src/kvilib/file/kvi_fileutils.h b/src/kvilib/file/kvi_fileutils.h index bea07fed..5224eb0c 100644 --- a/src/kvilib/file/kvi_fileutils.h +++ b/src/kvilib/file/kvi_fileutils.h @@ -98,7 +98,7 @@ namespace KviFileUtils // ALL THIS STUFF BELOW SHOULD DIE: IF YOU SEE IT, REPLACE WITH THE FUNCTIONS IN THE NAMESPACE ABOVE // Returns true if the path begins with '/' -KVILIB_API extern bool kvi_isAbsolutePath(const char *path); +KVILIB_API extern bool kvi_isAbsolutePath(const TQString &path); // Translates ANY string into a valid filename (with no path!) // There is NO way to come back to the original string // the algo is one-way only diff --git a/src/kvilib/irc/kvi_avatar.cpp b/src/kvilib/irc/kvi_avatar.cpp index 3a9f54df..300ad126 100644 --- a/src/kvilib/irc/kvi_avatar.cpp +++ b/src/kvilib/irc/kvi_avatar.cpp @@ -137,8 +137,8 @@ TQPixmap * KviAvatar::scaledPixmap(unsigned int w,unsigned int h) m_uLastScaleWidth = w; m_uLastScaleHeight = h; - int scaleW = w; - int scaleH; + unsigned int scaleW = w; + unsigned int scaleH; /* We want to maintain the aspect of the image instead simply set height and width. The first step is trying to adapt the image size diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/kvi_ircserver.cpp index 8e1898fa..659241d4 100644 --- a/src/kvilib/irc/kvi_ircserver.cpp +++ b/src/kvilib/irc/kvi_ircserver.cpp @@ -162,50 +162,50 @@ void KviIrcServer::setAutoJoinChannelList(TQStringList * pNewChannelList) bool KviIrcServer::load(KviConfig * cfg,const TQString &prefix) { TQString tmp; - KviTQString::sprintf(tmp,"%TQHostname",&prefix); + KviTQString::sprintf(tmp,"%QHostname",&prefix); m_szHostname = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQIp",&prefix); + KviTQString::sprintf(tmp,"%QIp",&prefix); m_szIp = cfg->readTQStringEntry(tmp); if(m_szHostname.isEmpty() && m_szIp.isEmpty())return false; - KviTQString::sprintf(tmp,"%TQDescription",&prefix); + KviTQString::sprintf(tmp,"%QDescription",&prefix); m_szDescription = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQUser",&prefix); + KviTQString::sprintf(tmp,"%QUser",&prefix); m_szUser = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQPass",&prefix); + KviTQString::sprintf(tmp,"%QPass",&prefix); m_szPass = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQNick",&prefix); + KviTQString::sprintf(tmp,"%QNick",&prefix); m_szNick = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQRealName",&prefix); + KviTQString::sprintf(tmp,"%QRealName",&prefix); m_szRealName = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQInitUmode",&prefix); + KviTQString::sprintf(tmp,"%QInitUmode",&prefix); m_szInitUMode = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQAutoJoinChannels",&prefix); + KviTQString::sprintf(tmp,"%QAutoJoinChannels",&prefix); TQStringList l = cfg->readStringListEntry(tmp,TQStringList()); if(l.count() > 0)setAutoJoinChannelList(new TQStringList(l)); - KviTQString::sprintf(tmp,"%TQAutoConnect",&prefix); + KviTQString::sprintf(tmp,"%QAutoConnect",&prefix); m_bAutoConnect = cfg->readBoolEntry(tmp,false); - KviTQString::sprintf(tmp,"%TQEncoding",&prefix); + KviTQString::sprintf(tmp,"%QEncoding",&prefix); m_szEncoding = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQOnConnectCommand",&prefix); + KviTQString::sprintf(tmp,"%QOnConnectCommand",&prefix); m_szOnConnectCommand = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQOnLoginCommand",&prefix); + KviTQString::sprintf(tmp,"%QOnLoginCommand",&prefix); m_szOnLoginCommand = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQLinkFilter",&prefix); + KviTQString::sprintf(tmp,"%QLinkFilter",&prefix); m_szLinkFilter = cfg->readTQStringEntry(tmp); - KviTQString::sprintf(tmp,"%TQPort",&prefix); + KviTQString::sprintf(tmp,"%QPort",&prefix); m_uPort = cfg->readUIntEntry(tmp,6667); - KviTQString::sprintf(tmp,"%TQId",&prefix); + KviTQString::sprintf(tmp,"%QId",&prefix); m_szId = cfg->readTQStringEntry(tmp); if(m_szId.isEmpty())generateUniqueId(); - KviTQString::sprintf(tmp,"%TQIpV6",&prefix); + KviTQString::sprintf(tmp,"%QIpV6",&prefix); setIpV6(cfg->readBoolEntry(tmp,false)); - KviTQString::sprintf(tmp,"%TQCacheIp",&prefix); + KviTQString::sprintf(tmp,"%QCacheIp",&prefix); setCacheIp(cfg->readBoolEntry(tmp,false)); // true ? - KviTQString::sprintf(tmp,"%TQSSL",&prefix); + KviTQString::sprintf(tmp,"%QSSL",&prefix); setUseSSL(cfg->readBoolEntry(tmp,false)); - KviTQString::sprintf(tmp,"%TQProxy",&prefix); + KviTQString::sprintf(tmp,"%QProxy",&prefix); setProxy(cfg->readIntEntry(tmp,-2)); - KviTQString::sprintf(tmp,"%TQUserIdentityId",&prefix); + KviTQString::sprintf(tmp,"%QUserIdentityId",&prefix); m_szUserIdentityId = cfg->readTQStringEntry(tmp); return true; } @@ -213,103 +213,103 @@ bool KviIrcServer::load(KviConfig * cfg,const TQString &prefix) void KviIrcServer::save(KviConfig * cfg,const TQString &prefix) { TQString tmp; - KviTQString::sprintf(tmp,"%TQHostname",&prefix); + KviTQString::sprintf(tmp,"%QHostname",&prefix); cfg->writeEntry(tmp,m_szHostname); - KviTQString::sprintf(tmp,"%TQId",&prefix); + KviTQString::sprintf(tmp,"%QId",&prefix); cfg->writeEntry(tmp,m_szId); if(!m_szIp.isEmpty()) { - KviTQString::sprintf(tmp,"%TQIp",&prefix); + KviTQString::sprintf(tmp,"%QIp",&prefix); cfg->writeEntry(tmp,m_szIp); } if(!m_szDescription.isEmpty()) { - KviTQString::sprintf(tmp,"%TQDescription",&prefix); + KviTQString::sprintf(tmp,"%QDescription",&prefix); cfg->writeEntry(tmp,m_szDescription); } if(!m_szUser.isEmpty()) { - KviTQString::sprintf(tmp,"%TQUser",&prefix); + KviTQString::sprintf(tmp,"%QUser",&prefix); cfg->writeEntry(tmp,m_szUser); } if(!m_szPass.isEmpty()) { - KviTQString::sprintf(tmp,"%TQPass",&prefix); + KviTQString::sprintf(tmp,"%QPass",&prefix); cfg->writeEntry(tmp,m_szPass); } if(!m_szNick.isEmpty()) { - KviTQString::sprintf(tmp,"%TQNick",&prefix); + KviTQString::sprintf(tmp,"%QNick",&prefix); cfg->writeEntry(tmp,m_szNick); } if(!m_szRealName.isEmpty()) { - KviTQString::sprintf(tmp,"%TQRealName",&prefix); + KviTQString::sprintf(tmp,"%QRealName",&prefix); cfg->writeEntry(tmp,m_szRealName); } if(!m_szInitUMode.isEmpty()) { - KviTQString::sprintf(tmp,"%TQInitUMode",&prefix); + KviTQString::sprintf(tmp,"%QInitUMode",&prefix); cfg->writeEntry(tmp,m_szInitUMode); } if(autoJoinChannelList()) { - KviTQString::sprintf(tmp,"%TQAutoJoinChannels",&prefix); + KviTQString::sprintf(tmp,"%QAutoJoinChannels",&prefix); cfg->writeEntry(tmp,*(autoJoinChannelList())); } if(autoConnect()) // otherwise it defaults to false anyway { - KviTQString::sprintf(tmp,"%TQAutoConnect",&prefix); + KviTQString::sprintf(tmp,"%QAutoConnect",&prefix); cfg->writeEntry(tmp,autoConnect()); } if(!m_szEncoding.isEmpty()) { - KviTQString::sprintf(tmp,"%TQEncoding",&prefix); + KviTQString::sprintf(tmp,"%QEncoding",&prefix); cfg->writeEntry(tmp,m_szEncoding); } if(!m_szOnConnectCommand.isEmpty()) { - KviTQString::sprintf(tmp,"%TQOnConnectCommand",&prefix); + KviTQString::sprintf(tmp,"%QOnConnectCommand",&prefix); cfg->writeEntry(tmp,m_szOnConnectCommand); } if(!m_szOnLoginCommand.isEmpty()) { - KviTQString::sprintf(tmp,"%TQOnLoginCommand",&prefix); + KviTQString::sprintf(tmp,"%QOnLoginCommand",&prefix); cfg->writeEntry(tmp,m_szOnLoginCommand); } if(!m_szLinkFilter.isEmpty()) { - KviTQString::sprintf(tmp,"%TQLinkFilter",&prefix); + KviTQString::sprintf(tmp,"%QLinkFilter",&prefix); cfg->writeEntry(tmp,m_szLinkFilter); } if(m_uPort != 6667) { - KviTQString::sprintf(tmp,"%TQPort",&prefix); + KviTQString::sprintf(tmp,"%QPort",&prefix); cfg->writeEntry(tmp,m_uPort); } if(isIpV6()) { - KviTQString::sprintf(tmp,"%TQIpV6",&prefix); + KviTQString::sprintf(tmp,"%QIpV6",&prefix); cfg->writeEntry(tmp,isIpV6()); } if(cacheIp()) { - KviTQString::sprintf(tmp,"%TQCacheIp",&prefix); + KviTQString::sprintf(tmp,"%QCacheIp",&prefix); cfg->writeEntry(tmp,cacheIp()); } if(useSSL()) { - KviTQString::sprintf(tmp,"%TQSSL",&prefix); + KviTQString::sprintf(tmp,"%QSSL",&prefix); cfg->writeEntry(tmp,useSSL()); } if(proxy()!=-2) { - KviTQString::sprintf(tmp,"%TQProxy",&prefix); + KviTQString::sprintf(tmp,"%QProxy",&prefix); cfg->writeEntry(tmp,proxy()); } if(!m_szUserIdentityId.isEmpty()) { - KviTQString::sprintf(tmp,"%TQUserIdentityId",&prefix); + KviTQString::sprintf(tmp,"%QUserIdentityId",&prefix); cfg->writeEntry(tmp,m_szUserIdentityId); } } diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp index beb4ed38..a5e66d99 100644 --- a/src/kvilib/irc/kvi_ircuserdb.cpp +++ b/src/kvilib/irc/kvi_ircuserdb.cpp @@ -283,3 +283,5 @@ void KviIrcUserDataBase::registeredDatabaseCleared() it.current()->m_bNotFoundRegUserLoockup=false; } } + +#include "kvi_ircuserdb.moc" diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp index 240ac515..45d11b7e 100644 --- a/src/kvilib/irc/kvi_nickserv.cpp +++ b/src/kvilib/irc/kvi_nickserv.cpp @@ -92,15 +92,15 @@ void KviNickServRuleSet::save(KviConfig * cfg,const TQString &prefix) TQString tmp; if(m_bEnabled) { - KviTQString::sprintf(tmp,"%TQNSEnabled",&prefix); + KviTQString::sprintf(tmp,"%QNSEnabled",&prefix); cfg->writeEntry(tmp,m_bEnabled); } - KviTQString::sprintf(tmp,"%TQNSRules",&prefix); + KviTQString::sprintf(tmp,"%QNSRules",&prefix); cfg->writeEntry(tmp,m_pRules->count()); int idx = 0; for(KviNickServRule * r = m_pRules->first();r;r = m_pRules->next()) { - KviTQString::sprintf(tmp,"%TQNSRule%d_",&prefix,idx); + KviTQString::sprintf(tmp,"%QNSRule%d_",&prefix,idx); r->save(cfg,tmp); idx++; } @@ -109,7 +109,7 @@ void KviNickServRuleSet::save(KviConfig * cfg,const TQString &prefix) KviNickServRuleSet * KviNickServRuleSet::load(KviConfig * cfg,const TQString &prefix) { TQString tmp; - KviTQString::sprintf(tmp,"%TQNSRules",&prefix); + KviTQString::sprintf(tmp,"%QNSRules",&prefix); unsigned int cnt = cfg->readUIntEntry(tmp,0); if(cnt == 0)return 0; KviNickServRuleSet * s = new KviNickServRuleSet(); @@ -148,11 +148,11 @@ bool KviNickServRuleSet::loadPrivate(KviConfig * cfg,const TQString &prefix,unsi if(nEntries != 0) { TQString tmp; - KviTQString::sprintf(tmp,"%TQNSEnabled",&prefix); + KviTQString::sprintf(tmp,"%QNSEnabled",&prefix); m_bEnabled = cfg->readBoolEntry(tmp,false); for(unsigned int u=0;u<nEntries;u++) { - KviTQString::sprintf(tmp,"%TQNSRule%u_",&prefix,u); + KviTQString::sprintf(tmp,"%QNSRule%u_",&prefix,u); KviNickServRule * r = new KviNickServRule(); if(!r->load(cfg,tmp))delete r; else m_pRules->append(r); @@ -259,33 +259,33 @@ void KviNickServRule::copyFrom(const KviNickServRule &src) void KviNickServRule::save(KviConfig * cfg,const TQString &prefix) { TQString tmp; - KviTQString::sprintf(tmp,"%TQRegisteredNick",&prefix); + KviTQString::sprintf(tmp,"%QRegisteredNick",&prefix); cfg->writeEntry(tmp,m_szRegisteredNick); - KviTQString::sprintf(tmp,"%TQNickServMask",&prefix); + KviTQString::sprintf(tmp,"%QNickServMask",&prefix); cfg->writeEntry(tmp,m_szNickServMask); - KviTQString::sprintf(tmp,"%TQMessageRegexp",&prefix); + KviTQString::sprintf(tmp,"%QMessageRegexp",&prefix); cfg->writeEntry(tmp,m_szMessageRegexp); - KviTQString::sprintf(tmp,"%TQIdentifyCommand",&prefix); + KviTQString::sprintf(tmp,"%QIdentifyCommand",&prefix); cfg->writeEntry(tmp,m_szIdentifyCommand); - KviTQString::sprintf(tmp,"%TQServerMask",&prefix); + KviTQString::sprintf(tmp,"%QServerMask",&prefix); cfg->writeEntry(tmp,m_szServerMask); } bool KviNickServRule::load(KviConfig * cfg,const TQString &prefix) { TQString tmp; - KviTQString::sprintf(tmp,"%TQRegisteredNick",&prefix); + KviTQString::sprintf(tmp,"%QRegisteredNick",&prefix); m_szRegisteredNick = KviTQString::trimmed(cfg->readTQStringEntry(tmp)); if(m_szRegisteredNick.isEmpty())return false; - KviTQString::sprintf(tmp,"%TQNickServMask",&prefix); + KviTQString::sprintf(tmp,"%QNickServMask",&prefix); m_szNickServMask = cfg->readTQStringEntry(tmp); if(m_szNickServMask.isEmpty())return false; - KviTQString::sprintf(tmp,"%TQServerMask",&prefix); + KviTQString::sprintf(tmp,"%QServerMask",&prefix); m_szServerMask = cfg->readTQStringEntry(tmp,TQString()); - KviTQString::sprintf(tmp,"%TQMessageRegexp",&prefix); + KviTQString::sprintf(tmp,"%QMessageRegexp",&prefix); m_szMessageRegexp = cfg->readTQStringEntry(tmp); if(m_szMessageRegexp.isEmpty())return false; - KviTQString::sprintf(tmp,"%TQIdentifyCommand",&prefix); + KviTQString::sprintf(tmp,"%QIdentifyCommand",&prefix); m_szIdentifyCommand = cfg->readTQStringEntry(tmp); return !m_szIdentifyCommand.isEmpty(); } diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp index d537e3fe..f4e8d8c9 100644 --- a/src/kvilib/net/kvi_dns.cpp +++ b/src/kvilib/net/kvi_dns.cpp @@ -220,9 +220,6 @@ void KviDnsThread::run() #else //!COMPILE_ON_WINDOWS || COMPILE_IPV6_SUPPORT int retVal; - - -//#ifdef HAVE_GETNAMEINFO struct sockaddr_in ipv4Addr; #ifdef COMPILE_IPV6_SUPPORT @@ -236,8 +233,6 @@ void KviDnsThread::run() if(!bIsIpV4Ip)bIsIpV6Ip = KviNetUtils::stringIpToBinaryIp_V6(m_szQuery,(struct in6_addr *)&(ipv6Addr.sin6_addr)); #endif -//#ifdef HAVE_GETNAMEINFO - #ifdef COMPILE_IPV6_SUPPORT if(bIsIpV4Ip || bIsIpV6Ip) { @@ -271,12 +266,7 @@ void KviDnsThread::run() } } else { -//#endif //HAVE_GETNAMEINFO - -//#ifdef COMPILE_IPV6_SUPPORT -// struct in6_addr in6Addr; -//#endif struct addrinfo * pRet = 0; struct addrinfo * pNext; struct addrinfo hints; @@ -334,10 +324,7 @@ void KviDnsThread::run() } } if(pRet)freeaddrinfo(pRet); -//#ifdef HAVE_GETNAMEINFO } -//#endif //HAVE_GETNAMEINFO - #endif // !COMPILE_ON_WINDOWS @@ -448,3 +435,4 @@ bool KviDns::event(TQEvent *e) return TQObject::event(e); } +#include "kvi_dns.moc" diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index 4e5f3ff3..67adc383 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -730,13 +730,14 @@ void KviHttpRequest::processData(KviDataBuffer * data) { // process the current chunk data unsigned int uProcessSize = m_uRemainingChunkSize; - if(uProcessSize > m_pBuffer->size())uProcessSize = m_pBuffer->size(); + unsigned int uBufferSize = static_cast<unsigned int>(m_pBuffer->size()); + if(uProcessSize > uBufferSize)uProcessSize = uBufferSize; m_uRemainingChunkSize -= uProcessSize; switch(m_eProcessingType) { case Blocks: - if(m_pBuffer->size() == uProcessSize) + if(uBufferSize == uProcessSize) { // avoid copying to a new buffer emit binaryData(*m_pBuffer); @@ -748,7 +749,7 @@ void KviHttpRequest::processData(KviDataBuffer * data) } break; case Lines: - if(m_pBuffer->size() == uProcessSize) + if(uBufferSize == uProcessSize) { // avoid copying to a new buffer emitLines(m_pBuffer); @@ -1434,3 +1435,4 @@ void KviHttpRequestThread::runInternal() } } +#include "kvi_http.moc" diff --git a/src/kvilib/system/kvi_env.cpp b/src/kvilib/system/kvi_env.cpp index 1497632e..7905feb5 100644 --- a/src/kvilib/system/kvi_env.cpp +++ b/src/kvilib/system/kvi_env.cpp @@ -23,8 +23,6 @@ //============================================================================= #define __KVILIB__ -#define _KVI_ENV_CPP_ - #include "kvi_env.h" #include "kvi_string.h" #include "kvi_malloc.h" diff --git a/src/kvilib/system/kvi_env.h b/src/kvilib/system/kvi_env.h index b3b24a2f..00ab8c0d 100644 --- a/src/kvilib/system/kvi_env.h +++ b/src/kvilib/system/kvi_env.h @@ -37,21 +37,15 @@ inline char * kvi_getenv(const char * name) { -#ifdef HAVE_GETENV return getenv(name); -#else - return 0; -#endif } #ifdef COMPILE_ON_WINDOWS #define kvi_setenv(__name,__value) SetEnvironmentVariable(__name,__value) #define kvi_unsetenv(__name) SetEnvironmentVariable(__name,NULL) #else - #ifndef _KVI_ENV_CPP_ - KVILIB_API extern bool kvi_setenv(const char * name,const char * value); - KVILIB_API extern void kvi_unsetenv(const char * name); - #endif + KVILIB_API extern bool kvi_setenv(const char * name,const char * value); + KVILIB_API extern void kvi_unsetenv(const char * name); #endif diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp index 6f083e89..db5868d7 100644 --- a/src/kvilib/system/kvi_locale.cpp +++ b/src/kvilib/system/kvi_locale.cpp @@ -96,8 +96,8 @@ typedef unsigned int gunichar; #define CONTINUATION_CHAR \ if ((*(guchar *)p & 0xc0) != 0x80) /* 10xxxxxx */ \ goto error; \ - val <<= 6; \ - val |= (*(guchar *)p) & 0x3f; + val <<= 6; \ + val |= (*(guchar *)p) & 0x3f; static const char * @@ -478,7 +478,7 @@ bool KviMessageCatalogue::load(const TQString& name) KviFile f(szCatalogueFile); if(!f.openForReading()) { - tqDebug("[KviLocale]: Failed to open the messages file %s: probably doesn't exist",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("[KviLocale]: Failed to open the messages file %s: probably doesn't exist",szCatalogueFile.local8Bit().data()); return false; } @@ -486,7 +486,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(f.readBlock((char *)&hdr,sizeof(GnuMoFileHeader)) < (int)sizeof(GnuMoFileHeader)) { - tqDebug("KviLocale: Failed to read header of %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Failed to read header of %s",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -497,10 +497,10 @@ bool KviMessageCatalogue::load(const TQString& name) { if(hdr.magic == KVI_LOCALE_MAGIC_SWAPPED) { - tqDebug("KviLocale: Swapped magic for file %s: swapping data too",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Swapped magic for file %s: swapping data too",szCatalogueFile.local8Bit().data()); bMustSwap = true; } else { - tqDebug("KviLocale: Bad locale magic for file %s: not a *.mo file ?",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Bad locale magic for file %s: not a *.mo file ?",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -508,7 +508,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(KVI_SWAP_IF_NEEDED(bMustSwap,hdr.revision) != MO_REVISION_NUMBER) { - tqDebug("KviLocale: Invalid *.mo file revision number for file %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Invalid *.mo file revision number for file %s",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -517,7 +517,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(numberOfStrings <= 0) { - tqDebug("KviLocale: No translated messages found in file %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: No translated messages found in file %s",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -537,7 +537,7 @@ bool KviMessageCatalogue::load(const TQString& name) // FIXME: maybe read it in blocks eh ? if(f.readBlock(buffer,fSize) < (int)fSize) { - tqDebug("KviLocale: Error while reading the translation file %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Error while reading the translation file %s",szCatalogueFile.local8Bit().data()); kvi_free(buffer); f.close(); return false; @@ -546,7 +546,7 @@ bool KviMessageCatalogue::load(const TQString& name) // Check for broken *.mo files if(fSize < (24 + (sizeof(GnuMoStringDescriptor) * numberOfStrings))) { - tqDebug("KviLocale: Broken translation file %s (too small for all descriptors)",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Broken translation file %s (too small for all descriptors)",szCatalogueFile.local8Bit().data()); kvi_free(buffer); f.close(); return false; @@ -561,7 +561,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(fSize < (unsigned int)expectedFileSize) { - tqDebug("KviLocale: Broken translation file %s (too small for all the message strings)",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Broken translation file %s (too small for all the message strings)",szCatalogueFile.local8Bit().data()); kvi_free(buffer); f.close(); return false; @@ -859,7 +859,8 @@ namespace KviLocale TQString szBuffer; - if(findCatalogue(szBuffer,name,szLocaleDir)) + TQString catalog_name = TQString("kvirc-" + name); + if(findCatalogue(szBuffer,catalog_name,szLocaleDir)) { KviMessageCatalogue * c = new KviMessageCatalogue(); if(c->load(szBuffer)) @@ -885,7 +886,7 @@ namespace KviLocale TQString szLocDir = szLocaleDir; KviTQString::ensureLastCharIs(szLocDir,KVI_PATH_SEPARATOR_CHAR); - KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr()); + KviTQString::sprintf(szBuffer,"%Q%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name); if(KviFileUtils::fileExists(szBuffer))return true; @@ -895,7 +896,7 @@ namespace KviLocale // kill them szLocale.cutFromFirst('.'); - KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr()); + KviTQString::sprintf(szBuffer,"%Q%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name); if(KviFileUtils::fileExists(szBuffer))return true; } @@ -904,7 +905,7 @@ namespace KviLocale // things like @euro ? // kill them szLocale.cutFromFirst('@'); - KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr()); + KviTQString::sprintf(szBuffer,"%Q%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name); if(KviFileUtils::fileExists(szBuffer))return true; } @@ -913,13 +914,13 @@ namespace KviLocale // things like en_GB // kill them szLocale.cutFromFirst('_'); - KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr()); + KviTQString::sprintf(szBuffer,"%Q%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name); if(KviFileUtils::fileExists(szBuffer))return true; } // try the lower case version too szLocale.toLower(); - KviTQString::sprintf(szBuffer,"%Q%TQ_%s.mo",&szLocDir,&name,szLocale.ptr()); + KviTQString::sprintf(szBuffer,"%Q%s/LC_MESSAGES/%Q.mo",&szLocDir,szLocale.ptr(),&name); if(KviFileUtils::fileExists(szBuffer))return true; return false; @@ -928,11 +929,11 @@ namespace KviLocale // // This function attempts to determine the current locale // and then load the corresponding translation file - // from the KVIrc locale directory + // from the system locale directory // Returns true if the locale was correctly set // i.e. the locale is C or POSIX (no translation needed) // or the locale is correctly defined and the - // translation map was sucesfully loaded + // translation map was successfully loaded // void init(TQApplication * app,const TQString &localeDir) @@ -953,7 +954,6 @@ namespace KviLocale if(g_szLang.isEmpty())g_szLang = "en"; g_szLang.stripWhiteSpace(); - // the main catalogue is supposed to be kvirc_<language>.mo g_pMainCatalogue = new KviMessageCatalogue(); // the catalogue dict g_pCatalogueDict = new KviPointerHashTable<const char *,KviMessageCatalogue>; @@ -1151,3 +1151,5 @@ static TQString fake_translations_table[]= } #endif + +#include "kvi_locale.moc" diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h index 599aec41..d8e5b5a1 100644 --- a/src/kvilib/system/kvi_locale.h +++ b/src/kvilib/system/kvi_locale.h @@ -40,10 +40,10 @@ namespace KviLocale { typedef struct _EncodingDescription { - char * szName; + const char *szName; char bSmart; // is it a smart codec ? char bSendUtf8; // does it send utf8 or the local charset ? - char * szDescription; + const char *szDescription; } EncodingDescription; // you MUST start iterating from 0 and terminate when diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp index f8404bb4..26761175 100644 --- a/src/kvilib/system/kvi_thread.cpp +++ b/src/kvilib/system/kvi_thread.cpp @@ -189,17 +189,17 @@ KviThreadManager::KviThreadManager() if(pipe(m_fd) != 0) { - tqDebug("Ops...thread manager pipe creation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); + tqDebug("Ops...thread manager pipe creation failed (%s)",KviError::getDescription(KviError::translateSystemError(errno)).local8Bit().data()); } if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_SLAVE],F_SETFL,O_NONBLOCK) == -1) { - tqDebug("Ops...thread manager slave pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); + tqDebug("Ops...thread manager slave pipe initialisation failed (%s)",KviError::getDescription(KviError::translateSystemError(errno)).local8Bit().data()); } if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],F_SETFL,O_NONBLOCK) == -1) { - tqDebug("Ops...thread manager master pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); + tqDebug("Ops...thread manager master pipe initialisation failed (%s)",KviError::getDescription(KviError::translateSystemError(errno)).local8Bit().data()); } m_pSn = new TQSocketNotifier(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],TQSocketNotifier::Read); @@ -642,3 +642,4 @@ void KviSensitiveThread::terminate() // tqDebug("Exiting KviSensitiveThread::terminate (this=%d)",this); } +#include "kvi_thread.moc" diff --git a/src/kvilib/system/kvi_thread.h b/src/kvilib/system/kvi_thread.h index 75bc0771..37eb3c07 100644 --- a/src/kvilib/system/kvi_thread.h +++ b/src/kvilib/system/kvi_thread.h @@ -72,7 +72,6 @@ #define kvi_threadExit() ExitThread(0) #else - #ifdef COMPILE_THREADS_USE_POSIX // Glibc pthread implementation #include <pthread.h> @@ -109,40 +108,6 @@ // We don't care about exit codes at all #define kvi_threadExit() pthread_exit(0) - #else - #ifdef COMPILE_THREADS_USE_SOLARIS_LIBTHREAD - // Native solaris implementation - #include <thread.h> - #include <synch.h> - #include <errno.h> - - // Mutex stuff - #define kvi_mutex_t mutex_t - #define kvi_threadMutexInit(_pMutex_t) mutex_init(_pMutex_t,0,0) - #define kvi_threadMutexLock(_pMutex_t) mutex_lock(_pMutex_t) - #define kvi_threadMutexUnlock(_pMutex_t) mutex_unlock(_pMutex_t) - #define kvi_threadMutexDestroy(_pMutex_t) mutex_destroy(_pMutex_t) - inline bool kvi_threadMutexTryLock(kvi_mutex_t *_pMutex_t) - { - return (mutex_trylock(_pMutex_t) != EBUSY); - }; - // Actually unused - // #define kvi_threadMutexTryLock(_pMutex_t) mutex_trylock(_pMutex_t) - - // Thread stuff - #define kvi_thread_t thread_t - - inline bool kvi_threadCreate(kvi_thread_t *t,void * (*start_routine)(void *),void *arg) - { - return (thr_create(0,0,start_routine,arg,THR_DETACHED,t) == 0); - } - - // We don't care about exit codes at all - #define kvi_threadExit() thr_exit(0) - #else -// FIXME: #warning "Missing a decent thread implementation: we're going to fail , sorry!" - #endif - #endif #endif class KVILIB_API KviMutex : public KviHeapObject diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index dd408edb..805801b9 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -362,7 +362,7 @@ ((KviTalCheckListItem*)parent())->type() == CheckBoxController ) ((KviTalCheckListItem*)parent())->updateController( update, store ); - updateController( update, store ); + updateController( update, store ); } else { // if there are no children we simply set the CheckBoxController and update its parent setCurrentState( s ); diff --git a/src/kvilib/tal/kvi_tal_popupmenu.cpp b/src/kvilib/tal/kvi_tal_popupmenu.cpp index 2033453c..af171832 100644 --- a/src/kvilib/tal/kvi_tal_popupmenu.cpp +++ b/src/kvilib/tal/kvi_tal_popupmenu.cpp @@ -1,3 +1,6 @@ +#ifndef _KVI_TAL_POPUPMENU_H_ +#define _KVI_TAL_POPUPMENU_H_ + //============================================================================= // // File : kvi_tal_popupmenu.cpp @@ -27,3 +30,4 @@ #include "kvi_tal_popupmenu_qt3.moc" +#endif // _KVI_TAL_POPUPMENU_H_ diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp index 4ea3f0e4..210e98dd 100644 --- a/src/kvilib/tal/kvi_tal_wizard.cpp +++ b/src/kvilib/tal/kvi_tal_wizard.cpp @@ -534,3 +534,4 @@ TQPushButton * KviTalWizard::backButton() return m_p->pBackButton; } +#include "kvi_tal_wizard.moc" diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am index 588e250e..f4b76206 100644 --- a/src/kvirc/build/Makefile.am +++ b/src/kvirc/build/Makefile.am @@ -11,10 +11,13 @@ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/ -I$(SS_TOPSRCDIR)/src/kvirc/ui/ \ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" -kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +lib_LTLIBRARIES = libkvirc.la +libkvirc_la_LDFLAGS = $(SS_LDFLAGS) -version-info 3:0:0 $(SS_LIBDIRS) +libkvirc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la -bin_PROGRAMS = kvirc +bin_PROGRAMS = kvirc +kvirc_LDFLAGS = $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) +kvirc_LDADD = $(SS_LIBLINK) libkvirc.la ../../kvilib/build/libkvilib.la # # Command useful to find out all the sources @@ -22,43 +25,8 @@ bin_PROGRAMS = kvirc # echo $SRC # -nodist_kvirc_SOURCES = ../kernel/moc_kvi_action.cpp \ -../kernel/moc_kvi_actionmanager.cpp \ -../kernel/moc_kvi_coreactions.cpp \ -../kernel/moc_kvi_filetransfer.cpp \ -../kernel/moc_kvi_ircconnection.cpp \ -../kernel/moc_kvi_irccontext.cpp \ -../kernel/moc_kvi_irclink.cpp \ -../kernel/moc_kvi_ircsocket.cpp \ -../kernel/moc_kvi_ircconnectiontargetresolver.cpp \ -../kvs/moc_kvi_kvs_action.cpp \ -../kvs/moc_kvi_kvs_asyncdnsoperation.cpp \ -../kvs/moc_kvi_kvs_asyncoperation.cpp \ -../kvs/moc_kvi_kvs_dnsmanager.cpp \ -../kvs/moc_kvi_kvs_timermanager.cpp \ -../kvs/moc_kvi_kvs_object.cpp \ -../kvs/moc_kvi_kvs_popupmenu.cpp \ -../kvs/moc_kvi_kvs_processmanager.cpp \ -../kvs/moc_kvi_kvs_useraction.cpp \ -../module/moc_kvi_mexlinkfilter.cpp \ -../module/moc_kvi_mexserverimport.cpp \ -../module/moc_kvi_mextoolbar.cpp \ -../module/moc_kvi_modulemanager.cpp \ -../ui/moc_kvi_actiondrawer.cpp \ -../ui/moc_kvi_customtoolbar.cpp \ -../ui/moc_kvi_debugwindow.cpp \ -../ui/moc_kvi_htmldialog.cpp \ -../ui/moc_kvi_imagedialog.cpp \ -../ui/moc_kvi_ircviewtools.cpp \ -../ui/moc_kvi_mdicaption.cpp \ -../ui/moc_kvi_mdichild.cpp \ -../ui/moc_kvi_mdimanager.cpp \ -../ui/moc_kvi_statusbar.cpp \ -../ui/moc_kvi_statusbarapplet.cpp \ -../ui/moc_kvi_toolwindows_container.cpp \ -../ui/moc_kvi_listview.cpp - -kvirc_SOURCES = ../kernel/kvi_action.cpp \ +libkvirc_la_SOURCES = \ +../kernel/kvi_action.cpp \ ../kernel/kvi_actionmanager.cpp \ ../kernel/kvi_app.cpp \ ../kernel/kvi_coreactions.cpp \ @@ -86,7 +54,6 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ ../kernel/kvi_irclink.cpp \ ../kernel/kvi_ircsocket.cpp \ ../kernel/kvi_ircurl.cpp \ -../kernel/kvi_main.cpp \ ../kernel/kvi_lagmeter.cpp \ ../kernel/kvi_notifylist.cpp \ ../kernel/kvi_options.cpp \ @@ -261,6 +228,9 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ ../ui/kvi_userlistview.cpp \ ../ui/kvi_window.cpp +kvirc_SOURCES = \ +../kernel/kvi_main.cpp + # # Command useful to find out all the headers # rm -f ../include/*.h @@ -268,7 +238,6 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ # echo $SRC # - headers_HEADERS = ../kernel/kvi_action.h \ ../kernel/kvi_actionmanager.h \ ../kernel/kvi_app.h \ @@ -458,6 +427,18 @@ headers_HEADERS = ../kernel/kvi_action.h \ ../ui/kvi_styled_controls.h \ ../ui/kvi_toolwindows_container.h +../kvs/%.moc: ../kvs/%.h + $(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@ + +../kernel/%.moc: ../kernel/%.h + $(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@ + +../module/%.moc: ../module/%.h + $(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@ + +../ui/%.moc: ../ui/%.h + $(SS_QT_MOC) $(SS_QT_FLAGS) $< -o $@ + %.moc: %.h $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ @@ -465,59 +446,81 @@ headers_HEADERS = ../kernel/kvi_action.h \ # DIRS="kernel sparser ui uparser" # for dire in $DIRS; do grep "\.moc" ../$dire/*.cpp | sort | sed -e 's/[[:space:]]*#include//' | sed -e s/\\\"/..\\\/$dire\\\// | sed -e 's/\"//'; done +../kernel/kvi_action.cpp: ../kernel/kvi_action.moc +../kernel/kvi_actionmanager.cpp: ../kernel/kvi_actionmanager.moc ../kernel/kvi_app.cpp: ../kernel/kvi_app.moc +../kernel/kvi_coreactions.cpp: ../kernel/kvi_coreactions.moc +../kernel/kvi_filetransfer.cpp: ../kernel/kvi_filetransfer.moc ../kernel/kvi_iconmanager.cpp: ../kernel/kvi_iconmanager.moc ../kernel/kvi_ipc.cpp: ../kernel/kvi_ipc.moc +../kernel/kvi_ircconnection.cpp: ../kernel/kvi_ircconnection.moc +../kernel/kvi_ircconnectiontargetresolver.cpp: ../kernel/kvi_ircconnectiontargetresolver.moc +../kernel/kvi_irccontext.cpp: ../kernel/kvi_irccontext.moc +../kernel/kvi_irclink.cpp: ../kernel/kvi_irclink.moc +../kernel/kvi_ircsocket.cpp: ../kernel/kvi_ircsocket.moc ../kernel/kvi_lagmeter.cpp: ../kernel/kvi_lagmeter.moc ../kernel/kvi_notifylist.cpp: ../kernel/kvi_notifylist.moc ../kernel/kvi_texticonmanager.cpp: ../kernel/kvi_texticonmanager.moc +../kvs/kvi_kvs_action.cpp: ../kvs/kvi_kvs_action.moc +../kvs/kvi_kvs_asyncdnsoperation.cpp: ../kvs/kvi_kvs_asyncdnsoperation.moc +../kvs/kvi_kvs_asyncoperation.cpp: ../kvs/kvi_kvs_asyncoperation.moc +../kvs/kvi_kvs_dnsmanager.cpp: ../kvs/kvi_kvs_dnsmanager.moc +../kvs/kvi_kvs_object.cpp: ../kvs/kvi_kvs_object.moc +../kvs/kvi_kvs_popupmenu.cpp: ../kvs/kvi_kvs_popupmenu.moc +../kvs/kvi_kvs_processmanager.cpp: ../kvs/kvi_kvs_processmanager.moc +../kvs/kvi_kvs_timermanager.cpp: ../kvs/kvi_kvs_timermanager.moc +../kvs/kvi_kvs_useraction.cpp: ../kvs/kvi_kvs_useraction.moc +../module/kvi_mexlinkfilter.cpp: ../module/kvi_mexlinkfilter.moc +../module/kvi_mexserverimport.cpp: ../module/kvi_mexserverimport.moc +../module/kvi_mextoolbar.cpp: ../module/kvi_mextoolbar.moc +../module/kvi_modulemanager.cpp: ../module/kvi_modulemanager.moc ../sparser/kvi_sparser.cpp: ../sparser/kvi_sparser.moc +../ui/kvi_actiondrawer.cpp: ../ui/kvi_actiondrawer.moc ../ui/kvi_channel.cpp: ../ui/kvi_channel.moc ../ui/kvi_colorwin.cpp: ../ui/kvi_colorwin.moc ../ui/kvi_console.cpp: ../ui/kvi_console.moc ../ui/kvi_cryptcontroller.cpp: ../ui/kvi_cryptcontroller.moc ../ui/kvi_ctcppagedialog.cpp: ../ui/kvi_ctcppagedialog.moc +../ui/kvi_customtoolbar.cpp: ../ui/kvi_customtoolbar.moc +../ui/kvi_debugwindow.cpp: ../ui/kvi_debugwindow.moc ../ui/kvi_dynamictooltip.cpp: ../ui/kvi_dynamictooltip.moc ../ui/kvi_filedialog.cpp: ../ui/kvi_filedialog.moc ../ui/kvi_frame.cpp: ../ui/kvi_frame.moc ../ui/kvi_historywin.cpp: ../ui/kvi_historywin.moc +../ui/kvi_htmldialog.cpp: ../ui/kvi_htmldialog.moc +../ui/kvi_imagedialog.cpp: ../ui/kvi_imagedialog.moc ../ui/kvi_input.cpp: ../ui/kvi_input.moc ../ui/kvi_ipeditor.cpp: ../ui/kvi_ipeditor.moc ../ui/kvi_irctoolbar.cpp: ../ui/kvi_irctoolbar.moc ../ui/kvi_ircview.cpp: ../ui/kvi_ircview.moc +../ui/kvi_ircviewtools.cpp: ../ui/kvi_ircviewtools.moc +../ui/kvi_listview.cpp: ../ui/kvi_listview.moc ../ui/kvi_maskeditor.cpp: ../ui/kvi_maskeditor.moc +../ui/kvi_mdicaption.cpp: ../ui/kvi_mdicaption.moc +../ui/kvi_mdichild.cpp: ../ui/kvi_mdichild.moc +../ui/kvi_mdimanager.cpp: ../ui/kvi_mdimanager.moc ../ui/kvi_menubar.cpp: ../ui/kvi_menubar.moc ../ui/kvi_modeeditor.cpp: ../ui/kvi_modeeditor.moc +../ui/kvi_modew.cpp: ../ui/kvi_modew.moc ../ui/kvi_optionswidget.cpp: ../ui/kvi_optionswidget.moc ../ui/kvi_query.cpp: ../ui/kvi_query.moc ../ui/kvi_scriptbutton.cpp: ../ui/kvi_scriptbutton.moc ../ui/kvi_scripteditor.cpp: ../ui/kvi_scripteditor.moc ../ui/kvi_selectors.cpp: ../ui/kvi_selectors.moc ../ui/kvi_splash.cpp: ../ui/kvi_splash.moc +../ui/kvi_statusbarapplet.cpp: ../ui/kvi_statusbarapplet.moc +../ui/kvi_statusbar.cpp: ../ui/kvi_statusbar.moc +../ui/kvi_styled_controls.cpp: ../ui/kvi_styled_controls.moc ../ui/kvi_taskbar.cpp: ../ui/kvi_taskbar.moc ../ui/kvi_texticonwin.cpp: ../ui/kvi_texticonwin.moc +../ui/kvi_texticonwin.cpp: ../ui/kvi_texticonwin.moc ../ui/kvi_themedlabel.cpp: ../ui/kvi_themedlabel.moc ../ui/kvi_toolbar.cpp: ../ui/kvi_toolbar.moc +../ui/kvi_toolwindows_container.cpp: ../ui/kvi_toolwindows_container.moc ../ui/kvi_topicw.cpp: ../ui/kvi_topicw.moc -../ui/kvi_modew.cpp: ../ui/kvi_modew.moc -../ui/kvi_styled_controls.cpp: ../ui/kvi_styled_controls.moc ../ui/kvi_userlistview.cpp: ../ui/kvi_userlistview.moc ../ui/kvi_window.cpp: ../ui/kvi_window.moc - -../kvs/moc_%.cpp: ../kvs/%.h - $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ - -../kernel/moc_%.cpp: ../kernel/%.h - $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ - -../module/moc_%.cpp: ../module/%.h - $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ - -../ui/moc_%.cpp: ../ui/%.h - $(SS_QT_MOC) $(SS_QT_MOC_FLAGS) $< -o $@ - - # # All the cpp files depend on symlinks beging up-to-date # diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 57684a2b..64511082 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -417,7 +417,7 @@ TQWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar) p ? *p : TQPixmap(), visibleName(), visibleName(), - this,TQ_SLOT(activate()),pParentToolBar,m_szName); + this,TQ_SLOT(activate()),pParentToolBar,m_szName.utf8().data()); if(!isEnabled())b->setEnabled(false); registerWidget(b); return b; @@ -429,3 +429,4 @@ void KviAction::activate() emit activated(); } +#include "kvi_action.moc" diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp index c4af1e7e..52d9f859 100644 --- a/src/kvirc/kernel/kvi_actionmanager.cpp +++ b/src/kvirc/kernel/kvi_actionmanager.cpp @@ -319,3 +319,4 @@ void KviActionManager::listActionsByCategory(const TQString &szCatName,KviPointe } } +#include "kvi_actionmanager.moc" diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 7071482b..c80f3080 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -116,7 +116,7 @@ KVIRC_API KviTextIconWindow * g_pTextIconWindow = 0; KVIRC_API KviTalPopupMenu * g_pInputPopup = 0; KVIRC_API TQStringList * g_pRecentTopicList = 0; //KVIRC_API TQStringList * g_pBookmarkList = 0; -KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict = 0; +KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict = 0; KVIRC_API KviMediaManager * g_pMediaManager = 0; //KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase = 0; KVIRC_API KviSharedFilesManager * g_pSharedFilesManager = 0; @@ -440,7 +440,7 @@ void KviApp::setup() KVI_SPLASH_SET_PROGRESS(91) // Global window dictionary - g_pGlobalWindowDict = new KviPointerHashTable<const char *,KviWindow>(41); + g_pGlobalWindowDict = new KviPointerHashTable<TQString,KviWindow>(41); g_pGlobalWindowDict->setAutoDelete(false); // Script object controller //g_pScriptObjectController = new KviScriptObjectController(); gone @@ -896,7 +896,7 @@ void KviApp::setClipboardText(const KviStr &str) void KviApp::setAvatarFromOptions() { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1559,7 +1559,7 @@ void KviApp::destroyFrame() bool KviApp::connectionExists(KviIrcConnection *cnn) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1572,7 +1572,7 @@ bool KviApp::connectionExists(KviIrcConnection *cnn) bool KviApp::windowExists(KviWindow *wnd) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1589,7 +1589,7 @@ unsigned int KviApp::windowCount() KviConsole * KviApp::findConsole(TQString &server,TQString &nick) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1634,7 +1634,7 @@ KviConsole * KviApp::findConsole(KviStr &server,KviStr &nick) void KviApp::restartLagMeters() { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1649,7 +1649,7 @@ void KviApp::restartLagMeters() void KviApp::restartNotifyLists() { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1664,7 +1664,7 @@ void KviApp::restartNotifyLists() void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * u) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1678,7 +1678,7 @@ void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * u) KviConsole * KviApp::findConsole(unsigned int ircContextId) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1704,7 +1704,7 @@ KviConsole * KviApp::topmostConnectedConsole() // try ANY connected console - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1718,19 +1718,19 @@ KviConsole * KviApp::topmostConnectedConsole() return 0; } -KviWindow * KviApp::findWindow(const char * windowId) +KviWindow * KviApp::findWindow(const TQString &windowId) { return g_pGlobalWindowDict->find(windowId); } KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iContextId) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { if(KviTQString::equalCI(windowCaption,it.current()->plainTextCaption()) && - (iContextId==-1 || it.current()->context()->id() == iContextId)) + (iContextId==-1 || it.current()->context()->id() == static_cast<unsigned int>(iContextId))) return it.current(); ++it; } diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 3f928087..f6de2250 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -199,21 +199,21 @@ public: // if the mediatype can be guessed ,it is looked up in the media type save path // if found , true is returned // if not found or the mediatype can't be guessed then false is returned - bool findFileByMediaType(KviStr &szRetPath,const char * filename); + bool findFileByMediaType(KviStr &szRetPath,const TQString &filename); - bool findImageInImageSearchPath(KviStr &szRetPath,const char * filename); - bool findImageInImageSearchPath(TQString &szRetPath,const char * filename); + bool findImageInImageSearchPath(KviStr &szRetPath,const TQString &filename); + bool findImageInImageSearchPath(TQString &szRetPath,const TQString &filename); bool findUserFile(KviStr &szRetPath,const char *filename); - bool findImage(KviStr &szRetPath,const char *filename); - bool findImage(TQString &szRetPath,const char *filename); - bool findImageThemeOnlyCompat(TQString &szRetPath,const char *filename); // temporary compat, will be removed soon (do not use) - bool findSmallIcon(TQString &szRetPath,const char *filename); + bool findImage(KviStr &szRetPath,const TQString &filename); + bool findImage(TQString &szRetPath,const TQString &filename); + bool findImageThemeOnlyCompat(TQString &szRetPath,const TQString &filename); // temporary compat, will be removed soon (do not use) + bool findSmallIcon(TQString &szRetPath,const TQString &filename); // tries to map the full path filename to one of the KVIrc's mapped directories // if it doesn't succeed it just returns the complete filename in szRetPath - bool mapImageFile(KviStr &szRetPath,const char * filename); - bool mapImageFile(TQString &szRetPath,const char * filename); + bool mapImageFile(KviStr &szRetPath,const TQString &filename); + bool mapImageFile(TQString &szRetPath,const TQString &filename); //void getDefaultDccSaveFilePath(KviStr &path,const char *filename); void completeDirectory(const TQString &word,KviPointerList<TQString> * matches); @@ -230,7 +230,7 @@ public: bool getReadOnlyConfigPath(TQString &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false); // kvi_app.cpp : Window stuff - KviWindow * findWindow(const char * windowId); + KviWindow * findWindow(const TQString &windowId); KviWindow * findWindowByCaption(const TQString &windowCaption,int iContextId=-1); KviConsole * findConsole(unsigned int ircContextId); KviConsole * findConsole(KviStr & server,KviStr & nick); @@ -309,8 +309,8 @@ private: bool checkFileAssociations(); void setupFileAssociations(); - bool checkUriAssociations(char * proto); - void setupUriAssociations(char * proto); + bool checkUriAssociations(const char *proto); + void setupUriAssociations(const char *proto); void saveKvircDirectory(); diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index c79742ba..cd80567a 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -38,6 +38,7 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tqdatetime.h> +#include <tdestandarddirs.h> #include "config.h" @@ -90,7 +91,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt case DefScript : szData.append("defscript"); break; case License : szData.append("license"); break; case Filters : szData.append("filters"); break; - case Locale : szData.append("locale"); break; + case Locale : szData=locate("locale",""); break; case Tmp : tqDebug("WARNING Global tmp directory requested!"); break; case Themes : szData.append("themes"); break; case Classes : szData.append("classes"); break; @@ -328,7 +329,7 @@ void KviApp::getChannelDumpLogFileName(TQString &str) KviFileUtils::adjustFilePath(str); } -bool KviApp::findFileByMediaType(KviStr &szRetPath,const char * filename) +bool KviApp::findFileByMediaType(KviStr &szRetPath,const TQString &filename) { g_pMediaManager->lock(); KviMediaType * m = g_pMediaManager->findMediaType(filename,false); @@ -429,7 +430,7 @@ bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) // FIXME: #warning "Check WHEN findImage is used and when findUserFile is used...we have a mess here" -bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename) +bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const TQString &filename) { // first lookup the user defined paths for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); @@ -445,7 +446,7 @@ bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename) return false; } -bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filename) +bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const TQString &filename) { // first lookup the user defined paths for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); @@ -464,7 +465,7 @@ bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filenam static KviApp::KvircSubdir pics_localsubdirs[2]={ KviApp::Pics , KviApp::Avatars }; static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics , KviApp::Avatars }; -bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename) +bool KviApp::mapImageFile(KviStr &szRetPath,const TQString &filename) { TQString buff; bool ret=mapImageFile(buff,filename); @@ -472,7 +473,7 @@ bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename) return ret; } -bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) +bool KviApp::mapImageFile(TQString &szRetPath,const TQString &filename) { szRetPath = filename; // can't map non absolute paths @@ -480,7 +481,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) // can't map non existing paths if(!KviFileUtils::fileExists(filename))return false; - TQFileInfo fi = TQFileInfo(TQString::fromUtf8(filename)); + TQFileInfo fi = TQFileInfo(filename); unsigned int size = fi.size(); @@ -553,7 +554,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) } -bool KviApp::findImage(KviStr &szRetPath,const char *filename) +bool KviApp::findImage(KviStr &szRetPath,const TQString &filename) { TQString buff; bool ret=findImage(buff,filename); @@ -561,7 +562,7 @@ bool KviApp::findImage(KviStr &szRetPath,const char *filename) return ret; } -bool KviApp::findImage(TQString &szRetPath,const char *filename) +bool KviApp::findImage(TQString &szRetPath,const TQString &filename) { // Find an user file... if(kvi_isAbsolutePath(filename)) @@ -611,7 +612,7 @@ bool KviApp::findImage(TQString &szRetPath,const char *filename) return false; } -bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const char *filename) +bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const TQString &filename) { // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) @@ -638,18 +639,11 @@ bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const char *filename) return false; } -bool KviApp::findSmallIcon(TQString &szRetPath,const char *filename) +bool KviApp::findSmallIcon(TQString &szRetPath,const TQString &filename) { // this is a bit optimized for the small builtin icons // looks up less places. - //if(kvi_isAbsolutePath(filename)) - //{ - // BUG!.. we should never - //szRetPath=filename; - //return KviFileUtils::fileExists(filename); - //} - // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) { diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index bb121855..8a94def3 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -258,7 +258,7 @@ bool KviApp::checkFileAssociations() } -bool KviApp::checkUriAssociations(char * proto) +bool KviApp::checkUriAssociations(const char *proto) { #ifdef COMPILE_ON_WINDOWS #define QUERY_BUFFER 2048 @@ -353,7 +353,7 @@ bool KviApp::checkUriAssociations(char * proto) } -void KviApp::setupUriAssociations(char * proto) +void KviApp::setupUriAssociations(const char *proto) { #ifdef COMPILE_ON_WINDOWS HKEY hKey; @@ -541,7 +541,7 @@ void KviApp::findGlobalKvircDirectory() if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\ - "The usual path for this directory is c:\\kvirc\\" KVI_VERSION_BRANCH "\\.\n"\ + "The usual path for this directory is c:\\kvirc\n"\ "I have tried %Q, but it seemed to fail\n" \ "Trying to run anyway...\n",&m_szGlobalKvircDir); #else // !COMPILE_ON_WINDOWS @@ -550,31 +550,28 @@ void KviApp::findGlobalKvircDirectory() // because of strange distributions or TDEDIRS // I do it in that way... #ifdef COMPILE_TDE_SUPPORT - // KDE compilation ... - // The things usually go installed into $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH - // Look in the main KDE directory + // TDE compilation ... + // The things usually go installed into $TDEDIR/share/apps/kvirc + // Look in the main TDE directory TDEStandardDirs * d = dirs(); if(d) { m_szGlobalKvircDir = locate("appdata",""); if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; - #ifdef HAVE_GETENV - //TDEDIR sanity check... - m_szGlobalKvircDir = getenv("TDEDIR"); - m_szGlobalKvircDir+="/share/apps/kvirc/" KVI_VERSION_BRANCH; - if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; - #endif + //TDEDIR sanity check... + m_szGlobalKvircDir = getenv("TDEDIR"); + m_szGlobalKvircDir+="/share/apps/kvirc/"; + if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } // FAILED ? Check the usual way... - #endif //COMPILE_WITH_KDE + #endif //COMPILE_TDE_SUPPORT - // Non KDE compilation , or not found under $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH + // Non TDE compilation , or not found under $TDEDIR/share/apps/kvirc // Check for MacOS X Bundle compilation #ifdef Q_OS_MACX m_szGlobalKvircDir = applicationDirPath(); - m_szGlobalKvircDir+= "/../Resources/kvirc/"; - m_szGlobalKvircDir+= KVI_VERSION_BRANCH; + m_szGlobalKvircDir+= "/../Resources/kvirc"; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; #endif //Q_OS_MACX @@ -583,7 +580,6 @@ void KviApp::findGlobalKvircDirectory() for(int i=0;usualKvircGlobalDir[i] != 0;i++){ m_szGlobalKvircDir = usualKvircGlobalPrePath[j]; m_szGlobalKvircDir+= usualKvircGlobalDir[i]; - m_szGlobalKvircDir+= KVI_VERSION_BRANCH; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } } @@ -592,7 +588,6 @@ void KviApp::findGlobalKvircDirectory() for(int k=0;usualKvircGlobalDir[k] != 0;k++){ m_szGlobalKvircDir = TQDir::homeDirPath(); m_szGlobalKvircDir+= usualKvircGlobalDir[k]; - m_szGlobalKvircDir+= KVI_VERSION_BRANCH; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } @@ -601,7 +596,6 @@ void KviApp::findGlobalKvircDirectory() m_szGlobalKvircDir = TQDir::homeDirPath(); m_szGlobalKvircDir+= "/.trinity"; m_szGlobalKvircDir+= usualKvircGlobalDir[k]; - m_szGlobalKvircDir+= KVI_VERSION_BRANCH; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } #endif //COMPILE_TDE_SUPPORT @@ -711,11 +705,7 @@ void KviApp::loadDirectories() // First find the global (readable) one... findGlobalKvircDirectory(); // Init locale - TQString szLocalePath = m_szGlobalKvircDir; - szLocalePath.append(KVI_PATH_SEPARATOR); - szLocalePath.append("locale"); - szLocalePath.append(KVI_PATH_SEPARATOR); - + TQString szLocalePath = locate("locale",""); KviLocale::init(this,szLocalePath); //__debug_1arg("Global Kvirc directory is %s",m_szGlobalKvircDir.ptr()); @@ -813,12 +803,6 @@ void KviApp::setupFinish() void KviApp::saveKvircDirectory() { -/* -#ifdef COMPILE_ON_WINDOWS - KviStr szKey(KviStr::Format,"LocalKvircDirectory%s",KVI_VERSION_BRANCH); - WritePrivateProfileString("kvirc",szKey.ptr(),m_szLocalKvircDir.ptr(),KVI_HOME_CONFIG_FILE_NAME); -#else //!COMPILE_ON_WINDOWS -*/ // Here we save the local directory path #ifdef COMPILE_TDE_SUPPORT // In KDE we use the application config file diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index e37fb3a8..2a449ac7 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -678,7 +678,7 @@ TQWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) *(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)), m_szConnectString, m_szConnectString, - this,TQ_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name().utf8().data()); registerWidget(b); activeContextStateChanged(); return b; @@ -751,7 +751,7 @@ TQWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) *(bigIcon()), visibleName(), visibleName(), - this,TQ_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name().utf8().data()); b->setPopup(m_pPopup); b->setShowSubmenuIndicator(true); @@ -959,7 +959,7 @@ void KviChangeUserModeAction::popupActivated(int id) if(idx != -1) { idx++; - if(idx < text.length()) + if(static_cast<unsigned int>(idx) < text.length()) { TQChar m = text[idx]; TQString command = "mode "; @@ -1094,7 +1094,7 @@ TQWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) *(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")), m_szAwayString, m_szAwayString, - this,TQ_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name().utf8().data()); registerWidget(b); activeContextStateChanged(); return b; @@ -1183,4 +1183,4 @@ void KviIrcOperationsAction::popupActivated(int id) { } - +#include "kvi_coreactions.moc" diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index 35d84287..200649f9 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -188,3 +188,5 @@ void KviFileTransfer::displayUpdate() { if(m_pDisplayItem)m_pDisplayItem->repaint(); } + +#include "kvi_filetransfer.moc" diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 6d9f328a..786e6680 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -688,14 +688,13 @@ void KviIconManager::addToCache(const TQString &szName,KviCachedPixmap * p) m_uCacheTotalSize += p->size(); } -TQPixmap * KviIconManager::getImage(const char * id,bool bCanBeNumber,TQString* pRetPath) +TQPixmap * KviIconManager::getImage(const TQString &id,bool bCanBeNumber,TQString* pRetPath) { - if(!id)return 0; + if(id.isEmpty())return 0; if(bCanBeNumber) { bool bOk; - TQString tmp = id; - int idx = tmp.toInt(&bOk); + int idx = id.toInt(&bOk); if(bOk) { // was a number : this is not a filename diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h index ee444d23..021b5e15 100644 --- a/src/kvirc/kernel/kvi_iconmanager.h +++ b/src/kvirc/kernel/kvi_iconmanager.h @@ -450,7 +450,7 @@ public: // WARNING: Don't store this pointer! // id == filename | number that indicates an internal pixmap // 0 stands for "any" - TQPixmap * getImage(const char * id,bool bCanBeNumber = true,TQString* pRetPath = 0); + TQPixmap * getImage(const TQString &id,bool bCanBeNumber = true,TQString* pRetPath = 0); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp index 61c9f165..87d7726c 100644 --- a/src/kvirc/kernel/kvi_internalcmd.cpp +++ b/src/kvirc/kernel/kvi_internalcmd.cpp @@ -26,7 +26,7 @@ // FIXME: #warning "LOCALIZE THIS!" -static char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]= +static const char *internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]= { "echo INTERNAL COMMAND ERROR: INDEX OUT OF RANGE", "help.open -n -m index.html", @@ -71,7 +71,7 @@ static char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]= }; -char * kvi_getInternalCommandBuffer(int idx) +const char* kvi_getInternalCommandBuffer(int idx) { if(idx > 0 && idx < KVI_NUM_INTERNAL_COMMANDS) { diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/kvi_internalcmd.h index 533dfc05..6e6f34c2 100644 --- a/src/kvirc/kernel/kvi_internalcmd.h +++ b/src/kvirc/kernel/kvi_internalcmd.h @@ -67,6 +67,6 @@ #define KVI_NUM_INTERNAL_COMMANDS 40 -extern KVIRC_API char * kvi_getInternalCommandBuffer(int idx); +extern KVIRC_API const char* kvi_getInternalCommandBuffer(int idx); #endif //_KVI_INTERNALCMD_H_ diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h index 26c50ef0..9a4e8bad 100644 --- a/src/kvirc/kernel/kvi_ipc.h +++ b/src/kvirc/kernel/kvi_ipc.h @@ -64,6 +64,8 @@ #endif //!COMPILE_ON_WINDOWS }; + KVIRC_API bool kvi_sendIpcMessage(const char * message); + #endif //!COMPILE_NO_IPC diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 22b3b2d7..20374ebb 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -186,7 +186,7 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->server()->encoding().isEmpty()) { m_pTextCodec = KviLocale::codecForName(m_pTarget->server()->encoding().latin1()); - if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data()); + if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().local8Bit().data()); } if(!m_pTextCodec) { @@ -194,7 +194,7 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->network()->encoding().isEmpty()) { m_pTextCodec = KviLocale::codecForName(m_pTarget->network()->encoding().latin1()); - if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data()); + if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().local8Bit().data()); } } if(!m_pTextCodec) @@ -420,7 +420,7 @@ KviChannel * KviIrcConnection::createChannel(const TQString &szName) c->setFocus(); } } else { - c = new KviChannel(m_pFrame,m_pConsole,szName); + c = new KviChannel(m_pFrame,m_pConsole,szName.utf8().data()); m_pFrame->addWindow(c,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels)); if(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels)) c->minimize(); } @@ -1352,3 +1352,5 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow) } } } + +#include <kvi_ircconnection.moc> diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp index 0040b53e..b73bd480 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp @@ -97,7 +97,7 @@ void KviIrcConnectionServerInfo::buildModePrefixTable() // Pragma: FIXME: The whole mode handling needs rethinking! // Alexey: FIXED: rethinked:) // Pragma: LOL :DDDD - int i=0; + unsigned int i=0; while( (uPrefix = cPrefix->unicode()) && (uFlag = cFlag->unicode()) && i<m_uPrefixes*3) { m_pModePrefixTable[i]=uPrefix; @@ -129,7 +129,7 @@ void KviIrcConnectionServerInfo::buildModePrefixTable() bool KviIrcConnectionServerInfo::isSupportedModePrefix(TQChar c) { if(!m_pModePrefixTable) return false; - for(int i=0;i<m_uPrefixes;i++) + for(unsigned int i=0;i<m_uPrefixes;i++) { if(m_pModePrefixTable[i*3]==c.unicode()) return true; } @@ -139,7 +139,7 @@ bool KviIrcConnectionServerInfo::isSupportedModePrefix(TQChar c) bool KviIrcConnectionServerInfo::isSupportedModeFlag(TQChar c) { if(!m_pModePrefixTable) return false; - for(int i=0;i<m_uPrefixes;i++) + for(unsigned int i=0;i<m_uPrefixes;i++) { if(m_pModePrefixTable[(i*3)+1]==c.unicode()) return true; } @@ -149,7 +149,7 @@ bool KviIrcConnectionServerInfo::isSupportedModeFlag(TQChar c) TQChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) { if(!m_pModePrefixTable) return TQChar(0); - for(int i=0;i<m_uPrefixes;i++) + for(unsigned int i=0;i<m_uPrefixes;i++) { if(m_pModePrefixTable[i*3+2] & flag) return TQChar(m_pModePrefixTable[i*3]); } @@ -159,7 +159,7 @@ TQChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) TQChar KviIrcConnectionServerInfo::modeFlagChar(kvi_u32_t flag) { if(!m_pModePrefixTable) return TQChar(0); - for(int i=0;i<m_uPrefixes;i++) + for(unsigned int i=0;i<m_uPrefixes;i++) { if(m_pModePrefixTable[i*3+2] & flag ) return TQChar(m_pModePrefixTable[i*3+1]); } @@ -169,7 +169,7 @@ TQChar KviIrcConnectionServerInfo::modeFlagChar(kvi_u32_t flag) kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromPrefixChar(TQChar c) { if(!m_pModePrefixTable) return 0; - for(int i=0;i<m_uPrefixes;i++) + for(unsigned int i=0;i<m_uPrefixes;i++) { if(m_pModePrefixTable[i*3]==c.unicode()) return m_pModePrefixTable[i*3+2]; } @@ -179,7 +179,7 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromPrefixChar(TQChar c) kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(TQChar c) { if(!m_pModePrefixTable) return 0; - for(int i=0;i<m_uPrefixes;i++) + for(unsigned int i=0;i<m_uPrefixes;i++) { if(m_pModePrefixTable[i*3+1]==c.unicode()) return m_pModePrefixTable[i*3+2]; } diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 117fcc12..456e9972 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -489,10 +489,12 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).find(':') != -1) { if(!_OUTPUT_MUTE) + { m_pConsole->output(KVI_OUT_SYSTEMWARNING, __tr2qs("The system-wide IPv6 bind address (%s) is not valid"), KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).utf8().data()); - KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false; + } + KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false; } else { // this is an interface address: might be down if(!_OUTPUT_MUTE) @@ -553,3 +555,5 @@ void KviIrcConnectionTargetResolver::terminate(Status s,int iLastError) m_iLastError = iLastError; emit terminated(); } + +#include "kvi_ircconnectiontargetresolver.moc" diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index 2195a109..13791211 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -904,3 +904,4 @@ void KviIrcContext::timerEvent(TQTimerEvent *e) m_pConnection->heartbeat(tNow); } +#include "kvi_irccontext.moc" diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 3d9e0451..4c53d0eb 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -129,7 +129,7 @@ void KviIrcLink::createSocket(const TQString &szLinkFilterName) if(KviTQString::equalCI(szLinkFilterName,"irc"))return; m_pLinkFilter = (KviMexLinkFilter *)g_pModuleExtensionManager->allocateExtension("linkfilter", - szLinkFilterName.utf8().data(),m_pConsole,0,this,szLinkFilterName.utf8().data()); + szLinkFilterName.utf8().data(),m_pConsole,0,this,szLinkFilterName); if(m_pLinkFilter) { @@ -404,3 +404,4 @@ void KviIrcLink::socketStateChange() } } +#include "kvi_irclink.moc" diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index 3c87453e..4905b098 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -701,7 +701,7 @@ void KviIrcSocket::proxyLoginV4() struct in_addr ircInAddr; - if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr)) + if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip().utf8().data(),&ircInAddr)) tqDebug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION"); TQ_UINT32 host=(TQ_UINT32)ircInAddr.s_addr; @@ -914,7 +914,7 @@ void KviIrcSocket::proxySendTargetDataV5() #ifdef COMPILE_IPV6_SUPPORT struct in6_addr ircInAddr; - if(!kvi_stringIpToBinaryIp_V6(m_pIrcServer->ip(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION"); + if(!kvi_stringIpToBinaryIp_V6(m_pIrcServer->ip().utf8().data(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION"); kvi_memmove((void *)(bufToSend + 4),(void *)(&ircInAddr),4); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); kvi_memmove((void *)(bufToSend + 20),(void *)&port,2); @@ -922,7 +922,7 @@ void KviIrcSocket::proxySendTargetDataV5() } else { struct in_addr ircInAddr; - if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION"); + if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip().utf8().data(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION"); TQ_UINT32 host = (TQ_UINT32)ircInAddr.s_addr; kvi_memmove((void *)(bufToSend + 4),(void *)&host,4); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); @@ -1216,7 +1216,7 @@ void KviIrcSocket::printSSLCipherInfo() if(ci) { //m_pConsole->socketEvent(SSLCipherInfo,(void *)ci); - KviSSLMaster::printSSLCipherInfo(m_pConsole,__tr2qs("Current transmission cipher"),ci); + KviSSLMaster::printSSLCipherInfo(m_pConsole,__tr2qs("Current transmission cipher").utf8().data(),ci); delete ci; } else { if(_OUTPUT_VERBOSE) @@ -1908,3 +1908,5 @@ bool KviIrcSocket::sendPacket(KviDataBuffer * pData) if(!m_bInProcessData)flushSendQueue(); return (m_state != Idle); } + +#include "kvi_ircsocket.moc" diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index aade9ad9..944f71b9 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -77,7 +77,6 @@ int parseArgs(ParseArgs * a) { KviTQString::appendFormatted(szMessage,"KVIrc %s '%s'\n",KVI_VERSION,KVI_RELEASE_NAME); KviTQString::appendFormatted(szMessage,"Sources date: %s\n",KVI_SOURCES_DATE); - KviTQString::appendFormatted(szMessage,"Build date: %s\n",KVI_BUILD_DATE); KviTQString::appendFormatted(szMessage,"Home page: http://www.kvirc.net/\n"); #ifdef COMPILE_ON_WINDOWS diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 69a0fb36..a702c5a2 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -1019,7 +1019,7 @@ namespace KviTheme cfg.writeEntry(g_pixmapOptionsTable[i].name,szPixName); } else { // we ignore this error for now - tqDebug("failed to save %s",szPixPath.utf8().data()); + tqDebug("failed to save %s",szPixPath.local8Bit().data()); cfg.writeEntry(g_pixmapOptionsTable[i].name,""); } } else { diff --git a/src/kvirc/kernel/kvi_sslmaster.cpp b/src/kvirc/kernel/kvi_sslmaster.cpp index d4b22196..3b9194c9 100644 --- a/src/kvirc/kernel/kvi_sslmaster.cpp +++ b/src/kvirc/kernel/kvi_sslmaster.cpp @@ -80,14 +80,14 @@ KVIRC_API void printSSLConnectionInfo(KviWindow * wnd,KviSSL * s) if(sc) { TQString tmp(__tr2qs("Peer X509 certificate")); - KviSSLMaster::printSSLCertificate(wnd,tmp,sc); + KviSSLMaster::printSSLCertificate(wnd,tmp.utf8().data(),sc); delete sc; } else wnd->outputNoFmt(KVI_OUT_SSL,__tr2qs("[SSL]: The peer didn't provide a certificate")); KviSSLCipherInfo * ci = s->getCurrentCipherInfo(); if(ci) { TQString tmp(__tr2qs("Current transmission cipher")); - KviSSLMaster::printSSLCipherInfo(wnd,tmp,ci); + KviSSLMaster::printSSLCipherInfo(wnd,tmp.utf8().data(),ci); delete ci; } else wnd->outputNoFmt(KVI_OUT_SSL,__tr2qs("[SSL]: Can't find out the current cipher info")); } diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/kvi_kvs_action.cpp index 82972d32..c83a89a2 100644 --- a/src/kvirc/kvs/kvi_kvs_action.cpp +++ b/src/kvirc/kvs/kvi_kvs_action.cpp @@ -64,3 +64,5 @@ void KviKvsAction::activate() if(!isEnabled())return; // no way m_pScript->run(g_pActiveWindow); // FIXME: complain more in case of error ? } + +#include "kvi_kvs_action.moc" diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index 06c0c4ed..5c56ee6f 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -120,3 +120,5 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) delete this; } + +#include "kvi_kvs_asyncdnsoperation.moc" diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp index 19e4656d..e3b479f7 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp @@ -64,3 +64,4 @@ void KviKvsAsyncOperationManager::unregisterOperation(KviKvsAsyncOperation * o) m_pOperationList->removeRef(o); } +#include "kvi_kvs_asyncoperation.moc" diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 93880f52..8e38915b 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -437,7 +437,7 @@ namespace KviKvsCoreCallbackCommands return true; } - pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->child(szName,"KviWindowScriptButton"); + pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->child(szName.utf8().data(),"KviWindowScriptButton"); if(KVSCCC_pCallback->code().isEmpty()) { @@ -451,7 +451,7 @@ namespace KviKvsCoreCallbackCommands if(!pButton) { - pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName); + pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName.utf8()); pButton->show(); } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 6968c1e2..76e935b4 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -425,7 +425,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("optionName",KVS_PT_NONEMPTYSTRING,0,szOpt) KVSCF_PARAMETERS_END TQString tmp; - if(g_pApp->getOptionString(szOpt,tmp))KVSCF_pRetBuffer->setString(tmp); + if(g_pApp->getOptionString(szOpt.utf8().data(),tmp))KVSCF_pRetBuffer->setString(tmp); else { KVSCF_pContext->warning(__tr2qs("There is no option named '%Q'"),&szOpt); KVSCF_pRetBuffer->setNothing(); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index 8feb7ee6..aecd6bbf 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -114,7 +114,7 @@ namespace KviKvsCoreFunctions KviWindow * wnd; if(KVSCF_pParams->count() > 0) { - wnd = g_pApp->findWindow(winId.utf8().data()); + wnd = g_pApp->findWindow(winId); if(!wnd) { KVSCF_pContext->warning(__tr2qs("Window with ID '%s' not found, returning empty string"),winId.utf8().data()); @@ -458,7 +458,7 @@ namespace KviKvsCoreFunctions KviWindow * wnd; if(KVSCF_pParams->count() > 0) { - wnd = g_pApp->findWindow(winId.utf8().data()); + wnd = g_pApp->findWindow(winId); if(!wnd) { KVSCF_pContext->warning(__tr2qs("Window with ID '%s' not found, returning empty string"),winId.utf8().data()); @@ -705,7 +705,7 @@ namespace KviKvsCoreFunctions KviMessageCatalogue * pCat = KviLocale::getLoadedCatalogue(szCatalogue); if(pCat) { - translation = pCat->translateToTQString(szString); + translation = pCat->translateToTQString(szString.utf8().data()); } else { // attempt to load it automatically TQString szDir; @@ -722,10 +722,10 @@ namespace KviKvsCoreFunctions // not fail unless /trunload is explicitly used // This will avoid trashing the user's disk too much // when a catalogue for a given language is not available - translation = __tr2qs_ctx_no_xgettext(szString,szCatalogue); + translation = __tr2qs_ctx_no_xgettext(szString.utf8().data(),szCatalogue.utf8().data()); } } else { - translation = __tr2qs_no_xgettext(szString); + translation = __tr2qs_no_xgettext(szString.utf8().data()); } // epilogue: set the return value @@ -1037,7 +1037,6 @@ namespace KviKvsCoreFunctions else { if(szType.find('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); else if(szType.find('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); - else if(szType.find('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); else KVSCF_pRetBuffer->setString(KVI_VERSION); } return true; diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 66d3d969..41185641 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -54,7 +54,7 @@ #include "kvi_tal_tooltip.h" // kvi_app.cpp -extern KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; namespace KviKvsCoreSimpleCommands { @@ -119,7 +119,7 @@ namespace KviKvsCoreSimpleCommands if(KVSCSC_pSwitches->find('a',"all-networks")) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -173,7 +173,7 @@ namespace KviKvsCoreSimpleCommands if(KVSCSC_pSwitches->find('a',"all-networks")) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -409,7 +409,7 @@ namespace KviKvsCoreSimpleCommands return true; } - pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName,"KviWindowScriptButton"); + pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName.utf8().data(),"KviWindowScriptButton"); if(!pButton) { @@ -849,7 +849,7 @@ namespace KviKvsCoreSimpleCommands TQString szWnd; v->asString(szWnd); //#warning "FIXME: the window database is not unicode! (we even could keep integer window id's at this point!)" - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { KVSCSC_pContext->warning(__tr2qs("The argument of the -w switch did not evaluate to a valid window id: using default")); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index d7664acf..dcf627ad 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -392,7 +392,7 @@ try_again: if(!(*it).isEmpty()) { bool bFound = false; - int id = 0; + unsigned int id = 0; TQChar f = (*it)[0]; while((id < szChanTypes.length()) && !bFound) { diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 2b973b53..10c02f22 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -509,7 +509,7 @@ namespace KviKvsCoreSimpleCommands // list available options g_pApp->listAvailableOptions(KVSCSC_pWindow); } else { - if(!g_pApp->setOptionValue(szName,szValue))KVSCSC_pContext->warning(__tr2qs("Option setting error: Unknown option or invalid value for option type")); + if(!g_pApp->setOptionValue(szName.utf8().data(),szValue))KVSCSC_pContext->warning(__tr2qs("Option setting error: Unknown option or invalid value for option type")); } return true; @@ -1230,7 +1230,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETER("window_id",KVS_PT_NONEMPTYSTRING,0,szWinId) KVSCSC_PARAMETERS_END - KviWindow * pAux = g_pApp->findWindow(szWinId.utf8().data()); + KviWindow * pAux = g_pApp->findWindow(szWinId); if(pAux)KVSCSC_pContext->setWindow(pAux); else { if(!KVSCSC_pSwitches->find('q',"quiet")) diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index 2f5c28b3..32575ce6 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -178,3 +178,5 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) m_pDnsObjects->remove(pDns); } + +#include "kvi_kvs_dnsmanager.moc" diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h index c7663cf3..2c811662 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.h +++ b/src/kvirc/kvs/kvi_kvs_hash.h @@ -32,7 +32,7 @@ #include "kvi_kvs_variant.h" #include "kvi_heapobject.h" -typedef KVIRC_API KviPointerHashTableIterator<TQString,KviKvsVariant> KviKvsHashIterator; +typedef KviPointerHashTableIterator<TQString,KviKvsVariant> KviKvsHashIterator; // This class must not have virtual funcitons nor destructor // Otherwise it will happily crash on windows when it is diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp index 4ec97bc0..d2252772 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.cpp +++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp @@ -140,7 +140,7 @@ void KviKvsKernel::completeCommand(const TQString &szCommandBegin,KviPointerList void KviKvsKernel::completeModuleCommand(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); + KviModule * pModule = g_pModuleManager->getModule(szModuleName); if(!pModule)return; KviPointerList<TQString> lModuleMatches; @@ -204,7 +204,7 @@ void KviKvsKernel::completeFunction(const TQString &szFunctionBegin,KviPointerLi void KviKvsKernel::completeModuleFunction(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); + KviModule * pModule = g_pModuleManager->getModule(szModuleName); if(!pModule)return; KviPointerList<TQString> lModuleMatches; diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 9b98621c..6f957657 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -1120,7 +1120,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName.utf8().data(),true); if(idx < 0) { c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); @@ -1133,7 +1133,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - TQVariant vv = m_pObject->property(szName); + TQVariant vv = m_pObject->property(szName.utf8().data()); if(!vv.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1144,9 +1144,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { TQString szKey; v->asString(szKey); - int val = p->keyToValue(szKey); + int val = p->keyToValue(szKey.utf8().data()); TQVariant var(val); - m_pObject->setProperty(szName,var); + m_pObject->setProperty(szName.utf8().data(),var); return true; } @@ -1162,7 +1162,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("integer") - m_pObject->setProperty(szName,TQVariant((int)i)); + m_pObject->setProperty(szName.utf8().data(),TQVariant((int)i)); } break; case TQVariant::UInt: @@ -1170,24 +1170,24 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("unsigned integer") if(i < 0)WRONG_TYPE("unsigned integer") - m_pObject->setProperty(szName,TQVariant((unsigned int)i)); + m_pObject->setProperty(szName.utf8().data(),TQVariant((unsigned int)i)); } break; case TQVariant::Bool: - m_pObject->setProperty(szName,TQVariant(v->asBoolean())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(v->asBoolean())); break; case TQVariant::String: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s)); + m_pObject->setProperty(szName.utf8().data(),TQVariant(s)); } break; case TQVariant::CString: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s.utf8())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(s.utf8().data())); } break; case TQVariant::Point: @@ -1199,7 +1199,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y)WRONG_TYPE("array(integer,integer)") kvs_int_t iX,iY; if(!x->asInteger(iX) || !y->asInteger(iY))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQPoint(iX,iY))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQPoint(iX,iY))); } break; case TQVariant::Size: @@ -1211,7 +1211,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!w || !h)WRONG_TYPE("array(integer,integer)") kvs_int_t iW,iH; if(!w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQSize(iW,iH))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQSize(iW,iH))); } break; case TQVariant::Rect: @@ -1225,7 +1225,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y || !w || !h)WRONG_TYPE("array(integer,integer,integer,integer)") kvs_int_t iX,iY,iW,iH; if(!x->asInteger(iX) || !y->asInteger(iY) || !w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer,integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQRect(iX,iY,iW,iH))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQRect(iX,iY,iW,iH))); } break; case TQVariant::Color: @@ -1238,7 +1238,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!r || !g || !b)WRONG_TYPE("array(integer,integer,integer)") kvs_int_t iR,iG,iB; if(!r->asInteger(iR) || !g->asInteger(iG) || !b->asInteger(iB))WRONG_TYPE("array(integer,integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQColor(iR,iG,iB))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQColor(iR,iG,iB))); } break; case TQVariant::Font: @@ -1263,7 +1263,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(szFl.find('o') != -1)fnt.setOverline(true); if(szFl.find('f') != -1)fnt.setFixedPitch(true); if(szFl.find('s') != -1)fnt.setStrikeOut(true); - m_pObject->setProperty(szName,TQVariant(fnt)); + m_pObject->setProperty(szName.utf8().data(),TQVariant(fnt)); } break; case TQVariant::Pixmap: @@ -1275,9 +1275,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { // null pixmap if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(TQPixmap())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQPixmap())); else - m_pObject->setProperty(szName,TQVariant(TQIconSet())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQIconSet())); } else { KviKvsObject * pix = KviKvsKernel::instance()->objectController()->lookupObject(v->hobject()); if(!pix->inherits("KviScriptPixmapObject")) @@ -1285,9 +1285,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) else { TQVariant pixv = pix->property("pixmap"); if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,pixv); + m_pObject->setProperty(szName.utf8().data(),pixv); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(pixv.toPixmap()))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQIconSet(pixv.toPixmap()))); } } } else { @@ -1297,9 +1297,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(pPix) { if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(*pPix)); + m_pObject->setProperty(szName.utf8().data(),TQVariant(*pPix)); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(*pPix))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQIconSet(*pPix))); } else c->warning(__tr2qs("Can't find the requested image")); @@ -1335,7 +1335,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName.utf8().data(),true); if(idx < 0) { if (bNoerror) c->returnValue()->setString("No TQt properties"); @@ -1354,7 +1354,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - TQVariant v = m_pObject->property(szName); + TQVariant v = m_pObject->property(szName.utf8().data()); if(!v.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1675,4 +1675,4 @@ KviKvsObject * KviKvsObject::findChild(const TQString &szClass,const TQString &s return 0; } - +#include "kvi_kvs_object.moc" diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index 541986d1..0e900262 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -921,52 +921,52 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) { for(idx = 0;idx < cnt;idx++) { - KviTQString::sprintf(tmp,"%TQ_Prologue%d",&(prefix),idx); + KviTQString::sprintf(tmp,"%Q_Prologue%d",&(prefix),idx); TQString pr = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx); + KviTQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx); TQString itemName = cfg->readTQStringEntry(tmp,""); if(!pr.isEmpty())addPrologue(itemName,pr); } } else { // Might be old version! - KviTQString::sprintf(tmp,"%TQ_Prologue",&(prefix)); + KviTQString::sprintf(tmp,"%Q_Prologue",&(prefix)); TQString pr = cfg->readTQStringEntry(tmp,""); if(!pr.isEmpty())addPrologue(TQString(),pr); } - KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix); + KviTQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); cnt = cfg->readIntEntry(tmp,0); if(cnt > 0) { for(idx = 0;idx < cnt;idx++) { - KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx); TQString ep = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx); + KviTQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx); TQString itemName = cfg->readTQStringEntry(tmp,""); if(!ep.isEmpty())addEpilogue(itemName,ep); } } else { // Might be old version! - KviTQString::sprintf(tmp,"%TQ_Epilogue",&prefix); + KviTQString::sprintf(tmp,"%Q_Epilogue",&prefix); TQString ep = cfg->readTQStringEntry(tmp,""); if(!ep.isEmpty())addEpilogue(TQString(),ep); } - KviTQString::sprintf(tmp,"%TQ_Count",&prefix); + KviTQString::sprintf(tmp,"%Q_Count",&prefix); cnt = cfg->readIntEntry(tmp,0); for(idx = 0;idx < cnt;idx++) { TQString pre; - KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx); + KviTQString::sprintf(pre,"%Q_%d",&prefix,idx); - KviTQString::sprintf(tmp,"%TQ_Id",&pre); + KviTQString::sprintf(tmp,"%Q_Id",&pre); TQString itemName = cfg->readTQStringEntry(tmp,TQString()); - KviTQString::sprintf(tmp,"%TQ_Type",&pre); + KviTQString::sprintf(tmp,"%Q_Type",&pre); int type = cfg->readIntEntry(tmp,3); switch(type) @@ -974,7 +974,7 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) case 0: // separator { TQString expr; - KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + KviTQString::sprintf(tmp,"%Q_Expr",&pre); expr = cfg->readTQStringEntry(tmp,""); addSeparator(itemName,expr); } @@ -982,13 +982,13 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) case 1: // item { TQString text,icon,code,expr; - KviTQString::sprintf(tmp,"%TQ_Text",&pre); + KviTQString::sprintf(tmp,"%Q_Text",&pre); text = cfg->readTQStringEntry(tmp,"Unnamed"); - KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + KviTQString::sprintf(tmp,"%Q_Icon",&pre); icon = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_Code",&pre); + KviTQString::sprintf(tmp,"%Q_Code",&pre); code = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + KviTQString::sprintf(tmp,"%Q_Expr",&pre); expr = cfg->readTQStringEntry(tmp,""); addItem(itemName,code,text,icon,expr); } @@ -996,11 +996,11 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) case 2: // menu { TQString text,icon,expr; - KviTQString::sprintf(tmp,"%TQ_Text",&pre); + KviTQString::sprintf(tmp,"%Q_Text",&pre); text = cfg->readTQStringEntry(tmp,"Unnamed"); - KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + KviTQString::sprintf(tmp,"%Q_Icon",&pre); icon = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + KviTQString::sprintf(tmp,"%Q_Expr",&pre); expr = cfg->readTQStringEntry(tmp,""); KviKvsPopupMenu * pop = addPopup(itemName,text,icon,expr); pop->load(pre,cfg); @@ -1009,11 +1009,11 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) case 3: // label { TQString text,icon,expr; - KviTQString::sprintf(tmp,"%TQ_Text",&pre); + KviTQString::sprintf(tmp,"%Q_Text",&pre); text = cfg->readTQStringEntry(tmp,"Unnamed"); - KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + KviTQString::sprintf(tmp,"%Q_Icon",&pre); icon = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + KviTQString::sprintf(tmp,"%Q_Expr",&pre); expr = cfg->readTQStringEntry(tmp,""); addLabel(itemName,text,icon,expr); } @@ -1021,13 +1021,13 @@ void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) case 4: // extmenu { TQString text,icon,code,expr; - KviTQString::sprintf(tmp,"%TQ_Text",&pre); + KviTQString::sprintf(tmp,"%Q_Text",&pre); text = cfg->readTQStringEntry(tmp,"Unnamed"); - KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + KviTQString::sprintf(tmp,"%Q_Icon",&pre); icon = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_ExtName",&pre); + KviTQString::sprintf(tmp,"%Q_ExtName",&pre); code = cfg->readTQStringEntry(tmp,""); - KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + KviTQString::sprintf(tmp,"%Q_Expr",&pre); expr = cfg->readTQStringEntry(tmp,""); addExtPopup(itemName,code,text,icon,expr); } @@ -1048,33 +1048,33 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg) KviKvsScript * s; TQString tmp; - KviTQString::sprintf(tmp,"%TQ_PrologueCount",&prefix); + KviTQString::sprintf(tmp,"%Q_PrologueCount",&prefix); cfg->writeEntry(tmp,m_pPrologues->count()); idx = 0; for(s = m_pPrologues->first();s;s = m_pPrologues->next()) { - KviTQString::sprintf(tmp,"%TQ_Prologue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%Q_Prologue%d",&prefix,idx); cfg->writeEntry(tmp,s->code()); - KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&prefix,idx); + KviTQString::sprintf(tmp,"%Q_PrologueId%d",&prefix,idx); cfg->writeEntry(tmp,s->name()); idx++; } - KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix); + KviTQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); cfg->writeEntry(tmp,m_pEpilogues->count()); idx = 0; for(s = m_pEpilogues->first();s;s = m_pEpilogues->next()) { - KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx); cfg->writeEntry(tmp,s->code()); - KviTQString::sprintf(tmp,"%TQ_EpilogueId%d",&prefix,idx); + KviTQString::sprintf(tmp,"%Q_EpilogueId%d",&prefix,idx); cfg->writeEntry(tmp,s->name()); idx++; } - KviTQString::sprintf(tmp,"%TQ_Count",&prefix); + KviTQString::sprintf(tmp,"%Q_Count",&prefix); cfg->writeEntry(tmp,m_pItemList->count()); idx = 0; @@ -1082,8 +1082,8 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg) for(KviKvsPopupMenuItem * it = m_pItemList->first();it;it = m_pItemList->next()) { TQString pre; - KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx); - KviTQString::sprintf(tmp,"%TQ_Type",&pre); + KviTQString::sprintf(pre,"%Q_%d",&prefix,idx); + KviTQString::sprintf(tmp,"%Q_Type",&pre); int typeCode = 0; switch(it->type()) { @@ -1096,34 +1096,34 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg) cfg->writeEntry(tmp,typeCode); - KviTQString::sprintf(tmp,"%TQ_Id",&pre); + KviTQString::sprintf(tmp,"%Q_Id",&pre); cfg->writeEntry(tmp,it->name()); s = it->kvsCondition(); if(s) { - KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + KviTQString::sprintf(tmp,"%Q_Expr",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsIcon(); if(s) { - KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + KviTQString::sprintf(tmp,"%Q_Icon",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsText(); if(s) { - KviTQString::sprintf(tmp,"%TQ_Text",&pre); + KviTQString::sprintf(tmp,"%Q_Text",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsCode(); if(s) { - KviTQString::sprintf(tmp,"%TQ_Code",&pre); + KviTQString::sprintf(tmp,"%Q_Code",&pre); cfg->writeEntry(tmp,s->code()); } @@ -1132,7 +1132,7 @@ void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg) ((KviKvsPopupMenuItemMenu *)it)->menu()->save(pre,cfg); } else if(it->isExtMenu()) { - KviTQString::sprintf(tmp,"%TQ_ExtName",&pre); + KviTQString::sprintf(tmp,"%Q_ExtName",&pre); cfg->writeEntry(tmp,((KviKvsPopupMenuItemExtMenu *)it)->extName()); } @@ -1224,8 +1224,4 @@ void KviKvsPopupMenu::generateDefPopup(TQString &buffer) buffer.append(core); } - - - - - +#include "kvi_kvs_popupmenu.moc" diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index 46571103..80b43f09 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -370,3 +370,5 @@ bool KviKvsProcessManager::execute(KviKvsProcessAsyncOperationData * d) return true; } */ + +#include "kvi_kvs_processmanager.moc" diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp index 064b7aee..27fb323a 100644 --- a/src/kvirc/kvs/kvi_kvs_script.cpp +++ b/src/kvirc/kvs/kvi_kvs_script.cpp @@ -123,10 +123,10 @@ bool KviKvsScript::locked() const return m_pData->m_uLock > 0; } -void KviKvsScript::dump(const char * prefix) +void KviKvsScript::dump(const TQString &prefix) { if(m_pData->m_pTree)m_pData->m_pTree->dump(prefix); - else tqDebug("%s KviKvsScript : no tree to dump",prefix); + else tqDebug("%s KviKvsScript : no tree to dump",prefix.local8Bit().data()); } void KviKvsScript::detach() diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h index 60e96a08..c1a6f77c 100644 --- a/src/kvirc/kvs/kvi_kvs_script.h +++ b/src/kvirc/kvs/kvi_kvs_script.h @@ -129,7 +129,7 @@ public: static int evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); static int evaluateAsString(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,TQString &szRetVal); public: - void dump(const char * prefix); + void dump(const TQString &prefix); protected: // returns true after a succesfull parsing // pOutput is useful only for printing errors diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp index 9d9a2a4d..ba0b3f71 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp @@ -254,3 +254,5 @@ void KviKvsTimerManager::timerEvent(TQTimerEvent *e) deleteTimer(t->id()); } } + +#include "kvi_kvs_timermanager.moc" diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp index cc309d81..d1cebb18 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp @@ -47,13 +47,13 @@ void KviKvsTreeNodeAliasFunctionCall::contextDescription(TQString &szBuffer) -void KviKvsTreeNodeAliasFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeAliasFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s AliasFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s AliasFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h index af0770fc..6e352b13 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h @@ -37,7 +37,7 @@ public: KviKvsTreeNodeAliasFunctionCall(const TQChar * pLocation,const TQString &szAliasName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeAliasFunctionCall(); public: - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp index 1396250f..5bea0e41 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp @@ -52,9 +52,9 @@ void KviKvsTreeNodeAliasSimpleCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Alias Simple Command \"%Q\"",&m_szCmdName); } -void KviKvsTreeNodeAliasSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeAliasSimpleCommand::dump(const TQString &prefix) { - tqDebug("%s AliasSimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s AliasSimpleCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h index 34a1a246..65183724 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeAliasSimpleCommand(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp index 50d11e97..97fceb3b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp @@ -45,10 +45,10 @@ void KviKvsTreeNodeArrayCount::contextDescription(TQString &szBuffer) szBuffer = "Array Count Operator"; } -void KviKvsTreeNodeArrayCount::dump(const char * prefix) +void KviKvsTreeNodeArrayCount::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ArrayCount",prefix); + tqDebug("%s ArrayCount",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h index 87ce7217..4fb43f90 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h @@ -39,7 +39,7 @@ public: ~KviKvsTreeNodeArrayCount(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp index 7f85813b..6d6f1c40 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp @@ -52,14 +52,14 @@ void KviKvsTreeNodeArrayElement::contextDescription(TQString &szBuffer) szBuffer = "Array Element Evaluation"; } -void KviKvsTreeNodeArrayElement::dump(const char * prefix) +void KviKvsTreeNodeArrayElement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ArrayElement",prefix); + tqDebug("%s ArrayElement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pSource->dump(tmp.utf8().data()); - m_pIndex->dump(tmp.utf8().data()); + m_pSource->dump(tmp); + m_pIndex->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h index 1d472032..7a40d1b0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h @@ -42,7 +42,7 @@ protected: KviKvsTreeNodeExpression * m_pIndex; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp index 6d4fea2e..2c66c8da 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp @@ -51,10 +51,10 @@ void KviKvsTreeNodeArrayReferenceAssert::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeArrayReferenceAssert::dump(const char * prefix) +void KviKvsTreeNodeArrayReferenceAssert::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ArrayReferenceAssert",prefix); + tqDebug("%s ArrayReferenceAssert",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h index 663068a8..436958c7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h @@ -43,7 +43,7 @@ protected: public: virtual bool isReadOnly(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h index 62f5314c..519973dc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h @@ -44,7 +44,7 @@ protected: public: KviKvsTreeNode * parent(){ return m_pParent; }; const TQChar * location(){ return m_pLocation; }; - virtual void dump(const char * prefix) = 0; + virtual void dump(const TQString &prefix) = 0; virtual void contextDescription(TQString &szBuffer) = 0; }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp index a32c9092..80cd34fb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp @@ -46,13 +46,13 @@ void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(TQString &szBuffer KviTQString::sprintf(szBuffer,"Base Object Function Call \"%s::%s\"",&m_szBaseClass,&m_szFunctionName); } -void KviKvsTreeNodeBaseObjectFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeBaseObjectFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s BaseObjectFunctionCall(%s::%s)",prefix,m_szBaseClass.utf8().data(),m_szFunctionName.utf8().data()); + tqDebug("%s BaseObjectFunctionCall(%s::%s)",prefix.local8Bit().data(),m_szBaseClass.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h index 1b8df699..5ff6b621 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h @@ -42,7 +42,7 @@ protected: TQString m_szBaseClass; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp index 53e85eba..ef0c461a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp @@ -52,22 +52,22 @@ void KviKvsTreeNodeCallbackCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Callback Command \"%s\"",&m_szCmdName); } -void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) +void KviKvsTreeNodeCallbackCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s CallbackCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CallbackCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); dumpCallback(prefix); #endif } -void KviKvsTreeNodeCallbackCommand::dumpCallback(const char * prefix) +void KviKvsTreeNodeCallbackCommand::dumpCallback(const TQString &prefix) { #ifdef COMPILE_NEW_KVS TQString tmp = prefix; tmp.append(" "); - m_pCallback->dump(tmp.utf8().data()); + m_pCallback->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h index 73b125b2..a2ac753f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h @@ -40,8 +40,8 @@ protected: KviKvsScript * m_pCallback; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); - void dumpCallback(const char * prefix); + virtual void dump(const TQString &prefix); + void dumpCallback(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp index bb1457dc..073c1579 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp @@ -52,21 +52,21 @@ void KviKvsTreeNodeCommand::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeCommand::dump(const char * prefix) +void KviKvsTreeNodeCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s Command(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s Command(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); #endif } -void KviKvsTreeNodeCommand::dumpSwitchList(const char * prefix) +void KviKvsTreeNodeCommand::dumpSwitchList(const TQString &prefix) { #ifdef COMPILE_NEW_KVS if(!m_pSwitches)return; TQString tmp = prefix; tmp.append(" "); - m_pSwitches->dump(tmp.utf8().data()); + m_pSwitches->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.h b/src/kvirc/kvs/kvi_kvs_treenode_command.h index aff3f552..a8893120 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.h @@ -43,8 +43,8 @@ protected: KviKvsTreeNodeSwitchList * m_pSwitches; // MAY BE 0! public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); - void dumpSwitchList(const char * prefix); + virtual void dump(const TQString &prefix); + void dumpSwitchList(const TQString &prefix); const TQString & commandName(){ return m_szCmdName; }; protected: void setSwitchList(KviKvsTreeNodeSwitchList * sw); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp index 2c83b9b2..e0e30fe4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp @@ -47,20 +47,20 @@ void KviKvsTreeNodeCommandWithParameters::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeCommandWithParameters::dump(const char * prefix) +void KviKvsTreeNodeCommandWithParameters::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s CommandWithParameters(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CommandWithParameters(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); #endif } -void KviKvsTreeNodeCommandWithParameters::dumpParameterList(const char * prefix) +void KviKvsTreeNodeCommandWithParameters::dumpParameterList(const TQString &prefix) { #ifdef COMPILE_NEW_KVS TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h index f8991fee..5247a20c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h @@ -42,8 +42,8 @@ protected: public: KviKvsTreeNodeDataList * params(){ return m_pParams; }; virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); - void dumpParameterList(const char * prefix); + virtual void dump(const TQString &prefix); + void dumpParameterList(const TQString &prefix); }; #endif //!_KVI_KVS_TREENODE_COMMANDWITHPARAMETERS_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp index 756af49c..f654f517 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp @@ -73,14 +73,14 @@ void KviKvsTreeNodeCompositeData::contextDescription(TQString &szBuffer) szBuffer = "Composite Data Evaluation (Implicit String Cast)"; } -void KviKvsTreeNodeCompositeData::dump(const char * prefix) +void KviKvsTreeNodeCompositeData::dump(const TQString &prefix) { - tqDebug("%s CompositeData",prefix); + tqDebug("%s CompositeData",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * p = m_pSubData->first();p;p = m_pSubData->next()) { - p->dump(tmp.utf8().data()); + p->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h index 065a4a7e..7875e027 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h @@ -41,7 +41,7 @@ public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp index 08d8f1db..35ba39f0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp @@ -65,12 +65,12 @@ bool KviKvsTreeNodeConstantData::convertStringConstantToNumeric() return true; } -void KviKvsTreeNodeConstantData::dump(const char * prefix) +void KviKvsTreeNodeConstantData::dump(const TQString &prefix) { - tqDebug("%s ConstantData",prefix); + tqDebug("%s ConstantData",prefix.local8Bit().data()); TQString tmp = prefix; tmp.prepend(" "); - m_pValue->dump(tmp.utf8().data()); + m_pValue->dump(tmp); } bool KviKvsTreeNodeConstantData::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h index 489caac5..c6602a76 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h @@ -41,7 +41,7 @@ public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant *pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool convertStringConstantToNumeric(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp index b4a21b49..98400a77 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp @@ -46,9 +46,9 @@ void KviKvsTreeNodeCoreCallbackCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Core Callback Command \"%Q\"",&m_szCmdName); } -void KviKvsTreeNodeCoreCallbackCommand::dump(const char * prefix) +void KviKvsTreeNodeCoreCallbackCommand::dump(const TQString &prefix) { - tqDebug("%s CoreCallbackCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CoreCallbackCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); dumpCallback(prefix); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h index 499db2b3..f92658bb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h @@ -43,7 +43,7 @@ protected: KviKvsCoreCallbackCommandExecRoutine * m_pExecRoutine; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp index 23bf13d3..40738da4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp @@ -43,12 +43,12 @@ void KviKvsTreeNodeCoreFunctionCall::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeCoreFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeCoreFunctionCall::dump(const TQString &prefix) { - tqDebug("%s CoreFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s CoreFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); } bool KviKvsTreeNodeCoreFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h index 9cbf18db..58cfa679 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h @@ -41,7 +41,7 @@ protected: KviKvsCoreFunctionExecRoutine * m_pExecRoutine; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp index 064c29d0..bd5549bd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp @@ -45,9 +45,9 @@ void KviKvsTreeNodeCoreSimpleCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Core Simple Command \"%Q\"",&m_szCmdName); } -void KviKvsTreeNodeCoreSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeCoreSimpleCommand::dump(const TQString &prefix) { - tqDebug("%s CoreSimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CoreSimpleCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h index 290b0cf6..b23cdd7b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h @@ -41,7 +41,7 @@ private: KviKvsCoreSimpleCommandExecRoutine * m_pExecRoutine; // shallow pointer! public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp index f1b34863..00bfb3bb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp @@ -43,9 +43,9 @@ void KviKvsTreeNodeData::contextDescription(TQString &szBuffer) szBuffer = "Data Evaluation"; } -void KviKvsTreeNodeData::dump(const char * prefix) +void KviKvsTreeNodeData::dump(const TQString &prefix) { - tqDebug("%s Data",prefix); + tqDebug("%s Data",prefix.local8Bit().data()); } bool KviKvsTreeNodeData::isReadOnly() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/kvi_kvs_treenode_data.h index 18d8d7b4..c9978f07 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.h @@ -49,7 +49,7 @@ public: virtual KviKvsRWEvaluationResult * evaluateReadWriteInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c); // error by default virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool isReadOnly(); // true by default virtual bool canEvaluateToObjectReference(); // no by default diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp index f086029a..07287353 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp @@ -65,14 +65,14 @@ void KviKvsTreeNodeDataList::contextDescription(TQString &szBuffer) szBuffer = "Data List Evaluation"; } -void KviKvsTreeNodeDataList::dump(const char * prefix) +void KviKvsTreeNodeDataList::dump(const TQString &prefix) { - tqDebug("%s DataList",prefix); + tqDebug("%s DataList",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * t = m_pDataList->first();t;t = m_pDataList->next()) { - t->dump(tmp.utf8().data()); + t->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h index 50c2f640..50c35b54 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h @@ -51,7 +51,7 @@ public: bool evaluate(KviKvsRunTimeContext * c,KviKvsVariantList * pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; #endif //!_KVI_KVS_TREENODE_DATALIST_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp index db91bf31..9e8f4529 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp @@ -45,9 +45,9 @@ void KviKvsTreeNodeExpression::contextDescription(TQString &szBuffer) szBuffer = "Expression Evaluation"; } -void KviKvsTreeNodeExpression::dump(const char * prefix) +void KviKvsTreeNodeExpression::dump(const TQString &prefix) { - tqDebug("%s Expression",prefix); + tqDebug("%s Expression",prefix.local8Bit().data()); } int KviKvsTreeNodeExpression::precedence() @@ -110,12 +110,12 @@ void KviKvsTreeNodeExpressionVariableOperand::contextDescription(TQString &szBuf szBuffer = "Expression Variable Operand Evaluation"; } -void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix) +void KviKvsTreeNodeExpressionVariableOperand::dump(const TQString &prefix) { - tqDebug("%s ExpressionVariableOperand",prefix); + tqDebug("%s ExpressionVariableOperand",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); } bool KviKvsTreeNodeExpressionVariableOperand::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) @@ -149,13 +149,13 @@ void KviKvsTreeNodeExpressionConstantOperand::contextDescription(TQString &szBuf } -void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix) +void KviKvsTreeNodeExpressionConstantOperand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionConstantOperand",prefix); + tqDebug("%s ExpressionConstantOperand",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pConstant->dump(tmp.utf8().data()); + m_pConstant->dump(tmp); #endif } @@ -187,10 +187,10 @@ void KviKvsTreeNodeExpressionOperator::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeExpressionOperator::dump(const char * prefix) +void KviKvsTreeNodeExpressionOperator::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionOperator",prefix); + tqDebug("%s ExpressionOperator",prefix.local8Bit().data()); #endif } @@ -226,13 +226,13 @@ void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(TQString &szBuffe -void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperator::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperator",prefix); + tqDebug("%s ExpressionUnaryOperator",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -272,13 +272,13 @@ void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(TQString &s } -void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperatorNegate",prefix); + tqDebug("%s ExpressionUnaryOperatorNegate",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -317,13 +317,13 @@ void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(TQStrin #endif } -void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperatorBitwiseNot",prefix); + tqDebug("%s ExpressionUnaryOperatorBitwiseNot",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -362,13 +362,13 @@ void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(TQStrin #endif } -void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperatorLogicalNot",prefix); + tqDebug("%s ExpressionUnaryOperatorLogicalNot",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -454,12 +454,12 @@ void KviKvsTreeNodeExpressionBinaryOperator::setRight(KviKvsTreeNodeExpression * } -void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const char * prefix) +void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const TQString &prefix) { TQString tmp = prefix; tmp.append(" "); - if(m_pLeft)m_pLeft->dump(tmp.utf8().data()); - if(m_pRight)m_pRight->dump(tmp.utf8().data()); + if(m_pLeft)m_pLeft->dump(tmp); + if(m_pRight)m_pRight->dump(tmp); } void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuffer) @@ -467,9 +467,9 @@ void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuff szBuffer = "Expression Binary Operator"; } -void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) +void KviKvsTreeNodeExpressionBinaryOperator::dump(const TQString &prefix) { - tqDebug("%s ExpressionBinaryOperator",prefix); + tqDebug("%s ExpressionBinaryOperator",prefix.local8Bit().data()); dumpOperands(prefix); } @@ -480,7 +480,7 @@ void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) __name::__name(const TQChar * pLocation) \ : KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \ __name::~__name(){} \ - void __name::dump(const char * prefix){ tqDebug("%s " __stringname,prefix); dumpOperands(prefix); } \ + void __name::dump(const TQString &prefix){ tqDebug("%s " __stringname,prefix.local8Bit().data()); dumpOperands(prefix); } \ void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \ int __name::precedence(){ return __precedence; }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h index d4fb3553..37c80e0e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h @@ -77,7 +77,7 @@ protected: KviKvsTreeNodeExpression * m_pParentExpression; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual int precedence(); virtual KviKvsTreeNodeExpression * left(); virtual KviKvsTreeNodeExpression * right(); @@ -99,7 +99,7 @@ protected: KviKvsTreeNodeData * m_pData; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -113,7 +113,7 @@ public: KviKvsVariant * m_pConstant; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -136,7 +136,7 @@ public: ~KviKvsTreeNodeExpressionOperator(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; class KVIRC_API KviKvsTreeNodeExpressionUnaryOperator : public KviKvsTreeNodeExpressionOperator @@ -149,7 +149,7 @@ protected: KviKvsNumber m_nData; // result of the number evaluation public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); bool evaluateOperand(KviKvsRunTimeContext * c); }; @@ -161,7 +161,7 @@ public: public: virtual int precedence(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -173,7 +173,7 @@ public: public: virtual int precedence(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -185,7 +185,7 @@ public: public: virtual int precedence(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -206,9 +206,9 @@ public: void setRight(KviKvsTreeNodeExpression * pRight); virtual int firstBinaryOperator(); public: - void dumpOperands(const char * prefix); + void dumpOperands(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); protected: bool evaluateOperands(KviKvsRunTimeContext * c); }; @@ -221,7 +221,7 @@ protected: ~__name(); \ public: \ virtual void contextDescription(TQString &szBuffer); \ - virtual void dump(const char * prefix); \ + virtual void dump(const TQString &prefix); \ virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); \ virtual int precedence(); \ } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp index d963decc..bd75f4b4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp @@ -52,13 +52,13 @@ void KviKvsTreeNodeExpressionReturn::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeExpressionReturn::dump(const char * prefix) +void KviKvsTreeNodeExpressionReturn::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionReturn",prefix); + tqDebug("%s ExpressionReturn",prefix.local8Bit().data()); TQString tmp = prefix; tmp += " "; - m_pExpression->dump(tmp.utf8().data()); + m_pExpression->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h index 7654c537..6d6a3732 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h @@ -38,7 +38,7 @@ protected: KviKvsTreeNodeExpression * m_pExpression; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp index 38949fef..485fe524 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp @@ -44,9 +44,9 @@ void KviKvsTreeNodeExtendedScopeVariable::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeExtendedScopeVariable::dump(const char * prefix) +void KviKvsTreeNodeExtendedScopeVariable::dump(const TQString &prefix) { - tqDebug("%s ExtendedScopeVariable(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s ExtendedScopeVariable(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); } bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h index 84fadc8b..aa1e605a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeExtendedScopeVariable(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp index cfe9d324..1f620b77 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp @@ -45,9 +45,9 @@ void KviKvsTreeNodeFunctionCall::contextDescription(TQString &szBuffer) szBuffer = "Function Call"; } -void KviKvsTreeNodeFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeFunctionCall::dump(const TQString &prefix) { - tqDebug("%s FunctionCall",prefix); + tqDebug("%s FunctionCall",prefix.local8Bit().data()); } bool KviKvsTreeNodeFunctionCall::canEvaluateToObjectReference() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h index c4378109..0f3f31da 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h @@ -38,7 +38,7 @@ protected: KviKvsTreeNodeDataList * m_pParams; // never 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateToObjectReference(); // yes virtual bool isFunctionCall(); // yes }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp index 20d8594d..0636d8bb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp @@ -43,9 +43,9 @@ void KviKvsTreeNodeGlobalVariable::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeGlobalVariable::dump(const char * prefix) +void KviKvsTreeNodeGlobalVariable::dump(const TQString &prefix) { - tqDebug("%s GlobalVariable(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s GlobalVariable(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h index a30430a4..2790f8d0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeGlobalVariable(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp index ee2a7c33..b48d4610 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp @@ -47,10 +47,10 @@ void KviKvsTreeNodeHashCount::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeHashCount::dump(const char * prefix) +void KviKvsTreeNodeHashCount::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s HashCount",prefix); + tqDebug("%s HashCount",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h index 9119bdee..f7a349e2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h @@ -39,7 +39,7 @@ public: ~KviKvsTreeNodeHashCount(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp index e5dec4e5..a96f92e8 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp @@ -54,14 +54,14 @@ void KviKvsTreeNodeHashElement::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeHashElement::dump(const char * prefix) +void KviKvsTreeNodeHashElement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s HashElement",prefix); + tqDebug("%s HashElement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pSource->dump(tmp.utf8().data()); - m_pKey->dump(tmp.utf8().data()); + m_pSource->dump(tmp); + m_pKey->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h index ce36d124..161ef8e0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h @@ -41,7 +41,7 @@ protected: KviKvsTreeNodeData * m_pKey; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp index 18889a11..8b37a744 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp @@ -51,10 +51,10 @@ void KviKvsTreeNodeHashReferenceAssert::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeHashReferenceAssert::dump(const char * prefix) +void KviKvsTreeNodeHashReferenceAssert::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s HashReferenceAssert",prefix); + tqDebug("%s HashReferenceAssert",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h index e97de6d3..68244b81 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h @@ -43,7 +43,7 @@ protected: public: virtual bool isReadOnly(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp index 4d1b6403..51667c8e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp @@ -33,10 +33,10 @@ void KviKvsTreeNodeInstruction::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeInstruction::dump(const char * prefix) +void KviKvsTreeNodeInstruction::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s Instruction",prefix); + tqDebug("%s Instruction",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h index 8326b2e6..ae668518 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeInstruction(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); // execute() is the main entry point to the tree visit // execute() returns false when the tree visiting has diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp index 87437b5d..37d39955 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp @@ -45,14 +45,14 @@ void KviKvsTreeNodeInstructionBlock::contextDescription(TQString &szBuffer) szBuffer = "Instruction Block"; } -void KviKvsTreeNodeInstructionBlock::dump(const char * prefix) +void KviKvsTreeNodeInstructionBlock::dump(const TQString &prefix) { - tqDebug("%s InstructionBlock",prefix); + tqDebug("%s InstructionBlock",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeInstruction * i = m_pInstructionList->first();i;i = m_pInstructionList->next()) { - i->dump(tmp.utf8().data()); + i->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h index 659aab5f..e876def7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h @@ -45,7 +45,7 @@ public: void addInstruction(KviKvsTreeNodeInstruction * i); KviKvsTreeNodeInstruction * releaseFirst(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp index 36b76545..e5689faf 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp @@ -45,10 +45,10 @@ void KviKvsTreeNodeLocalVariable::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeLocalVariable::dump(const char * prefix) +void KviKvsTreeNodeLocalVariable::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s LocalVariable(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s LocalVariable(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h index 4200fbc0..e6c5f07d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeLocalVariable(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp index 8df45a3f..ea8530ce 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp @@ -53,9 +53,9 @@ void KviKvsTreeNodeModuleCallbackCommand::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeModuleCallbackCommand::dump(const char * prefix) +void KviKvsTreeNodeModuleCallbackCommand::dump(const TQString &prefix) { - tqDebug("%s ModuleCallbackCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data()); + tqDebug("%s ModuleCallbackCommand(%s.%s)",prefix.local8Bit().data(),m_szModuleName.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); dumpCallback(prefix); @@ -64,7 +64,7 @@ void KviKvsTreeNodeModuleCallbackCommand::dump(const char * prefix) bool KviKvsTreeNodeModuleCallbackCommand::execute(KviKvsRunTimeContext * c) { //#warning "FIXME: module names should be UNICODE!" - KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); + KviModule * m = g_pModuleManager->getModule(m_szModuleName); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h index c24f1c5a..c153ac67 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h @@ -42,7 +42,7 @@ protected: TQString m_szModuleName; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); bool execute(KviKvsRunTimeContext* c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp index 457e3f69..879a49f1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp @@ -52,18 +52,18 @@ void KviKvsTreeNodeModuleFunctionCall::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeModuleFunctionCall::dump(const TQString &prefix) { - tqDebug("%s ModuleFunctionCall(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szFunctionName.utf8().data()); + tqDebug("%s ModuleFunctionCall(%s.%s)",prefix.local8Bit().data(),m_szModuleName.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); } bool KviKvsTreeNodeModuleFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { //#warning "FIXME: module names should be UNICODE!" - KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); + KviModule * m = g_pModuleManager->getModule(m_szModuleName); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h index 86dde629..04ef7998 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h @@ -41,7 +41,7 @@ protected: TQString m_szModuleName; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp index 18343997..94923e08 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp @@ -53,9 +53,9 @@ void KviKvsTreeNodeModuleSimpleCommand::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeModuleSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeModuleSimpleCommand::dump(const TQString &prefix) { - tqDebug("%s ModuleSimpleCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data()); + tqDebug("%s ModuleSimpleCommand(%s.%s)",prefix.local8Bit().data(),m_szModuleName.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); } @@ -63,7 +63,7 @@ void KviKvsTreeNodeModuleSimpleCommand::dump(const char * prefix) bool KviKvsTreeNodeModuleSimpleCommand::execute(KviKvsRunTimeContext * c) { //#warning "FIXME: module names should be UNICODE!" - KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); + KviModule * m = g_pModuleManager->getModule(m_szModuleName); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h index 5396cc55..7a1921ec 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h @@ -40,7 +40,7 @@ protected: TQString m_szModuleName; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp index 16c8ff2a..00e82905 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp @@ -48,10 +48,10 @@ void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(TQString &szB szBuffer += "\""; } -void KviKvsTreeNodeMultipleParameterIdentifier::dump(const char * prefix) +void KviKvsTreeNodeMultipleParameterIdentifier::dump(const TQString &prefix) { - if(m_iEnd < m_iStart)tqDebug("%s MultipleParameterIdentifier(%d-)",prefix,m_iStart); - else tqDebug("%s MultipleParameterIdentifier(%d-%d)",prefix,m_iStart,m_iEnd); + if(m_iEnd < m_iStart)tqDebug("%s MultipleParameterIdentifier(%d-)",prefix.local8Bit().data(),m_iStart); + else tqDebug("%s MultipleParameterIdentifier(%d-%d)",prefix.local8Bit().data(),m_iStart,m_iEnd); } bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h index 54d86ec1..dc288065 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h @@ -41,7 +41,7 @@ protected: int m_iEnd; // the index of the last parameter wanted (may be -1: in that case all up to the end) public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp index c5681cad..28962494 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp @@ -47,10 +47,10 @@ void KviKvsTreeNodeObjectField::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeObjectField::dump(const char * prefix) +void KviKvsTreeNodeObjectField::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ObjectField(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s ObjectField(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h index 607a69f0..9ce2fdb9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeObjectField(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateInObjectScope(); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWriteInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp index b86771bf..2a90d2bc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp @@ -44,13 +44,13 @@ void KviKvsTreeNodeObjectFunctionCall::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeObjectFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeObjectFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s ObjectFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h index 5588a02b..12aba985 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeObjectFunctionCall(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateInObjectScope(); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index e717e238..2b1f6f86 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -56,12 +56,12 @@ void KviKvsTreeNodeOperation::contextDescription(TQString &szBuffer) szBuffer = "Operation"; } -void KviKvsTreeNodeOperation::dump(const char * prefix) +void KviKvsTreeNodeOperation::dump(const TQString &prefix) { - tqDebug("%s Operation",prefix); + tqDebug("%s Operation",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); } @@ -86,13 +86,13 @@ void KviKvsTreeNodeOperationAssignment::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationAssignment::dump(const char * prefix) +void KviKvsTreeNodeOperationAssignment::dump(const TQString &prefix) { - tqDebug("%s OperationAssignment",prefix); + tqDebug("%s OperationAssignment",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeOperationAssignment::execute(KviKvsRunTimeContext * c) @@ -130,13 +130,13 @@ void KviKvsTreeNodeOperationDecrement::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationDecrement::dump(const char * prefix) +void KviKvsTreeNodeOperationDecrement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationDecrement",prefix); + tqDebug("%s OperationDecrement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); #endif } @@ -193,13 +193,13 @@ void KviKvsTreeNodeOperationIncrement::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationIncrement::dump(const char * prefix) +void KviKvsTreeNodeOperationIncrement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationIncrement",prefix); + tqDebug("%s OperationIncrement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); #endif } @@ -259,14 +259,14 @@ void KviKvsTreeNodeOperationSelfAnd::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfAnd::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfAnd",prefix); + tqDebug("%s OperationSelfAnd",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -329,14 +329,14 @@ void KviKvsTreeNodeOperationSelfDivision::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfDivision::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfDivision",prefix); + tqDebug("%s OperationSelfDivision",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -423,14 +423,14 @@ void KviKvsTreeNodeOperationSelfModulus::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfModulus::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfModulus",prefix); + tqDebug("%s OperationSelfModulus",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -518,14 +518,14 @@ void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(TQString &szB } -void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfMultiplication::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfMultiplication",prefix); + tqDebug("%s OperationSelfMultiplication",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -597,14 +597,14 @@ void KviKvsTreeNodeOperationSelfOr::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfOr::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfOr",prefix); + tqDebug("%s OperationSelfOr",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -667,14 +667,14 @@ void KviKvsTreeNodeOperationSelfShl::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfShl::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfShl",prefix); + tqDebug("%s OperationSelfShl",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -739,14 +739,14 @@ void KviKvsTreeNodeOperationSelfShr::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfShr::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfShr",prefix); + tqDebug("%s OperationSelfShr",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -817,14 +817,14 @@ void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(TQString &szBuff } -void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfSubtraction::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfSubtraction",prefix); + tqDebug("%s OperationSelfSubtraction",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -900,14 +900,14 @@ void KviKvsTreeNodeOperationSelfSum::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfSum::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfSum",prefix); + tqDebug("%s OperationSelfSum",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -985,14 +985,14 @@ void KviKvsTreeNodeOperationSelfXor::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfXor::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfXor",prefix); + tqDebug("%s OperationSelfXor",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -1053,13 +1053,13 @@ void KviKvsTreeNodeOperationStringAppend::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix) +void KviKvsTreeNodeOperationStringAppend::dump(const TQString &prefix) { - tqDebug("%s OperationStringAppend",prefix); + tqDebug("%s OperationStringAppend",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) @@ -1100,13 +1100,13 @@ void KviKvsTreeNodeOperationArrayAppend::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix) +void KviKvsTreeNodeOperationArrayAppend::dump(const TQString &prefix) { - tqDebug("%s OperationArrayAppend",prefix); + tqDebug("%s OperationArrayAppend",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeOperationArrayAppend::execute(KviKvsRunTimeContext * c) @@ -1189,14 +1189,14 @@ void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(TQString & } -void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix) +void KviKvsTreeNodeOperationStringAppendWithComma::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringAppendWithComma",prefix); + tqDebug("%s OperationStringAppendWithComma",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -1254,14 +1254,14 @@ void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(TQString & } -void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix) +void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringAppendWithSpace",prefix); + tqDebug("%s OperationStringAppendWithSpace",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -1329,15 +1329,15 @@ void KviKvsTreeNodeOperationStringTransliteration::contextDescription(TQString & } -void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix) +void KviKvsTreeNodeOperationStringTransliteration::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringTransliteration",prefix); + tqDebug("%s OperationStringTransliteration",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pLeft->dump(tmp.utf8().data()); - m_pRight->dump(tmp.utf8().data()); - m_pFlags->dump(tmp.utf8().data()); + m_pLeft->dump(tmp); + m_pRight->dump(tmp); + m_pFlags->dump(tmp); #endif } @@ -1410,15 +1410,15 @@ void KviKvsTreeNodeOperationStringSubstitution::contextDescription(TQString &szB } -void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix) +void KviKvsTreeNodeOperationStringSubstitution::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringSubstitution",prefix); + tqDebug("%s OperationStringSubstitution",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pLeft->dump(tmp.utf8().data()); - m_pRight->dump(tmp.utf8().data()); - m_pFlags->dump(tmp.utf8().data()); + m_pLeft->dump(tmp); + m_pRight->dump(tmp); + m_pFlags->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.h b/src/kvirc/kvs/kvi_kvs_treenode_operation.h index cc57df04..40563ab1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.h @@ -42,7 +42,7 @@ protected: public: void setTargetVariableReference(KviKvsTreeNodeData * r); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; class KviKvsTreeNodeOperationAssignment : public KviKvsTreeNodeOperation @@ -54,7 +54,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -65,7 +65,7 @@ public: ~KviKvsTreeNodeOperationDecrement(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -76,7 +76,7 @@ public: ~KviKvsTreeNodeOperationIncrement(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -89,7 +89,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -102,7 +102,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -115,7 +115,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -128,7 +128,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -141,7 +141,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -154,7 +154,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -167,7 +167,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -180,7 +180,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -193,7 +193,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -206,7 +206,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -219,7 +219,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -232,7 +232,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -245,7 +245,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -258,7 +258,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -273,7 +273,7 @@ protected: KviKvsTreeNodeData * m_pFlags; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -288,7 +288,7 @@ protected: KviKvsTreeNodeData * m_pFlags; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp index 29fc23bb..89607e34 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp @@ -53,13 +53,13 @@ void KviKvsTreeNodeParameterReturn::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeParameterReturn::dump(const char * prefix) +void KviKvsTreeNodeParameterReturn::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ParameterReturn",prefix); + tqDebug("%s ParameterReturn",prefix.local8Bit().data()); TQString tmp = prefix; tmp += " "; - m_pDataList->dump(tmp.utf8().data()); + m_pDataList->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h index da65b6da..0ff9620d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h @@ -38,7 +38,7 @@ protected: KviKvsTreeNodeDataList * m_pDataList; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp index 55c5646a..34ee7530 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp @@ -52,13 +52,13 @@ void KviKvsTreeNodeRebindingSwitch::contextDescription(TQString &szBuffer) szBuffer = "Window Rebinding Switch"; } -void KviKvsTreeNodeRebindingSwitch::dump(const char * prefix) +void KviKvsTreeNodeRebindingSwitch::dump(const TQString &prefix) { - tqDebug("%sRebindingSwitch",prefix); + tqDebug("%sRebindingSwitch",prefix.local8Bit().data()); TQString tmp = prefix; tmp += " "; - m_pTargetWindow->dump(tmp.utf8().data()); - m_pChildCommand->dump(tmp.utf8().data()); + m_pTargetWindow->dump(tmp); + m_pChildCommand->dump(tmp); } const TQString & KviKvsTreeNodeRebindingSwitch::commandName() @@ -80,10 +80,10 @@ bool KviKvsTreeNodeRebindingSwitch::execute(KviKvsRunTimeContext * c) c->warning(this,__tr2qs("Empty window identifier specified in the standard rebinding switch: no rebinding performed")); pNewWindow = 0; } else { - pNewWindow = g_pApp->findWindow(szWinId.utf8().data()); + pNewWindow = g_pApp->findWindow(szWinId); } - pNewWindow = g_pApp->findWindow(szWinId.utf8().data()); + pNewWindow = g_pApp->findWindow(szWinId); KviWindow * pOldWindow = c->window(); if(pNewWindow) c->setWindow(pNewWindow); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h index b71945e9..65722a1c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h @@ -41,7 +41,7 @@ protected: KviKvsTreeNodeCommand * m_pChildCommand; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); const TQString & commandName(); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp index b8020ef6..1d121e67 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp @@ -57,13 +57,13 @@ void KviKvsTreeNodeScopeOperator::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeScopeOperator::dump(const char * prefix) +void KviKvsTreeNodeScopeOperator::dump(const TQString &prefix) { - tqDebug("%s ScopeOperator",prefix); + tqDebug("%s ScopeOperator",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pObjectReference->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pObjectReference->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeScopeOperator::isReadOnly() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h index c132a43d..e71a156f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h @@ -39,7 +39,7 @@ public: KviKvsTreeNodeData * m_pRightSide; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool isReadOnly(); // gets the m_pRightSide read only state virtual bool canEvaluateToObjectReference(); // gets the m_pRightSide result virtual bool isFunctionCall(); // gets the m_pRightSide result diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp index 6803376b..69602592 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp @@ -46,10 +46,10 @@ void KviKvsTreeNodeSimpleCommand::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeSimpleCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s SimpleCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h index 3636c5e7..cbf19012 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h @@ -36,7 +36,7 @@ public: ~KviKvsTreeNodeSimpleCommand(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp index 5cf892c2..a1418818 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp @@ -50,10 +50,10 @@ void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(TQString &szBuf } -void KviKvsTreeNodeSingleParameterIdentifier::dump(const char * prefix) +void KviKvsTreeNodeSingleParameterIdentifier::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SingleParameterIdentifier(%d)",prefix,m_iStart); + tqDebug("%s SingleParameterIdentifier(%d)",prefix.local8Bit().data(),m_iStart); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h index 0a9f802c..89ba54b3 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h @@ -40,7 +40,7 @@ protected: int m_iStart; // the index of the parameter wanted (always >= 0) public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateToObjectReference(); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp index 5a4cd548..351caed6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp @@ -45,10 +45,10 @@ void KviKvsTreeNodeSpecialCommand::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSpecialCommand::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s SpecialCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h index c7d1153b..0fbde13d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h @@ -35,7 +35,7 @@ public: ~KviKvsTreeNodeSpecialCommand(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; #endif //!_KVI_KVS_TREENODE_SPECIALCOMMAND_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp index 928dc2dc..731ebf2b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp @@ -43,9 +43,9 @@ void KviKvsTreeNodeSpecialCommandBreak::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSpecialCommandBreak::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandBreak::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandBreak",prefix); + tqDebug("%s SpecialCommandBreak",prefix.local8Bit().data()); } bool KviKvsTreeNodeSpecialCommandBreak::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h index 44cdac66..15d6a32b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeSpecialCommandBreak(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp index 6e737005..75cd7b1e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp @@ -39,10 +39,10 @@ KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialComman m_szBuffer = szBuffer; } -void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandClassFunctionDefinition(%s)",prefix,m_szName.utf8().data()); - tqDebug("%s (command buffer with %d characters)",prefix,m_szBuffer.length()); + tqDebug("%s SpecialCommandClassFunctionDefinition(%s)",prefix.local8Bit().data(),m_szName.local8Bit().data()); + tqDebug("%s (command buffer with %d characters)",prefix.local8Bit().data(),m_szBuffer.length()); } void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(TQString &szBuffer) @@ -77,14 +77,14 @@ void KviKvsTreeNodeSpecialCommandClass::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"class\""; } -void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandClass::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandClass",prefix); + tqDebug("%s SpecialCommandClass",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); for(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * d = m_pFunctions->first();d;d = m_pFunctions->next()) - d->dump(tmp.utf8().data()); + d->dump(tmp); } bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h index 592c4544..d7de0c7e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h @@ -46,7 +46,7 @@ public: const TQString & name(){ return m_szName; }; const TQString & buffer(){ return m_szBuffer; }; virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; @@ -62,7 +62,7 @@ protected: public: void addFunctionDefinition(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * pDef); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp index adf38511..1ec75c88 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp @@ -40,28 +40,28 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(TQStr #endif } -void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelExtpopup",prefix); + tqDebug("%s SpecialCommandDefpopupLabelExtpopup",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "NAME: "; x += m_szName; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); #endif } @@ -82,28 +82,28 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelItem",prefix); + tqDebug("%s SpecialCommandDefpopupLabelItem",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "INSTRUCTION: "; x += m_szInstruction; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); #endif } @@ -123,24 +123,24 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelLabel",prefix); + tqDebug("%s SpecialCommandDefpopupLabelLabel",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); #endif } @@ -163,14 +163,14 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(TQSt } -void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelSeparator",prefix); + tqDebug("%s SpecialCommandDefpopupLabelSeparator",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" CONDITION:"); tmp.append(m_szCondition); - tqDebug("%s",tmp.utf8().data()); + tqDebug("%s",tmp.local8Bit().data()); #endif } @@ -192,14 +192,14 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(TQStr } -void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelEpilogue",prefix); + tqDebug("%s SpecialCommandDefpopupLabelEpilogue",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; - tqDebug("%s",tmp.utf8().data()); + tqDebug("%s",tmp.local8Bit().data()); #endif } @@ -221,14 +221,14 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(TQStr -void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelPrologue",prefix); + tqDebug("%s SpecialCommandDefpopupLabelPrologue",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; - tqDebug("%s",tmp.utf8().data()); + tqDebug("%s",tmp.local8Bit().data()); #endif } @@ -272,26 +272,26 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelPopup",prefix); + tqDebug("%s SpecialCommandDefpopupLabelPopup",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); for(KviKvsTreeNodeSpecialCommandDefpopupLabel * l = m_pLabels->first();l;l = m_pLabels->next()) - l->dump(tmp.utf8().data()); + l->dump(tmp); #endif } @@ -359,14 +359,14 @@ void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(TQString &szBuffer } -void KviKvsTreeNodeSpecialCommandDefpopup::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopup::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopup",prefix); + tqDebug("%s SpecialCommandDefpopup",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pPopupName->dump(tmp.utf8().data()); - m_pMainPopup->dump(tmp.utf8().data()); + m_pPopupName->dump(tmp); + m_pMainPopup->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h index b55b1fb1..0117b50d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h @@ -69,7 +69,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -97,7 +97,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -111,7 +111,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelItem(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -124,7 +124,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -140,7 +140,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -154,7 +154,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -170,7 +170,7 @@ public: bool isEmpty(){ return m_pLabels->isEmpty(); }; void addLabel(KviKvsTreeNodeSpecialCommandDefpopupLabel * pLabel); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); bool fill(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -186,7 +186,7 @@ private: KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * m_pMainPopup; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp index b59ac3d4..8241f044 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp @@ -51,9 +51,9 @@ void KviKvsTreeNodeSpecialCommandDo::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"do\""; } -void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDo::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandDo",prefix); + tqDebug("%s SpecialCommandDo",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h index 834d0eae..12ad030c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h @@ -43,7 +43,7 @@ private: KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp index 075f00e5..ff764ec1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp @@ -56,15 +56,15 @@ void KviKvsTreeNodeSpecialCommandFor::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"for\""; } -void KviKvsTreeNodeSpecialCommandFor::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandFor::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandFor",prefix); + tqDebug("%s SpecialCommandFor",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pInitialization)m_pInitialization->dump(tmp.utf8().data()); - if(m_pCondition)m_pCondition->dump(tmp.utf8().data()); - if(m_pUpdate)m_pUpdate->dump(tmp.utf8().data()); - if(m_pLoop)m_pLoop->dump(tmp.utf8().data()); + if(m_pInitialization)m_pInitialization->dump(tmp); + if(m_pCondition)m_pCondition->dump(tmp); + if(m_pUpdate)m_pUpdate->dump(tmp); + if(m_pLoop)m_pLoop->dump(tmp); } bool KviKvsTreeNodeSpecialCommandFor::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h index 3800c95e..284f9d15 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h @@ -45,7 +45,7 @@ private: KviKvsTreeNodeInstruction * m_pLoop; // can be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp index 5c56bcb1..24f3ba35 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp @@ -55,14 +55,14 @@ void KviKvsTreeNodeSpecialCommandForeach::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"foreach\""; } -void KviKvsTreeNodeSpecialCommandForeach::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandForeach::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandForeach",prefix); + tqDebug("%s SpecialCommandForeach",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pIterationVariable->dump(tmp.utf8().data()); - m_pIterationData->dump(tmp.utf8().data()); - m_pLoop->dump(tmp.utf8().data()); + m_pIterationVariable->dump(tmp); + m_pIterationData->dump(tmp); + m_pLoop->dump(tmp); } bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h index d3b8ff2d..39b32f5a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h @@ -45,7 +45,7 @@ private: KviKvsTreeNodeInstruction * m_pLoop; // can't be zero! public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp index 16636f6a..ef79b0bd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp @@ -59,10 +59,10 @@ void KviKvsTreeNodeSpecialCommandIf::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeSpecialCommandIf::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandIf::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandIf",prefix); + tqDebug("%s SpecialCommandIf",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h index 856b8951..e90932a4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h @@ -43,7 +43,7 @@ private: KviKvsTreeNodeInstruction * m_pElseInstruction; // may be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp index 0bc342dd..1ea35569 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp @@ -78,13 +78,13 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(TQString &s szBuffer = "Label \"case\" For Special Command \"switch\""; } -void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelCase",prefix); + tqDebug("%s SpecialCommandSwitchLabelCase",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pParameter)m_pParameter->dump(tmp); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -154,13 +154,13 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(TQString & } -void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelMatch",prefix); + tqDebug("%s SpecialCommandSwitchLabelMatch",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pParameter)m_pParameter->dump(tmp); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -208,13 +208,13 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelRegexp",prefix); + tqDebug("%s SpecialCommandSwitchLabelRegexp",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pParameter)m_pParameter->dump(tmp); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -264,12 +264,12 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelDefault",prefix); + tqDebug("%s SpecialCommandSwitchLabelDefault",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelDefault::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -316,14 +316,14 @@ void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSpecialCommandSwitch::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitch::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitch",prefix); + tqDebug("%s SpecialCommandSwitch",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pExpression->dump(tmp.utf8().data()); + m_pExpression->dump(tmp); for(KviKvsTreeNodeSpecialCommandSwitchLabel * l = m_pLabels->first();l;l = m_pLabels->next()) - l->dump(tmp.utf8().data()); + l->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitch::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h index aa5473ba..1b2b1c60 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h @@ -58,7 +58,7 @@ public: ~KviKvsTreeNodeSpecialCommandSwitchLabelCase(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -70,7 +70,7 @@ public: ~KviKvsTreeNodeSpecialCommandSwitchLabelMatch(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -81,7 +81,7 @@ public: ~KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -91,7 +91,7 @@ public: KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelDefault(); public: - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -110,7 +110,7 @@ public: void addLabel(KviKvsTreeNodeSpecialCommandSwitchLabel * l); bool isEmpty(){ return m_pLabels->isEmpty(); }; virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp index 689c120d..4486cebc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp @@ -49,14 +49,14 @@ void KviKvsTreeNodeSpecialCommandUnset::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"unset\""; } -void KviKvsTreeNodeSpecialCommandUnset::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandUnset::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandUnset",prefix); + tqDebug("%s SpecialCommandUnset",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeVariable * pVar = m_pVariableList->first();pVar;pVar = m_pVariableList->next()) { - pVar->dump(tmp.utf8().data()); + pVar->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h index 9d36517a..8b31d3e2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h @@ -40,7 +40,7 @@ private: KviPointerList<KviKvsTreeNodeVariable> * m_pVariableList; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp index 13921ae3..eb0efd73 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp @@ -56,10 +56,10 @@ void KviKvsTreeNodeSpecialCommandWhile::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeSpecialCommandWhile::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandWhile::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandWhile",prefix); + tqDebug("%s SpecialCommandWhile",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h index 38c4907e..5f8bd813 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h @@ -43,7 +43,7 @@ private: KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp index e02546f5..c9079bc1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp @@ -57,11 +57,11 @@ void KviKvsTreeNodeStringCast::contextDescription(TQString &szBuffer) szBuffer = "String Cast"; } -void KviKvsTreeNodeStringCast::dump(const char * prefix) +void KviKvsTreeNodeStringCast::dump(const TQString &prefix) { - tqDebug("%s StringCast",prefix); + tqDebug("%s StringCast",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pChildData->dump(tmp.utf8().data()); + m_pChildData->dump(tmp); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h index 3cc3de6c..0f4a1f35 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h @@ -38,7 +38,7 @@ public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp index adf3c09f..81b86c11 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp @@ -46,9 +46,9 @@ void KviKvsTreeNodeSwitchList::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSwitchList::dump(const char * prefix) +void KviKvsTreeNodeSwitchList::dump(const TQString &prefix) { - tqDebug("%s SwitchList",prefix); + tqDebug("%s SwitchList",prefix.local8Bit().data()); if(m_pShortSwitchDict) { KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict); @@ -59,7 +59,7 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) TQChar c((unsigned short)it.currentKey()); tmp.append(c); tmp.append("): "); - it.current()->dump(tmp.utf8().data()); + it.current()->dump(tmp); ++it; } } @@ -72,7 +72,7 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) tmp.append(" Sw("); tmp.append(it.currentKey()); tmp.append("): "); - it.current()->dump(tmp.utf8().data()); + it.current()->dump(tmp); ++it; } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h index 0bc68559..16a4975e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h @@ -48,7 +48,7 @@ public: void addShort(int iShortKey,KviKvsTreeNodeData * p); void addLong(const TQString &szLongKey,KviKvsTreeNodeData * p); bool isEmpty(){ return (m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0); }; - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); KviKvsTreeNodeData * getStandardRebindingSwitch(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp index 1cba7405..38abf608 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp @@ -46,13 +46,13 @@ void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(TQString &szBuffer #endif } -void KviKvsTreeNodeThisObjectFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeThisObjectFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ThisObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s ThisObjectFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h index b31f9ebf..1c00bd71 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h @@ -41,7 +41,7 @@ public: ~KviKvsTreeNodeThisObjectFunctionCall(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp index 3d2c0880..bec8f0a7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp @@ -49,13 +49,13 @@ void KviKvsTreeNodeVoidFunctionCall::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeVoidFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeVoidFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s VoidFunctionCall",prefix); + tqDebug("%s VoidFunctionCall",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pFunctionCall->dump(tmp.utf8().data()); + m_pFunctionCall->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h index 584034d0..305ffd20 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h @@ -40,7 +40,7 @@ protected: KviKvsTreeNodeFunctionCall * m_pFunctionCall; // may be scope operator or direct function call public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 9a77d51d..ac5c7572 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -210,7 +210,7 @@ const TQString & KviKvsUserAction::descriptionCode() TQPixmap * KviKvsUserAction::smallIcon() { - return g_pIconManager->getImage(m_szSmallIcon.utf8().data()); + return g_pIconManager->getImage(m_szSmallIcon); } bool KviKvsUserAction::isKviUserActionNeverOverrideThis() @@ -275,3 +275,4 @@ void KviKvsUserAction::save(KviConfig * cfg) cfg->writeEntry("Code",m_pScript->code()); } +#include "kvi_kvs_useraction.moc" diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index 14608bea..8d6377d5 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -622,22 +622,22 @@ void KviKvsVariant::appendAsString(TQString &szBuffer) const } } -void KviKvsVariant::dump(const char * prefix) const +void KviKvsVariant::dump(const TQString &prefix) const { if(!m_pData) { - tqDebug("%s Nothing [this=0x%lx]",prefix,this); + tqDebug("%s Nothing [this=0x%p]",prefix.local8Bit().data(),this); return; } switch(m_pData->m_eType) { - case KviKvsVariantData::String: tqDebug("%s String(%s) [this=0x%lx]",prefix,m_pData->m_u.pString->utf8().data(),this); break; - case KviKvsVariantData::Array: tqDebug("%s Array(ptr=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pArray,this); break; - case KviKvsVariantData::Hash: tqDebug("%s Hash(ptr=0x%lx,dict=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break; - case KviKvsVariantData::Integer: tqDebug("%s Integer(%d) [this=0x%lx]",prefix,m_pData->m_u.iInteger,this); break; - case KviKvsVariantData::Real: tqDebug("%s Real(%f) [this=0x%lx]",prefix,*(m_pData->m_u.pReal),this); break; - case KviKvsVariantData::Boolean: tqDebug("%s Boolean(%s) [this=0x%lx]",prefix,m_pData->m_u.bBoolean ? "true" : "false",this); break; - case KviKvsVariantData::HObject: tqDebug("%s HObject(%lx) [this=0x%lx]",prefix,m_pData->m_u.hObject,this); break; + case KviKvsVariantData::String: tqDebug("%s String(%s) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.pString->local8Bit().data(),this); break; + case KviKvsVariantData::Array: tqDebug("%s Array(ptr=0x%p) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.pArray,this); break; + case KviKvsVariantData::Hash: tqDebug("%s Hash(ptr=0x%p,dict=0x%p) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break; + case KviKvsVariantData::Integer: tqDebug("%s Integer(%ld) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.iInteger,this); break; + case KviKvsVariantData::Real: tqDebug("%s Real(%f) [this=0x%p]",prefix.local8Bit().data(),*(m_pData->m_u.pReal),this); break; + case KviKvsVariantData::Boolean: tqDebug("%s Boolean(%s) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.bBoolean ? "true" : "false",this); break; + case KviKvsVariantData::HObject: tqDebug("%s HObject(%p) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.hObject,this); break; default: /* make gcc happy */ break; } } diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h index 234bbc75..76d5366b 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.h +++ b/src/kvirc/kvs/kvi_kvs_variant.h @@ -174,7 +174,7 @@ public: void takeFrom(KviKvsVariant * v); void takeFrom(KviKvsVariant &v); - void dump(const char * prefix) const; + void dump(const TQString &prefix) const; // returns -1 if this variant is greater than the other, 0 if are equal, 1 if the other is greater // if bPreferNumeric is true then when comparing strings a conversion to a numeric format diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/kvi_mexlinkfilter.cpp index b479d3c0..32cf2093 100644 --- a/src/kvirc/module/kvi_mexlinkfilter.cpp +++ b/src/kvirc/module/kvi_mexlinkfilter.cpp @@ -33,3 +33,5 @@ KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d) KviMexLinkFilter::~KviMexLinkFilter() { } + +#include "kvi_mexlinkfilter.moc" diff --git a/src/kvirc/module/kvi_mexserverimport.cpp b/src/kvirc/module/kvi_mexserverimport.cpp index 59ac15ec..eebb80b8 100644 --- a/src/kvirc/module/kvi_mexserverimport.cpp +++ b/src/kvirc/module/kvi_mexserverimport.cpp @@ -31,3 +31,5 @@ KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d) KviMexServerImport::~KviMexServerImport() { } + +#include "kvi_mexserverimport.moc" diff --git a/src/kvirc/module/kvi_mextoolbar.cpp b/src/kvirc/module/kvi_mextoolbar.cpp index ccae2f30..235804f3 100644 --- a/src/kvirc/module/kvi_mextoolbar.cpp +++ b/src/kvirc/module/kvi_mextoolbar.cpp @@ -36,3 +36,4 @@ KviMexToolBar::~KviMexToolBar() g_pFrame->unregisterModuleExtensionToolBar(this); } +#include "kvi_mextoolbar.moc" diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp index 6a4f30f5..3653cd2d 100644 --- a/src/kvirc/module/kvi_module.cpp +++ b/src/kvirc/module/kvi_module.cpp @@ -132,7 +132,7 @@ extern KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager; // FIXME: #warning "Move all the modules to the new locking method ?" -KviModule::KviModule(kvi_library_t handle,KviModuleInfo * info,const char * name,const char * filename) +KviModule::KviModule(kvi_library_t handle,KviModuleInfo * info,const TQString &name,const TQString &filename) : KviKvsModuleInterface() { m_dlHandle = handle; @@ -356,16 +356,14 @@ void * KviModule::getSymbol(const char * symname) void KviModule::getDefaultConfigFileName(KviStr &buffer) { - KviStr szName(KviStr::Format,"libkvi%s.kvc",m_szName.ptr()); - g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,szName.ptr()); + TQString szName { TQString::fromLatin1("libkvi%1.kvc").arg(m_szName) }; + g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,szName); } void KviModule::getDefaultConfigFileName(TQString &szBuffer) { - TQString tmp = "libkvi"; - tmp += m_szName.ptr(); - tmp += ".kvc"; - g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,tmp); + TQString szName { TQString::fromLatin1("libkvi%1.kvc").arg(m_szName) }; + g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szName); } bool KviModule::ctrl(const char * operation,void * param) diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h index f07c461c..897f104c 100644 --- a/src/kvirc/module/kvi_module.h +++ b/src/kvirc/module/kvi_module.h @@ -42,14 +42,16 @@ #ifdef COMPILE_ON_WINDOWS - #define KVIMODULEEXPORT extern "C" __declspec(dllexport) - #define KVIMODULEEXPORTDATA KVIMODULEEXPORT - #define KVIMODULEEXPORTFUNC KVIMODULEEXPORT + #define KVIMODULEEXPORT __declspec(dllexport) #else - #define KVIMODULEEXPORT extern "C" - #define KVIMODULEEXPORTDATA - #define KVIMODULEEXPORTFUNC KVIMODULEEXPORT + #ifdef __TDE_HAVE_GCC_VISIBILITY + #define KVIMODULEEXPORT KVIRC_API + #else + #define KVIMODULEEXPORT + #endif #endif +#define KVIMODULEEXPORTDATA KVIMODULEEXPORT +#define KVIMODULEEXPORTFUNC KVIMODULEEXPORT class KviModule; @@ -112,18 +114,21 @@ typedef struct _KviModuleInfo #define KVIRC_MODULE(_szModuleName,_szVersion,_szCopyright,_szDescription,_init_routine,_can_unload,_ctrl_routine,_cleanup_routine) \ \ - KVIMODULEEXPORTDATA KviModuleInfo KVIrc_module_info= \ + extern "C" \ { \ - KVI_VERSION, \ - _szModuleName, \ - _szVersion, \ - _szCopyright, \ - _szDescription, \ - _init_routine, \ - _can_unload, \ - _ctrl_routine, \ - _cleanup_routine \ - }; + KVIMODULEEXPORTDATA KviModuleInfo KVIrc_module_info= \ + { \ + KVI_VERSION, \ + _szModuleName, \ + _szVersion, \ + _szCopyright, \ + _szDescription, \ + _init_routine, \ + _can_unload, \ + _ctrl_routine, \ + _cleanup_routine \ + }; \ + } // old type parsing procedures @@ -140,24 +145,24 @@ class KVIRC_API KviModule : public KviKvsModuleInterface friend class KviModuleManager; friend class KviUserParser; protected: - KviModule(kvi_library_t handle,KviModuleInfo * info,const char * name,const char * filename); + KviModule(kvi_library_t handle,KviModuleInfo * info,const TQString &name,const TQString &filename); public: ~KviModule(); // must be public for KviPointerList private: - KviStr m_szName; - KviStr m_szFileName; - KviModuleInfo * m_pModuleInfo; - kvi_library_t m_dlHandle; - unsigned int m_uLock; - long int m_lastAccessTime; + TQString m_szName; + TQString m_szFileName; + KviModuleInfo * m_pModuleInfo; + kvi_library_t m_dlHandle; + unsigned int m_uLock; + long int m_lastAccessTime; protected: void updateAccessTime(); unsigned int secondsSinceLastAccess(); public: // name of this module: always low case , single word - const char * name(){ return m_szName.ptr(); }; + TQString name(){ return m_szName; }; // filename of this module (with NO path): formatted as "libkvi%s.so",name() - const char * filename(){ return m_szFileName.ptr(); }; + TQString filename(){ return m_szFileName; }; kvi_library_t handle(){ return m_dlHandle; }; KviModuleInfo * moduleInfo(){ return m_pModuleInfo; }; diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp index 7b182643..f72f1f31 100644 --- a/src/kvirc/module/kvi_moduleextension.cpp +++ b/src/kvirc/module/kvi_moduleextension.cpp @@ -149,9 +149,9 @@ void KviModuleExtensionManager::unregisterExtensionsByModule(KviModule * m) } } -KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule) +KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionGetDescriptorList(const KviStr &szType,const TQString &preloadModule) { - if(preloadModule) + if(!preloadModule.isEmpty()) { KviModule * m = g_pModuleManager->getModule(preloadModule); (void)m; // get rid of the unused warning :D @@ -181,7 +181,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto return 0; } -KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule) +KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const TQString &preloadModule) { KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule); if(!l)return 0; @@ -208,7 +208,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr & } -KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule) +KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const TQString &preloadModule) { KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule); if(!l)return 0; diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h index 7bbc360c..a39a5bcc 100644 --- a/src/kvirc/module/kvi_moduleextension.h +++ b/src/kvirc/module/kvi_moduleextension.h @@ -116,10 +116,10 @@ public: KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName); static KviModuleExtensionManager * instance(){ return g_pModuleExtensionManager; }; KviModuleExtensionDescriptorList * getExtensionList(const KviStr &szType); - KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); - KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); + KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const TQString &preloadModule = TQString::null); + KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const TQString &preloadModule = TQString::null); private: - KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule); + KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const TQString &preloadModule); }; diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index 4d83edd0..e874c2eb 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -43,7 +43,7 @@ KviModuleManager * g_pModuleManager = 0; KviModuleManager::KviModuleManager() { - m_pModuleDict = new KviPointerHashTable<const char *,KviModule>(17,false); + m_pModuleDict = new KviPointerHashTable<TQString,KviModule>(17,false); m_pModuleDict->setAutoDelete(false); m_pCleanupTimer = new TQTimer(this); @@ -72,7 +72,7 @@ void KviModuleManager::loadModulesByCaps(const char * caps,const char * dir) { KviStr modname = *it; modname.cutToLast(KVI_PATH_SEPARATOR_CHAR); - getModule((*it).ascii()); + getModule((*it)); } } @@ -122,14 +122,14 @@ void KviModuleManager::completeModuleNames(const TQString &word,KviPointerList<T completeModuleNames(szDir,word,matches); } -KviModule * KviModuleManager::findModule(const char * modName) +KviModule * KviModuleManager::findModule(const TQString &modName) { KviModule * m = m_pModuleDict->find(modName); if(m)m->updateAccessTime(); return m; } -KviModule * KviModuleManager::getModule(const char * modName) +KviModule * KviModuleManager::getModule(const TQString &modName) { KviModule * m = m_pModuleDict->find(modName); if(!m) @@ -154,19 +154,18 @@ static bool default_module_cmd_unload(KviModule *m,KviCommand *) } */ -bool KviModuleManager::loadModule(const char * modName) +bool KviModuleManager::loadModule(const TQString &modName) { if(findModule(modName)) { - //tqDebug("MODULE %s ALREADY IN CORE MEMORY",modName); + //tqDebug("MODULE %s ALREADY IN CORE MEMORY",modName.local8Bit().data()); return true; } TQString tmp; - TQString szName; #ifdef COMPILE_ON_WINDOWS - KviTQString::appendFormatted(szName,"kvi%s.dll",modName); + TQString szName { TQString::fromLatin1("kvi%1.dll").arg(modName) }; #else - KviTQString::appendFormatted(szName,"libkvi%s.so",modName); + TQString szName { TQString::fromLatin1("libkvi%1.so").arg(modName) }; #endif szName=szName.lower(); @@ -181,7 +180,7 @@ bool KviModuleManager::loadModule(const char * modName) if(!handle) { m_szLastError = kvi_library_error(); - //tqDebug("ERROR IN LOADING MODULE %s (%s): %s",modName,szName.ptr(),kvi_library_error()); + //tqDebug("ERROR IN LOADING MODULE %s (%s): %s",modName.local8Bit().data(),szName.ptr(),kvi_library_error()); return false; } KviModuleInfo * info = (KviModuleInfo *)kvi_library_symbol(handle,KVIRC_MODULE_STRUCTURE_SYMBOL); @@ -209,7 +208,7 @@ bool KviModuleManager::loadModule(const char * modName) return false; } } - KviModule * module = new KviModule(handle,info,modName,szName.utf8().data()); + KviModule * module = new KviModule(handle,info,modName,szName); // the module is probably up.. the only thing can fail is the init_routine now // load the message catalogue if any @@ -230,7 +229,7 @@ bool KviModuleManager::loadModule(const char * modName) if(!((info->init_routine)(module))) { m_szLastError = __tr2qs("Failed to execute the init routine"); - //tqDebug("ERROR IN LOADING MODULE %s (%s): failed to execute the init routine",modName,szName.ptr()); + //tqDebug("ERROR IN LOADING MODULE %s (%s): failed to execute the init routine",modName.local8Bit().data(),szName.ptr()); kvi_library_close(handle); delete module; // kill the message catalogue too then @@ -258,7 +257,7 @@ bool KviModuleManager::loadModule(const char * modName) if(_OUTPUT_VERBOSE && !g_pApp->closingDown()) { if(g_pFrame)g_pFrame->firstConsole()->output(KVI_OUT_VERBOSE, - __tr2qs("Loaded module '%s' (%s)"),modName,szName.utf8().data()); + __tr2qs("Loaded module '%s' (%s)"),modName.utf8().data(),szName.utf8().data()); } return true; } @@ -271,7 +270,7 @@ void KviModuleManager::registerDefaultCommands(KviModule * module) module->registerCommand("unload",default_module_cmd_unload); } */ -bool KviModuleManager::unloadModule(const char * modName) +bool KviModuleManager::unloadModule(const TQString &modName) { return unloadModule(findModule(modName)); } @@ -310,7 +309,7 @@ bool KviModuleManager::unloadModule(KviModule * module) bool KviModuleManager::hasLockedModules() { - KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict); + KviPointerHashTableIterator<TQString,KviModule> it(*m_pModuleDict); while(KviModule * m = it.current()) { if(m->isLocked())return true; @@ -322,7 +321,7 @@ bool KviModuleManager::hasLockedModules() void KviModuleManager::cleanupUnusedModules() { - KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict); + KviPointerHashTableIterator<TQString,KviModule> it(*m_pModuleDict); KviPointerList<KviModule> lModulesToUnload; lModulesToUnload.setAutoDelete(false); @@ -354,7 +353,7 @@ void KviModuleManager::cleanupUnusedModules() void KviModuleManager::unloadAllModules() { - KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict); + KviPointerHashTableIterator<TQString,KviModule> it(*m_pModuleDict); KviPointerList<KviModule> lModulesToUnload; lModulesToUnload.setAutoDelete(false); @@ -367,3 +366,5 @@ void KviModuleManager::unloadAllModules() for(KviModule * pModule = lModulesToUnload.first();pModule;pModule = lModulesToUnload.next()) unloadModule(pModule); } + +#include "kvi_modulemanager.moc" diff --git a/src/kvirc/module/kvi_modulemanager.h b/src/kvirc/module/kvi_modulemanager.h index 79b34b5b..b89802ef 100644 --- a/src/kvirc/module/kvi_modulemanager.h +++ b/src/kvirc/module/kvi_modulemanager.h @@ -42,15 +42,15 @@ public: KviModuleManager(); ~KviModuleManager(); private: - KviPointerHashTable<const char *,KviModule> * m_pModuleDict; - TQTimer * m_pCleanupTimer; - KviStr m_szLastError; + KviPointerHashTable<TQString,KviModule> * m_pModuleDict; + TQTimer * m_pCleanupTimer; + KviStr m_szLastError; public: KviStr & lastError(){ return m_szLastError; }; - KviModule * findModule(const char * modName); - KviModule * getModule(const char * modName); - bool loadModule(const char * modName); - bool unloadModule(const char * modName); + KviModule * findModule(const TQString &modName); + KviModule * getModule(const TQString &modName); + bool loadModule(const TQString &modName); + bool unloadModule(const TQString &modName); bool unloadModule(KviModule * module); void unloadAllModules(); //void registerDefaultCommands(KviModule * module); diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 7ed3dc74..dfb3ab53 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -1021,8 +1021,8 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg) } else bIsChannel = true; } - TQString szRequest = pOut->decodeText(req); - TQString szTag = pOut->decodeText(msg->szTag); + TQString szRequest { req }; + TQString szTag { msg->szTag }; TQString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : TQString("CTCP"); if(msg->bIsFlood) @@ -1143,7 +1143,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpVersion)) { - TQString szVersion = "KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE " - " KVI_BUILD_FLAGS; + TQString szVersion = "KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE; szVersion.append(TQString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release())); //szVersion.append(TQString(" - TQt Version: %1 - %2").arg(tqVersion()).arg(__tr2qs("http://www.kvirc.net/"))); if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty()) @@ -1315,7 +1315,7 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpTime)) { - replyCtcp(msg,TQDateTime::currentDateTime().toString()); + replyCtcp(msg,TQDateTime::currentDateTime().toString().utf8().data()); } else msg->bIgnored = true; } @@ -1333,7 +1333,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg) { KVI_OPTION_STRING(KviOption_stringCtcpPageReply) = KVI_DEFAULT_CTCP_PAGE_REPLY; } - replyCtcp(msg,KVI_OPTION_STRING(KviOption_stringCtcpPageReply)); + replyCtcp(msg,KVI_OPTION_STRING(KviOption_stringCtcpPageReply).utf8().data()); if(KVI_OPTION_BOOL(KviOption_boolShowDialogOnCtcpPage)) { if(!g_pCtcpPageDialog)g_pCtcpPageDialog = new KviCtcpPageDialog(); @@ -1494,7 +1494,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) szFileName.replace(" ","_"); // escape the spaces with the right octal code - encodeCtcpParameter(szFileName,szReply); + encodeCtcpParameter(szFileName.utf8().data(),szReply); if(!a->isRemote()) @@ -1745,11 +1745,11 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) { TQString decoded = msg->msg->console()->decodeText(p.szType.ptr()); msg->msg->console()->output(KVI_OUT_DCCREQUEST, - __tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%s %s)"), + __tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"), &decoded,&(msg->pSource->nick()), &(msg->pSource->user()),&(msg->pSource->host()), - msg->msg->console()->decodeText(msg->szTag).data(), - msg->msg->console()->decodeText(aux.ptr()).data()); + msg->szTag, + msg->msg->console()->decodeText(aux.ptr())); } KviModule * m = g_pModuleManager->getModule("dcc"); diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index 35d50950..08992496 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -1481,7 +1481,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) &szNick,&szUser,&szHost,&szNewNick); if(!_OUTPUT_MUTE) old->output(KVI_OUT_SYSTEMWARNING,__tr2qs("End of merged output")); - old->userAction(szNewNick,szUser,szHost,KVI_USERACTION_NICK); + old->userAction(szNewNick,szUser,szHost,KVI_USERACTION_NICK); if(bTQWasActive)old->delayedAutoRaise(); } if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) @@ -1495,7 +1495,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) { // the target SHOULD have changed his nick here if(!q->nickChange(szNick,szNewNick)) - tqDebug("Internal error: query %s failed to change nick from %s to s",szNick.utf8().data(),szNick.utf8().data(),szNewNick.utf8().data()); + tqDebug("Internal error: query %s failed to change nick from %s to %s",szNick.local8Bit().data(),szNick.local8Bit().data(),szNewNick.local8Bit().data()); if(!msg->haltOutput()) q->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"), &szNick,&szUser,&szHost,&szNewNick); diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index 2637d4d8..248cdb2f 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -213,4 +213,4 @@ void KviActionDrawer::fill() } } - +#include "kvi_actiondrawer.moc" diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index a224bb42..cb4ce52b 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -107,7 +107,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name m_pActionHistory->setAutoDelete(true); m_uActionHistoryHotActionCount = 0; - m_pTmpHighLighted = new KviPointerHashTable<const char *,TQString>(); + m_pTmpHighLighted = new KviPointerHashTable<TQString,TQString>(); m_pTmpHighLighted->setAutoDelete(true); // Register ourselves @@ -393,7 +393,8 @@ void KviChannel::toggleModeEditor() if(m_pModeEditorButton->isOn()) m_pModeEditorButton->setOn(false); resizeEvent(0); } else { - m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(),m_szChannelMode,m_szChannelKey,m_szChannelLimit.ptr()); + m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(), + m_szChannelMode.utf8().data(),m_szChannelKey.utf8().data(),m_szChannelLimit.ptr()); connect(m_pModeEditor,TQ_SIGNAL(setMode(const char *)),this,TQ_SLOT(setMode(const char *))); connect(m_pModeEditor,TQ_SIGNAL(done()),this,TQ_SLOT(modeSelectorDone())); m_pModeEditor->show(); @@ -489,7 +490,7 @@ void KviChannel::removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l) { KviStr masks; KviStr flags; - unsigned int count = 0; + int count = 0; for(KviMaskEntry * e = l->first();e;e = l->next()) { if(masks.hasData())masks.append(' '); @@ -556,28 +557,28 @@ void KviChannel::setChannelMode(char mode,bool bAdd) } } -void KviChannel::setChannelKey(const char * key) +void KviChannel::setChannelKey(const TQString &key) { m_szChannelKey = key; updateModeLabel(); updateCaption(); } -void KviChannel::setChannelLimit(const char * limit) +void KviChannel::setChannelLimit(const TQString &limit) { m_szChannelLimit = limit; updateModeLabel(); updateCaption(); } -void KviChannel::addHighlightedUser(const char * nick) +void KviChannel::addHighlightedUser(const TQString &nick) { if(!m_pUserListView->findEntry(nick))return; else m_pTmpHighLighted->replace(nick,new TQString()); } -void KviChannel::removeHighlightedUser(const char * nick) +void KviChannel::removeHighlightedUser(const TQString &nick) { m_pTmpHighLighted->remove(nick); } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 93867b40..bd223c6d 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -140,7 +140,7 @@ protected: KviPixmap m_privateBackground; TQDateTime m_joinTime; TQString m_szNameWithUserFlag; - KviPointerHashTable<const char *,TQString> * m_pTmpHighLighted; + KviPointerHashTable<TQString,TQString> * m_pTmpHighLighted; unsigned int m_uActionHistoryHotActionCount; KviPointerList<KviChannelAction> * m_pActionHistory; kvi_time_t m_tLastReceivedWhoReply; @@ -272,8 +272,8 @@ public: void ownMessage(const TQString &buffer); void ownAction(const TQString &buffer); void setChannelMode(char mode,bool bAdd); - void setChannelKey(const char * key); - void setChannelLimit(const char * limit); + void setChannelKey(const TQString &key); + void setChannelLimit(const TQString &limit); void getChannelModeString(TQString &buffer); @@ -283,10 +283,10 @@ public: bool hasChannelKey() { return !m_szChannelKey.isEmpty(); }; TQString & channelKey(){ return m_szChannelKey; }; - void addHighlightedUser(const char * nick); - void removeHighlightedUser(const char * nick); - bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); }; - KviIrcView * messageView() const { return m_pMessageView; }; + void addHighlightedUser(const TQString &nick); + void removeHighlightedUser(const TQString &nick); + bool isHighlightedUser(const TQString &nick) { return m_pTmpHighLighted->find(nick); }; + KviIrcView * messageView() const { return m_pMessageView; }; virtual void lostUserFocus(); virtual void getTaskBarTipText(TQString &buffer); TQString channelMode() { return m_szChannelMode; }; diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 24259c2c..618940f2 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -523,3 +523,5 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) unhandled: return KviToolBar::eventFilter(o,e); } + +#include "kvi_customtoolbar.moc" diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 70651796..ec209c74 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -130,3 +130,4 @@ TQSize KviDebugWindow::sizeHint() const return ret; } +#include "kvi_debugwindow.moc" diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 5f9fdf1b..a9ca67e2 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -469,7 +469,7 @@ void KviFrame::executeInternalCommand(int index) } -void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection) +void KviFrame::saveWindowProperties(KviWindow * wnd,const TQString &szSection) { g_pWinPropertiesConfig->setGroup(szSection); g_pWinPropertiesConfig->writeEntry("EntryTimestamp",(unsigned int)time(0)); diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index b7486c26..22d164cb 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -161,7 +161,7 @@ public: // and the active irc context changes state void updateCaption(); // helper for saving the window properties - void saveWindowProperties(KviWindow * wnd,const char * szSection); + void saveWindowProperties(KviWindow * wnd,const TQString &szSection); // finds the module extension toolbar with the specified identifier // see kvi_moduleextension.h and kvi_mextoolbar.h KviMexToolBar * moduleExtensionToolBar(int extensionId); diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 18330547..da92abb0 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -152,4 +152,4 @@ int KviHtmlDialog::display(TQWidget * pParent,KviHtmlDialogData * pData) return pData->iSelectedButton; } - +#include "kvi_htmldialog.moc" diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index 4d79b932..1cd9fb31 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -361,3 +361,5 @@ void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) KviImageDialogItem * i = (KviImageDialogItem *)it; m_pTip->tip(r,i->tipText()); } + +#include "kvi_imagedialog.moc" diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index eab23235..eed1c463 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -117,7 +117,7 @@ void KviInputHistory::add(TQString * s) if(m_pStringList->count() > KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES)m_pStringList->removeLast(); } -void KviInputHistory::load(const char * filename) +void KviInputHistory::load(const TQString &filename) { KviConfig c(filename,KviConfig::Read); @@ -135,7 +135,7 @@ void KviInputHistory::load(const char * filename) } } -void KviInputHistory::save(const char * filename) +void KviInputHistory::save(const TQString &filename) { KviConfig c(filename,KviConfig::Write); c.clear(); @@ -1982,7 +1982,7 @@ void KviInputEditor::home() void KviInputEditor::insertChar(TQChar c) { - if(m_szTextBuffer.length() >= m_iMaxBufferSize)return; + if(m_szTextBuffer.length() >= static_cast<unsigned int>(m_iMaxBufferSize))return; // Kill the selection if((m_iSelectionBegin > -1) || (m_iSelectionEnd > -1)) @@ -2340,7 +2340,7 @@ void KviInput::inputEditorEnterPressed() void KviInput::keyPressEvent(TQKeyEvent *e) { - //tqDebug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data()); + //tqDebug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().local8Bit().data()); if((e->state() & TQt::ControlButton) || (e->state() & TQt::AltButton) || (e->state() & TQt::MetaButton)) { diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 60ee313d..2d1cb10c 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -67,8 +67,8 @@ protected: public: void add(TQString * s); KviPointerList<TQString> * list(){ return m_pStringList; }; - void save(const char * filename); - void load(const char * filename); + void save(const TQString &filename); + void load(const TQString &filename); }; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 9422296e..6cd5d944 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -502,9 +502,7 @@ void KviIrcView::stopLogging() { if(m_pLogFile) { - TQString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); - + TQString szLogEnd { __tr2qs("### Log session terminated at %1 ###").arg(TQDateTime::currentDateTime().toString()) }; add2Log(szLogEnd); m_pLogFile->close(); #ifdef COMPILE_ZLIB_SUPPORT @@ -676,8 +674,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) } } - TQString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); + TQString szLogStart { __tr2qs("### Log session started at %1 ###").arg(TQDateTime::currentDateTime().toString()) }; add2Log(szLogStart); if(bPrependCurBuffer) { diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 88717dfa..1ceeefcc 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -207,7 +207,7 @@ public slots: signals: void rightClicked(); void dndEntered(); - void fileDropped(const char *); + void fileDropped(const TQString&); private: void setCursorLine(KviIrcViewLine * l); KviIrcViewLine * getVisibleLineAt(int xPos,int yPos); diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index e71e1ab9..7fc44a3c 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -337,3 +337,4 @@ void KviIrcViewToolTip::maybeTip(const TQPoint &pnt) m_pView->maybeTip(pnt); } +#include "kvi_ircviewtools.moc" diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index 4a459e5e..7352f5b6 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -203,3 +203,5 @@ void KviListView::focusOutEvent(TQFocusEvent * e) } #endif + +#include "kvi_listview.moc" diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index 6276f821..d9954acc 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -249,3 +249,4 @@ TQSize KviMenuBarToolButton::sizeHint() const return TQSize(20,20); } +#include "kvi_mdicaption.moc" diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 6f4e8947..fd1b57aa 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -557,4 +557,4 @@ TQSize KviMdiChild::sizeHint() return TQFrame::sizeHint(); } - +#include "kvi_mdichild.moc" diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 07013f70..1fea6ad2 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -1050,4 +1050,4 @@ void KviMdiManager::tileAnodine() updateContentsSize(); } - +#include "kvi_mdimanager.moc" diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 7f8df435..9e0519fd 100644 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -137,7 +137,7 @@ void KviModeWidget::editorReturnPressed() TQString szCurModes=m_pChannel->channelMode(); TQString szNewModes=m_pLineEdit->text(); TQString szMinusModes; - for(int i=0; i<szCurModes.length(); i++) + for(unsigned int i=0; i<szCurModes.length(); i++) { if(szNewModes.contains(szCurModes[i])) szNewModes.remove(szCurModes[i]); @@ -157,12 +157,12 @@ void KviModeWidget::editorReturnPressed() void KviModeWidget::editorTextChanged( const TQString & text) { - int i = 0; + unsigned int i = 0; TQString szText=text; for(i=0;i<szText.length();i++) { if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().contains(szText[i]) || - szText.find(szText[i])<i ) + szText.find(szText[i])<static_cast<int>(i) ) szText.remove(i,1); } m_pLineEdit->setText(szText); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 334530c4..bd3651f3 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -106,7 +106,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) // FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..." m_pIrcView->enableDnd(true); - connect(m_pIrcView,TQ_SIGNAL(fileDropped(const char *)),this,TQ_SLOT(slotDndEvents(const char *))); + connect(m_pIrcView,TQ_SIGNAL(fileDropped(const TQString&)),this,TQ_SLOT(slotDndEvents(const TQString&))); updateCaption(); } @@ -253,9 +253,9 @@ TQString KviQuery::getInfoLabelText() } return tmp; } -void KviQuery::slotDndEvents(const char *file) +void KviQuery::slotDndEvents(const TQString &file) { - KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,TQString(file)); + KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,file); } void KviQuery::triggerCreationEvents() diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h index 6f05063b..729fe87b 100644 --- a/src/kvirc/ui/kvi_query.h +++ b/src/kvirc/ui/kvi_query.h @@ -90,7 +90,7 @@ protected: protected slots: void textViewRightClicked(); void toggleListView(); - void slotDndEvents(const char *); + void slotDndEvents(const TQString&); }; #endif //_KVI_CHANNEL_H_ diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h index c26b4332..e5857f2a 100644 --- a/src/kvirc/ui/kvi_scriptbutton.h +++ b/src/kvirc/ui/kvi_scriptbutton.h @@ -44,7 +44,7 @@ protected: public: void setButtonCode(KviKvsScript * pScript); virtual void setButtonPixmap(const TQPixmap & pix){ setIconSet(pix); }; - void setButtonText(const char * text){ setTextLabel(text); }; + void setButtonText(const TQString &text){ setTextLabel(text); }; virtual KviWindow * window(); protected slots: void btnClicked(); diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 16037a89..4d3cd1a7 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -274,19 +274,18 @@ void KviPixmapSelector::choosePixmap() } } -void KviPixmapSelector::setImagePath(const char * path) +void KviPixmapSelector::setImagePath(const TQString &path) { m_localPixmap.load(path); m_pPreview->setPixmap(&m_localPixmap); if(m_localPixmap.isNull()) { - KviStr tmp2(KviStr::Format,__tr("Unloadable: %s"),path); - m_pFileNameLabel->setText(tmp2.ptr()); + m_pFileNameLabel->setText(__tr2qs("Unloadable: %1").arg(path)); m_pCheckBox->setChecked(false); } else { - m_pCheckBox->setChecked(true); m_pFileNameLabel->setText(path); + m_pCheckBox->setChecked(true); } setEnabled(isEnabled()); diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 843b31c3..7bd447f1 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -152,7 +152,7 @@ private: KviPixmap * m_pOption; KviPixmap m_localPixmap; public: - void setImagePath(const char * path); + void setImagePath(const TQString &path); virtual void commit(); virtual void setEnabled(bool bEnabled); protected slots: diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 2ec878b6..3d8be6a4 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -153,7 +153,7 @@ void KviStatusBar::load() tmp.sprintf("%s_PreloadModule",prefix.ptr()); TQString szPreloadModule = cfg.readEntry(tmp.ptr(),""); if(!szPreloadModule.isEmpty()) - g_pModuleManager->getModule(szPreloadModule.utf8().data()); + g_pModuleManager->getModule(szPreloadModule); KviStatusBarApplet * a = createApplet(szInternalName); if (a) @@ -627,3 +627,5 @@ void KviStatusBar::setPermanentMessage() m_pMessageLabel->setText(txt); } + +#include "kvi_statusbar.moc" diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 3a23bd34..2e610248 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -552,3 +552,4 @@ void KviStatusBarSeparator::selfRegister(KviStatusBar * pBar) pBar->registerAppletDescriptor(d); } +#include "kvi_statusbarapplet.moc" diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 286b3ff8..b11fc4d2 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -216,7 +216,7 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event) ); image.setPixel(x,y,rgb); } - p.drawImage(0,0,image); + p.drawImage(0,0,image); } else { p.drawPixmap(0,0,pix); } @@ -331,7 +331,7 @@ void KviStyledToolButton::paintEvent ( TQPaintEvent * event) ); image.setPixel(x,y,rgb); } - p.drawImage(pos,image); + p.drawImage(pos,image); } else { p.drawPixmap(pos,pix); } diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 64a857a2..e65c26c2 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -613,7 +613,7 @@ void KviClassicTaskBar::doLayout() if ((orientation() == TQt::Horizontal) && - (((unsigned int)rows) > m_pBase->height() / m_iButtonHeight )) + (rows > m_pBase->height() / m_iButtonHeight )) { rows = m_pBase->height() / m_iButtonHeight; } @@ -642,7 +642,7 @@ void KviClassicTaskBar::doLayout() if((btnInRow == btnsInRow) || (totCount == 1))theWidth = baseWidth - theX; } - if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && + if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > static_cast<int>(KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth))) && (orientation() == TQt::Horizontal) ) theWidth = KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth); diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index e4f6fb5e..34feb54a 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -272,5 +272,4 @@ hideme: doHide(); } - #include "kvi_texticonwin.moc" diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 0a2ec1a7..a5262374 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -132,3 +132,5 @@ KviWindowToolPageButton::~KviWindowToolPageButton() p->rotate( -90 ); p->drawPixmap( 1 - pixmap.width(), 0, pixmap ); }*/ + +#include "kvi_toolwindows_container.moc" diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 7fb4b491..378a0f14 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -162,8 +162,8 @@ void KviUserListEntry::recalcSize() if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (av->pixmap()->width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (av->pixmap()->height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + (static_cast<unsigned int>(av->pixmap()->width()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + (static_cast<unsigned int>(av->pixmap()->height()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) { @@ -1549,8 +1549,8 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev) if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || - (av->pixmap()->width() > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || - (av->pixmap()->height() > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) + (static_cast<unsigned int>(av->pixmap()->width()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth)) || + (static_cast<unsigned int>(av->pixmap()->height()) > KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) ) ) pix=av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth),KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); @@ -1793,7 +1793,7 @@ void KviUserListViewArea::keyPressEvent( TQKeyEvent * e ) KviUserListEntry * aux = m_pListView->m_pHeadItem; while(aux) { - //tqDebug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0)); + //tqDebug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().local8Bit().data(),aux->nick().find(szKey,0,0)); if(aux->nick().find(szKey,0,0)==0) { nick=aux; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 013e5215..977e2361 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -103,10 +103,6 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * m_uId = g_uUniqueWindowId; g_uUniqueWindowId++; - - // FIXME: REMOVE THIS - setName(name); - // END FIXME m_szName = name; g_pApp->registerWindow(this); @@ -185,10 +181,10 @@ void KviWindow::toggleButtonContainer() } } -void KviWindow::setName(const char * name) +void KviWindow::setName(const TQString &name) { m_szName = name; - TQWidget::setName(name); + TQWidget::setName(name.utf8().data()); } KviIrcConnection * KviWindow::connection() @@ -847,7 +843,7 @@ void KviWindow::savePropertiesAsDefault() TQString group; getConfigGroupName(group); - if(!kvi_strEqualCI(group,typeString())) + if(!kvi_strEqualCI(group.utf8(),typeString())) { // save also the settings for THIS specialized window g_pFrame->saveWindowProperties(this,group); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index dce7bb7c..f5abee09 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -183,7 +183,7 @@ public: const TQString & windowName(){ return m_szName; }; void setWindowName(const TQString &szName); // force TQt to set our UNICODE name too... FIXME: this should be removed later... - virtual void setName(const char * szName); + virtual void setName(const TQString &szName); // Window type management int type() const { return m_iType; }; diff --git a/src/modules/about/Makefile.am b/src/modules/about/Makefile.am index 4192c119..bc1654d5 100644 --- a/src/modules/about/Makefile.am +++ b/src/modules/about/Makefile.am @@ -11,7 +11,7 @@ libkviabout_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviabout_la_SOURCES = libkviabout.cpp aboutdialog.cpp -libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= aboutdialog.h diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 540a7fb3..1d4eb9ff 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -130,7 +130,7 @@ KviAboutDialog::KviAboutDialog() TQString szLicense; TQString szLicensePath; - g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { diff --git a/src/modules/about/abouttext.inc b/src/modules/about/abouttext.inc index c35fc173..6e5c0b16 100644 --- a/src/modules/about/abouttext.inc +++ b/src/modules/about/abouttext.inc @@ -1,4 +1,4 @@ -static char * g_szAboutText = "" \ +static const char *g_szAboutText = "" \ "<html>" \ "<head>" \ "<title>Honor and glory</title>" \ diff --git a/src/modules/about/mkabouttext.pl b/src/modules/about/mkabouttext.pl index 0b58a42c..482bae72 100644 --- a/src/modules/about/mkabouttext.pl +++ b/src/modules/about/mkabouttext.pl @@ -70,7 +70,7 @@ sub p open(OUT,">abouttext.inc") or die "Can't open abouttext.inc"; -print OUT "static char * g_szAboutText = \"\" \\\n"; +print OUT "static const char * g_szAboutText = \"\" \\\n"; p "<html>"; p " <head>"; diff --git a/src/modules/action/Makefile.am b/src/modules/action/Makefile.am index 2015e908..f765fa25 100644 --- a/src/modules/action/Makefile.am +++ b/src/modules/action/Makefile.am @@ -11,7 +11,7 @@ libkviaction_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviaction_la_SOURCES = libkviaction.cpp -libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= actiondialog.h diff --git a/src/modules/actioneditor/Makefile.am b/src/modules/actioneditor/Makefile.am index 84ce9dd7..937892e1 100644 --- a/src/modules/actioneditor/Makefile.am +++ b/src/modules/actioneditor/Makefile.am @@ -10,12 +10,12 @@ pluglib_LTLIBRARIES = libkviactioneditor.la libkviactioneditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviactioneditor_la_SOURCES = libkviactioneditor.cpp actioneditor.cpp -nodist_libkviactioneditor_la_SOURCES = moc_actioneditor.cpp -noinst_HEADERS = actioneditor.h -libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la -# noinst_HEADERS= +noinst_HEADERS = actioneditor.h -moc_actioneditor.cpp: actioneditor.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +actioneditor.cpp: actioneditor.moc diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 608a90e5..3e736fc1 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -383,7 +383,7 @@ void KviSingleActionEditor::chooseSmallIcon() TQString s = d->selectedImage(); delete d; if(ret != TQDialog::Accepted)return; - TQPixmap * p = g_pIconManager->getImage(s.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(s); if(!p)return; m_pSmallIconEdit->setText(s); m_pSmallIconButton->setPixmap(*p); @@ -993,3 +993,5 @@ void KviActionEditorWindow::loadProperties(KviConfig *cfg) def.append((w * 75) / 100); m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); } + +#include "actioneditor.moc" diff --git a/src/modules/addon/Makefile.am b/src/modules/addon/Makefile.am index e232b8ff..61e2a1cc 100644 --- a/src/modules/addon/Makefile.am +++ b/src/modules/addon/Makefile.am @@ -12,11 +12,12 @@ pluglib_LTLIBRARIES = libkviaddon.la libkviaddon_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviaddon_la_SOURCES = libkviaddon.cpp managementdialog.cpp -nodist_libkviaddon_la_SOURCES = moc_managementdialog.cpp -libkviaddon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviaddon_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= managementdialog.h -moc_managementdialog.cpp: managementdialog.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +managementdialog.cpp: managementdialog.moc diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index a19022a2..a990c47a 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -370,3 +370,4 @@ void KviScriptManagementDialog::closeEvent(TQCloseEvent * e) delete this; } +#include "managementdialog.moc" diff --git a/src/modules/aliaseditor/Makefile.am b/src/modules/aliaseditor/Makefile.am index 60845dbc..6fcfd844 100644 --- a/src/modules/aliaseditor/Makefile.am +++ b/src/modules/aliaseditor/Makefile.am @@ -10,12 +10,12 @@ pluglib_LTLIBRARIES = libkvialiaseditor.la libkvialiaseditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvialiaseditor_la_SOURCES = libkvialiaseditor.cpp aliaseditor.cpp -nodist_libkvialiaseditor_la_SOURCES = moc_aliaseditor.cpp -noinst_HEADERS = aliaseditor.h -libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la -# noinst_HEADERS= +noinst_HEADERS = aliaseditor.h -moc_aliaseditor.cpp: aliaseditor.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +aliaseditor.cpp: aliaseditor.moc diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index 30353a50..4a0e60cd 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -1401,3 +1401,5 @@ void KviAliasEditorWindow::loadProperties(KviConfig *cfg) { m_pEditor->loadProperties(cfg); } + +#include "aliaseditor.moc" diff --git a/src/modules/avatar/Makefile.am b/src/modules/avatar/Makefile.am index 8e8a793a..7567295c 100644 --- a/src/modules/avatar/Makefile.am +++ b/src/modules/avatar/Makefile.am @@ -10,11 +10,12 @@ pluglib_LTLIBRARIES = libkviavatar.la libkviavatar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviavatar_la_SOURCES = libkviavatar.cpp -nodist_libkviavatar_la_SOURCES = moc_libkviavatar.cpp -libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = libkviavatar.h -moc_%.cpp: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +libkviavatar.cpp: libkviavatar.moc diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index 57b51f01..c77f7870 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -583,3 +583,5 @@ KVIRC_MODULE( 0, avatar_module_cleanup ) + +#include "libkviavatar.moc" diff --git a/src/modules/chan/Makefile.am b/src/modules/chan/Makefile.am index 620836ac..312f12b1 100644 --- a/src/modules/chan/Makefile.am +++ b/src/modules/chan/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvichan.la libkvichan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvichan_la_SOURCES = libkvichan.cpp -libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/channelsjoin/Makefile.am b/src/modules/channelsjoin/Makefile.am index c9f8a78e..09436e6e 100644 --- a/src/modules/channelsjoin/Makefile.am +++ b/src/modules/channelsjoin/Makefile.am @@ -10,11 +10,12 @@ pluglib_LTLIBRARIES = libkvichannelsjoin.la libkvichannelsjoin_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvichannelsjoin_la_SOURCES = libkvichannelsjoin.cpp channelsjoinwindow.cpp -libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= channelsjoinwindow.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -channelsjoinwindow.cpp: m_channelsjoinwindow.moc +channelsjoinwindow.cpp: channelsjoinwindow.moc diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 57c31930..32149579 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -174,10 +174,10 @@ void KviChannelsJoinWindow::fillListView() par = new KviTalListViewItem(m_pListView,__tr2qs("Registered Channels")); par->setOpen(true); - KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviPointerHashTable<TQString,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); if(d) { - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*d); while(it.current()) { chld = new KviTalListViewItem(par,it.currentKey()); @@ -290,4 +290,4 @@ void KviChannelsJoinWindow::closeEvent(TQCloseEvent *e) delete this; } -#include "m_channelsjoinwindow.moc" +#include "channelsjoinwindow.moc" diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am index bf0a6816..3ae0d0ba 100644 --- a/src/modules/clock/Makefile.am +++ b/src/modules/clock/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviclock.la libkviclock_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviclock_la_SOURCES = libkviclock.cpp -libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviclock.h diff --git a/src/modules/codetester/Makefile.am b/src/modules/codetester/Makefile.am index 37540094..b7b15455 100644 --- a/src/modules/codetester/Makefile.am +++ b/src/modules/codetester/Makefile.am @@ -6,12 +6,12 @@ pluglib_LTLIBRARIES = libkvicodetester.la libkvicodetester_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvicodetester_la_SOURCES = libkvicodetester.cpp codetester.cpp -nodist_libkvicodetester_la_SOURCES = moc_codetester.cpp -noinst_HEADERS = codetester.h -libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la -# noinst_HEADERS= +noinst_HEADERS = codetester.h -moc_codetester.cpp: codetester.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +codetester.cpp: codetester.moc diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index eb58a9a7..abd7d453 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -155,3 +155,5 @@ void KviCodeTesterWindow::loadProperties(KviConfig *cfg) #endif // COMPILE_SCRIPTTOOLBAR */ } + +#include "codetester.moc" diff --git a/src/modules/config/Makefile.am b/src/modules/config/Makefile.am index 1a43c2e9..78310a2e 100644 --- a/src/modules/config/Makefile.am +++ b/src/modules/config/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviconfig.la libkviconfig_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviconfig_la_SOURCES = libkviconfig.cpp -libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/context/Makefile.am b/src/modules/context/Makefile.am index e4ec3252..a303fc0d 100644 --- a/src/modules/context/Makefile.am +++ b/src/modules/context/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvicontext.la libkvicontext_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvicontext_la_SOURCES = libkvicontext.cpp -libkvicontext_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvicontext_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/dcc/Makefile.am b/src/modules/dcc/Makefile.am index 8a63b888..f168506a 100644 --- a/src/modules/dcc/Makefile.am +++ b/src/modules/dcc/Makefile.am @@ -8,7 +8,6 @@ tmp_DATA=kvi_dccfiletransfericons.png EXTRA_DIST=kvi_dccfiletransfericons.png - AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" @@ -34,7 +33,7 @@ libkvidcc_la_SOURCES = adpcmcodec.cpp \ voice.cpp \ window.cpp -libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= adpcmcodec.h \ broker.h \ @@ -52,15 +51,15 @@ noinst_HEADERS= adpcmcodec.h \ voice.h \ window.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -broker.cpp: m_broker.moc -canvas.cpp: m_canvas.moc -canvaswidget.cpp: m_canvaswidget.moc -chat.cpp: m_chat.moc -dialogs.cpp: m_dialogs.moc -marshal.cpp: m_marshal.moc -send.cpp: m_send.moc -voice.cpp: m_voice.moc -window.cpp: m_window.moc +broker.cpp: broker.moc +canvas.cpp: canvas.moc +canvaswidget.cpp: canvaswidget.moc +chat.cpp: chat.moc +dialogs.cpp: dialogs.moc +marshal.cpp: marshal.moc +send.cpp: send.moc +voice.cpp: voice.moc +window.cpp: window.moc diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index a766f932..a2d44b76 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -576,7 +576,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath)) { g_pMediaManager->lock(); - if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName.utf8().data(),false)) + if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName,false)) { if(mt->szSavePath.hasData()) { @@ -895,4 +895,4 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename } -#include "m_broker.moc" +#include "broker.moc" diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index d9ccd025..03a925be 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -296,6 +296,6 @@ void KviDccCanvas::connected() } -#include "m_canvas.moc" +#include "canvas.moc" #endif diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index d012a05a..990ccd43 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1548,6 +1548,6 @@ void KviCanvasWidget::resizeEvent(TQResizeEvent *) } -#include "m_canvaswidget.moc" +#include "canvaswidget.moc" #endif diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 9ad8ded4..640e2764 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -839,4 +839,4 @@ out_of_the_loop: return bRet; } -#include "m_chat.moc" +#include "chat.moc" diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 9f4e3967..ac2f20c4 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -197,4 +197,4 @@ void KviDccRenameBox::cancelClicked() -#include "m_dialogs.moc" +#include "dialogs.moc" diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index de818ce4..d9ae6567 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -1143,7 +1143,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c) TQString szCodec; pCodec->asString(szCodec); - if(!kvi_dcc_voice_is_valid_codec(szCodec)) + if(!kvi_dcc_voice_is_valid_codec(szCodec.utf8().data())) { c->warning(__tr2qs_ctx("Invalid codec specified, defaulting to 'adpcm'","dcc")); d->szCodec = "adpcm"; diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index ba920ec7..856c927b 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -138,10 +138,10 @@ void KviDccMarshal::doListen() } // Check the address type - if(!kvi_isValidStringIp(m_szIp)) + if(!kvi_isValidStringIp(m_szIp.utf8().data())) { #ifdef COMPILE_IPV6_SUPPORT - if(!kvi_isValidStringIp_V6(m_szIp)) + if(!kvi_isValidStringIp_V6(m_szIp.utf8().data())) { emit error(KviError_invalidIpAddress); return; @@ -186,9 +186,9 @@ void KviDccMarshal::doListen() if((!KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)) || (m_uPort != 0)) { #ifdef COMPILE_IPV6_SUPPORT - KviSockaddr sa(m_szIp,m_uPort,m_bIpV6); + KviSockaddr sa(m_szIp.utf8().data(),m_uPort,m_bIpV6); #else - KviSockaddr sa(m_szIp,m_uPort,false); + KviSockaddr sa(m_szIp.utf8().data(),m_uPort,false); #endif if(!sa.socketAddress()) @@ -211,9 +211,9 @@ void KviDccMarshal::doListen() bool bBindSuccess; do { #ifdef COMPILE_IPV6_SUPPORT - KviSockaddr sa(m_szIp,m_uPort,m_bIpV6); + KviSockaddr sa(m_szIp.utf8().data(),m_uPort,m_bIpV6); #else - KviSockaddr sa(m_szIp,m_uPort,false); + KviSockaddr sa(m_szIp.utf8().data(),m_uPort,false); #endif if(!sa.socketAddress()) { @@ -327,10 +327,10 @@ void KviDccMarshal::doConnect() } // Check the address type - if(!kvi_isValidStringIp(m_szIp)) + if(!kvi_isValidStringIp(m_szIp.utf8().data())) { #ifdef COMPILE_IPV6_SUPPORT - if(!kvi_isValidStringIp_V6(m_szIp)) + if(!kvi_isValidStringIp_V6(m_szIp.utf8().data())) { emit error(KviError_invalidIpAddress); return; @@ -376,9 +376,9 @@ void KviDccMarshal::doConnect() // fill the sockaddr structure #ifdef COMPILE_IPV6_SUPPORT - KviSockaddr sa(m_szIp,m_uPort,m_bIpV6); + KviSockaddr sa(m_szIp.utf8().data(),m_uPort,m_bIpV6); #else - KviSockaddr sa(m_szIp,m_uPort,false); + KviSockaddr sa(m_szIp.utf8().data(),m_uPort,false); #endif if(!sa.socketAddress()) @@ -644,4 +644,4 @@ void KviDccMarshal::connectionTimedOut() } -#include "m_marshal.moc" +#include "marshal.moc" diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index bf8a9192..a3ab1945 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -92,7 +92,7 @@ static bool dcc_module_check_concurrent_transfers_limit(KviDccRequest * dcc) unsigned int uTransfers = KviDccFileTransfer::runningTransfersCount(); if(uTransfers >= KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers)) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Concurrent transfer limit reached (%u of %u transfers running)","dcc"), + KviStr szError(KviStr::Format,__tr2qs_ctx("Concurrent transfer limit reached (%u of %u transfers running)","dcc").utf8().data(), uTransfers,KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers)); dcc_module_request_error(dcc,szError.ptr()); return false; @@ -108,7 +108,7 @@ static bool dcc_module_check_limits(KviDccRequest * dcc) unsigned int uWindows = g_pDccBroker->dccWindowsCount(); if(uWindows >= KVI_OPTION_UINT(KviOption_uintMaxDccSlots)) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Slot limit reached (%u slots of %u)","dcc"), + KviStr szError(KviStr::Format,__tr2qs_ctx("Slot limit reached (%u slots of %u)","dcc").utf8().data(), uWindows,KVI_OPTION_UINT(KviOption_uintMaxDccSlots)); dcc_module_request_error(dcc,szError.ptr()); return false; @@ -153,7 +153,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr, { if(!dcc->ctcpMsg->msg->haltOutput()) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid port number %s","dcc"),port.ptr()); + KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid port number %s","dcc").utf8().data(),port.ptr()); dcc_module_request_error(dcc,szError.ptr()); } return false; @@ -169,7 +169,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr, { if(!dcc->ctcpMsg->msg->haltOutput()) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address in old format %s","dcc"),ipaddr.ptr()); + KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address in old format %s","dcc").utf8().data(),ipaddr.ptr()); dcc_module_request_error(dcc,szError.ptr()); } return false; @@ -188,7 +188,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr, #endif if(!dcc->ctcpMsg->msg->haltOutput()) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address %s","dcc"),ipaddr.ptr()); + KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address %s","dcc").utf8().data(),ipaddr.ptr()); dcc_module_request_error(dcc,szError.ptr()); } return false; @@ -525,7 +525,7 @@ static void dccModuleParseDccAccept(KviDccRequest *dcc) //#warning "IF KviOption_boolReplyCtcpErrmsgOnInvalidAccept..." if(!dcc->ctcpMsg->msg->haltOutput()) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %s on port %s","dcc"),dcc->szParam1.ptr(),dcc->szParam2.ptr()); + KviStr szError(KviStr::Format,__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %s on port %s","dcc").utf8().data(),dcc->szParam1.ptr(),dcc->szParam2.ptr()); dcc_module_request_error(dcc,szError.ptr()); } } @@ -550,7 +550,7 @@ static void dccModuleParseDccResume(KviDccRequest *dcc) { if(!dcc->ctcpMsg->msg->haltOutput()) { - KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid resume position argument '%s'","dcc"),dcc->szParam3.ptr()); + KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid resume position argument '%s'","dcc").utf8().data(),dcc->szParam3.ptr()); dcc_module_request_error(dcc,szError.ptr()); } return; @@ -562,7 +562,7 @@ static void dccModuleParseDccResume(KviDccRequest *dcc) if(!dcc->ctcpMsg->msg->haltOutput()) { KviStr szError(KviStr::Format, - __tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %s on port %s, or invalid resume size","dcc"), + __tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %s on port %s, or invalid resume size","dcc").utf8().data(), dcc->szParam1.ptr(),dcc->szParam2.ptr()); dcc_module_request_error(dcc,szError.ptr()); } @@ -626,7 +626,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc) { // senseless request KviStr szError(KviStr::Format, - __tr2qs_ctx("Invalid RECV request: Position %u is is larger than file size","dcc"),uResumeSize); + __tr2qs_ctx("Invalid RECV request: Position %u is is larger than file size","dcc").utf8().data(),uResumeSize); dcc_module_request_error(dcc,szError.ptr()); return; } @@ -843,7 +843,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc) if(!dcc->ctcpMsg->msg->haltOutput()) { KviStr szError(KviStr::Format, - __tr2qs_ctx("No file offer named '%s' (with size %s) available for %Q [%Q@%Q]","dcc"), + __tr2qs_ctx("No file offer named '%s' (with size %s) available for %Q [%Q@%Q]","dcc").utf8().data(), dcc->szParam1.ptr(),uSize > 0 ? dcc->szParam2.ptr() : __tr_ctx("\"any\"","dcc"), &(dcc->ctcpMsg->pSource->nick()), &(dcc->ctcpMsg->pSource->username()), @@ -1132,7 +1132,7 @@ static dccParseProcEntry dccParseProcTable[KVI_NUM_KNOWN_DCC_TYPES]= // We want C linkage on this one: we want to be able to dlsym() it with a simple name // FIXME: Is this portable enough ? Or is better to have a table entry ? -KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc) +extern "C" KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc) { dcc->szType.toUpper(); @@ -1148,7 +1148,7 @@ KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc) if(!dcc->ctcpMsg->msg->haltOutput()) { KviStr szError(KviStr::Format, - __tr2qs_ctx("Unknown DCC type '%s'","dcc"),dcc->szType.ptr()); + __tr2qs_ctx("Unknown DCC type '%s'","dcc").utf8().data(),dcc->szType.ptr()); dcc_module_request_error(dcc,szError.ptr()); } } diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 05236d95..d8522b97 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -257,8 +257,8 @@ void KviDccRecvThread::run() // Readed something useful...write back if((m_pOpt->iTotalFileSize > -1) && ((readLen + (int)m_pFile->at()) > m_pOpt->iTotalFileSize)) { - postMessageEvent(__tr2qs_ctx("WARNING: The peer is sending garbage data past the end of the file","dcc")); - postMessageEvent(__tr2qs_ctx("WARNING: Ignoring data past the declared end of file and closing the connection","dcc")); + postMessageEvent(__tr2qs_ctx("WARNING: The peer is sending garbage data past the end of the file","dcc").utf8().data()); + postMessageEvent(__tr2qs_ctx("WARNING: Ignoring data past the declared end of file and closing the connection","dcc").utf8().data()); readLen = m_pOpt->iTotalFileSize - m_pFile->at(); if(readLen > 0) @@ -359,14 +359,14 @@ void KviDccRecvThread::run() { iProbableTerminationTime = (int)kvi_unixTime(); m_pFile->flush(); - postMessageEvent(__tr2qs_ctx("Data transfer terminated, waiting 30 seconds for the peer to close the connection...","dcc")); + postMessageEvent(__tr2qs_ctx("Data transfer terminated, waiting 30 seconds for the peer to close the connection...","dcc").utf8().data()); // FIXME: Close the file ? } else { int iDiff = (((int)kvi_unixTime()) - iProbableTerminationTime); if(iDiff > 30) { // success if we got the whole file or if we don't know the file size (we trust the peer) - postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc")); + postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc").utf8().data()); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS); postEvent(parent(),e); break; @@ -1895,4 +1895,4 @@ void KviDccFileTransferBandwidthDialog::closeEvent(TQCloseEvent * e) -#include "m_send.moc" +#include "send.moc" diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index be674ab8..6a98313f 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -161,7 +161,7 @@ bool KviDccVoiceThread::checkSoundcard() if(ioctl(m_soundFd,SNDCTL_DSP_GETCAPS,&caps) < 0) { - postMessageEvent(__tr2qs_ctx("WARNING: failed to check the soundcard duplex capabilities: if this is a half-duplex soundcard , use the DCC VOICE option to force half-duplex algorithm","dcc")); + postMessageEvent(__tr2qs_ctx("WARNING: failed to check the soundcard duplex capabilities: if this is a half-duplex soundcard , use the DCC VOICE option to force half-duplex algorithm","dcc").utf8().data()); if(bOpened)closeSoundcard(); return false; } @@ -169,7 +169,7 @@ bool KviDccVoiceThread::checkSoundcard() if(!(caps & DSP_CAP_DUPLEX)) { m_pOpt->bForceHalfDuplex = true; // the device is half duplex...use it in that way - postMessageEvent(__tr2qs_ctx("Half duplex soundcard detected, you will not be able to talk and listen at the same time","dcc")); + postMessageEvent(__tr2qs_ctx("Half duplex soundcard detected, you will not be able to talk and listen at the same time","dcc").utf8().data()); } if(bOpened)closeSoundcard(); @@ -210,7 +210,7 @@ bool KviDccVoiceThread::openSoundcard(int mode) if(ioctl(m_soundFd,SNDCTL_DSP_SPEED,&speed)<0)goto exit_false; if(speed != m_pOpt->iSampleRate) { - KviStr tmp(KviStr::Format,__tr2qs_ctx("WARNING: failed to set the requested sample rate (%d): the device used closest match (%d)","dcc"), + KviStr tmp(KviStr::Format,__tr2qs_ctx("WARNING: failed to set the requested sample rate (%d): the device used closest match (%d)","dcc").utf8().data(), m_pOpt->iSampleRate,speed); postMessageEvent(tmp.ptr()); } @@ -268,7 +268,7 @@ bool KviDccVoiceThread::openSoundcardWithDuplexOption(int openMode,int failMode) if(!openSoundcard(openMode))return false; if(!checkSoundcard()) { - postMessageEvent(__tr2qs_ctx("Ops...failed to test the soundcard capabilities...expect problems...","dcc")); + postMessageEvent(__tr2qs_ctx("Ops...failed to test the soundcard capabilities...expect problems...","dcc").utf8().data()); } } // else the test has been done and it is a full duplex card that is just busy } @@ -1033,4 +1033,4 @@ void KviDccVoice::focusInEvent(TQFocusEvent *e) KviWindow::focusInEvent(e); } -#include "m_voice.moc" +#include "voice.moc" diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp index 4abd7f99..7c15c1c4 100644 --- a/src/modules/dcc/window.cpp +++ b/src/modules/dcc/window.cpp @@ -50,4 +50,4 @@ const char * KviDccWindow::dccMarshalOutputContextString() return static_context; } -#include "m_window.moc" +#include "window.moc" diff --git a/src/modules/dialog/Makefile.am b/src/modules/dialog/Makefile.am index 06018a14..4ed9e9fa 100644 --- a/src/modules/dialog/Makefile.am +++ b/src/modules/dialog/Makefile.am @@ -11,7 +11,7 @@ libkvidialog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvidialog_la_SOURCES = libkvidialog.cpp -libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvidialog.h diff --git a/src/modules/dockwidget/Makefile.am b/src/modules/dockwidget/Makefile.am index f0411021..72dbe1fc 100644 --- a/src/modules/dockwidget/Makefile.am +++ b/src/modules/dockwidget/Makefile.am @@ -11,9 +11,7 @@ libkvidockwidget_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvidockwidget_la_SOURCES = libkvidockwidget_qt3.cpp -#nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp - -libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvidockwidget.h libkvidockwidget_qt3.h @@ -26,7 +24,4 @@ EXTRA_DIST = $(tmp_DATA) %.moc: %.h $(SS_QT_MOC) $< -o $@ -moc_%.cpp: %.h - $(SS_QT_MOC) $< -o $@ - libkvidockwidget_qt3.cpp: libkvidockwidget_qt3.moc diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index bf7baaeb..c2f0a269 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -88,7 +88,7 @@ #endif #endif -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; static KviPointerList<KviDockWidget> * g_pDockWidgetList = 0; static TQPixmap * g_pDock1 = 0; @@ -104,10 +104,10 @@ static TQPixmap * g_pDock3 = 0; KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) : TQWidget(0,name) { - m_iConsoles = 0; - m_iChannels = 0; - m_iQueries = 0; - m_iOther = 0; + m_uConsoles = 0; + m_uChannels = 0; + m_uQueries = 0; + m_uOther = 0; m_pFlashingTimer = new TQTimer(this,"flashing_timer"); connect( m_pFlashingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flashingTimerShot()) ); @@ -380,7 +380,7 @@ void KviDockWidget::doAway(int id) { if(id<0) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -425,7 +425,7 @@ void KviDockWidget::fillContextPopup() int iSeparator=m_pAwayPopup->insertSeparator(); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); bool bAllAway=1; bool bAllUnaway=1; int iNetCount=0; @@ -491,13 +491,13 @@ void KviDockWidget::refresh() // how to copy transparency???? delete g_pCurrentPixmap; g_pCurrentPixmap=new TQPixmap(16,16); - bitBlt(g_pCurrentPixmap,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,0,8,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,8,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,8,8,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,0,0,m_uOther ? ((m_uOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,0,8,m_uConsoles ? ((m_uConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,8,0,m_uQueries ? ((m_uQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,8,8,m_uChannels ? ((m_uChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,TQt::ClearROP); #endif - if( (m_iChannels == 2) || (m_iQueries == 2) ) + if( (m_uChannels == 2) || (m_uQueries == 2) ) { if(!m_pFlashingTimer->isActive() && KVI_OPTION_BOOL(KviOption_boolEnableTrayIconFlashing) ) m_pFlashingTimer->start(1000); } else { @@ -528,56 +528,56 @@ void KviDockWidget::grabActivityInfo() KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)=KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage); } - m_iConsoles = 0; - m_iChannels = 0; - m_iQueries = 0; - m_iOther = 0; + m_uConsoles = 0; + m_uChannels = 0; + m_uQueries = 0; + m_uOther = 0; for(KviTaskBarItem * b = t->firstItem();b;b = t->nextItem()) { if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - int iLevel = b->highlightLevel(); + unsigned int uLevel = static_cast<unsigned int>(b->highlightLevel()); switch(b->kviWindow()->type()) { case KVI_WINDOW_TYPE_CONSOLE: - if(m_iConsoles < iLevel) m_iConsoles = iLevel; + if(m_uConsoles < uLevel) m_uConsoles = uLevel; break; case KVI_WINDOW_TYPE_CHANNEL: - if(m_iChannels < iLevel) m_iChannels = iLevel; + if(m_uChannels < uLevel) m_uChannels = uLevel; break; case KVI_WINDOW_TYPE_QUERY: - if(m_iQueries < iLevel) m_iQueries = iLevel; + if(m_uQueries < uLevel) m_uQueries = uLevel; break; default: - if(m_iOther < iLevel) m_iOther = iLevel; + if(m_uOther < uLevel) m_uOther = uLevel; break; } } else { - int iLevel=0; + int uLevel=0; if(b->kviWindow()->view()) { if(b->kviWindow()->view()->haveUnreadedHighlightedMessages()) { - iLevel=2; + uLevel=2; } else if(b->kviWindow()->view()->haveUnreadedMessages()) { - iLevel=1; + uLevel=1; } - if(iLevel>0) + if(uLevel>0) switch(b->kviWindow()->type()) { case KVI_WINDOW_TYPE_CONSOLE: - if(m_iConsoles < iLevel) m_iConsoles = iLevel; + if(m_uConsoles < uLevel) m_uConsoles = uLevel; break; case KVI_WINDOW_TYPE_CHANNEL: - if(m_iChannels < iLevel) m_iChannels = iLevel; + if(m_uChannels < uLevel) m_uChannels = uLevel; break; case KVI_WINDOW_TYPE_QUERY: - if(m_iQueries < iLevel) m_iQueries = iLevel; + if(m_uQueries < uLevel) m_uQueries = uLevel; break; default: - if(m_iOther < iLevel) m_iOther = iLevel; + if(m_uOther < uLevel) m_uOther = uLevel; break; } } @@ -586,21 +586,21 @@ void KviDockWidget::grabActivityInfo() if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2; - else if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iConsoles=1; - else m_iConsoles=0; + if(m_uConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uConsoles=2; + else if(m_uConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uConsoles=1; + else m_uConsoles=0; - if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2; - else if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iChannels=1; - else m_iChannels=0; + if(m_uChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uChannels=2; + else if(m_uChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uChannels=1; + else m_uChannels=0; - if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2; - else if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iQueries=1; - else m_iQueries=0; + if(m_uQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uQueries=2; + else if(m_uQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uQueries=1; + else m_uQueries=0; - if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2; - else if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iOther=1; - else m_iOther=0; + if(m_uOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uOther=2; + else if(m_uOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uOther=1; + else m_uOther=0; } } @@ -611,10 +611,10 @@ void KviDockWidget::paintEvent(TQPaintEvent * event) erase(); bitBlt(this,4,4,g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE),0,0,16,16); } else { - bitBlt(this,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false); - bitBlt(this,0,12,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false); - bitBlt(this,12,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false); - bitBlt(this,12,12,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false); + bitBlt(this,0,0,m_uOther ? ((m_uOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false); + bitBlt(this,0,12,m_uConsoles ? ((m_uConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false); + bitBlt(this,12,0,m_uQueries ? ((m_uQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false); + bitBlt(this,12,12,m_uChannels ? ((m_uChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false); } } diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.h b/src/modules/dockwidget/libkvidockwidget_qt3.h index 2ec3c268..4259ce66 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.h +++ b/src/modules/dockwidget/libkvidockwidget_qt3.h @@ -60,10 +60,10 @@ protected: bool m_bFlashed; TQTimer* m_pFlashingTimer; - int m_iConsoles; - int m_iChannels; - int m_iQueries; - int m_iOther; + unsigned int m_uConsoles; + unsigned int m_uChannels; + unsigned int m_uQueries; + unsigned int m_uOther; public: KviFrame * frame(){ return m_pFrm; }; public: diff --git a/src/modules/editor/Makefile.am b/src/modules/editor/Makefile.am index beb22541..55d96437 100644 --- a/src/modules/editor/Makefile.am +++ b/src/modules/editor/Makefile.am @@ -9,12 +9,13 @@ pluglib_LTLIBRARIES = libkvieditor.la libkvieditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) -nodist_libkvieditor_la_SOURCES = moc_scripteditor.cpp libkvieditor_la_SOURCES = libkvieditor.cpp scripteditor.cpp -libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= scripteditor.h -moc_%.cpp: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ +scripteditor.cpp: scripteditor.moc diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp index e265a8ff..faa14c81 100644 --- a/src/modules/editor/libkvieditor.cpp +++ b/src/modules/editor/libkvieditor.cpp @@ -83,12 +83,12 @@ KVIRC_MODULE( // We want C linkage on this one: we want to be able to dlsym() it with a simple name // FIXME: Is this portable enough ? Or is better to have a table entry ? -KVIMODULEEXPORTFUNC KviScriptEditor * editor_module_createScriptEditor(TQWidget * par) +extern "C" KVIMODULEEXPORTFUNC KviScriptEditor * editor_module_createScriptEditor(TQWidget * par) { return new KviScriptEditorImplementation(par); } -KVIMODULEEXPORTFUNC void editor_module_destroyScriptEditor(KviScriptEditor * e) +extern "C" KVIMODULEEXPORTFUNC void editor_module_destroyScriptEditor(KviScriptEditor * e) { delete ((KviScriptEditorImplementation *)e); } diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 68a70d3f..618b8997 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -249,7 +249,7 @@ void KviScriptEditorWidget::slotFind() void KviScriptEditorWidget::slotReplace() { - KviScriptEditorReplaceDialog *dialog=new KviScriptEditorReplaceDialog(this,tr("Find & Replace")); + KviScriptEditorReplaceDialog *dialog=new KviScriptEditorReplaceDialog(this,tr("Find & Replace").utf8().data()); connect (dialog,TQ_SIGNAL(replaceAll(const TQString &,const TQString &)),m_pParent,TQ_SLOT(slotReplaceAll(const TQString &,const TQString &))); connect (dialog,TQ_SIGNAL(initFind()),m_pParent,TQ_SLOT(slotInitFind())); connect (dialog,TQ_SIGNAL(nextFind(const TQString &)),m_pParent,TQ_SLOT(slotNextFind(const TQString &))); @@ -458,7 +458,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const { TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]"); - //tqDebug("BUFFER IS %s",buffer.utf8().data()); + //tqDebug("BUFFER IS %s",buffer.local8Bit().data()); int start = buffer.findRev(re,index); int end = buffer.find(re,index); @@ -471,7 +471,7 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const tmp = buffer.mid(start,end-start); } buffer = tmp; - //tqDebug("BUFFER NOW IS %s",buffer.utf8().data()); + //tqDebug("BUFFER NOW IS %s",buffer.local8Bit().data()); } void KviScriptEditorWidget::completition(bool bCanComplete) @@ -988,7 +988,7 @@ void KviScriptEditorImplementation::setText(const KviTQCString &txt) void KviScriptEditorImplementation::getText(KviTQCString &txt) { - txt = m_pEditor->text(); + txt = m_pEditor->text().utf8(); } TQLineEdit * KviScriptEditorImplementation::getFindlineedit() { @@ -1178,3 +1178,5 @@ void KviScriptEditorReplaceDialog::slotNextFind() { emit nextFind(m_pFindlineedit->text()); } + +#include "scripteditor.moc" diff --git a/src/modules/eventeditor/Makefile.am b/src/modules/eventeditor/Makefile.am index ceb7541a..b6f56d92 100644 --- a/src/modules/eventeditor/Makefile.am +++ b/src/modules/eventeditor/Makefile.am @@ -10,12 +10,12 @@ pluglib_LTLIBRARIES = libkvieventeditor.la libkvieventeditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvieventeditor_la_SOURCES = libkvieventeditor.cpp eventeditor.cpp -nodist_libkvieventeditor_la_SOURCES = moc_eventeditor.cpp -noinst_HEADERS = eventeditor.h -libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la -# noinst_HEADERS= +noinst_HEADERS = eventeditor.h -moc_eventeditor.cpp: eventeditor.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +eventeditor.cpp: eventeditor.moc diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index 06d6e3e2..4cc08509 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -193,7 +193,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventListViewItem *it,TQString &buf if(KviTQString::equalCI(newName,ch->m_szName)) { bFound = true; - KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx); + KviTQString::sprintf(newName,"%Q_%d",&buffer,idx); idx++; break; } @@ -534,3 +534,5 @@ void KviEventEditorWindow::loadProperties(KviConfig *cfg) #endif // COMPILE_SCRIPTTOOLBAR */ } + +#include "eventeditor.moc" diff --git a/src/modules/file/Makefile.am b/src/modules/file/Makefile.am index 1545a63a..f1b70abd 100644 --- a/src/modules/file/Makefile.am +++ b/src/modules/file/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvifile.la libkvifile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvifile_la_SOURCES = libkvifile.cpp -libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 2b29e007..c15a030c 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -835,8 +835,10 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) if(iCount>0) { for(; (iCount>0 && !stream.atEnd()) ; iCount-- ) + { a->set(iIndex,new KviKvsVariant(stream.readLine())); iIndex++; + } } else { while(!stream.atEnd()) { a->set(iIndex,new KviKvsVariant(stream.readLine())); diff --git a/src/modules/filetransferwindow/Makefile.am b/src/modules/filetransferwindow/Makefile.am index 910d86b4..61ba2db1 100644 --- a/src/modules/filetransferwindow/Makefile.am +++ b/src/modules/filetransferwindow/Makefile.am @@ -12,11 +12,12 @@ pluglib_LTLIBRARIES = libkvifiletransferwindow.la libkvifiletransferwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvifiletransferwindow_la_SOURCES = libkvifiletransferwindow.cpp filetransferwindow.cpp -libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= filetransferwindow.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -filetransferwindow.cpp: m_filetransferwindow.moc +filetransferwindow.cpp: filetransferwindow.moc diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 45613218..25b5d0e4 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -757,4 +757,4 @@ void KviFileTransferWindow::applyOptions() KviWindow::applyOptions(); } -#include "m_filetransferwindow.moc" +#include "filetransferwindow.moc" diff --git a/src/modules/help/Makefile.am b/src/modules/help/Makefile.am index fe6f03f6..36e130af 100644 --- a/src/modules/help/Makefile.am +++ b/src/modules/help/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvihelp.la libkvihelp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvihelp_la_SOURCES = libkvihelp.cpp helpwidget.cpp helpwindow.cpp index.cpp index.moc -libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= helpwidget.h helpwindow.h index.h diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 82c5f575..2d6dbf09 100644 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -134,7 +134,7 @@ void Index::setupDocumentList() void Index::insertInDict( const TQString &str, int docNum ) { - if ( strcmp( str, "amp" ) == 0 || strcmp( str, "nbsp" ) == 0 ) + if ( str == "amp" || str == "nbsp" ) return; Entry *e = 0; if ( dict.count() ) diff --git a/src/modules/http/Makefile.am b/src/modules/http/Makefile.am index ab7fe3b2..ff710130 100644 --- a/src/modules/http/Makefile.am +++ b/src/modules/http/Makefile.am @@ -16,11 +16,12 @@ pluglib_LTLIBRARIES = libkvihttp.la libkvihttp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvihttp_la_SOURCES = libkvihttp.cpp httpfiletransfer.cpp -libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= httpfiletransfer.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -httpfiletransfer.cpp: m_httpfiletransfer.moc +httpfiletransfer.cpp: httpfiletransfer.moc diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index c9ee4ff1..c7f04b81 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -486,4 +486,4 @@ bool KviHttpFileTransfer::startDownload() return m_pHttpRequest->start(); } -#include "m_httpfiletransfer.moc" +#include "httpfiletransfer.moc" diff --git a/src/modules/ident/Makefile.am b/src/modules/ident/Makefile.am index c02c0b47..71bf0e9b 100644 --- a/src/modules/ident/Makefile.am +++ b/src/modules/ident/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviident.la libkviident_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviident_la_SOURCES = libkviident.cpp -libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviident.h diff --git a/src/modules/iograph/Makefile.am b/src/modules/iograph/Makefile.am index a9ea3928..8d10a3cf 100644 --- a/src/modules/iograph/Makefile.am +++ b/src/modules/iograph/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviiograph.la libkviiograph_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviiograph_la_SOURCES = libkviiograph.cpp -libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviiograph.h diff --git a/src/modules/lamerizer/Makefile.am b/src/modules/lamerizer/Makefile.am index ce798e5c..164a6523 100644 --- a/src/modules/lamerizer/Makefile.am +++ b/src/modules/lamerizer/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilamerizer.la libkvilamerizer_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilamerizer_la_SOURCES = libkvilamerizer.cpp -libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvilamerizer.h diff --git a/src/modules/links/Makefile.am b/src/modules/links/Makefile.am index 51eea094..d20dae11 100644 --- a/src/modules/links/Makefile.am +++ b/src/modules/links/Makefile.am @@ -10,11 +10,12 @@ pluglib_LTLIBRARIES = libkvilinks.la libkvilinks_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilinks_la_SOURCES = libkvilinks.cpp linkswindow.cpp -libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= linkswindow.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -linkswindow.cpp: m_linkswindow.moc +linkswindow.cpp: linkswindow.moc diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 3bc5d0f7..1b012b71 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -122,7 +122,7 @@ void KviLinksWindow::connectionStateChange() m_pRequestButton->setEnabled(st == KviIrcContext::Connected); if(st == KviIrcContext::Connected) { - KviStr tmp(KviStr::Format,__tr2qs("Connected to %s (%s)"),m_pConsole->connection()->currentServerName().utf8().data(),m_pConsole->currentNetworkName().utf8().data()); + KviStr tmp(KviStr::Format,__tr2qs("Connected to %s (%s)").utf8().data(),m_pConsole->connection()->currentServerName().utf8().data(),m_pConsole->currentNetworkName().utf8().data()); m_pInfoLabel->setText(tmp.ptr()); } else { m_pInfoLabel->setText(__tr2qs("Links cannot be requested: Not connected to a server")); @@ -235,7 +235,7 @@ void KviLinksWindow::endOfLinks() output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"), l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr()); brokenLinks++; - KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr()); + KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s").utf8().data(),l->description.ptr(),l->parent.ptr()); KviStr tmp2(KviStr::Format,"%d",l->hops); if(root)it = new KviTalListViewItem(m_pListView,root,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr())); else { @@ -469,4 +469,4 @@ void KviLinksWindow::applyOptions() KviWindow::applyOptions(); } -#include "m_linkswindow.moc" +#include "linkswindow.moc" diff --git a/src/modules/list/Makefile.am b/src/modules/list/Makefile.am index 52290210..bb75d337 100644 --- a/src/modules/list/Makefile.am +++ b/src/modules/list/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilist.la libkvilist_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilist_la_SOURCES = libkvilist.cpp listwindow.cpp -libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= listwindow.h diff --git a/src/modules/log/Makefile.am b/src/modules/log/Makefile.am index e2bfe1e9..52703f8f 100644 --- a/src/modules/log/Makefile.am +++ b/src/modules/log/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilog.la libkvilog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilog_la_SOURCES = libkvilog.cpp -libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/logview/Makefile.am b/src/modules/logview/Makefile.am index 03a1b07e..36dfce6c 100644 --- a/src/modules/logview/Makefile.am +++ b/src/modules/logview/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvilogview.la libkvilogview_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilogview_la_SOURCES = libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp -libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= logviewwidget.h logviewmdiwindow.h diff --git a/src/modules/mask/Makefile.am b/src/modules/mask/Makefile.am index 0ca529fe..1cd18470 100644 --- a/src/modules/mask/Makefile.am +++ b/src/modules/mask/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimask.la libkvimask_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimask_la_SOURCES = libkvimask.cpp -libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/math/Makefile.am b/src/modules/math/Makefile.am index 001bef24..bfaaaafa 100644 --- a/src/modules/math/Makefile.am +++ b/src/modules/math/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimath.la libkvimath_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimath_la_SOURCES = libkvimath.cpp -libkvimath_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimath_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am index 41e5b850..97e03ca3 100644 --- a/src/modules/mediaplayer/Makefile.am +++ b/src/modules/mediaplayer/Makefile.am @@ -22,7 +22,7 @@ libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \ mp_winampinterface.cpp \ mp_xmmsinterface.cpp -libkvimediaplayer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimediaplayer_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = mp_amarokinterface.h \ mp_amipinterface.h \ diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index 283f551c..d3675623 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -30,7 +30,7 @@ static TQTextCodec * mediaplayer_get_codec() { - TQTextCodec * c= TQTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)); + TQTextCodec * c= TQTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).utf8().data()); if(!c)c = TQTextCodec::codecForLocale(); return c; diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 4942ee50..f25a2d26 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -43,6 +43,8 @@ #include <tqfileinfo.h> #include <tqtextcodec.h> +#include <tuple> + #define MAXGENRE 147 #define GENREROWS 50 @@ -396,7 +398,7 @@ int get_id3(mp3info *mp3) { retcode |= 4; } else { - fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; + std::ignore = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; mp3->id3.genre[0]=255; if(!strcmp((const char *)"TAG",(const char *)fbuf)) @@ -404,16 +406,16 @@ int get_id3(mp3info *mp3) mp3->id3_isvalid=1; mp3->datasize -= 128; fseek(mp3->file, -125, SEEK_END); - fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; - fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; - fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; - fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; - fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; + std::ignore = fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; + std::ignore = fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; + std::ignore = fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; + std::ignore = fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; + std::ignore = fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; if(mp3->id3.comment[28] == '\0') { mp3->id3.track[0] = mp3->id3.comment[29]; } - fread(mp3->id3.genre,1,1,mp3->file); + std::ignore = fread(mp3->id3.genre,1,1,mp3->file); unpad(mp3->id3.title); unpad(mp3->id3.artist); unpad(mp3->id3.album); diff --git a/src/modules/mircimport/Makefile.am b/src/modules/mircimport/Makefile.am index d47e88c7..5bd59ac1 100644 --- a/src/modules/mircimport/Makefile.am +++ b/src/modules/mircimport/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvimircimport.la libkvimircimport_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimircimport_la_SOURCES = libkvimircimport.cpp -libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvimircimport.h diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 96b74cf1..3d283b4c 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -102,7 +102,7 @@ int KviMircServersIniImport::doImport(const TQString& filename) s.m_szDescription = description; s.m_uPort = uPort; iCount++; - emit server(s,entry); + emit server(s,entry.utf8().data()); } ++i; } @@ -355,7 +355,7 @@ static bool mircimport_module_can_unload(KviModule * m) } /* -KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName) +extern "C" KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName) { if(kvi_strEqualCI(filterName,__tr("Import from servers.ini"))) { diff --git a/src/modules/my/Makefile.am b/src/modules/my/Makefile.am index 4c179e48..c3d31944 100644 --- a/src/modules/my/Makefile.am +++ b/src/modules/my/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimy.la libkvimy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimy_la_SOURCES = libkvimy.cpp idle_x11.cpp idle_mac.cpp idle.cpp -libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= idle.h diff --git a/src/modules/notifier/Makefile.am b/src/modules/notifier/Makefile.am index 59639aca..30a5c731 100644 --- a/src/modules/notifier/Makefile.am +++ b/src/modules/notifier/Makefile.am @@ -19,7 +19,7 @@ libkvinotifier_la_SOURCES = libkvinotifier.cpp \ notifierwindowborder.cpp \ notifierwindowprogressbar.cpp -libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= \ notifiersettings.h \ @@ -36,9 +36,9 @@ conf_DATA = libkvinotifier.kvc EXTRA_DIST = $(conf_DATA) -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -notifierwindow.cpp: m_notifierwindow.moc -notifierwindowtabs.cpp: m_notifierwindowtabs.moc +notifierwindow.cpp: notifierwindow.moc +notifierwindowtabs.cpp: notifierwindowtabs.moc diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 3e2f7d15..081edd45 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -1318,5 +1318,5 @@ void KviNotifierWindow::progressUpdate() TQPainter p(this); m_pProgressBar->draw(&p); } -#include "m_notifierwindow.moc" +#include "notifierwindow.moc" diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index faf10ba6..edf9cedc 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -85,7 +85,7 @@ void KviNotifierWindowTab::setNextMessageAsCurrent() void KviNotifierWindowTab::setPrevMessageAsCurrent() { if(!m_pCurrentMessage)return; - if(!m_pMessageList->findRef(m_pCurrentMessage) == -1)return; + if(m_pMessageList->findRef(m_pCurrentMessage) == -1)return; m_pCurrentMessage = m_pMessageList->prev(); if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->first(); } @@ -702,4 +702,4 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT } } -#include "m_notifierwindowtabs.moc" +#include "notifierwindowtabs.moc" diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am index c4574582..5c59b485 100644 --- a/src/modules/objects/Makefile.am +++ b/src/modules/objects/Makefile.am @@ -10,53 +10,52 @@ pluglib_LTLIBRARIES = libkviobjects.la libkviobjects_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviobjects_la_SOURCES = libkviobjects.cpp \ - class_button.cpp \ - class_buttongroup.cpp \ - class_checkbox.cpp \ - class_combobox.cpp \ - class_dialog.cpp \ - class_dockwindow.cpp \ - class_file.cpp \ - class_groupbox.cpp \ - class_label.cpp \ - class_layout.cpp \ - class_lcd.cpp \ - class_lineedit.cpp \ - class_list.cpp \ - class_listbox.cpp \ - class_listview.cpp \ - class_listviewitem.cpp \ - class_mainwindow.cpp \ - class_menubar.cpp \ - class_multilineedit.cpp \ - class_popupmenu.cpp \ - class_process.cpp \ - class_progressbar.cpp \ - class_radiobutton.cpp \ - class_slider.cpp \ - class_socket.cpp \ - class_spinbox.cpp \ - class_tabwidget.cpp \ - class_toolbar.cpp \ - class_toolbutton.cpp \ - class_painter.cpp \ - class_pixmap.cpp \ - class_tbrowser.cpp \ - class_widget.cpp \ - class_window.cpp \ - class_wizard.cpp \ - class_workspace.cpp \ - class_wrapper.cpp \ - class_urllabel.cpp \ - class_xmlreader.cpp \ - class_vbox.cpp \ - class_hbox.cpp + class_button.cpp \ + class_buttongroup.cpp \ + class_checkbox.cpp \ + class_combobox.cpp \ + class_dialog.cpp \ + class_dockwindow.cpp \ + class_file.cpp \ + class_groupbox.cpp \ + class_label.cpp \ + class_layout.cpp \ + class_lcd.cpp \ + class_lineedit.cpp \ + class_list.cpp \ + class_listbox.cpp \ + class_listview.cpp \ + class_listviewitem.cpp \ + class_mainwindow.cpp \ + class_menubar.cpp \ + class_multilineedit.cpp \ + class_popupmenu.cpp \ + class_process.cpp \ + class_progressbar.cpp \ + class_radiobutton.cpp \ + class_slider.cpp \ + class_socket.cpp \ + class_spinbox.cpp \ + class_tabwidget.cpp \ + class_toolbar.cpp \ + class_toolbutton.cpp \ + class_painter.cpp \ + class_pixmap.cpp \ + class_tbrowser.cpp \ + class_widget.cpp \ + class_window.cpp \ + class_wizard.cpp \ + class_workspace.cpp \ + class_wrapper.cpp \ + class_urllabel.cpp \ + class_xmlreader.cpp \ + class_vbox.cpp \ + class_hbox.cpp - -libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= class_button.h \ - class_buttongroup.h \ + class_buttongroup.h \ class_checkbox.h \ class_combobox.h \ class_dialog.h \ @@ -94,50 +93,50 @@ noinst_HEADERS= class_button.h \ class_workspace.h \ class_wrapper.h \ class_xmlreader.h \ - class_vbox.h \ - class_hbox.h \ + class_vbox.h \ + class_hbox.h \ object_macros.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -class_checkbox.cpp: m_class_checkbox.moc -class_combobox.cpp: m_class_combobox.moc -class_button.cpp: m_class_button.moc -class_dialog.cpp: m_class_dialog.moc -class_dockwindow.cpp: m_class_dockwindow.moc -class_file.cpp: m_class_file.moc -class_groupbox.cpp: m_class_groupbox.moc -class_label.cpp: m_class_label.moc -class_layout.cpp: m_class_layout.moc -class_lcd.cpp: m_class_lcd.moc -class_lineedit.cpp: m_class_lineedit.moc -class_list.cpp: m_class_list.moc -class_listbox.cpp: m_class_listbox.moc -class_listview.cpp: m_class_listview.moc -class_listviewitem.cpp: m_class_listviewitem.moc -class_listbox.cpp: m_class_listbox.moc -class_mainwindow.cpp: m_class_mainwindow.moc -class_menubar.cpp: m_class_menubar.moc -class_multilineedit.cpp: m_class_multilineedit.moc -class_painter.cpp: m_class_painter.moc -class_pixmap.cpp: m_class_pixmap.moc -class_popupmenu.cpp: m_class_popupmenu.moc -class_process.cpp: m_class_process.moc -class_progressbar.cpp: m_class_progressbar.moc -class_radiobutton.cpp: m_class_radiobutton.moc -class_slider.cpp: m_class_slider.moc -class_socket.cpp: m_class_socket.moc -class_spinbox.cpp: m_class_spinbox.moc -class_tabwidget.cpp: m_class_tabwidget.moc -class_tbrowser.cpp: m_class_tbrowser.moc -class_toolbar.cpp: m_class_toolbar.moc -class_toolbutton.cpp: m_class_toolbutton.moc -class_urllabel.cpp: m_class_urllabel.moc -class_widget.cpp: m_class_widget.moc -class_window.cpp: m_class_window.moc -class_wizard.cpp: m_class_wizard.moc -class_workspace.cpp: m_class_workspace.moc -class_wrapper.cpp: m_class_wrapper.moc -class_xmlreader.cpp: m_class_xmlreader.moc +class_checkbox.cpp: class_checkbox.moc +class_combobox.cpp: class_combobox.moc +class_button.cpp: class_button.moc +class_dialog.cpp: class_dialog.moc +class_dockwindow.cpp: class_dockwindow.moc +class_file.cpp: class_file.moc +class_groupbox.cpp: class_groupbox.moc +class_label.cpp: class_label.moc +class_layout.cpp: class_layout.moc +class_lcd.cpp: class_lcd.moc +class_lineedit.cpp: class_lineedit.moc +class_list.cpp: class_list.moc +class_listbox.cpp: class_listbox.moc +class_listview.cpp: class_listview.moc +class_listviewitem.cpp: class_listviewitem.moc +class_listbox.cpp: class_listbox.moc +class_mainwindow.cpp: class_mainwindow.moc +class_menubar.cpp: class_menubar.moc +class_multilineedit.cpp: class_multilineedit.moc +class_painter.cpp: class_painter.moc +class_pixmap.cpp: class_pixmap.moc +class_popupmenu.cpp: class_popupmenu.moc +class_process.cpp: class_process.moc +class_progressbar.cpp: class_progressbar.moc +class_radiobutton.cpp: class_radiobutton.moc +class_slider.cpp: class_slider.moc +class_socket.cpp: class_socket.moc +class_spinbox.cpp: class_spinbox.moc +class_tabwidget.cpp: class_tabwidget.moc +class_tbrowser.cpp: class_tbrowser.moc +class_toolbar.cpp: class_toolbar.moc +class_toolbutton.cpp: class_toolbutton.moc +class_urllabel.cpp: class_urllabel.moc +class_widget.cpp: class_widget.moc +class_window.cpp: class_window.moc +class_wizard.cpp: class_wizard.moc +class_workspace.cpp: class_workspace.moc +class_wrapper.cpp: class_wrapper.moc +class_xmlreader.cpp: class_xmlreader.moc diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index db4ee3e5..4ec12a47 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -167,4 +167,4 @@ void KviKvsObject_button::slotClicked() } -#include "m_class_button.moc" +#include "class_button.moc" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 2be2e3fe..c0ab6a09 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -124,4 +124,4 @@ void KviKvsObject_checkbox::toggled(bool b) } -#include "m_class_checkbox.moc" +#include "class_checkbox.moc" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index baf15336..b00ae015 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -364,4 +364,4 @@ void KviKvsObject_combobox::slotActivated(int i) } -#include "m_class_combobox.moc" +#include "class_combobox.moc" diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index 6ecdf51a..db589358 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -91,7 +91,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow) bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(new TQT_DOCK_WINDOW(g_pFrame,getName()),true); + setObject(new TQT_DOCK_WINDOW(g_pFrame,getName().utf8().data()),true); return true; } @@ -217,4 +217,4 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) return true; } -#include "m_class_dockwindow.moc" +#include "class_dockwindow.moc" diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 9e4b2790..98198cd4 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -296,8 +296,14 @@ bool KviKvsObject_file::functionputch(KviKvsObjectFunctionCall *c) if (m_pFile) { if (szChar.length()>1)c->warning(__tr2qs("Argument to long, using only first char")); - const char *ch=szChar; - if (m_pFile->putch(ch[0])<0) c->warning(__tr2qs("Write error occured !")); + // FIXME: putch() argument shouldn't be passed via TQString. + char ch = szChar[0].latin1(); + if (!ch && !szChar[0].isNull()) + { + c->warning(__tr2qs("Can't properly handle non-latin-1 characters.")); + ch = '?'; + } + if (m_pFile->putch(ch)<0) c->warning(__tr2qs("Write error occurred!")); } return true; @@ -328,8 +334,14 @@ bool KviKvsObject_file::functionunGetch(KviKvsObjectFunctionCall *c) else { if (szChar.length()>1) c->warning(__tr2qs("Argument to long, using only first char")); - const char *ch=szChar; - if (m_pFile->ungetch(ch[0])<0) c->warning(__tr2qs("An error occured !"));// c->error ? + // FIXME: ungetch() argument shouldn't be passed via TQString. + char ch = szChar[0].latin1(); + if (!ch && !szChar[0].isNull()) + { + c->warning(__tr2qs("Can't properly handle non-latin-1 characters.")); + ch = '?'; + } + if (m_pFile->ungetch(ch)<0) c->warning(__tr2qs("An error occurred!")); } return true; } @@ -365,8 +377,7 @@ bool KviKvsObject_file::functionwriteBlock(KviKvsObjectFunctionCall *c) if (!m_pFile) return true; if(!m_pFile->isOpen()) c->warning(__tr("File is not open !")); - const char *block=szBlock; - int rlen = m_pFile->writeBlock(block, uLen); + int rlen = m_pFile->writeBlock(szBlock.utf8().data(), uLen); c->returnValue()->setInteger(rlen); m_pFile->flush(); return true; @@ -446,4 +457,4 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p, } */ -#include "m_class_file.moc" +#include "class_file.moc" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index e6f4037a..d51f4df8 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -217,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit) bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(new TQLineEdit(parentScriptWidget(),getName()),true); + setObject(new TQLineEdit(parentScriptWidget(),getName().utf8().data()),true); connect(widget(),TQ_SIGNAL(returnPressed()),this,TQ_SLOT(slotreturnPressed())); connect(widget(),TQ_SIGNAL(lostFocus()),this,TQ_SLOT(slotlostFocus())); connect(widget(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & ))); @@ -457,4 +457,4 @@ void KviKvsObject_lineedit::slottextChanged(const TQString &text) } -#include "m_class_lineedit.moc" +#include "class_lineedit.moc" diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index 5b2301b5..1acac67f 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -386,4 +386,4 @@ kvs_uint_t uIndex; } -#include "m_class_listbox.moc" +#include "class_listbox.moc" diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 34a66b5c..0f5989ae 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -549,4 +549,4 @@ void KviKvsMdmListView::contentsDropEvent(TQDropEvent *e) } } -#include "m_class_listview.moc" +#include "class_listview.moc" diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index a4dba4c8..b9397ac2 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -418,4 +418,4 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_listviewitem.moc" +#include "class_listviewitem.moc" diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index ac8ce39d..12faa34b 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -42,7 +42,7 @@ //->Tables for Text Format -static char * const mod_tbl[] = { +static const char *const mod_tbl[] = { "PlainText", "RichText", "AutoText", @@ -340,7 +340,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit) bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true); + setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName().utf8().data()),true); return true; } @@ -410,7 +410,7 @@ bool KviKvsObject_mledit::functionInsertAt(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol) KVSO_PARAMETERS_END(c) if(!widget())return true; - if(iLine < 0 || iCol < 0 || iLine > ((KviTalMultiLineEdit *)widget())->numLines()) + if(iLine < 0 || iCol < 0 || iLine > static_cast<kvs_uint_t>(((KviTalMultiLineEdit *)widget())->numLines())) c->warning("No such line number"); else ((KviTalMultiLineEdit *)widget())->insertAt(szInsert,iLine,iCol); @@ -1192,4 +1192,4 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c) -#include "m_class_multilineedit.moc" +#include "class_multilineedit.moc" diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index b2f76a68..a291f9b6 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -407,8 +407,7 @@ if(__pXOrArray->isArray())\ } else {\ if(c->params()->count() < 4)\ {\ - TQString error=function+" requires either an array as first parameter or four integers";\ - c->error(__tr2qs(error));\ + c->error(__tr2qs("%1 requires either an array as first parameter or four integers").arg(function));\ return false;\ }\ if(!__pXOrArray->asInteger(iX))\ @@ -441,8 +440,7 @@ if(__pXOrArray->isArray())\ } else {\ if(c->params()->count() < 2)\ {\ - TQString error=function+" requires either an array as first parameter or two integers";\ - c->error(__tr2qs(error));\ + c->error(__tr2qs("%1 requires either an array as first parameter or two integers").arg(function));\ return false;\ }\ if(!__pXOrArray->asInteger(iX))\ @@ -476,8 +474,7 @@ if(__pCol1OrArray->isArray())\ } else {\ if(c->params()->count() < 3)\ {\ - TQString error=function+" requires either an array as first parameter or 3 integers";\ - c->error(__tr2qs(error));\ + c->error(__tr2qs("%1 requires either an array as first parameter or 3 integers").arg(function));\ return false;\ }\ if(!__pCol1OrArray->asInteger(iCol1))\ @@ -924,4 +921,4 @@ bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c) -#include "m_class_painter.moc" +#include "class_painter.moc" diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index e5c7223d..2aa8d7a1 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -223,7 +223,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) if (bPixmapModified) { *m_pImage=m_pPixmap->convertToImage(); } - if (uWidth>buffer->width() || uHeight>buffer->height()) + if (uWidth>static_cast<kvs_uint_t>(buffer->width()) || uHeight>static_cast<kvs_uint_t>(buffer->height())) { c->warning(__tr2qs("Area dimensions are out of destination size ")); return true; @@ -246,12 +246,12 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) } -if(uXoffset+uWidth>m_pImage->width()) +if(uXoffset+uWidth>static_cast<kvs_uint_t>(m_pImage->width())) { c->warning(__tr2qs("Offset width area is out of pixmap size ")); return true; } - if( uYoffset+uHeight>m_pImage->height()) + if( uYoffset+uHeight>static_cast<kvs_uint_t>(m_pImage->height())) { c->warning(__tr2qs("Offset height area is out of pixmap size ")); return true; @@ -304,4 +304,4 @@ TQImage * KviKvsObject_pixmap::getImage() return m_pImage; } -#include "m_class_pixmap.moc" +#include "class_pixmap.moc" diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 32163004..ff390038 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -358,4 +358,4 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c) } -#include "m_class_popupmenu.moc" +#include "class_popupmenu.moc" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 2ffdadb0..1e92e756 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -306,4 +306,4 @@ void KviKvsObject_process::slotReadStderr() callFunction(this,"readyReadStderrEvent",params); } -#include "m_class_process.moc" +#include "class_process.moc" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index b068b388..ba596eca 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -135,4 +135,4 @@ void KviKvsObject_radiobutton::toggled(bool b) } -#include "m_class_radiobutton.moc" +#include "class_radiobutton.moc" diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index a55a2593..017ec196 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -284,4 +284,4 @@ void KviKvsObject_slider::valueChanged(int value) } -#include "m_class_slider.moc" +#include "class_slider.moc" diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 5f30bbd0..686a5de7 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -600,18 +600,18 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) #ifdef COMPILE_IPV6_SUPPORT - if(kvi_isValidStringIp(m_szRemoteIp) || kvi_isValidStringIp_V6(m_szRemoteIp)) + if(kvi_isValidStringIp(m_szRemoteIp.utf8().data()) || kvi_isValidStringIp_V6(m_szRemoteIp.utf8().data())) #else - if(kvi_isValidStringIp(m_szRemoteIp)) + if(kvi_isValidStringIp(m_szRemoteIp.utf8().data())) #endif { tqDebug ("ok connecting"); - tqDebug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); + tqDebug ("connectinhg on ip %s ",m_szRemoteIp.local8Bit().data()); tqDebug ("non so ip"); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } else { - tqDebug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); + tqDebug ("connectinhg on ip %s port %ld",m_szRemoteIp.local8Bit().data(),m_uRemotePort); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; delayedLookupRemoteIp(); } @@ -658,10 +658,10 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) { // Check the address type - if(kvi_isValidStringIp(m_szLocalIp))bGotIp = true; + if(kvi_isValidStringIp(m_szLocalIp.utf8().data()))bGotIp = true; else { #ifdef COMPILE_IPV6_SUPPORT - if(kvi_isValidStringIp_V6(m_szLocalIp)) + if(kvi_isValidStringIp_V6(m_szLocalIp.utf8().data())) { bGotIp = true; m_bIpV6 = true; @@ -697,9 +697,9 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) if(!m_szLocalIp.isEmpty()) { #ifdef COMPILE_IPV6_SUPPORT - KviSockaddr sa(m_szLocalIp,m_uLocalPort,m_bIpV6,m_bUdp); + KviSockaddr sa(m_szLocalIp.utf8().data(),m_uLocalPort,m_bIpV6,m_bUdp); #else - KviSockaddr sa(m_szLocalIp,m_uLocalPort,false,m_bUdp); + KviSockaddr sa(m_szLocalIp.utf8().data(),m_uLocalPort,false,m_bUdp); #endif if(!sa.socketAddress()) { @@ -826,7 +826,7 @@ void KviKvsObject_socket::incomingConnection(int) } // else..huh ?... wait for the next notifier call } -void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp) +void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const TQString &szIp) { reset(); m_sock = s; @@ -868,7 +868,7 @@ void KviKvsObject_socket::doConnect() m_pDelayTimer = 0; - KviSockaddr sa(m_szRemoteIp,m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp),m_bUdp); + KviSockaddr sa(m_szRemoteIp.utf8().data(),m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp.utf8().data()),m_bUdp); if(!sa.socketAddress()) { @@ -1328,4 +1328,4 @@ KviTQCString szData8 = szData.utf8(); //-------------- -#include "m_class_socket.moc" +#include "class_socket.moc" diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h index bcb0284f..6b185b10 100644 --- a/src/modules/objects/class_socket.h +++ b/src/modules/objects/class_socket.h @@ -92,7 +92,7 @@ protected: void eatInData(unsigned int uLen); unsigned int readGetLength(KviParameterList * params); - void acceptConnection(kvi_socket_t s,unsigned short int uPort,const char * szIp); + void acceptConnection(kvi_socket_t s,unsigned short int uPort,const TQString &szIp); void reset(); protected slots: @@ -171,7 +171,7 @@ protected: void eatInData(unsigned int uLen); unsigned int readGetLength(KviKvsObjectFunctionCall * params); - void acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp); + void acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const TQString &szIp); void reset(); protected slots: diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 5f06c78e..8d3e8bf4 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -258,4 +258,4 @@ void KviKvsObject_spinbox::valueChanged(int value) callFunction(this,"valueChangedEvent",¶ms); } -#include "m_class_spinbox.moc" +#include "class_spinbox.moc" diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 5196573f..758d7fee 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -526,4 +526,4 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value) callFunction(this,"currentChangedEvent",¶ms); } -#include "m_class_tabwidget.moc" +#include "class_tabwidget.moc" diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 9e21a32d..d9a7bee7 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -140,4 +140,4 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal return true; } -#include "m_class_tbrowser.moc" +#include "class_tbrowser.moc" diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index d40edf6c..50475fbc 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -149,5 +149,5 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_toolbar.moc" +#include "class_toolbar.moc" diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 8ff37ea1..1a677e99 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -233,9 +233,11 @@ bool KviKvsObject_toolbutton::functionsetTextLabel(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("tooltip",KVS_PT_STRING,KVS_PF_OPTIONAL,szTip) KVSO_PARAMETERS_END(c) if(!widget()) return true; - - if (szTip.isEmpty()) ((TQToolButton *)widget())->setTextLabel(szLabel); - else ((TQToolButton *)widget())->setTextLabel(szLabel,szTip); + ((TQToolButton *)widget())->setTextLabel(szLabel); + if (!szTip.isEmpty()) + { + TQToolTip::add(widget(), szTip); + } return true; } bool KviKvsObject_toolbutton::functiontextLabel(KviKvsObjectFunctionCall *c) @@ -328,5 +330,5 @@ void KviKvsObject_toolbutton::slotClicked() callFunction(this,"clickEvent",params); } -#include "m_class_toolbutton.moc" +#include "class_toolbutton.moc" diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index f3b11d20..69f416f1 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -592,7 +592,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget) bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(new TQWidget(parentScriptWidget(),getName()),true); + setObject(new TQWidget(parentScriptWidget(),getName().utf8().data()),true); return true; } @@ -1644,4 +1644,4 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_widget.moc" +#include "class_widget.moc" diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index a03cd147..09666e63 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -151,4 +151,4 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget()); return true; } -#include "m_class_window.moc" +#include "class_window.moc" diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 496a24d7..217ad8a9 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -368,4 +368,4 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } -#include "m_class_wizard.moc" +#include "class_wizard.moc" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 74dcc8f9..9a14f5d8 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis tqDebug ("ci sono i parametri"); TQWidget *pWidget = 0; - int i=0; + unsigned int i=0; while(i!=pParams->count()) { TQString szClass; @@ -178,7 +178,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis return true; } -TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, const TQString szName) +TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString &szClass, const TQString &szName) { TQWidgetList *list = g_pApp->topLevelWidgets(); @@ -188,11 +188,11 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, while( it.current() ) { bool bNameMatch = false; bool bClassMatch = false; - if( szName ) + if( !szName.isEmpty() ) bNameMatch = KviTQString::equalCI(it.current()->name(), szName); else bNameMatch = true; - if( szClass ) + if( !szClass.isEmpty() ) bClassMatch = KviTQString::equalCI(it.current()->className(), szClass); else bClassMatch = true; @@ -208,10 +208,9 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, return 0; } -TQWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char *szName, TQWidget *childOf) +TQWidget *KviKvsObject_wrapper::findWidgetToWrap(const TQString &szClass, const TQString &szName, TQWidget *childOf) { - - TQObjectList *list = childOf->queryList(szClass ? szClass : 0, szName ? szName : 0, false, true); + TQObjectList *list = childOf->queryList(!szClass.isEmpty() ? szClass.utf8().data() : 0, !szName.isEmpty() ? szName.utf8().data() : 0, false, true); if( !list ) return 0; TQObjectListIt it(*list); @@ -227,4 +226,4 @@ TQWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char return 0; } -#include "m_class_wrapper.moc" +#include "class_wrapper.moc" diff --git a/src/modules/objects/class_wrapper.h b/src/modules/objects/class_wrapper.h index f1707311..ba26424b 100644 --- a/src/modules/objects/class_wrapper.h +++ b/src/modules/objects/class_wrapper.h @@ -44,8 +44,8 @@ public: TQWidget * widget() { return (TQWidget *)object(); }; protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - TQWidget * findTopLevelWidgetToWrap(const TQString szClass, const TQString szName); - TQWidget * findWidgetToWrap(const char *szClass, const char *szName, TQWidget *childOf); + TQWidget * findTopLevelWidgetToWrap(const TQString &szClass, const TQString &szName); + TQWidget * findWidgetToWrap(const TQString &szClass, const TQString &szName, TQWidget *childOf); }; diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index dfeea0c5..8f2ce38e 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c) TQByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in data source.setData(data); - //tqDebug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); + //tqDebug("PARSING(%s) LEN(%d)",szString.local8Bit().data(),szString.local8Bit().length()); TQXmlSimpleReader reader; reader.setContentHandler(&handler); reader.setErrorHandler(&handler); @@ -340,4 +340,4 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_xmlreader.moc" +#include "class_xmlreader.moc" diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 782b486d..b62b5c50 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -84,7 +84,7 @@ #include "class_dockwindow.h" #include "class_vbox.h" #include "class_hbox.h" -static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx); +static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const TQString &spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx); static bool objects_module_cleanup(KviModule *m) { @@ -853,7 +853,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) return true; } -static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx) +static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const TQString &spacing, bool bFlag, KviKvsArray *n, int &idx) { const TQObjectList l = parent->childrenListObject(); if( l.isEmpty() ) return; @@ -867,7 +867,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac if (bFlag) { pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s", - spacing, it.current(), KVI_TEXT_BOLD, + spacing.local8Bit().data(), it.current(), KVI_TEXT_BOLD, it.current()->name(), KVI_TEXT_BOLD, it.current()->className() ); } diff --git a/src/modules/options/Makefile.am b/src/modules/options/Makefile.am index 53c0988c..092b198c 100644 --- a/src/modules/options/Makefile.am +++ b/src/modules/options/Makefile.am @@ -57,7 +57,7 @@ libkvioptions_la_SOURCES = libkvioptions.cpp \ optw_userlist.cpp \ optw_tray.cpp -libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= container.h \ dialog.h \ @@ -107,51 +107,53 @@ noinst_HEADERS= container.h \ instances.h: optw_*.h mkcreateinstanceproc.sh ./mkcreateinstanceproc.sh -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -container.cpp: m_container.moc -dialog.cpp: m_dialog.moc -instances.cpp: m_instances.moc -optw_antispam.cpp: m_optw_antispam.moc -optw_avatar.cpp: m_optw_avatar.moc -optw_away.cpp: m_optw_away.moc -optw_connection.cpp: m_optw_connection.moc -optw_ctcp.cpp: m_optw_ctcp.moc -optw_ctcpfloodprotection.cpp: m_optw_ctcpfloodprotection.moc -optw_dcc.cpp: m_optw_dcc.moc -optw_generalopt.cpp: m_optw_generalopt.moc -optw_highlighting.cpp: m_optw_highlighting.moc -optw_ident.cpp: m_optw_ident.moc -optw_identity.cpp: m_optw_identity.moc -optw_ignore.cpp: m_optw_ignore.moc -optw_input.cpp: m_optw_input.moc -optw_interfacefeatures.cpp: m_optw_interfacefeatures.moc -optw_interfacelookglobal.cpp: m_optw_interfacelookglobal.moc -optw_irc.cpp: m_optw_irc.moc -optw_ircoutput.cpp: m_optw_ircoutput.moc -optw_ircview.cpp: m_optw_ircview.moc -optw_lag.cpp: m_optw_lag.moc -optw_logging.cpp: m_optw_logging.moc -optw_look.cpp: m_optw_look.moc -optw_mediatypes.cpp: m_optw_mediatypes.moc -optw_messages.cpp: m_optw_messages.moc -optw_nickserv.cpp: m_optw_nickserv.moc -optw_notify.cpp: m_optw_notify.moc -optw_protection.cpp: m_optw_protection.moc -optw_proxy.cpp: m_optw_proxy.moc -optw_query.cpp: m_optw_query.moc -optw_servers.cpp: m_optw_servers.moc -optw_sound.cpp: m_optw_sound.moc -optw_ssl.cpp: m_optw_ssl.moc -optw_taskbar.cpp: m_optw_taskbar.moc -optw_textencoding.cpp: m_optw_textencoding.moc -optw_texticons.cpp: m_optw_texticons.moc -optw_transport.cpp: m_optw_transport.moc -optw_theme.cpp: m_optw_theme.moc -optw_topiclabel.cpp: m_optw_topiclabel.moc -optw_tools.cpp: m_optw_tools.moc -optw_uparser.cpp: m_optw_uparser.moc -optw_urlhandlers.cpp: m_optw_urlhandlers.moc -optw_userlist.cpp: m_optw_userlist.moc -optw_tray.cpp : m_optw_tray.moc +container.cpp libkvioptions.cpp dialogs.h: instances.h + +container.cpp: container.moc +dialog.cpp: dialog.moc +instances.cpp: instances.moc +optw_antispam.cpp: optw_antispam.moc +optw_avatar.cpp: optw_avatar.moc +optw_away.cpp: optw_away.moc +optw_connection.cpp: optw_connection.moc +optw_ctcp.cpp: optw_ctcp.moc +optw_ctcpfloodprotection.cpp: optw_ctcpfloodprotection.moc +optw_dcc.cpp: optw_dcc.moc +optw_generalopt.cpp: optw_generalopt.moc +optw_highlighting.cpp: optw_highlighting.moc +optw_ident.cpp: optw_ident.moc +optw_identity.cpp: optw_identity.moc +optw_ignore.cpp: optw_ignore.moc +optw_input.cpp: optw_input.moc +optw_interfacefeatures.cpp: optw_interfacefeatures.moc +optw_interfacelookglobal.cpp: optw_interfacelookglobal.moc +optw_irc.cpp: optw_irc.moc +optw_ircoutput.cpp: optw_ircoutput.moc +optw_ircview.cpp: optw_ircview.moc +optw_lag.cpp: optw_lag.moc +optw_logging.cpp: optw_logging.moc +optw_look.cpp: optw_look.moc +optw_mediatypes.cpp: optw_mediatypes.moc +optw_messages.cpp: optw_messages.moc +optw_nickserv.cpp: optw_nickserv.moc +optw_notify.cpp: optw_notify.moc +optw_protection.cpp: optw_protection.moc +optw_proxy.cpp: optw_proxy.moc +optw_query.cpp: optw_query.moc +optw_servers.cpp: optw_servers.moc +optw_sound.cpp: optw_sound.moc +optw_ssl.cpp: optw_ssl.moc +optw_taskbar.cpp: optw_taskbar.moc +optw_textencoding.cpp: optw_textencoding.moc +optw_texticons.cpp: optw_texticons.moc +optw_transport.cpp: optw_transport.moc +optw_theme.cpp: optw_theme.moc +optw_topiclabel.cpp: optw_topiclabel.moc +optw_tools.cpp: optw_tools.moc +optw_uparser.cpp: optw_uparser.moc +optw_urlhandlers.cpp: optw_urlhandlers.moc +optw_userlist.cpp: optw_userlist.moc +optw_tray.cpp : optw_tray.moc diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index fd5dbd1c..1fe8921a 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -117,4 +117,4 @@ void KviOptionsWidgetContainer::cancelClicked() deleteLater(); } -#include "m_container.moc" +#include "container.moc" diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 4dd17505..80df61d0 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -333,7 +333,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt if(!szText.isEmpty()) { bool bOk = true; - for(int j=0;j<lKeywords.count();j++) + for(size_t j=0;j<lKeywords.count();j++) { if(szText.find(*(lKeywords.at(j)),0,false) == -1) { @@ -644,4 +644,4 @@ void KviOptionsDialog::keyPressEvent( TQKeyEvent * e ) e->ignore(); } -#include "m_dialog.moc" +#include "dialog.moc" diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp deleted file mode 100644 index 0e326d9f..00000000 --- a/src/modules/options/instances.cpp +++ /dev/null @@ -1,3590 +0,0 @@ - - -// -// File : instances.cpp -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2001 Szymon Stefanek (stefanek@tin.it) -// -// 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. -// - -// -// Instance creation routines for the KVIrc options module -// DO NOT EDIT THIS FILE!! ALL CHANGES WILL BE LOST!! -// This file is automatically generated by mkcreateinstanceproc.sh -// so any change should go in that script -// - -#include "optw_antispam.h" -#include "optw_avatar.h" -#include "optw_away.h" -#include "optw_connection.h" -#include "optw_ctcp.h" -#include "optw_ctcpfloodprotection.h" -#include "optw_dcc.h" -#include "optw_generalopt.h" -#include "optw_highlighting.h" -#include "optw_ident.h" -#include "optw_identity.h" -#include "optw_ignore.h" -#include "optw_input.h" -#include "optw_interfacefeatures.h" -#include "optw_interfacelookglobal.h" -#include "optw_irc.h" -#include "optw_ircoutput.h" -#include "optw_ircview.h" -#include "optw_lag.h" -#include "optw_logging.h" -#include "optw_mediatypes.h" -#include "optw_messages.h" -#include "optw_nickserv.h" -#include "optw_notify.h" -#include "optw_protection.h" -#include "optw_proxy.h" -#include "optw_query.h" -#include "optw_servers.h" -#include "optw_sound.h" -#include "optw_ssl.h" -#include "optw_taskbar.h" -#include "optw_textencoding.h" -#include "optw_texticons.h" -#include "optw_theme.h" -#include "optw_tools.h" -#include "optw_topiclabel.h" -#include "optw_transport.h" -#include "optw_tray.h" -#include "optw_uparser.h" -#include "optw_urlhandlers.h" -#include "optw_userlist.h" - -#include "kvi_locale.h" -#include "kvi_iconmanager.h" -#include "instances.h" - -int g_iOptionWidgetInstances = 0; - -KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviAntispamOptionsWidget(parent); -} - -KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviAvatarAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviAwayOptionsWidget(parent); -} - -KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviConnectionOptionsWidget(parent); -} - -KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviConnectionAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviSSLOptionsWidget(parent); -} - -KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTransportOptionsWidget(parent); -} - -KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIdentOptionsWidget(parent); -} - -KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviCtcpOptionsWidget(parent); -} - -KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviCtcpFloodProtectionOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccSendOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccSendGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccSendAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccChatOptionsWidget(parent); -} - -KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviDccVoiceOptionsWidget(parent); -} - -KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviGeneralOptOptionsWidget(parent); -} - -KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviAlertHighlightingOptionsWidget(parent); -} - -KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviHighlightingOptionsWidget(parent); -} - -KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviAlertOptionsWidget(parent); -} - -KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIdentityOptionsWidget(parent); -} - -KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIdentityGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIdentityAvatarOptionsWidget(parent); -} - -KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIdentityAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIgnoreOptionsWidget(parent); -} - -KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviInputLookOptionsWidget(parent); -} - -KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviInputFeaturesOptionsWidget(parent); -} - -KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviInterfaceFeaturesOptionsWidget(parent); -} - -KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviThemeGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviThemeTransparencyOptionsWidget(parent); -} - -KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviThemeMdiCaptionsOptionsWidget(parent); -} - -KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviThemeMdiAreaOptionsWidget(parent); -} - -KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviThemeToolBarAppletsOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviChannelOptionsWidget(parent); -} - -KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviChannelGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviChannelAdvancedOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcOutputOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcViewThemeOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcViewLookOptionsWidget(parent); -} - -KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviIrcViewFeaturesOptionsWidget(parent); -} - -KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviLagOptionsWidget(parent); -} - -KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviLoggingOptionsWidget(parent); -} - -KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviMediaTypesOptionsWidget(parent); -} - -KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviMessageOptionsWidget(parent); -} - -KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviPrivmsgOptionsWidget(parent); -} - -KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTimestampOptionsWidget(parent); -} - -KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviMessageColorsOptionsWidget(parent); -} - -KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviStandardColorsOptionsWidget(parent); -} - -KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviNickServOptionsWidget(parent); -} - -KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviNotifyOptionsWidget(parent); -} - -KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviNotifierOptionsWidget(parent); -} - -KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviProtectionOptionsWidget(parent); -} - -KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviProxyOptionsWidget(parent); -} - -KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviQueryOptionsWidget(parent); -} - -KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviServerOptionsWidget(parent); -} - -KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviSoundOptionsWidget(parent); -} - -KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviSoundGeneralOptionsWidget(parent); -} - -KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviSoundsOptionsWidget(parent); -} - -KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTaskBarOptionsWidget(parent); -} - -KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTreeTaskBarOptionsWidget(parent); -} - -KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTreeTaskBarForegroundOptionsWidget(parent); -} - -KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTreeTaskBarBackgroundOptionsWidget(parent); -} - -KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTreeTaskBarFeaturesOptionsWidget(parent); -} - -KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviClassicTaskBarOptionsWidget(parent); -} - -KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTextEncodingOptionsWidget(parent); -} - -KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTextIconsOptionsWidget(parent); -} - -KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviToolsOptionsWidget(parent); -} - -KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTopicLabelLookOptionsWidget(parent); -} - -KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviTrayOptionsWidget(parent); -} - -KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUParserOptionsWidget(parent); -} - -KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUrlHandlersOptionsWidget(parent); -} - -KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUserListLookOptionsWidget(parent); -} - -KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUserListLookBackgroundOptionsWidget(parent); -} - -KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUserListLookForegroundOptionsWidget(parent); -} - -KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUserListGridOptionsWidget(parent); -} - -KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(TQWidget * parent) -{ - return new KviUserListFeaturesOptionsWidget(parent); -} - - - -static const char * g_szName_KviAntispamOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget; -static const char * g_szClassName_KviAntispamOptionsWidget = "KviAntispamOptionsWidget"; -static const char * g_szName_KviAvatarAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAvatarAdvancedOptionsWidget; -static const char * g_szClassName_KviAvatarAdvancedOptionsWidget = "KviAvatarAdvancedOptionsWidget"; -static const char * g_szName_KviAwayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget; -static const char * g_szClassName_KviAwayOptionsWidget = "KviAwayOptionsWidget"; -static const char * g_szName_KviConnectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionOptionsWidget; -static const char * g_szClassName_KviConnectionOptionsWidget = "KviConnectionOptionsWidget"; -static const char * g_szName_KviConnectionAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionAdvancedOptionsWidget; -static const char * g_szClassName_KviConnectionAdvancedOptionsWidget = "KviConnectionAdvancedOptionsWidget"; -static const char * g_szName_KviSSLOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSSLOptionsWidget; -static const char * g_szClassName_KviSSLOptionsWidget = "KviSSLOptionsWidget"; -static const char * g_szName_KviTransportOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTransportOptionsWidget; -static const char * g_szClassName_KviTransportOptionsWidget = "KviTransportOptionsWidget"; -static const char * g_szName_KviIdentOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentOptionsWidget; -static const char * g_szClassName_KviIdentOptionsWidget = "KviIdentOptionsWidget"; -static const char * g_szName_KviCtcpOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviCtcpOptionsWidget; -static const char * g_szClassName_KviCtcpOptionsWidget = "KviCtcpOptionsWidget"; -static const char * g_szName_KviCtcpFloodProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviCtcpFloodProtectionOptionsWidget; -static const char * g_szClassName_KviCtcpFloodProtectionOptionsWidget = "KviCtcpFloodProtectionOptionsWidget"; -static const char * g_szName_KviDccOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccOptionsWidget; -static const char * g_szClassName_KviDccOptionsWidget = "KviDccOptionsWidget"; -static const char * g_szName_KviDccGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccGeneralOptionsWidget; -static const char * g_szClassName_KviDccGeneralOptionsWidget = "KviDccGeneralOptionsWidget"; -static const char * g_szName_KviDccAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccAdvancedOptionsWidget; -static const char * g_szClassName_KviDccAdvancedOptionsWidget = "KviDccAdvancedOptionsWidget"; -static const char * g_szName_KviDccSendOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendOptionsWidget; -static const char * g_szClassName_KviDccSendOptionsWidget = "KviDccSendOptionsWidget"; -static const char * g_szName_KviDccSendGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendGeneralOptionsWidget; -static const char * g_szClassName_KviDccSendGeneralOptionsWidget = "KviDccSendGeneralOptionsWidget"; -static const char * g_szName_KviDccSendAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendAdvancedOptionsWidget; -static const char * g_szClassName_KviDccSendAdvancedOptionsWidget = "KviDccSendAdvancedOptionsWidget"; -static const char * g_szName_KviDccChatOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccChatOptionsWidget; -static const char * g_szClassName_KviDccChatOptionsWidget = "KviDccChatOptionsWidget"; -static const char * g_szName_KviDccVoiceOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccVoiceOptionsWidget; -static const char * g_szClassName_KviDccVoiceOptionsWidget = "KviDccVoiceOptionsWidget"; -static const char * g_szName_KviGeneralOptOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviGeneralOptOptionsWidget; -static const char * g_szClassName_KviGeneralOptOptionsWidget = "KviGeneralOptOptionsWidget"; -static const char * g_szName_KviAlertHighlightingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAlertHighlightingOptionsWidget; -static const char * g_szClassName_KviAlertHighlightingOptionsWidget = "KviAlertHighlightingOptionsWidget"; -static const char * g_szName_KviHighlightingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviHighlightingOptionsWidget; -static const char * g_szClassName_KviHighlightingOptionsWidget = "KviHighlightingOptionsWidget"; -static const char * g_szName_KviAlertOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget; -static const char * g_szClassName_KviAlertOptionsWidget = "KviAlertOptionsWidget"; -static const char * g_szName_KviIdentityOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityOptionsWidget; -static const char * g_szClassName_KviIdentityOptionsWidget = "KviIdentityOptionsWidget"; -static const char * g_szName_KviIdentityGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget; -static const char * g_szClassName_KviIdentityGeneralOptionsWidget = "KviIdentityGeneralOptionsWidget"; -static const char * g_szName_KviIdentityAvatarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityAvatarOptionsWidget; -static const char * g_szClassName_KviIdentityAvatarOptionsWidget = "KviIdentityAvatarOptionsWidget"; -static const char * g_szName_KviIdentityAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityAdvancedOptionsWidget; -static const char * g_szClassName_KviIdentityAdvancedOptionsWidget = "KviIdentityAdvancedOptionsWidget"; -static const char * g_szName_KviIgnoreOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIgnoreOptionsWidget; -static const char * g_szClassName_KviIgnoreOptionsWidget = "KviIgnoreOptionsWidget"; -static const char * g_szName_KviInputLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInputLookOptionsWidget; -static const char * g_szClassName_KviInputLookOptionsWidget = "KviInputLookOptionsWidget"; -static const char * g_szName_KviInputFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInputFeaturesOptionsWidget; -static const char * g_szClassName_KviInputFeaturesOptionsWidget = "KviInputFeaturesOptionsWidget"; -static const char * g_szName_KviInterfaceFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget; -static const char * g_szClassName_KviInterfaceFeaturesOptionsWidget = "KviInterfaceFeaturesOptionsWidget"; -static const char * g_szName_KviThemeGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeGeneralOptionsWidget; -static const char * g_szClassName_KviThemeGeneralOptionsWidget = "KviThemeGeneralOptionsWidget"; -static const char * g_szName_KviThemeTransparencyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget; -static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "KviThemeTransparencyOptionsWidget"; -static const char * g_szName_KviThemeMdiCaptionsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget; -static const char * g_szClassName_KviThemeMdiCaptionsOptionsWidget = "KviThemeMdiCaptionsOptionsWidget"; -static const char * g_szName_KviThemeMdiAreaOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget; -static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "KviThemeMdiAreaOptionsWidget"; -static const char * g_szName_KviThemeToolBarAppletsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget; -static const char * g_szClassName_KviThemeToolBarAppletsOptionsWidget = "KviThemeToolBarAppletsOptionsWidget"; -static const char * g_szName_KviIrcOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOptionsWidget; -static const char * g_szClassName_KviIrcOptionsWidget = "KviIrcOptionsWidget"; -static const char * g_szName_KviIrcGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcGeneralOptionsWidget; -static const char * g_szClassName_KviIrcGeneralOptionsWidget = "KviIrcGeneralOptionsWidget"; -static const char * g_szName_KviIrcAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcAdvancedOptionsWidget; -static const char * g_szClassName_KviIrcAdvancedOptionsWidget = "KviIrcAdvancedOptionsWidget"; -static const char * g_szName_KviChannelOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget; -static const char * g_szClassName_KviChannelOptionsWidget = "KviChannelOptionsWidget"; -static const char * g_szName_KviChannelGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget; -static const char * g_szClassName_KviChannelGeneralOptionsWidget = "KviChannelGeneralOptionsWidget"; -static const char * g_szName_KviChannelAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget; -static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "KviChannelAdvancedOptionsWidget"; -static const char * g_szName_KviIrcOutputOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget; -static const char * g_szClassName_KviIrcOutputOptionsWidget = "KviIrcOutputOptionsWidget"; -static const char * g_szName_KviIrcViewThemeOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewThemeOptionsWidget; -static const char * g_szClassName_KviIrcViewThemeOptionsWidget = "KviIrcViewThemeOptionsWidget"; -static const char * g_szName_KviIrcViewLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewLookOptionsWidget; -static const char * g_szClassName_KviIrcViewLookOptionsWidget = "KviIrcViewLookOptionsWidget"; -static const char * g_szName_KviIrcViewFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewFeaturesOptionsWidget; -static const char * g_szClassName_KviIrcViewFeaturesOptionsWidget = "KviIrcViewFeaturesOptionsWidget"; -static const char * g_szName_KviLagOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviLagOptionsWidget; -static const char * g_szClassName_KviLagOptionsWidget = "KviLagOptionsWidget"; -static const char * g_szName_KviLoggingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviLoggingOptionsWidget; -static const char * g_szClassName_KviLoggingOptionsWidget = "KviLoggingOptionsWidget"; -static const char * g_szName_KviMediaTypesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMediaTypesOptionsWidget; -static const char * g_szClassName_KviMediaTypesOptionsWidget = "KviMediaTypesOptionsWidget"; -static const char * g_szName_KviMessageOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMessageOptionsWidget; -static const char * g_szClassName_KviMessageOptionsWidget = "KviMessageOptionsWidget"; -static const char * g_szName_KviPrivmsgOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviPrivmsgOptionsWidget; -static const char * g_szClassName_KviPrivmsgOptionsWidget = "KviPrivmsgOptionsWidget"; -static const char * g_szName_KviTimestampOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTimestampOptionsWidget; -static const char * g_szClassName_KviTimestampOptionsWidget = "KviTimestampOptionsWidget"; -static const char * g_szName_KviMessageColorsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMessageColorsOptionsWidget; -static const char * g_szClassName_KviMessageColorsOptionsWidget = "KviMessageColorsOptionsWidget"; -static const char * g_szName_KviStandardColorsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviStandardColorsOptionsWidget; -static const char * g_szClassName_KviStandardColorsOptionsWidget = "KviStandardColorsOptionsWidget"; -static const char * g_szName_KviNickServOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget; -static const char * g_szClassName_KviNickServOptionsWidget = "KviNickServOptionsWidget"; -static const char * g_szName_KviNotifyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget; -static const char * g_szClassName_KviNotifyOptionsWidget = "KviNotifyOptionsWidget"; -static const char * g_szName_KviNotifierOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget; -static const char * g_szClassName_KviNotifierOptionsWidget = "KviNotifierOptionsWidget"; -static const char * g_szName_KviProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget; -static const char * g_szClassName_KviProtectionOptionsWidget = "KviProtectionOptionsWidget"; -static const char * g_szName_KviProxyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget; -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_KviSoundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget; -static const char * g_szClassName_KviSoundOptionsWidget = "KviSoundOptionsWidget"; -static const char * g_szName_KviSoundGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget; -static const char * g_szClassName_KviSoundGeneralOptionsWidget = "KviSoundGeneralOptionsWidget"; -static const char * g_szName_KviSoundsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundsOptionsWidget; -static const char * g_szClassName_KviSoundsOptionsWidget = "KviSoundsOptionsWidget"; -static const char * g_szName_KviTaskBarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTaskBarOptionsWidget; -static const char * g_szClassName_KviTaskBarOptionsWidget = "KviTaskBarOptionsWidget"; -static const char * g_szName_KviTreeTaskBarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarOptionsWidget; -static const char * g_szClassName_KviTreeTaskBarOptionsWidget = "KviTreeTaskBarOptionsWidget"; -static const char * g_szName_KviTreeTaskBarForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarForegroundOptionsWidget; -static const char * g_szClassName_KviTreeTaskBarForegroundOptionsWidget = "KviTreeTaskBarForegroundOptionsWidget"; -static const char * g_szName_KviTreeTaskBarBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarBackgroundOptionsWidget; -static const char * g_szClassName_KviTreeTaskBarBackgroundOptionsWidget = "KviTreeTaskBarBackgroundOptionsWidget"; -static const char * g_szName_KviTreeTaskBarFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarFeaturesOptionsWidget; -static const char * g_szClassName_KviTreeTaskBarFeaturesOptionsWidget = "KviTreeTaskBarFeaturesOptionsWidget"; -static const char * g_szName_KviClassicTaskBarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviClassicTaskBarOptionsWidget; -static const char * g_szClassName_KviClassicTaskBarOptionsWidget = "KviClassicTaskBarOptionsWidget"; -static const char * g_szName_KviTextEncodingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget; -static const char * g_szClassName_KviTextEncodingOptionsWidget = "KviTextEncodingOptionsWidget"; -static const char * g_szName_KviTextIconsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextIconsOptionsWidget; -static const char * g_szClassName_KviTextIconsOptionsWidget = "KviTextIconsOptionsWidget"; -static const char * g_szName_KviToolsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviToolsOptionsWidget; -static const char * g_szClassName_KviToolsOptionsWidget = "KviToolsOptionsWidget"; -static const char * g_szName_KviTopicLabelLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTopicLabelLookOptionsWidget; -static const char * g_szClassName_KviTopicLabelLookOptionsWidget = "KviTopicLabelLookOptionsWidget"; -static const char * g_szName_KviTrayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTrayOptionsWidget; -static const char * g_szClassName_KviTrayOptionsWidget = "KviTrayOptionsWidget"; -static const char * g_szName_KviUParserOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUParserOptionsWidget; -static const char * g_szClassName_KviUParserOptionsWidget = "KviUParserOptionsWidget"; -static const char * g_szName_KviUrlHandlersOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUrlHandlersOptionsWidget; -static const char * g_szClassName_KviUrlHandlersOptionsWidget = "KviUrlHandlersOptionsWidget"; -static const char * g_szName_KviUserListLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookOptionsWidget; -static const char * g_szClassName_KviUserListLookOptionsWidget = "KviUserListLookOptionsWidget"; -static const char * g_szName_KviUserListLookBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookBackgroundOptionsWidget; -static const char * g_szClassName_KviUserListLookBackgroundOptionsWidget = "KviUserListLookBackgroundOptionsWidget"; -static const char * g_szName_KviUserListLookForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookForegroundOptionsWidget; -static const char * g_szClassName_KviUserListLookForegroundOptionsWidget = "KviUserListLookForegroundOptionsWidget"; -static const char * g_szName_KviUserListGridOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListGridOptionsWidget; -static const char * g_szClassName_KviUserListGridOptionsWidget = "KviUserListGridOptionsWidget"; -static const char * g_szName_KviUserListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListFeaturesOptionsWidget; -static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "KviUserListFeaturesOptionsWidget"; - -KviOptionsInstanceManager::KviOptionsInstanceManager() -: TQObject(0) -{ - - //tqDebug("Instantiating"); - // Create the global widget dict : case sensitive , do not copy keys - m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>; - m_pInstanceTree->setAutoDelete(true); - - - KviOptionsWidgetInstanceEntry * e0; - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviConnectionOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviConnectionOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviConnectionOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviConnectionOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviConnectionOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviConnectionOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviConnectionOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviConnectionOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviConnectionOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviConnectionOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviConnectionOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviConnectionOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - KviOptionsWidgetInstanceEntry * e1; - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviConnectionAdvancedOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviConnectionAdvancedOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviConnectionAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviConnectionAdvancedOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviConnectionAdvancedOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionAdvancedOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionAdvancedOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviConnectionAdvancedOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviConnectionAdvancedOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviConnectionAdvancedOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviConnectionAdvancedOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviConnectionAdvancedOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviConnectionAdvancedOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviConnectionAdvancedOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionAdvancedOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - KviOptionsWidgetInstanceEntry * e2; - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviSSLOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviSSLOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviSSLOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviSSLOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviSSLOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSSLOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSSLOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviSSLOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSSLOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviSSLOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviSSLOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSSLOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSSLOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviSSLOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSSLOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviTransportOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviTransportOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTransportOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTransportOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTransportOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTransportOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTransportOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTransportOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTransportOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTransportOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTransportOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTransportOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTransportOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviTransportOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTransportOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviIdentOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviIdentOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviIdentOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviProxyOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviProxyOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviProxyOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviProxyOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviProxyOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviProxyOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviProxyOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviProxyOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviProxyOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviProxyOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviProxyOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviProxyOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviProxyOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviProxyOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviProxyOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviDccOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviDccOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviDccOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviDccGeneralOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviDccGeneralOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccGeneralOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccGeneralOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccGeneralOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccGeneralOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccGeneralOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccGeneralOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccGeneralOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccGeneralOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccGeneralOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccGeneralOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviDccGeneralOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccGeneralOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviDccAdvancedOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviDccAdvancedOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccAdvancedOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccAdvancedOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccAdvancedOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccAdvancedOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccAdvancedOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccAdvancedOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccAdvancedOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccAdvancedOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccAdvancedOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccAdvancedOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviDccAdvancedOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccAdvancedOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviDccSendOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviDccSendOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccSendOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccSendOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccSendOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccSendOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccSendOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccSendOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccSendOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviDccSendOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccSendOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviDccSendGeneralOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviDccSendGeneralOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccSendGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccSendGeneralOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccSendGeneralOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendGeneralOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendGeneralOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccSendGeneralOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccSendGeneralOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendGeneralOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendGeneralOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccSendGeneralOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccSendGeneralOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviDccSendGeneralOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccSendGeneralOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviDccSendAdvancedOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviDccSendAdvancedOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccSendAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccSendAdvancedOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccSendAdvancedOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendAdvancedOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendAdvancedOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccSendAdvancedOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccSendAdvancedOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendAdvancedOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendAdvancedOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccSendAdvancedOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccSendAdvancedOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviDccSendAdvancedOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccSendAdvancedOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviDccChatOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviDccChatOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccChatOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccChatOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccChatOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccChatOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccChatOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccChatOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccChatOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccChatOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccChatOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccChatOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccChatOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviDccChatOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccChatOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviDccVoiceOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviDccVoiceOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviDccVoiceOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviDccVoiceOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviDccVoiceOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccVoiceOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccVoiceOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccVoiceOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccVoiceOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviDccVoiceOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviDccVoiceOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccVoiceOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccVoiceOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviDccVoiceOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccVoiceOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviGeneralOptOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviGeneralOptOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviGeneralOptOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviGeneralOptOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviGeneralOptOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviGeneralOptOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviGeneralOptOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviGeneralOptOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviGeneralOptOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviGeneralOptOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviGeneralOptOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviGeneralOptOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviGeneralOptOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviGeneralOptOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviGeneralOptOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviMediaTypesOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviMediaTypesOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviMediaTypesOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviMediaTypesOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviMediaTypesOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviMediaTypesOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviMediaTypesOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviMediaTypesOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviMediaTypesOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviMediaTypesOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviMediaTypesOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviMediaTypesOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviMediaTypesOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviMediaTypesOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviMediaTypesOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviSoundOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviSoundOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviSoundOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviSoundOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviSoundOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviSoundOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSoundOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviSoundOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviSoundOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSoundOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSoundOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviSoundOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSoundOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviSoundGeneralOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviSoundGeneralOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviSoundGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviSoundGeneralOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviSoundGeneralOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundGeneralOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundGeneralOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviSoundGeneralOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSoundGeneralOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviSoundGeneralOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviSoundGeneralOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSoundGeneralOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSoundGeneralOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviSoundGeneralOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSoundGeneralOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviSoundsOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviSoundsOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviSoundsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviSoundsOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviSoundsOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundsOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundsOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviSoundsOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSoundsOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviSoundsOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviSoundsOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSoundsOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviSoundsOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviSoundsOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSoundsOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviTextEncodingOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviTextEncodingOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTextEncodingOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTextEncodingOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTextEncodingOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTextEncodingOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTextEncodingOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTextEncodingOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTextEncodingOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTextEncodingOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTextEncodingOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTextEncodingOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTextEncodingOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviTextEncodingOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTextEncodingOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviUParserOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviUParserOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUParserOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUParserOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUParserOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUParserOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUParserOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUParserOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUParserOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUParserOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUParserOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUParserOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUParserOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviUParserOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUParserOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviUrlHandlersOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviUrlHandlersOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUrlHandlersOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUrlHandlersOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUrlHandlersOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUrlHandlersOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUrlHandlersOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUrlHandlersOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUrlHandlersOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUrlHandlersOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUrlHandlersOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUrlHandlersOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUrlHandlersOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviUrlHandlersOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUrlHandlersOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviIdentityOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviIdentityOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviIdentityOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityGeneralOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityGeneralOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityGeneralOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityGeneralOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIdentityGeneralOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityGeneralOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIdentityAvatarOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIdentityAvatarOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityAvatarOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAvatarOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAvatarOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAvatarOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAvatarOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityAvatarOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityAvatarOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityAvatarOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityAvatarOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityAvatarOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityAvatarOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIdentityAvatarOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityAvatarOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIdentityAdvancedOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIdentityAdvancedOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAdvancedOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAdvancedOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAdvancedOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAdvancedOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityAdvancedOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityAdvancedOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityAdvancedOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityAdvancedOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityAdvancedOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityAdvancedOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIdentityAdvancedOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityAdvancedOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviInputLookOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviInputLookOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviInputLookOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviInputLookOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviInputLookOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviInputLookOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviInputLookOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviInputLookOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviInputLookOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviInputLookOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviInputLookOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviInputLookOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviInputLookOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviInputLookOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviInputLookOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviInterfaceFeaturesOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviInterfaceFeaturesOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviInterfaceFeaturesOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviInterfaceFeaturesOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviInterfaceFeaturesOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviInterfaceFeaturesOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviInterfaceFeaturesOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviInterfaceFeaturesOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviInterfaceFeaturesOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviInterfaceFeaturesOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviInterfaceFeaturesOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviInterfaceFeaturesOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviInterfaceFeaturesOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviInputFeaturesOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviInputFeaturesOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviInputFeaturesOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviInputFeaturesOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviInputFeaturesOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviInputFeaturesOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviInputFeaturesOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviInputFeaturesOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviInputFeaturesOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviInputFeaturesOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviInputFeaturesOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviInputFeaturesOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviInputFeaturesOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviInputFeaturesOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviInputFeaturesOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviNotifierOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviNotifierOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviNotifierOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviNotifierOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviNotifierOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviNotifierOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNotifierOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviNotifierOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviNotifierOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNotifierOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNotifierOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviNotifierOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviNotifierOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviTrayOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviTrayOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTrayOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTrayOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTrayOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTrayOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTrayOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTrayOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTrayOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTrayOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTrayOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTrayOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTrayOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviTrayOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTrayOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviThemeGeneralOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviThemeGeneralOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeGeneralOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeGeneralOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeGeneralOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeGeneralOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeGeneralOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeGeneralOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeGeneralOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeGeneralOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviThemeGeneralOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeGeneralOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviThemeTransparencyOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviThemeTransparencyOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeTransparencyOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeTransparencyOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeTransparencyOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeTransparencyOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeTransparencyOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeTransparencyOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeTransparencyOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeTransparencyOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeTransparencyOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviThemeTransparencyOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeTransparencyOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviThemeMdiCaptionsOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviThemeMdiCaptionsOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiCaptionsOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiCaptionsOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiCaptionsOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiCaptionsOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiCaptionsOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiCaptionsOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviThemeMdiCaptionsOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeMdiCaptionsOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviThemeMdiAreaOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviThemeMdiAreaOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeMdiAreaOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiAreaOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiAreaOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiAreaOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiAreaOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiAreaOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiAreaOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviThemeMdiAreaOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeMdiAreaOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviThemeToolBarAppletsOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviThemeToolBarAppletsOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeToolBarAppletsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeToolBarAppletsOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeToolBarAppletsOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeToolBarAppletsOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeToolBarAppletsOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeToolBarAppletsOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeToolBarAppletsOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeToolBarAppletsOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeToolBarAppletsOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviThemeToolBarAppletsOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeToolBarAppletsOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviIrcOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviIrcOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviIrcOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIrcGeneralOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIrcGeneralOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcGeneralOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcGeneralOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcGeneralOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcGeneralOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIrcGeneralOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcGeneralOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIrcAdvancedOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIrcAdvancedOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcAdvancedOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcAdvancedOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcAdvancedOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcAdvancedOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIrcAdvancedOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcAdvancedOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviChannelOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviChannelOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviChannelOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviChannelOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviChannelOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviChannelOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviChannelOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviChannelOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviChannelOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviChannelOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviChannelOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviChannelGeneralOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviChannelGeneralOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviChannelGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviChannelGeneralOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviChannelGeneralOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelGeneralOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelGeneralOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviChannelGeneralOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviChannelGeneralOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviChannelGeneralOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviChannelGeneralOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelGeneralOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelGeneralOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviChannelGeneralOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviChannelGeneralOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviChannelAdvancedOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviChannelAdvancedOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviChannelAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviChannelAdvancedOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviChannelAdvancedOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelAdvancedOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelAdvancedOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviChannelAdvancedOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviChannelAdvancedOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviChannelAdvancedOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviChannelAdvancedOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelAdvancedOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelAdvancedOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviChannelAdvancedOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviChannelAdvancedOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIrcOutputOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIrcOutputOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcOutputOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOutputOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOutputOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOutputOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOutputOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcOutputOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcOutputOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcOutputOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcOutputOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcOutputOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcOutputOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIrcOutputOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcOutputOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviProtectionOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviProtectionOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviProtectionOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviProtectionOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviProtectionOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviProtectionOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviProtectionOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviProtectionOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviProtectionOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviProtectionOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviProtectionOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviProtectionOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviProtectionOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviProtectionOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviProtectionOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviAntispamOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviAntispamOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviAntispamOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviAntispamOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviAntispamOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAntispamOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAntispamOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviAntispamOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAntispamOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviAntispamOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviAntispamOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAntispamOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAntispamOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviAntispamOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAntispamOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviCtcpFloodProtectionOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviCtcpFloodProtectionOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviCtcpFloodProtectionOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviCtcpFloodProtectionOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviCtcpFloodProtectionOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpFloodProtectionOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpFloodProtectionOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviCtcpFloodProtectionOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviCtcpFloodProtectionOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviCtcpFloodProtectionOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviCtcpFloodProtectionOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviCtcpFloodProtectionOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviCtcpFloodProtectionOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviCtcpFloodProtectionOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviCtcpFloodProtectionOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviIgnoreOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviIgnoreOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIgnoreOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIgnoreOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIgnoreOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIgnoreOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIgnoreOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIgnoreOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIgnoreOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIgnoreOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIgnoreOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIgnoreOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIgnoreOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviIgnoreOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIgnoreOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviQueryOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviQueryOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviQueryOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviQueryOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviQueryOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviQueryOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviQueryOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviQueryOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviQueryOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviQueryOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviQueryOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviQueryOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviToolsOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviToolsOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviToolsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviToolsOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviToolsOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviToolsOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviToolsOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviToolsOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviToolsOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviToolsOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviToolsOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviToolsOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviToolsOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviToolsOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviToolsOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviAvatarAdvancedOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviAvatarAdvancedOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviAvatarAdvancedOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviAvatarAdvancedOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviAvatarAdvancedOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAvatarAdvancedOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAvatarAdvancedOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviAvatarAdvancedOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAvatarAdvancedOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviAvatarAdvancedOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviAvatarAdvancedOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAvatarAdvancedOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAvatarAdvancedOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviAvatarAdvancedOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAvatarAdvancedOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviAwayOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviAwayOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviAwayOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviAwayOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviAwayOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAwayOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAwayOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviAwayOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAwayOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviAwayOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviAwayOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAwayOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAwayOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviAwayOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAwayOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviCtcpOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviCtcpOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviCtcpOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviCtcpOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviCtcpOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviCtcpOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviCtcpOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviCtcpOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviCtcpOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviCtcpOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviCtcpOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviCtcpOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviCtcpOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviAlertHighlightingOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviAlertHighlightingOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviAlertHighlightingOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviAlertHighlightingOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviAlertHighlightingOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertHighlightingOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertHighlightingOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviAlertHighlightingOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAlertHighlightingOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviAlertHighlightingOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviAlertHighlightingOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAlertHighlightingOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAlertHighlightingOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviAlertHighlightingOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAlertHighlightingOptionsWidget,"options"); - e1->pChildList->append(e2); - - e2->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e2->pChildList->setAutoDelete(true); - - KviOptionsWidgetInstanceEntry * e3; - e3 = new KviOptionsWidgetInstanceEntry; - e3->createProc = &classKviHighlightingOptionsWidget_createInstanceProc; - e3->pWidget = 0; - e3->szClassName = g_szClassName_KviHighlightingOptionsWidget; - e3->iIcon = KVI_OPTIONS_WIDGET_ICON_KviHighlightingOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviHighlightingOptionsWidget - e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviHighlightingOptionsWidget; - #else - e3->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviHighlightingOptionsWidget - e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviHighlightingOptionsWidget; - e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviHighlightingOptionsWidget - e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviHighlightingOptionsWidget; - #else - e3->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviHighlightingOptionsWidget - e3->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviHighlightingOptionsWidget; - #else - e3->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviHighlightingOptionsWidget - e3->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviHighlightingOptionsWidget; - #else - e3->bIsNotContained = false; - #endif - e3->szNameNoLocale = g_szName_KviHighlightingOptionsWidget; - e3->szName = __tr2qs_ctx_no_xgettext(g_szName_KviHighlightingOptionsWidget,"options"); - e2->pChildList->append(e3); - e3->pChildList = 0; - - e3 = new KviOptionsWidgetInstanceEntry; - e3->createProc = &classKviAlertOptionsWidget_createInstanceProc; - e3->pWidget = 0; - e3->szClassName = g_szClassName_KviAlertOptionsWidget; - e3->iIcon = KVI_OPTIONS_WIDGET_ICON_KviAlertOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviAlertOptionsWidget - e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviAlertOptionsWidget; - #else - e3->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertOptionsWidget - e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertOptionsWidget; - e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviAlertOptionsWidget - e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAlertOptionsWidget; - #else - e3->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviAlertOptionsWidget - e3->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviAlertOptionsWidget; - #else - e3->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAlertOptionsWidget - e3->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviAlertOptionsWidget; - #else - e3->bIsNotContained = false; - #endif - e3->szNameNoLocale = g_szName_KviAlertOptionsWidget; - e3->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAlertOptionsWidget,"options"); - e2->pChildList->append(e3); - e3->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviLagOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviLagOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviLagOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviLagOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviLagOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviLagOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviLagOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviLagOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviLagOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviLagOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviLagOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviLagOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviLagOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviLagOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviLagOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviLoggingOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviLoggingOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviLoggingOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviLoggingOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviLoggingOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviLoggingOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviLoggingOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviLoggingOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviLoggingOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviLoggingOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviLoggingOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviLoggingOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviLoggingOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviLoggingOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviLoggingOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviNickServOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviNickServOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviNickServOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviNickServOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviNickServOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNickServOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNickServOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviNickServOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNickServOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviNickServOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviNickServOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNickServOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNickServOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviNickServOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviNickServOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviNotifyOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviNotifyOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviNotifyOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviNotifyOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviNotifyOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifyOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifyOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviNotifyOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNotifyOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviNotifyOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviNotifyOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNotifyOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNotifyOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviNotifyOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviNotifyOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviTextIconsOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviTextIconsOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTextIconsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTextIconsOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTextIconsOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTextIconsOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTextIconsOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTextIconsOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTextIconsOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTextIconsOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTextIconsOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTextIconsOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTextIconsOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviTextIconsOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTextIconsOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviIrcViewThemeOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviIrcViewThemeOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcViewThemeOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewThemeOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewThemeOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewThemeOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewThemeOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcViewThemeOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcViewThemeOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewThemeOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewThemeOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcViewThemeOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcViewThemeOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviIrcViewThemeOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcViewThemeOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIrcViewLookOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIrcViewLookOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcViewLookOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewLookOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewLookOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewLookOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewLookOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcViewLookOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcViewLookOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewLookOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewLookOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcViewLookOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcViewLookOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIrcViewLookOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcViewLookOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviIrcViewFeaturesOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIrcViewFeaturesOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcViewFeaturesOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewFeaturesOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewFeaturesOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewFeaturesOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewFeaturesOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcViewFeaturesOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcViewFeaturesOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewFeaturesOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewFeaturesOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcViewFeaturesOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcViewFeaturesOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIrcViewFeaturesOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcViewFeaturesOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviMessageOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviMessageOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviMessageOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviMessageOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviMessageOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviMessageOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviMessageOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviMessageOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviMessageOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviMessageOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviMessageOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviMessageOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviMessageOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviPrivmsgOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviPrivmsgOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviPrivmsgOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviPrivmsgOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviPrivmsgOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviPrivmsgOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviPrivmsgOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviPrivmsgOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviPrivmsgOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviPrivmsgOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviPrivmsgOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviPrivmsgOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviPrivmsgOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviPrivmsgOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviPrivmsgOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviTimestampOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviTimestampOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTimestampOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTimestampOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTimestampOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTimestampOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTimestampOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTimestampOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTimestampOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviTimestampOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTimestampOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviMessageColorsOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviMessageColorsOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviMessageColorsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviMessageColorsOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviMessageColorsOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageColorsOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageColorsOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviMessageColorsOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviMessageColorsOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviMessageColorsOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviMessageColorsOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviMessageColorsOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviMessageColorsOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviMessageColorsOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviMessageColorsOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviStandardColorsOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviStandardColorsOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviStandardColorsOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviStandardColorsOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviStandardColorsOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviStandardColorsOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviStandardColorsOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviStandardColorsOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviStandardColorsOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviStandardColorsOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviStandardColorsOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviStandardColorsOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviStandardColorsOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviStandardColorsOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviStandardColorsOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviServerOptionsWidget_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; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviServerOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviServerOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviServerOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviServerOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviServerOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviServerOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviTaskBarOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviTaskBarOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTaskBarOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTaskBarOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTaskBarOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTaskBarOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTaskBarOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTaskBarOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTaskBarOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviTaskBarOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTaskBarOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviTreeTaskBarOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviTreeTaskBarOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviTreeTaskBarOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarOptionsWidget,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e1->pChildList->setAutoDelete(true); - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviTreeTaskBarForegroundOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarForegroundOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarForegroundOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarForegroundOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarForegroundOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarForegroundOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarForegroundOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarForegroundOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarForegroundOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarForegroundOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviTreeTaskBarForegroundOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarForegroundOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviTreeTaskBarBackgroundOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarBackgroundOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarBackgroundOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarBackgroundOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarBackgroundOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarBackgroundOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarBackgroundOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarBackgroundOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarBackgroundOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarBackgroundOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviTreeTaskBarBackgroundOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarBackgroundOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new KviOptionsWidgetInstanceEntry; - e2->createProc = &classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_KviTreeTaskBarFeaturesOptionsWidget; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarFeaturesOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarFeaturesOptionsWidget - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarFeaturesOptionsWidget; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarFeaturesOptionsWidget - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarFeaturesOptionsWidget; - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarFeaturesOptionsWidget - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarFeaturesOptionsWidget; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarFeaturesOptionsWidget - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarFeaturesOptionsWidget; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_KviTreeTaskBarFeaturesOptionsWidget; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarFeaturesOptionsWidget,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviClassicTaskBarOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviClassicTaskBarOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviClassicTaskBarOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviClassicTaskBarOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviClassicTaskBarOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviClassicTaskBarOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviClassicTaskBarOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviClassicTaskBarOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviClassicTaskBarOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviClassicTaskBarOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviClassicTaskBarOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviTopicLabelLookOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviTopicLabelLookOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTopicLabelLookOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTopicLabelLookOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTopicLabelLookOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTopicLabelLookOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTopicLabelLookOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTopicLabelLookOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTopicLabelLookOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTopicLabelLookOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTopicLabelLookOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTopicLabelLookOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTopicLabelLookOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviTopicLabelLookOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTopicLabelLookOptionsWidget,"options"); - m_pInstanceTree->append(e0); - e0->pChildList = 0; - - e0 = new KviOptionsWidgetInstanceEntry; - e0->createProc = &classKviUserListLookOptionsWidget_createInstanceProc; - e0->pWidget = 0; - e0->szClassName = g_szClassName_KviUserListLookOptionsWidget; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUserListLookOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookOptionsWidget - e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookOptionsWidget; - #else - e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookOptionsWidget - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookOptionsWidget; - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListLookOptionsWidget - e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListLookOptionsWidget; - #else - e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookOptionsWidget - e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookOptionsWidget; - #else - e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListLookOptionsWidget - e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListLookOptionsWidget; - #else - e0->bIsNotContained = false; - #endif - e0->szNameNoLocale = g_szName_KviUserListLookOptionsWidget; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListLookOptionsWidget,"options"); - m_pInstanceTree->append(e0); - - e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>; - e0->pChildList->setAutoDelete(true); - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviUserListLookBackgroundOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviUserListLookBackgroundOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUserListLookBackgroundOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookBackgroundOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookBackgroundOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookBackgroundOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookBackgroundOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListLookBackgroundOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListLookBackgroundOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookBackgroundOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookBackgroundOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListLookBackgroundOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListLookBackgroundOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviUserListLookBackgroundOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListLookBackgroundOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviUserListLookForegroundOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviUserListLookForegroundOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUserListLookForegroundOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookForegroundOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookForegroundOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookForegroundOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookForegroundOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListLookForegroundOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListLookForegroundOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookForegroundOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookForegroundOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListLookForegroundOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListLookForegroundOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviUserListLookForegroundOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListLookForegroundOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviUserListGridOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviUserListGridOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUserListGridOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUserListGridOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUserListGridOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListGridOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListGridOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListGridOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListGridOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUserListGridOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUserListGridOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListGridOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListGridOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviUserListGridOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListGridOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new KviOptionsWidgetInstanceEntry; - e1->createProc = &classKviUserListFeaturesOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviUserListFeaturesOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviUserListFeaturesOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviUserListFeaturesOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviUserListFeaturesOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListFeaturesOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListFeaturesOptionsWidget; - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");; - #endif - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListFeaturesOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListFeaturesOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviUserListFeaturesOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviUserListFeaturesOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListFeaturesOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviUserListFeaturesOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviUserListFeaturesOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListFeaturesOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - -} - -void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l) -{ - if(l) - { - for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) - { - if(e->pWidget) - { - if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer")) - { - disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); - delete e->pWidget->parent(); - e->pWidget = 0; - } else { - tqDebug("Ops...i have deleted the options dialog ?"); - } - } //else tqDebug("Clas %s has no widget",e->szName); - if(e->pChildList)deleteInstanceTree(e->pChildList); - } - delete l; - } -} - - -KviOptionsInstanceManager::~KviOptionsInstanceManager() -{ - if(m_pInstanceTree)tqDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?"); -} - -void KviOptionsInstanceManager::cleanup(KviModule * m) -{ - deleteInstanceTree(m_pInstanceTree); - m_pInstanceTree = 0; -} - -void KviOptionsInstanceManager::widgetDestroyed() -{ - KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree); - if(e)e->pWidget = 0; - if(g_iOptionWidgetInstances > 0)g_iOptionWidgetInstances--; - -} - -KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par) -{ - if(!e)return 0; - if(!(e->pWidget)) - { - e->pWidget = e->createProc(par); - g_iOptionWidgetInstances++; - connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); - } - if(e->pWidget->parent() != par) - { - TQWidget * oldPar = (TQWidget *)e->pWidget->parent(); - e->pWidget->reparent(par,TQPoint(0,0)); - delete oldPar; - } - if(e->bIsContainer) - { - // need to create the container structure! - e->pWidget->createTabbedPage(); - if(e->pChildList) - { - KviPointerList<KviOptionsWidgetInstanceEntry> tmp; - tmp.setAutoDelete(false); - - for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next()) - { - // add only non containers and widgets not explicitly marked as noncontained - if((!e2->bIsContainer) && (!e2->bIsNotContained)) - { - KviOptionsWidgetInstanceEntry * ee = tmp.first(); - int idx = 0; - while(ee) - { - if(ee->iPriority >= e2->iPriority)break; - idx++; - ee = tmp.next(); - } - tmp.insert(idx,e2); - } - } - - for(KviOptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev()) - { - KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget()); - e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow); - } - } - } - return e->pWidget; -} - -KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l) -{ - if(l) - { - for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) - { - if(ptr == e->pWidget)return e; - if(e->pChildList) - { - KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList); - if(e2)return e2; - } - } - } - return 0; -} - -KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l) -{ - if(l) - { - for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) - { - if(kvi_strEqualCI(e->szClassName,clName))return e; - if(e->pChildList) - { - KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList); - if(e2)return e2; - } - } - } - return 0; -} - -KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName) -{ - return findInstanceEntry(clName,m_pInstanceTree); -} - - -#include "m_instances.moc" - diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h deleted file mode 100644 index 561f4874..00000000 --- a/src/modules/options/instances.h +++ /dev/null @@ -1,84 +0,0 @@ - - -#ifndef __OPTIONS_INSTANCES_H__ -#define __OPTIONS_INSTANCES_H__ - -// -// File : instances.h -// -// This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2006 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. -// - -// -// Instance creation routines for the KVIrc options module -// DO NOT EDIT THIS FILE!! ALL CHANGES WILL BE LOST!! -// This file is automatically generated by mkcreateinstanceproc.sh -// so any change should go in that script -// - -#include "kvi_optionswidget.h" -#include "kvi_module.h" -#include "kvi_pointerlist.h" -#include "kvi_qstring.h" - -typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry; - - -typedef struct _KviOptionsWidgetInstanceEntry -{ - KviOptionsWidget * (*createProc)(TQWidget *); - KviOptionsWidget * pWidget; // singleton - int iIcon; - TQString szName; - TQString szNameNoLocale; - const char * szClassName; - int iPriority; - TQString szKeywords; - TQString szKeywordsNoLocale; - TQString szGroup; - bool bIsContainer; - bool bIsNotContained; - KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList; - bool bDoInsert; // a helper for KviOptionsDialog::fillListView() -} KviOptionsWidgetInstanceEntry; - - -class KviOptionsInstanceManager : public TQObject -{ - TQ_OBJECT - -public: - KviOptionsInstanceManager(); - virtual ~KviOptionsInstanceManager(); -protected: - KviPointerList<KviOptionsWidgetInstanceEntry> * m_pInstanceTree; -public: - KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; }; - KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par); - KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName); - void cleanup(KviModule * m); -protected: - KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l); - KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l); - void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l); -protected slots: - void widgetDestroyed(); -}; - -#endif //__OPTIONS_INSTANCES_H__ - diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index bdca2099..8607a684 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -193,7 +193,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption) KVSM_PARAMETERS_END(c) - KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption); + KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.utf8().data()); if(!e) { c->warning(__tr2qs_ctx("No such options page class name %Q","options"),&szOption); diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index 5c0cbb78..ed1d8cb7 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -434,7 +434,7 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con } -#include "m_instances.moc" +#include "instances.moc" EOF ###################################################################################################### diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 972cdc68..c2936fe7 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -61,4 +61,4 @@ void KviAntispamOptionsWidget::reenableStuff(bool) } -#include "m_optw_antispam.moc" +#include "optw_antispam.moc" diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index aaa8d319..1f1cb528 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -128,4 +128,4 @@ KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget() } -#include "m_optw_avatar.moc" +#include "optw_avatar.moc" diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index f8d7cb37..57fa279e 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -68,4 +68,4 @@ void KviAwayOptionsWidget::enableCustomAwayText(bool) } -#include "m_optw_away.moc" +#include "optw_away.moc" diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index f65a52dd..5daf314a 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -318,4 +318,4 @@ KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget() } -#include "m_optw_connection.moc" +#include "optw_connection.moc" diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index 9ae7e8e4..546ec2a5 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -87,4 +87,4 @@ KviCtcpOptionsWidget::~KviCtcpOptionsWidget() } -#include "m_optw_ctcp.moc" +#include "optw_ctcp.moc" diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 56cdf0c1..28c600a1 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -113,4 +113,4 @@ KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget() } -#include "m_optw_ctcpfloodprotection.moc" +#include "optw_ctcpfloodprotection.moc" diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 263c4f11..505b1183 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -390,4 +390,4 @@ KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget() { } -#include "m_optw_dcc.moc" +#include "optw_dcc.moc" diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp index 76ecdf49..769d8926 100644 --- a/src/modules/options/optw_generalopt.cpp +++ b/src/modules/options/optw_generalopt.cpp @@ -48,4 +48,4 @@ KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget() } -#include "m_optw_generalopt.moc" +#include "optw_generalopt.moc" diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index 2016fa80..7d1417e5 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -123,6 +123,6 @@ KviAlertOptionsWidget::~KviAlertOptionsWidget() } -#include "m_optw_highlighting.moc" +#include "optw_highlighting.moc" #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp index 7dafdd52..dabdeb61 100644 --- a/src/modules/options/optw_ident.cpp +++ b/src/modules/options/optw_ident.cpp @@ -34,4 +34,4 @@ -#include "m_optw_ident.moc" +#include "optw_ident.moc" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 0c3db84f..65f7b26e 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -726,4 +726,4 @@ void KviIdentityAdvancedOptionsWidget::commit() -#include "m_optw_identity.moc" +#include "optw_identity.moc" diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index 06a70035..22f3f2ec 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -59,4 +59,4 @@ void KviIgnoreOptionsWidget::enableVerbose(bool) -#include "m_optw_ignore.moc" +#include "optw_ignore.moc" diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index 20284eae..05676d08 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -153,4 +153,4 @@ KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget() { } -#include "m_optw_input.moc" +#include "optw_input.moc" diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index d3377267..e65c7f25 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -85,4 +85,4 @@ void KviInterfaceFeaturesOptionsWidget::commit() } -#include "m_optw_interfacefeatures.moc" +#include "optw_interfacefeatures.moc" diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index 424786b6..1899287e 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -212,4 +212,4 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() } -#include "m_optw_interfacelookglobal.moc" +#include "optw_interfacelookglobal.moc" diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 22620045..907cafae 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -217,4 +217,4 @@ void KviChannelAdvancedOptionsWidget::commit() KviOptionsWidget::commit(); } -#include "m_optw_irc.moc" +#include "optw_irc.moc" diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index 47bc7610..c586220b 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -91,4 +91,4 @@ void KviIrcOutputOptionsWidget::commit() KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i; } -#include "m_optw_ircoutput.moc" +#include "optw_ircoutput.moc" diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp index 52f7cecb..85496a27 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -165,4 +165,4 @@ KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget() -#include "m_optw_ircview.moc" +#include "optw_ircview.moc" diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index addfa7a4..fbbc84e0 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -82,4 +82,4 @@ KviLagOptionsWidget::~KviLagOptionsWidget() } -#include "m_optw_lag.moc" +#include "optw_lag.moc" diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index b1f25976..dedefbce 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -61,4 +61,4 @@ KviLoggingOptionsWidget::~KviLoggingOptionsWidget() -#include "m_optw_logging.moc" +#include "optw_logging.moc" diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index 5b1ec8a2..ac2fac50 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -259,4 +259,4 @@ void KviMediaTypesOptionsWidget::commit() g_pMediaManager->unlock(); } -#include "m_optw_mediatypes.moc" +#include "optw_mediatypes.moc" diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index ea9dfafb..77f853b2 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -47,6 +47,8 @@ #include "kvi_config.h" #include "kvi_filedialog.h" +#include <tuple> + //#warning "Info tips" #ifdef COMPILE_PSEUDO_TRANSPARENCY @@ -292,7 +294,7 @@ void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,in // skip the msgtype prefix TQString txt = (g_msgtypeOptionsTable[m_iOptId].name + 7); txt += " ("; - txt += __tr2qs_no_xgettext(TQString::fromUtf8(m_pMsgType->type())); + txt += __tr2qs_no_xgettext(m_pMsgType->type()); txt += ")"; p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),TQt::AlignLeft | TQt::AlignVCenter,txt); if(isSelected()) @@ -614,7 +616,7 @@ void KviMessageColorsOptionsWidget::load() //tqDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); //tqDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); //tqDebug("ERRNO (%d)",errno); - symlink(szGlobal,szLocal); + std::ignore = symlink(szGlobal.utf8().data(),szLocal.utf8().data()); // FIXME: Do it also on windows... #endif @@ -665,4 +667,4 @@ void KviMessageColorsOptionsWidget::load() } } -#include "m_optw_messages.moc" +#include "optw_messages.moc" diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index 83f0a4a6..7e882420 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -365,4 +365,4 @@ void KviNickServOptionsWidget::commit() KviOptionsWidget::commit(); } -#include "m_optw_nickserv.moc" +#include "optw_nickserv.moc" diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index e1b4711a..949517a0 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -131,4 +131,4 @@ KviNotifierOptionsWidget::~KviNotifierOptionsWidget() } -#include "m_optw_notify.moc" +#include "optw_notify.moc" diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index 5f125101..392296c5 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -47,4 +47,4 @@ KviProtectionOptionsWidget::~KviProtectionOptionsWidget() { } -#include "m_optw_protection.moc" +#include "optw_protection.moc" diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index b36a0fb3..2cdaacf6 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -364,4 +364,4 @@ void KviProxyOptionsWidget::removeCurrent() } } -#include "m_optw_proxy.moc" +#include "optw_proxy.moc" diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 1efc3417..97f762d8 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -112,4 +112,4 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget() } -#include "m_optw_query.moc" +#include "optw_query.moc" diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 336d899b..5295ea43 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1709,4 +1709,4 @@ void KviServerOptionsWidget::detailsClicked() } } -#include "m_optw_servers.moc" +#include "optw_servers.moc" diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index b77262ce..1e0df2b9 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -30,6 +30,7 @@ #include "kvi_modulemanager.h" #include "kvi_pointerlist.h" #include "kvi_string.h" +#include "kvi_tal_tooltip.h" #include <tqlabel.h> #include <tqpushbutton.h> @@ -307,4 +308,4 @@ KviSoundsOptionsWidget::~KviSoundsOptionsWidget() { } -#include "m_optw_sound.moc" +#include "optw_sound.moc" diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 54135f69..c4474673 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -32,4 +32,4 @@ -#include "m_optw_ssl.moc" +#include "optw_ssl.moc" diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 394c8a10..79194d52 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -252,4 +252,4 @@ KviClassicTaskBarOptionsWidget::~KviClassicTaskBarOptionsWidget() { } -#include "m_optw_taskbar.moc" +#include "optw_taskbar.moc" diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index fc915ed4..844d4e82 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -30,6 +30,10 @@ #include <tqdir.h> #include <tqmessagebox.h> +#include <algorithm> +#include <filesystem> +#include <vector> + TQString g_szPrevSettedLocale; KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent) @@ -82,15 +86,29 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent) TQString szLocaleDir; g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale); - TQStringList list=TQDir(szLocaleDir).entryList("kvirc_*.mo",TQDir::Files); - + // Find available translations by checking for existance of kvirc.mo files + namespace fs = std::filesystem; + std::vector<fs::path> translationPaths; + const fs::path localeDir { szLocaleDir.local8Bit().data() }; + for (const auto &dir : fs::directory_iterator(localeDir)) + { + if (!dir.is_directory()) + { + continue; + } + + if (fs::exists(dir.path()/"LC_MESSAGES/kvirc.mo")) + { + translationPaths.push_back(dir.path().filename()); + } + } + std::sort(translationPaths.begin(), translationPaths.end()); + i = 0; iMatch = 0; - - for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - TQString szTmp=*it; - szTmp.replace("kvirc_",""); - szTmp.replace(".mo",""); + for (const auto &filename : translationPaths) + { + TQString szTmp { filename.c_str() }; m_pForcedLocaleCombo->insertItem(szTmp); if(KviTQString::equalCI(szTmp,m_szLanguage)) iMatch = i + 2; @@ -136,4 +154,4 @@ void KviTextEncodingOptionsWidget::commit() TQMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),TQMessageBox::Ok);*/ } -#include "m_optw_textencoding.moc" +#include "optw_textencoding.moc" diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index f9c24501..a999153d 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -79,7 +79,7 @@ void KviTextIconEditor::chooseFromFile() if(g_pIconManager->getPixmap(szFile)) { m_pIcon->setFilename(szFile); -// tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().utf8().data(),m_pIcon); +// tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().local8Bit().data(),m_pIcon); updateIcon(); } } @@ -241,4 +241,4 @@ void KviTextIconsOptionsWidget::commit() } -#include "m_optw_texticons.moc" +#include "optw_texticons.moc" diff --git a/src/modules/options/optw_theme.cpp b/src/modules/options/optw_theme.cpp index e3afeba4..78b23577 100644 --- a/src/modules/options/optw_theme.cpp +++ b/src/modules/options/optw_theme.cpp @@ -23,4 +23,4 @@ //============================================================================= -#include "m_optw_theme.moc" +#include "optw_theme.moc" diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index a1f3cf00..b1452f11 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -47,4 +47,4 @@ KviToolsOptionsWidget::~KviToolsOptionsWidget() { } -#include "m_optw_tools.moc" +#include "optw_tools.moc" diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index 904eeaee..788a68e4 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -40,4 +40,4 @@ KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget() { } -#include "m_optw_topiclabel.moc" +#include "optw_topiclabel.moc" diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp index d7cf3971..aa412e92 100644 --- a/src/modules/options/optw_transport.cpp +++ b/src/modules/options/optw_transport.cpp @@ -30,4 +30,4 @@ -#include "m_optw_transport.moc" +#include "optw_transport.moc" diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 32a5f4cf..95fa4de7 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -88,4 +88,4 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled) } -#include "m_optw_tray.moc" +#include "optw_tray.moc" diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp index 15fe465c..8fe6537c 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -59,4 +59,4 @@ KviUParserOptionsWidget::~KviUParserOptionsWidget() } -#include "m_optw_uparser.moc" +#include "optw_uparser.moc" diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index f7b366e9..735697b4 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -122,6 +122,6 @@ void KviUrlHandlersOptionsWidget::commit() #endif } -#include "m_optw_urlhandlers.moc" +#include "optw_urlhandlers.moc" #endif //_OPTW_URLHANDLERS_CPP_ diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index a75c1efa..32396bee 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -242,4 +242,4 @@ KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget() { } -#include "m_optw_userlist.moc" +#include "optw_userlist.moc" diff --git a/src/modules/perl/Makefile.am b/src/modules/perl/Makefile.am index ea5e4a5b..7f6f2d8b 100644 --- a/src/modules/perl/Makefile.am +++ b/src/modules/perl/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviperl.la libkviperl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviperl_la_SOURCES = libkviperl.cpp -libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs index 017350c5..e8568884 100644 --- a/src/modules/perlcore/KVIrc.xs +++ b/src/modules/perlcore/KVIrc.xs @@ -49,7 +49,7 @@ void internalWarning(text) g_lWarningList.append(TQString(text)); -char * getLocal(varname) +const char * getLocal(varname) char * varname CODE: TQString tmp; @@ -82,7 +82,7 @@ void setLocal(varname,value) } } -char * getGlobal(varname) +const char * getGlobal(varname) char * varname CODE: TQString tmp; @@ -116,7 +116,7 @@ void setGlobal(varname,value) } -char * eval(code) +const char * eval(code) char * code CODE: if(g_pCurrentKvsContext && code) diff --git a/src/modules/perlcore/Makefile.am b/src/modules/perlcore/Makefile.am index a153262c..94dd4c65 100644 --- a/src/modules/perlcore/Makefile.am +++ b/src/modules/perlcore/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviperlcore.la libkviperlcore_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_PERL_LDFLAGS) libkviperlcore_la_SOURCES = libkviperlcore.cpp -libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = perlcoreinterface.h @@ -19,5 +19,7 @@ EXTRA_DIST = KVIrc.xs ppport.h xs.inc typemap %.moc: %.h $(SS_QT_MOC) $< -o $@ -xs: +libkviperlcore.cpp: xs.inc + +xs.inc: xsubpp -noversioncheck -C++ -noprototypes KVIrc.xs > xs.inc diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index a7c9a282..e4a64f7f 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -125,7 +125,7 @@ extern "C" void boot_DynaLoader(pTHX_ CV* cv); extern "C" void xs_init(pTHX) { - char *file = __FILE__; + const char *file = __FILE__; // boot up the DynaLoader newXS("DynaLoader::boot_DynaLoader",boot_DynaLoader,file); // now bootstrap the KVIrc module @@ -154,8 +154,8 @@ bool KviPerlInterpreter::init() PERL_SET_CONTEXT(m_pInterpreter); PL_perl_destruct_level = 1; perl_construct(m_pInterpreter); - char * daArgs[] = { "yo", "-e", "0", "-w" }; - perl_parse(m_pInterpreter,xs_init,4,daArgs,NULL); + const char * daArgs[] = { "yo", "-e", "0", "-w" }; + perl_parse(m_pInterpreter,xs_init,4,(char**)daArgs,NULL); TQString szInitCode; // this part of the code seems to be unnecessary diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h index 8c8a706d..f9deb946 100644 --- a/src/modules/perlcore/ppport.h +++ b/src/modules/perlcore/ppport.h @@ -217,14 +217,16 @@ __DATA__ /* Replace: 0 */ #endif -#ifdef HASATTRIBUTE -# if defined(__GNUC__) && defined(__cplusplus) -# define PERL_UNUSED_DECL +#ifndef PERL_UNUSED_DECL +# ifdef HASATTRIBUTE +# if defined(__GNUC__) && defined(__cplusplus) +# define PERL_UNUSED_DECL +# else +# define PERL_UNUSED_DECL __attribute__((unused)) +# endif # else -# define PERL_UNUSED_DECL __attribute__((unused)) +# define PERL_UNUSED_DECL # endif -#else -# define PERL_UNUSED_DECL #endif #ifndef dNOOP diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc deleted file mode 100644 index a0741207..00000000 --- a/src/modules/perlcore/xs.inc +++ /dev/null @@ -1,277 +0,0 @@ -/* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of KVIrc.xs. Do not edit this file, edit KVIrc.xs instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ - -#line 1 "KVIrc.xs" -#line 11 "KVIrc.c" -XS(XS_KVIrc_echo); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_echo) -{ - dXSARGS; - if (items < 1 || items > 3) - Perl_croak(aTHX_ "Usage: KVIrc::echo(text, colorset = 0, windowid = 0)"); - { - char * text = (char *)SvPV_nolen(ST(0)); - int colorset; - char * windowid; - - if (items < 2) - colorset = 0; - else { - colorset = (int)SvIV(ST(1)); - } - - if (items < 3) - windowid = 0; - else { - windowid = (char *)SvPV_nolen(ST(2)); - } -#line 8 "KVIrc.xs" - if(g_pCurrentKvsContext && text) - { - KviWindow * pWnd; - if(windowid) - { - pWnd = g_pApp->findWindow(windowid); - if(!pWnd)pWnd = g_pCurrentKvsContext->window(); - } else { - pWnd = g_pCurrentKvsContext->window(); - } - pWnd->outputNoFmt(colorset,TQString::fromUtf8(text)); - } -#line 47 "KVIrc.c" - } - XSRETURN_EMPTY; -} - -XS(XS_KVIrc_say); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_say) -{ - dXSARGS; - if (items < 1 || items > 2) - Perl_croak(aTHX_ "Usage: KVIrc::say(text, windowid = 0)"); - { - char * text = (char *)SvPV_nolen(ST(0)); - char * windowid; - - if (items < 2) - windowid = 0; - else { - windowid = (char *)SvPV_nolen(ST(1)); - } -#line 25 "KVIrc.xs" - if(g_pCurrentKvsContext && text) - { - KviWindow * pWnd; - if(windowid) - { - pWnd = g_pApp->findWindow(windowid); - if(!pWnd)pWnd = g_pCurrentKvsContext->window(); - } else { - pWnd = g_pCurrentKvsContext->window(); - } - TQString tmp = TQString::fromUtf8(text); - KviUserInput::parse(tmp,pWnd); - } -#line 81 "KVIrc.c" - } - XSRETURN_EMPTY; -} - -XS(XS_KVIrc_warning); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_warning) -{ - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: KVIrc::warning(text)"); - { - char * text = (char *)SvPV_nolen(ST(0)); -#line 42 "KVIrc.xs" - if((!g_bExecuteQuiet) && g_pCurrentKvsContext) - g_pCurrentKvsContext->warning(text); -#line 97 "KVIrc.c" - } - XSRETURN_EMPTY; -} - -XS(XS_KVIrc_internalWarning); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_internalWarning) -{ - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: KVIrc::internalWarning(text)"); - { - char * text = (char *)SvPV_nolen(ST(0)); -#line 48 "KVIrc.xs" - if(!g_bExecuteQuiet) - g_lWarningList.append(TQString(text)); -#line 113 "KVIrc.c" - } - XSRETURN_EMPTY; -} - -XS(XS_KVIrc_getLocal); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_getLocal) -{ - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: KVIrc::getLocal(varname)"); - { - char * varname = (char *)SvPV_nolen(ST(0)); - char * RETVAL; - dXSTARG; -#line 55 "KVIrc.xs" - TQString tmp; - KviStr hack; - if(g_pCurrentKvsContext) - { - KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname); - if(pVar) - { - pVar->asString(tmp); - hack = tmp; - RETVAL = hack.ptr(); - } else RETVAL = ""; - } -#line 141 "KVIrc.c" - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; - } - XSRETURN(1); -} - -XS(XS_KVIrc_setLocal); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_setLocal) -{ - dXSARGS; - if (items != 2) - Perl_croak(aTHX_ "Usage: KVIrc::setLocal(varname, value)"); - { - char * varname = (char *)SvPV_nolen(ST(0)); - char * value = (char *)SvPV_nolen(ST(1)); -#line 74 "KVIrc.xs" - if(g_pCurrentKvsContext) - { - if(value && *value) - { - KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->get(varname); - pVar->setString(value); - } else { - g_pCurrentKvsContext->localVariables()->unset(varname); - } - } -#line 167 "KVIrc.c" - } - XSRETURN_EMPTY; -} - -XS(XS_KVIrc_getGlobal); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_getGlobal) -{ - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: KVIrc::getGlobal(varname)"); - { - char * varname = (char *)SvPV_nolen(ST(0)); - char * RETVAL; - dXSTARG; -#line 88 "KVIrc.xs" - TQString tmp; - KviStr hack; - if(g_pCurrentKvsContext) - { - KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname); - if(pVar) - { - pVar->asString(tmp); - hack = tmp; - RETVAL = hack.ptr(); - } else RETVAL = ""; - } -#line 195 "KVIrc.c" - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; - } - XSRETURN(1); -} - -XS(XS_KVIrc_setGlobal); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_setGlobal) -{ - dXSARGS; - if (items != 2) - Perl_croak(aTHX_ "Usage: KVIrc::setGlobal(varname, value)"); - { - char * varname = (char *)SvPV_nolen(ST(0)); - char * value = (char *)SvPV_nolen(ST(1)); -#line 107 "KVIrc.xs" - if(g_pCurrentKvsContext) - { - if(value && *value) - { - KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->get(varname); - pVar->setString(value); - } else { - g_pCurrentKvsContext->localVariables()->unset(varname); - } - } -#line 221 "KVIrc.c" - } - XSRETURN_EMPTY; -} - -XS(XS_KVIrc_eval); /* prototype to pass -Wmissing-prototypes */ -XS(XS_KVIrc_eval) -{ - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: KVIrc::eval(code)"); - { - char * code = (char *)SvPV_nolen(ST(0)); - char * RETVAL; - dXSTARG; -#line 122 "KVIrc.xs" - if(g_pCurrentKvsContext && code) - { - KviKvsVariant ret; - if(KviKvsScript::run(TQString::fromUtf8(code),g_pCurrentKvsContext->window(),0,&ret)) - { - TQString tmp; - ret.asString(tmp); - g_szLastReturnValue = tmp; - } else { - g_szLastReturnValue = ""; - } - RETVAL = g_szLastReturnValue.ptr(); - } else { - RETVAL = ""; - } -#line 252 "KVIrc.c" - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; - } - XSRETURN(1); -} - -#ifdef __cplusplus -extern "C" -#endif -XS(boot_KVIrc); /* prototype to pass -Wmissing-prototypes */ -XS(boot_KVIrc) -{ - dXSARGS; - char* file = __FILE__; - - newXS("KVIrc::echo", XS_KVIrc_echo, file); - newXS("KVIrc::say", XS_KVIrc_say, file); - newXS("KVIrc::warning", XS_KVIrc_warning, file); - newXS("KVIrc::internalWarning", XS_KVIrc_internalWarning, file); - newXS("KVIrc::getLocal", XS_KVIrc_getLocal, file); - newXS("KVIrc::setLocal", XS_KVIrc_setLocal, file); - newXS("KVIrc::getGlobal", XS_KVIrc_getGlobal, file); - newXS("KVIrc::setGlobal", XS_KVIrc_setGlobal, file); - newXS("KVIrc::eval", XS_KVIrc_eval, file); - XSRETURN_YES; -} - diff --git a/src/modules/popupeditor/Makefile.am b/src/modules/popupeditor/Makefile.am index a9e2f1d7..91da5914 100644 --- a/src/modules/popupeditor/Makefile.am +++ b/src/modules/popupeditor/Makefile.am @@ -6,12 +6,12 @@ pluglib_LTLIBRARIES = libkvipopupeditor.la libkvipopupeditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvipopupeditor_la_SOURCES = libkvipopupeditor.cpp popupeditor.cpp -nodist_libkvipopupeditor_la_SOURCES = moc_popupeditor.cpp -noinst_HEADERS = popupeditor.h -libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la -# noinst_HEADERS= +noinst_HEADERS = popupeditor.h -moc_popupeditor.cpp: popupeditor.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +popupeditor.cpp: popupeditor.moc diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 1a5265c2..040456e5 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -1421,3 +1421,5 @@ void KviPopupEditorWindow::loadProperties(KviConfig *cfg) #endif // COMPILE_SCRIPTTOOLBAR */ } + +#include "popupeditor.moc" diff --git a/src/modules/raweditor/Makefile.am b/src/modules/raweditor/Makefile.am index 74c64e9b..34612156 100644 --- a/src/modules/raweditor/Makefile.am +++ b/src/modules/raweditor/Makefile.am @@ -6,12 +6,12 @@ pluglib_LTLIBRARIES = libkviraweditor.la libkviraweditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviraweditor_la_SOURCES = libkviraweditor.cpp raweditor.cpp -nodist_libkviraweditor_la_SOURCES = moc_raweditor.cpp -noinst_HEADERS = raweditor.h -libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la -# noinst_HEADERS= +noinst_HEADERS = raweditor.h -moc_raweditor.cpp: raweditor.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +raweditor.cpp: raweditor.moc diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index a1221d73..14f00342 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -196,7 +196,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawListViewItem *it,TQString &buffer) if(KviTQString::equalCI(newName,ch->m_szName)) { bFound = true; - KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx); + KviTQString::sprintf(newName,"%Q_%d",&buffer,idx); idx++; break; } @@ -556,3 +556,5 @@ void KviRawEditorWindow::loadProperties(KviConfig *cfg) #endif // COMPILE_SCRIPTTOOLBAR */ } + +#include "raweditor.moc" diff --git a/src/modules/regchan/Makefile.am b/src/modules/regchan/Makefile.am index c46f64aa..5f7d5479 100644 --- a/src/modules/regchan/Makefile.am +++ b/src/modules/regchan/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviregchan.la libkviregchan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviregchan_la_SOURCES = libkviregchan.cpp -libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= edituser.h diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index fe38cf34..a8b29de7 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -170,7 +170,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c) { if(!szValue.isEmpty()) { - ch->setProperty(szProperty.utf8().data(),new KviStr(szValue)); + ch->setProperty(szProperty,new KviStr(szValue)); } else { ch->removeProperty(szProperty); } @@ -199,7 +199,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) int tot = 0; - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); while(KviRegisteredChannelList * l = it.current()) { for(KviRegisteredChannel * ch = l->first();ch;ch = l->next()) @@ -207,7 +207,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) tot++; c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Channel: %c%s@%s"), KVI_TEXT_BOLD,ch->name().ptr(),ch->netMask().ptr()); - KviPointerHashTableIterator<const char *,KviStr> pit(*(ch->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(ch->propertyDict())); while(KviStr * s = pit.current()) { c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" Property: %s=%s"),pit.currentKey(),s->ptr()); @@ -259,8 +259,8 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c) if(szChan.isEmpty())szChan="*"; if(szNetmask.isEmpty())szNetmask="*"; - KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); + KviPointerHashTable<TQString,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*d); while(KviRegisteredChannelList * l = it.current()) { diff --git a/src/modules/reguser/Makefile.am b/src/modules/reguser/Makefile.am index 93aea872..0dbeb866 100644 --- a/src/modules/reguser/Makefile.am +++ b/src/modules/reguser/Makefile.am @@ -10,16 +10,14 @@ pluglib_LTLIBRARIES = libkvireguser.la libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp -libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= edituser.h wizard.h dialog.h -nodist_libkvireguser_la_SOURCES = moc_dialog.cpp %.moc: %.h $(SS_QT_MOC) $< -o $@ -moc_dialog.cpp: dialog.h - $(SS_QT_MOC) $< -o $@ - +dialog.cpp: dialog.moc edituser.cpp: edituser.moc wizard.cpp: wizard.moc diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 876740d6..2cc18b1f 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -874,3 +874,5 @@ succesfull_import: f.close(); fillList(); } + +#include "dialog.moc" diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 2da4c6f9..0d4b21d1 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -405,8 +405,8 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist m_pAvatar = 0; if(r) { - const char * av = r->getProperty("avatar"); - if(av) + const TQString &av = r->getProperty("avatar"); + if(!av.isEmpty()) { m_pAvatar = new KviPixmap(av); } @@ -761,7 +761,4 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() } - - - #include "edituser.moc" diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index fa453b0a..a2da7c52 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -45,7 +45,7 @@ extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase; extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList; -KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,TQWidget * par,bool bModal) +KviRegistrationWizard::KviRegistrationWizard(const TQString &startMask,KviRegisteredUserDataBase * db,TQWidget * par,bool bModal) : KviTalWizard(par) { m_pDb = db; @@ -54,7 +54,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_bModal = bModal; - KviIrcMask mask(startMask ? startMask : "*!*@*"); + KviIrcMask mask(!startMask.isEmpty() ? startMask : "*!*@*"); g_pRegistrationWizardList->append(this); diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h index 7fd954b4..078676c1 100644 --- a/src/modules/reguser/wizard.h +++ b/src/modules/reguser/wizard.h @@ -42,7 +42,7 @@ class KviRegistrationWizard : public KviTalWizard TQ_OBJECT public: - KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db = 0,TQWidget * par = 0,bool bModal = false); + KviRegistrationWizard(const TQString &startMask,KviRegisteredUserDataBase * db = 0,TQWidget * par = 0,bool bModal = false); ~KviRegistrationWizard(); KviRegisteredUserDataBase * m_pDb; diff --git a/src/modules/rijndael/Makefile.am b/src/modules/rijndael/Makefile.am index 69b2fe01..3a46a300 100644 --- a/src/modules/rijndael/Makefile.am +++ b/src/modules/rijndael/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvirijndael.la libkvirijndael_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvirijndael_la_SOURCES = libkvirijndael.cpp rijndael.cpp ablowfish.cpp -libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvirijndael.h rijndael.h ablowfish.h diff --git a/src/modules/setup/Makefile.am b/src/modules/setup/Makefile.am index 73e3bcec..7634b3fc 100644 --- a/src/modules/setup/Makefile.am +++ b/src/modules/setup/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisetup.la libkvisetup_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisetup_la_SOURCES = libkvisetup.cpp setupwizard.cpp -libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= setupwizard.h diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index 33184cc1..af8e0360 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -53,7 +53,7 @@ TQString szMircIni; // this is called by KviApp when no local kvirc directory has been found // we have nothing to rely on yet... (settings have not been loaded yet) -KVIMODULEEXPORTFUNC bool setup_begin() +extern "C" KVIMODULEEXPORTFUNC bool setup_begin() { // FIXME: try to guess the user's .kvirc directory // and the preferred nickname from a previous installation @@ -69,7 +69,7 @@ KVIMODULEEXPORTFUNC bool setup_begin() // all the subsystems are up and running (we even have a nice console // to write on if needed). // all the options are loaded. -KVIMODULEEXPORTFUNC void setup_finish() +extern "C" KVIMODULEEXPORTFUNC void setup_finish() { if(bNeedToApplyDefaults) { diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index b08de956..f6aeecb2 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -46,6 +46,8 @@ bool g_bFoundMirc; #include <tqlayout.h> #include "kvi_tal_hbox.h" +#include <tuple> + #ifdef COMPILE_ON_WINDOWS #include <windows.h> #include <winnls.h> // for MultiByteToWideChar @@ -191,7 +193,7 @@ KviSetupWizard::KviSetupWizard() ed->setWordWrap(KviTalTextEdit::NoWrap); TQString szLicense; TQString szLicensePath; - g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { szLicense = __tr("Oops... can't find the license file.\n" \ @@ -1001,7 +1003,7 @@ void KviSetupWizard::accept() // Make local->global link TQString localPath = TQString("%1/global").arg(g_pApp->m_szLocalKvircDir); unlink(TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); - symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); + std::ignore = symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); #endif #ifdef COMPILE_TDE_SUPPORT diff --git a/src/modules/sharedfile/Makefile.am b/src/modules/sharedfile/Makefile.am index 5c4ace3b..effd6099 100644 --- a/src/modules/sharedfile/Makefile.am +++ b/src/modules/sharedfile/Makefile.am @@ -10,9 +10,5 @@ pluglib_LTLIBRARIES = libkvisharedfile.la libkvisharedfile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisharedfile_la_SOURCES = libkvisharedfile.cpp -libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la -#noinst_HEADERS= sharedfilewindow.h - -m_%.moc: %.h - $(SS_QT_MOC) $< -o $@ +libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la diff --git a/src/modules/sharedfileswindow/Makefile.am b/src/modules/sharedfileswindow/Makefile.am index f43e1e67..6707b018 100644 --- a/src/modules/sharedfileswindow/Makefile.am +++ b/src/modules/sharedfileswindow/Makefile.am @@ -12,11 +12,12 @@ pluglib_LTLIBRARIES = libkvisharedfileswindow.la libkvisharedfileswindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisharedfileswindow_la_SOURCES = libkvisharedfileswindow.cpp sharedfileswindow.cpp -libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= sharedfileswindow.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -sharedfileswindow.cpp: m_sharedfileswindow.moc +sharedfileswindow.cpp: sharedfileswindow.moc diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index dcc8079c..649165d5 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -734,5 +734,4 @@ void KviSharedFilesWindow::die() // m_pIrcView->setShowImages(p->imagesVisible); //} - -#include "m_sharedfileswindow.moc" +#include "sharedfileswindow.moc" diff --git a/src/modules/snd/Makefile.am b/src/modules/snd/Makefile.am index 09e193a6..10e1110a 100644 --- a/src/modules/snd/Makefile.am +++ b/src/modules/snd/Makefile.am @@ -11,7 +11,7 @@ pluglib_LTLIBRARIES = libkvisnd.la libkvisnd_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisnd_la_SOURCES = libkvisnd.cpp -libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvisnd.h diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index d508ed39..7f0db3f6 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -434,7 +434,7 @@ void KviSoundThread::run() if(!f.open(IO_ReadOnly)) { - tqDebug("Could not open sound file %s! [OSS]",m_szFileName.utf8().data()); + tqDebug("Could not open sound file %s! [OSS]",m_szFileName.local8Bit().data()); return; } @@ -442,13 +442,13 @@ void KviSoundThread::run() if(iSize < 24) { - tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.utf8().data()); + tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } if(f.readBlock(buf,24) < 24) { - tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } @@ -472,7 +472,7 @@ void KviSoundThread::run() int iReaded = f.readBlock(buf + iDataLen,iToRead); if(iReaded < 1) { - tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } iSize -= iReaded; @@ -485,7 +485,7 @@ void KviSoundThread::run() { if((errno != EINTR) && (errno != EAGAIN)) { - tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } } @@ -519,7 +519,7 @@ void KviSoundThread::run() { // ESD has a really nice API if(!esd_play_file(NULL,m_szFileName.utf8().data(),1)) - tqDebug("Could not play sound %s! [ESD]",m_szFileName.utf8().data()); + tqDebug("Could not play sound %s! [ESD]",m_szFileName.local8Bit().data()); } #endif //COMPILE_ESD_SUPPORT @@ -542,9 +542,9 @@ void KviSoundThread::run() Arts::SimpleSoundServer *server = new Arts::SimpleSoundServer(Arts::Reference("global:Arts_SimpleSoundServer")); if(server->isNull()) { - tqDebug("Can't connect to sound server to play file %s",m_szFileName.utf8().data()); + tqDebug("Can't connect to sound server to play file %s",m_szFileName.local8Bit().data()); } else { - server->play(m_szFileName); + server->play(TQFile::encodeName(m_szFileName).data()); } delete server; } diff --git a/src/modules/socketspy/Makefile.am b/src/modules/socketspy/Makefile.am index 7e0a4b6b..b65e3ff7 100644 --- a/src/modules/socketspy/Makefile.am +++ b/src/modules/socketspy/Makefile.am @@ -10,11 +10,12 @@ pluglib_LTLIBRARIES = libkvisocketspy.la libkvisocketspy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisocketspy_la_SOURCES = libkvisocketspy.cpp socketspywindow.cpp -libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + +libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= socketspywindow.h -m_%.moc: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -socketspywindow.cpp: m_socketspywindow.moc +socketspywindow.cpp: socketspywindow.moc diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 9f0d2ac9..a6b6fe81 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -118,4 +118,5 @@ void KviSocketSpyWindow::applyOptions() m_pIrcView->applyOptions(); KviWindow::applyOptions(); } -#include "m_socketspywindow.moc" + +#include "socketspywindow.moc" diff --git a/src/modules/spaste/Makefile.am b/src/modules/spaste/Makefile.am index 3912fbfe..1de6b360 100644 --- a/src/modules/spaste/Makefile.am +++ b/src/modules/spaste/Makefile.am @@ -13,7 +13,7 @@ pluglib_LTLIBRARIES = libkvispaste.la libkvispaste_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvispaste_la_SOURCES = libkvispaste.cpp controller.cpp -libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= controller.h libkvispaste.h diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index 92a28a31..9f3bc671 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -221,7 +221,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) while( (item = it.current()) != 0) { ++it; - if(kvi_strEqualCS(item->window()->id(),c->window()->id()))delete item; + if(item->window()->id() == c->window()->id())delete item; } } } else //Delete the spaste with the given id diff --git a/src/modules/str/Makefile.am b/src/modules/str/Makefile.am index 7fe7e93a..1557f046 100644 --- a/src/modules/str/Makefile.am +++ b/src/modules/str/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvistr.la libkvistr_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvistr_la_SOURCES = libkvistr.cpp -libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index e372f75a..810bf345 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -1085,8 +1085,8 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETERS_END(c) - char * toReplace[]={" ", "#", "$", "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"}; - char * newStr[]={"%20", "%23", "%24", "&", "%2F", "%3A", "<", "%3D", ">", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"}; + const char *toReplace[]={" ", "#", "$", "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"}; + const char *newStr[]={"%20", "%23", "%24", "&", "%2F", "%3A", "<", "%3D", ">", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"}; /* for(int idx=0,idx<22,idx++) @@ -1428,7 +1428,7 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c) } int idx = 0; - int cnt = 0; + kvs_uint_t cnt = 0; int begin; int len = szString.length(); while (idx<len) diff --git a/src/modules/system/Makefile.am b/src/modules/system/Makefile.am index 69302d13..19d452f9 100644 --- a/src/modules/system/Makefile.am +++ b/src/modules/system/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisystem.la libkvisystem_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisystem_la_SOURCES = libkvisystem.cpp plugin.cpp -libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = plugin.h diff --git a/src/modules/term/Makefile.am b/src/modules/term/Makefile.am index 1567e615..f7a7e279 100644 --- a/src/modules/term/Makefile.am +++ b/src/modules/term/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviterm.la libkviterm_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviterm_la_SOURCES = libkviterm.cpp termwidget.cpp termwindow.cpp -libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= termwidget.h termwindow.h diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index e2eb8865..f0a9c24a 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -87,13 +87,11 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) connect(m_pKonsoleWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(konsoleDestroyed())); // tqDebug("Widget %d",m_pKonsoleWidget); } else { - m_pKonsoleWidget = new TQLabel(this, - __tr2qs("Can't create the terminal emulation part")); + m_pKonsoleWidget = new TQLabel(__tr2qs("Can't create the terminal emulation part"), this); } } else { - m_pKonsoleWidget = new TQLabel(this, - __tr2qs("Can't retrieve the terminal emulation factory")); + m_pKonsoleWidget = new TQLabel(__tr2qs("Can't retrieve the terminal emulation factory"), this); } } diff --git a/src/modules/texticons/Makefile.am b/src/modules/texticons/Makefile.am index 77646abd..447d85dd 100644 --- a/src/modules/texticons/Makefile.am +++ b/src/modules/texticons/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitexticons.la libkvitexticons_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitexticons_la_SOURCES = libkvitexticons.cpp -libkvitexticons_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitexticons_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/theme/Makefile.am b/src/modules/theme/Makefile.am index 5417e9e5..1ba74a09 100644 --- a/src/modules/theme/Makefile.am +++ b/src/modules/theme/Makefile.am @@ -15,22 +15,16 @@ libkvitheme_la_SOURCES = libkvitheme.cpp \ savethemedialog.cpp \ themefunctions.cpp -nodist_libkvitheme_la_SOURCES = moc_managementdialog.cpp \ - moc_packthemedialog.cpp \ - moc_savethemedialog.cpp - -libkvitheme_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitheme_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= managementdialog.h \ packthemedialog.h \ savethemedialog.h \ themefunctions.h -moc_managementdialog.cpp: managementdialog.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ -moc_packthemedialog.cpp: packthemedialog.h - $(SS_QT_MOC) $< -o $@ - -moc_savethemedialog.cpp: savethemedialog.h - $(SS_QT_MOC) $< -o $@ +managementdialog.cpp: managementdialog.moc +packthemedialog.cpp: packthemedialog.moc +savethemedialog.cpp: savethemedialog.moc diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 7afabc9b..5e4006ca 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -454,3 +454,5 @@ void KviThemeManagementDialog::tipRequest(KviDynamicToolTip *pTip,const TQPoint pTip->tip(m_pListBox->itemRect(it),szThemeDescription); } + +#include "managementdialog.moc" diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index d4c5f5b8..25b578d6 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -466,3 +466,4 @@ bool KviPackThemeDialog::packTheme() return true; } +#include "packthemedialog.moc" diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index fd8ac85f..0902acd4 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -290,3 +290,4 @@ bool KviSaveThemeDialog::saveTheme() return true; } +#include "savethemedialog.moc" diff --git a/src/modules/tip/Makefile.am b/src/modules/tip/Makefile.am index 2a9fbbcb..37be4b04 100644 --- a/src/modules/tip/Makefile.am +++ b/src/modules/tip/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitip.la libkvitip_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitip_la_SOURCES = libkvitip.cpp -libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvitip.h diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 911a3f9f..c69992aa 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -148,7 +148,7 @@ KviTipWindow::~KviTipWindow() if(m_pConfig)closeConfig(); } -bool KviTipWindow::openConfig(const char * filename,bool bEnsureExists) +bool KviTipWindow::openConfig(const KviStr &filename,bool bEnsureExists) { if(m_pConfig)closeConfig(); @@ -184,13 +184,13 @@ void KviTipWindow::nextTip() KviStr szLocale = KviLocale::localeName(); KviStr szFile; szFile.sprintf("libkvitip_%s.kvc",szLocale.ptr()); - if(!openConfig(szFile.ptr(),true)) + if(!openConfig(szFile,true)) { szLocale.cutFromFirst('.'); szLocale.cutFromFirst('_'); szLocale.cutFromFirst('@'); szFile.sprintf("libkvitip_%s.kvc",szLocale.ptr()); - if(!openConfig(szFile.ptr(),true)) + if(!openConfig(szFile,true)) { openConfig("libkvitip.kvc",false); } @@ -204,7 +204,7 @@ void KviTipWindow::nextTip() KviStr tmp(KviStr::Format,"%u",uNextTip); TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>")); - //tqDebug("REDECODED=%s",szTip.utf8().data()); + //tqDebug("REDECODED=%s",szTip.local8Bit().data()); uNextTip++; if(uNextTip >= uNumTips)uNextTip = 0; diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h index a95ccb24..9a361a4f 100644 --- a/src/modules/tip/libkvitip.h +++ b/src/modules/tip/libkvitip.h @@ -64,7 +64,7 @@ protected: virtual void showEvent(TQShowEvent *e); virtual void closeEvent(TQCloseEvent *e); public: - bool openConfig(const char * filename,bool bEnsureExists = true); + bool openConfig(const KviStr &filename,bool bEnsureExists = true); void closeConfig(); public slots: void nextTip(); diff --git a/src/modules/tmphighlight/Makefile.am b/src/modules/tmphighlight/Makefile.am index b35caea8..1a9c1461 100644 --- a/src/modules/tmphighlight/Makefile.am +++ b/src/modules/tmphighlight/Makefile.am @@ -13,7 +13,7 @@ pluglib_LTLIBRARIES = libkvitmphighlight.la libkvitmphighlight_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitmphighlight_la_SOURCES = libkvitmphighlight.cpp -libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp index b69b7998..af13415b 100644 --- a/src/modules/tmphighlight/libkvitmphighlight.cpp +++ b/src/modules/tmphighlight/libkvitmphighlight.cpp @@ -56,7 +56,7 @@ static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; @@ -95,7 +95,7 @@ static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; @@ -133,7 +133,7 @@ static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; diff --git a/src/modules/toolbar/Makefile.am b/src/modules/toolbar/Makefile.am index e009e306..445235f2 100644 --- a/src/modules/toolbar/Makefile.am +++ b/src/modules/toolbar/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitoolbar.la libkvitoolbar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitoolbar_la_SOURCES = libkvitoolbar.cpp -libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/toolbareditor/Makefile.am b/src/modules/toolbareditor/Makefile.am index a578e10c..4ac10229 100644 --- a/src/modules/toolbareditor/Makefile.am +++ b/src/modules/toolbareditor/Makefile.am @@ -11,10 +11,12 @@ pluglib_LTLIBRARIES = libkvitoolbareditor.la libkvitoolbareditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitoolbareditor_la_SOURCES = libkvitoolbareditor.cpp toolbareditor.cpp -nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp + +libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = toolbareditor.h -libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la -moc_toolbareditor.cpp: toolbareditor.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +toolbareditor.cpp: toolbareditor.moc diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index e93bfe1f..76801120 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -199,7 +199,7 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog() void KviCustomToolBarPropertiesDialog::iconSelected(const TQString &szIconId) { - TQPixmap * p = g_pIconManager->getImage(szIconId.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(szIconId); if(p) { m_pIconButton->setPixmap(*p); @@ -535,3 +535,4 @@ void KviCustomizeToolBarsDialog::closeEvent(TQCloseEvent * e) delete this; } +#include "toolbareditor.moc" diff --git a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am index fff58478..5325de6b 100644 --- a/src/modules/torrent/Makefile.am +++ b/src/modules/torrent/Makefile.am @@ -17,7 +17,7 @@ libkvitorrent_la_SOURCES = libkvitorrent.cpp \ tc_ktorrentdcopinterface.cpp \ tc_statusbarapplet.cpp -libkvitorrent_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitorrent_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = tc_interface.h \ tc_ktorrentdcopinterface.h \ diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index 4d5c72d9..9f7c24da 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -25,16 +25,14 @@ // //============================================================================= -#ifdef COMPILE_TDE_SUPPORT - -#include "kvi_app.h" +#include "kvi_settings.h" - -#include "dcopclient.h" // <-- this include should be hidden in kvilib +#ifdef COMPILE_TDE_SUPPORT #include "tc_ktorrentdcopinterface.h" +#include "dcopclient.h" // <-- this include should be hidden in kvilib - +#include "kvi_app.h" #include "kvi_locale.h" #include <tqtimer.h> @@ -49,17 +47,15 @@ TORR_IMPLEMENT_DESCRIPTOR( ) #define ERROR_MSG \ - TQCString msg; \ if (!findRunningApp(m_szAppId)) \ - msg = "KTorrent's isn't running!"; \ + m_lastError = __tr2qs_ctx("KTorrent isn't running!", "torrent"); \ else \ - msg = "Something's wrong here! KTorrent's DCOP interface has probably changed."; \ - m_lastError = __tr2qs_ctx(TQString(msg), "torrent"); \ - tqDebug("%s (%s:%d): %s", __PRETTY_FUNCTION__, __FILE__, __LINE__, (const char*)msg); \ + m_lastError = __tr2qs_ctx("Something's wrong here! KTorrent's DCOP interface has probably changed.", "torrent"); \ + tqDebug("%s (%s:%d): %s", __PRETTY_FUNCTION__, __FILE__, __LINE__, m_lastError.local8Bit().data()); #define ERROR_MSG_RANGE(I, SIZE) \ - KviTQString::sprintf(m_lastError, __tr2qs_ctx("Index out of range: %d [0-%d]!", "torrent"), I, (SIZE>0)?(SIZE-1):0); \ - tqDebug("%s (%s:%d): Index out of range: %d [0-%d]!", __PRETTY_FUNCTION__ , __FILE__, __LINE__, I, (SIZE>0)?(SIZE-1):0); + KviTQString::sprintf(m_lastError, __tr2qs_ctx("Index out of range: %d [0-%ld]!", "torrent"), I, (SIZE>0)?(SIZE-1):0); \ + tqDebug("%s (%s:%d): Index out of range: %d [0-%ld]!", __PRETTY_FUNCTION__ , __FILE__, __LINE__, I, (SIZE>0)?(SIZE-1):0); #define ERROR_RET_BOOL \ { \ @@ -194,7 +190,7 @@ bool KviKTorrentDCOPInterface::start(int i) { CHECK_RANGE_BOOL(i, m_ti.size()) - tqDebug("starting %s [%d]", (const char*)m_ti[i].name, m_ti[i].num); + tqDebug("starting %s [%d]", m_ti[i].name.local8Bit().data(), m_ti[i].num); if (!voidRetIntDCOPCall("KTorrent", "start(int)", m_ti[i].num)) ERROR_RET_BOOL @@ -205,7 +201,7 @@ bool KviKTorrentDCOPInterface::stop(int i) { CHECK_RANGE_BOOL(i, m_ti.size()) - tqDebug("stopping %s [%d]", (const char*)m_ti[i].name, m_ti[i].num); + tqDebug("stopping %s [%d]", m_ti[i].name.local8Bit().data(), m_ti[i].num); if (!voidRetIntBoolDCOPCall("KTorrent", "stop(int, bool)", m_ti[i].num, true)) ERROR_RET_BOOL @@ -216,7 +212,7 @@ bool KviKTorrentDCOPInterface::announce(int i) { CHECK_RANGE_BOOL(i, m_ti.size()) - tqDebug("announcing %s [%d]", (const char*)m_ti[i].name, m_ti[i].num); + tqDebug("announcing %s [%d]", m_ti[i].name.local8Bit().data(), m_ti[i].num); if (!voidRetIntDCOPCall("KTorrent", "announce(int)", m_ti[i].num)) ERROR_RET_BOOL return true; diff --git a/src/modules/url/Makefile.am b/src/modules/url/Makefile.am index c2d88957..ab6d4a29 100644 --- a/src/modules/url/Makefile.am +++ b/src/modules/url/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkviurl.la libkviurl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviurl_la_SOURCES = libkviurl.cpp -libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviurl.h icons.h diff --git a/src/modules/window/Makefile.am b/src/modules/window/Makefile.am index 52912925..623952cc 100644 --- a/src/modules/window/Makefile.am +++ b/src/modules/window/Makefile.am @@ -9,13 +9,13 @@ pluglib_LTLIBRARIES = libkviwindow.la libkviwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) -nodist_libkviwindow_la_SOURCES = moc_userwindow.cpp - libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp -libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= userwindow.h -moc_%.cpp: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +userwindow.cpp: userwindow.moc diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 3624402d..2f3a3c99 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -54,7 +54,7 @@ // kvi_app.cpp -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; KviPointerList<KviUserWindow> * g_pUserWindowList = 0; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type @@ -71,7 +71,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ { \ if(!c->hasSwitch('q',"quiet")) \ @@ -90,7 +90,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ return true; \ } @@ -858,7 +858,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts but no "no_context" windows bool bAllWindows = KviTQString::equalCI(szType,"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -882,7 +882,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts and also "no_context" windows bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -903,7 +903,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // only "no_context" windows bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -948,7 +948,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -1048,7 +1048,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) KviUserWindow * wnd = new KviUserWindow( c->window()->frame(), - szCaption, + szCaption.utf8().data(), iIcon, pConsole, iFlags); @@ -1104,7 +1104,7 @@ static bool window_kvs_cmd_setCaption(KviKvsModuleCommandCall * c) KVSM_PARAMETER("html_active_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szActive) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1150,7 +1150,7 @@ static bool window_kvs_cmd_setInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1195,7 +1195,7 @@ static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1268,7 +1268,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c) KVSM_PARAMETER("plain_text_caption",KVS_PT_STRING,0, szBackground) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1401,7 +1401,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) if(szDecryptKey.isEmpty())szDecryptKey = szEncryptKey; #ifdef COMPILE_CRYPT_SUPPORT - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp index adf52cd3..b45123c2 100644 --- a/src/modules/window/userwindow.cpp +++ b/src/modules/window/userwindow.cpp @@ -105,3 +105,4 @@ void KviUserWindow::setCaptionStrings(const TQString &szPlainText,const TQString updateCaption(); } +#include "userwindow.moc" diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am new file mode 100644 index 00000000..4a7d94c7 --- /dev/null +++ b/src/scripts/Makefile.am @@ -0,0 +1,5 @@ +############################################################################### +# KVirc IRC client Makefile - 16.12.98 Szymon Stefanek <stefanek@tin.it> +############################################################################### + +SUBDIRS = browser helpsearch diff --git a/src/scripts/browser/Makefile.am b/src/scripts/browser/Makefile.am new file mode 100644 index 00000000..6e5f216a --- /dev/null +++ b/src/scripts/browser/Makefile.am @@ -0,0 +1,6 @@ +############################################################################### +# KVirc Makefile 08.12.98 Szymon Stefanek +############################################################################### +bin_SCRIPTS = kvi_run_netscape + +EXTRA_DIST= $(bin_SCRIPTS) diff --git a/src/scripts/browser/kvi_run_netscape b/src/scripts/browser/kvi_run_netscape new file mode 100755 index 00000000..4ee301a4 --- /dev/null +++ b/src/scripts/browser/kvi_run_netscape @@ -0,0 +1,24 @@ +#! /bin/sh + +set -e + +BROWSER= + +if [ -z "$1" ]; then + echo "Missing URL" +else + for BROWSER in firefox seamonkey mozilla netscape ""; do + if [ -z "$BROWSER" ]; then + echo "Could not find either Netscape or Mozilla" + exit 0 + fi + if which "$BROWSER" > /dev/null; then + break; + fi + done + + if ! "$BROWSER" -remote "openURL($1)" 2> /dev/null; then + echo "$BROWSER is not currently running. Starting a new instance..." + exec "$BROWSER" "$1" + fi +fi diff --git a/src/scripts/helpsearch/Makefile.am b/src/scripts/helpsearch/Makefile.am new file mode 100644 index 00000000..45f812a6 --- /dev/null +++ b/src/scripts/helpsearch/Makefile.am @@ -0,0 +1,6 @@ +############################################################################### +# KVirc Makefile 08.12.98 Szymon Stefanek +############################################################################### +bin_SCRIPTS = kvi_search_help + +EXTRA_DIST= $(bin_SCRIPTS) diff --git a/src/scripts/helpsearch/kvi_search_help b/src/scripts/helpsearch/kvi_search_help new file mode 100755 index 00000000..bf962f1c --- /dev/null +++ b/src/scripts/helpsearch/kvi_search_help @@ -0,0 +1,123 @@ +#!/bin/sh + +# Arguments: +# $1 = directory to search in +# $2 = filename to produce +# $3- = search string + +if test -z "$1"; then + echo "Search error : missing files to search" + exit -1 +fi + +if test -z "$2"; then + echo "Search error : missing target filename" + exit -1 +fi + +if test -z "$3"; then + echo "Search error : missing search string" + exit -1 +fi + +# Build the search criteria string...not so funky, but works + +SEARCH_CRITERIA="$3" +SEARCH_WORDS="$3" + +if test -n "$4"; then + SEARCH_WORDS="$SEARCH_WORDS $4" + SEARCH_CRITERIA="$SEARCH_CRITERIA AND $4" +fi +if test -n "$5"; then + SEARCH_WORDS="$SEARCH_WORDS $5" + SEARCH_CRITERIA="$SEARCH_CRITERIA AND $5" +fi +if test -n "$6"; then + SEARCH_WORDS="$SEARCH_WORDS $6" + SEARCH_CRITERIA="$SEARCH_CRITERIA AND $6" +fi +if test -n "$7"; then + SEARCH_WORDS="$SEARCH_WORDS $7" + SEARCH_CRITERIA="$SEARCH_CRITERIA AND $7" +fi +if test -n "$8"; then + SEARCH_WORDS="$SEARCH_WORDS $8" + SEARCH_CRITERIA="$SEARCH_CRITERIA AND $8" +fi +if test -n "$9"; then + SEARCH_WORDS="$SEARCH_WORDS $9" + SEARCH_CRITERIA="$SEARCH_CRITERIA AND $9" +fi + + +DOCUMENT="<html> +<head><title>Search results</title></head> +<body bgcolor=\"#FFFFFF\" text=\"#000000\"> +KVirc documentation<br> +<hr> +<table bgcolor=\"#A0A0A0\" width=\"100%\"> +<tr> + <td><h1>Search results for \"$SEARCH_CRITERIA\"</h1></td> +</tr> +" + +FILES_TO_SEARCH=`find $1 -name "*.html"` + +if test -z "$FILES_TO_SEARCH"; then + DOCUMENT="$DOCUMENT <tr bgcolor=\"#F0F0F0\"></td><b>Internal error: no files to search</b></td></tr></table><hr><a href=\"index.html\">Main index</a></html>" + echo "$DOCUMENT" > $2 + exit 0 +fi + +# Now grep the files +SEARCH_RESULT="" +for a_word in $SEARCH_WORDS; do + if test -z "$SEARCH_RESULT"; then + SEARCH_RESULT=`grep -i -l $a_word $FILES_TO_SEARCH` + else + SEARCH_RESULT=`grep -i -l $a_word $SEARCH_RESULT` + fi + if test -z "$SEARCH_RESULT"; then + + DOCUMENT="$DOCUMENT <tr bgcolor=\"#F0F0F0\"><td><b>No matches found</b></td></tr></table><hr><a href=\"index.html\">Main index</a></html>" + echo "$DOCUMENT" > $2 + exit 0 + fi +done + +DOCS_COUNT="0" + +for a_file in $SEARCH_RESULT; do + + RESULT_DESCRIPTION="<b>[" + for a_word in $SEARCH_WORDS; do + WORD_MATCHES=`grep -i -h -c $a_word "$a_file"` + RESULT_DESCRIPTION="$RESULT_DESCRIPTION $a_word:$WORD_MATCHES " + done + RESULT_DESCRIPTION="$RESULT_DESCRIPTION ]</b>" + + DOC_TITLE=`grep -i -h "<title>" "$a_file" | sed -e 's/title/b/g'` + if test -z "$DOC_TITLE"; then + DOC_TITLE="<b>Untitled</b>" + fi + DOC_PREMATCH=`grep -i -h -A 30 "searchbody" "$a_file" | tac | tail -n 30 | tac` + DOC_MATCH=`echo "$DOC_PREMATCH" | sed -e 's/<[a-zA-Z0-9 _ \=\"\#\%\&\/\.]*>/ /g'` + DOC_MATCH=`echo "$DOC_MATCH" | sed -e 's/</\</g'` + DOC_MATCH=`echo "$DOC_MATCH" | sed -e 's/>/\>/g'` + DOC_MATCH=`echo "$DOC_MATCH" | grep -h "[a-zA-Z0-9{}]"` + DOC_MATCH=`echo "$DOC_MATCH" | sed -e 's/^[ ]*//'` + DOC_MATCH=`echo "$DOC_MATCH" | tac | tail -n 10 | tac` + if test -z "$DOC_MATCH"; then + DOC_MATCH="No document body found" + fi + + DOCS_COUNT=`expr $DOCS_COUNT + 1` + + DOCUMENT="$DOCUMENT <tr bgcolor=\"#F0F0F0\"><td><a href=\"$a_file\"><b>$DOCS_COUNT</b>. $DOC_TITLE</a><br><br><I>...$DOC_MATCH...</I><br><br><b>$RESULT_DESCRIPTION</b></td></tr>" + +done + +DOCUMENT="$DOCUMENT</table><hr><br>Found $DOCS_COUNT matches</html>" + +echo "$DOCUMENT" > $2 |