diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-01-08 22:21:09 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-01-20 19:07:47 +0900 |
| commit | 84136f93b36f0107deca190ebc105e3216b0638f (patch) | |
| tree | c3dcaff9a31760e7471822c09606a38ec9f8f4df | |
| parent | 111d9fbdfdbb78cdf3203c37761ecd5d422fa01c (diff) | |
| download | kvirc-feat/cmake-conversion.tar.gz kvirc-feat/cmake-conversion.zip | |
TEMP: cmakefeat/cmake-conversion
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
127 files changed, 1074 insertions, 201 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..896bfef --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,101 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) + + +#### general package setup + +project( kvirc ) +set( PACKAGE_VERSION 3.4.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckIncludeFileCXX ) +include( CheckIncludeFiles ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) +include( CheckTypeSize ) + + +#### include our cmake modules + +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" ON ) +option( WITH_TDE "Build with TDE integration instead of standalone TQt" ON ) +option( WITH_ARTS "Build with aRts integration (require TDE support)" ${WITH_ALL_OPTIONS} ) + +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H ) +add_definitions( -UTQT_NO_TRANSLATION ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( data ) +add_subdirectory( icons ) +add_subdirectory( pics ) +add_subdirectory( src ) + + +##### other data ################################ + +tde_conditional_add_subdirectory( BUILD_DOC doc ) +if( WITH_TDE ) + tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) +endif() + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) +install( + FILES ${CMAKE_BINARY_DIR}/config.h + RENAME kvi_configstatus.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..1868f1e --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,66 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + + +# required stuff +find_package( TQt ) +if( WITH_TDE ) + find_package( TDE ) +endif( ) + +tde_setup_compiler_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) + + +##### build with TDE integration + +if( WITH_TDE ) + set( COMPILE_TDE_SUPPORT 1 ) +endif( ) + + +##### check for pthread + +find_package ( Threads REQUIRED ) + + +##### check size of various types +check_type_size( "int" SIZEOF_INT ) +check_type_size( "long" SIZEOF_LONG_INT ) +check_type_size( "long" SIZEOF_LONG_LONG_INT ) +check_type_size( "short" SIZEOF_SHORT_INT ) +check_type_size( "int" SIZEOF_UNSIGNED_INT ) +check_type_size( "long" SIZEOF_UNSIGNED_LONG_INT ) +check_type_size( "long" SIZEOF_UNSIGNED_LONG_LONG_INT ) +check_type_size( "short" SIZEOF_UNSIGNED_SHORT_INT ) +check_type_size( "void*" SIZEOF_VOID_P ) + + +##### check for aRts + +if( WITH_TDE AND WITH_ARTS ) + pkg_search_module( ARTS arts ) + find_library( ARTSKDE artskde ) + if( (NOT ARTS_FOUND) OR (NOT ARTSKDE) ) + tde_message_fatal( "aRts support was requested but not found on your system." ) + endif( ) + + set( ARTSKDE_LIBRARIES artskde-shared ) + set( COMPILE_ARTS_SUPPORT 1 ) +endif( ) diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..d11a4a2 --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,30 @@ +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1 + +// Define WORDS_BIGENDIAN to 1 if your processor stores words with the most +// significant byte first (like Motorola and SPARC, unlike Intel). +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ + +// The size of `int', as computed by sizeof +#cmakedefine SIZEOF_INT @SIZEOF_INT@ + +// The size of `long int', as computed by sizeof +#cmakedefine SIZEOF_LONG_INT @SIZEOF_LONG_INT@ + +// The size of `long long int', as computed by sizeof +#cmakedefine SIZEOF_LONG_LONG_INT @SIZEOF_LONG_LONG_INT@ + +// The size of `short int', as computed by sizeof +#cmakedefine SIZEOF_SHORT_INT @SIZEOF_SHORT_INT@ + +// TDE directory +#define TDE_DIR "@CMAKE_INSTALL_PREFIX@" + +// TDE Library directory +#define TDE_LIBDIR "@LIB_INSTALL_DIR@" + +// Defined if building with TDE integration +#cmakedefine COMPILE_TDE_SUPPORT @COMPILE_TDE_SUPPORT@ + +// Defined if building with aRts support +#cmakedefine COMPILE_ARTS_SUPPORT @COMPILE_ARTS_SUPPORT@ diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..1e6042a --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,14 @@ +##### subfolders +# +# Note that files in the 'doctemplates' subfolder +# are used when processing the 'gendoc' folder +# + +add_subdirectory( app ) +add_subdirectory( config ) +add_subdirectory( defscript ) +add_subdirectory( deftheme ) +#add_subdirectory( gendoc ) +add_subdirectory( mimelnk ) +add_subdirectory( msgcolors ) +add_subdirectory( protocols ) diff --git a/data/app/CMakeLists.txt b/data/app/CMakeLists.txt new file mode 100644 index 0000000..4532b6e --- /dev/null +++ b/data/app/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_translated_desktop( kvirc.desktop ) diff --git a/data/config/CMakeLists.txt b/data/config/CMakeLists.txt new file mode 100644 index 0000000..d4b31c8 --- /dev/null +++ b/data/config/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES serverdb.kvc texticons.kvc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/config +) diff --git a/data/defscript/CMakeLists.txt b/data/defscript/CMakeLists.txt new file mode 100644 index 0000000..75356d3 --- /dev/null +++ b/data/defscript/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES aliases.kvs default.kvs events.kvs installer.kvs popups.kvs theme-install.kvs toolbars.kvs + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/defscript +) diff --git a/data/deftheme/CMakeLists.txt b/data/deftheme/CMakeLists.txt new file mode 100644 index 0000000..26d3b11 --- /dev/null +++ b/data/deftheme/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( silverirc ) diff --git a/data/deftheme/silverirc/CMakeLists.txt b/data/deftheme/silverirc/CMakeLists.txt new file mode 100644 index 0000000..586a1bd --- /dev/null +++ b/data/deftheme/silverirc/CMakeLists.txt @@ -0,0 +1,6 @@ +install( + FILES + themeinfo.kvc themedata.kvc pixmapIrcViewBackground.png pixmapInputBackground.png + pixmapUserListViewBackground.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/themes/silverirc +) diff --git a/data/gendoc/CMakeLists.txt b/data/gendoc/CMakeLists.txt new file mode 100644 index 0000000..3336f3f --- /dev/null +++ b/data/gendoc/CMakeLists.txt @@ -0,0 +1,19 @@ +file( GLOB_RECURSE _h_files RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/*.h ) +file( GLOB_RECURSE _cpp_files RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/*.cpp ) + +set( GENERATE_DIR "${CMAKE_BINARY_DIR}/gendoc" ) + +add_custom_target(generate_docfiles ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${GENERATE_DIR} + COMMAND perl data/gendoc/gendoc.pl -v ${PACKAGE_VERSION} ${GENERATE_DIR} + data/doctemplates/*.template ${_cpp_files} ${_h_files} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +) + +install(CODE " + file( + INSTALL ${GENERATE_DIR}/ + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/help/en + PATTERN *.html + ) +") diff --git a/data/mimelnk/CMakeLists.txt b/data/mimelnk/CMakeLists.txt new file mode 100644 index 0000000..f6d4d54 --- /dev/null +++ b/data/mimelnk/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES x-kvs.desktop x-kvt.desktop x-kva.desktop x-kvc.desktop + DESTINATION ${SHARE_INSTALL_PREFIX}/mimelnk/text +) diff --git a/data/msgcolors/CMakeLists.txt b/data/msgcolors/CMakeLists.txt new file mode 100644 index 0000000..376af19 --- /dev/null +++ b/data/msgcolors/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _msgclr_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.msgclr ) + +install( + FILES ${_msgclr_files} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/msgcolors +) diff --git a/data/protocols/CMakeLists.txt b/data/protocols/CMakeLists.txt new file mode 100644 index 0000000..0e4f0dd --- /dev/null +++ b/data/protocols/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES irc.protocol irc6.protocol + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/services +) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..e956c73 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,9 @@ +##### subfolders + +add_subdirectory( man ) +add_subdirectory( scriptexamples ) + +install( + FILES COPYING + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/license +) diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt new file mode 100644 index 0000000..9655073 --- /dev/null +++ b/doc/man/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES kvirc.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 +) diff --git a/doc/scriptexamples/CMakeLists.txt b/doc/scriptexamples/CMakeLists.txt new file mode 100644 index 0000000..c02a3ce --- /dev/null +++ b/doc/scriptexamples/CMakeLists.txt @@ -0,0 +1,19 @@ +##### subfolders + +add_subdirectory( antiidle ) +add_subdirectory( minesweeper ) +add_subdirectory( mp3share ) +add_subdirectory( playing ) +add_subdirectory( runmenu ) +add_subdirectory( simplehttp ) +add_subdirectory( tutorial ) + + +# this folder + +file( GLOB _kvs_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvs ) + +install( + FILES ${_kvs_files} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples +) diff --git a/doc/scriptexamples/antiidle/CMakeLists.txt b/doc/scriptexamples/antiidle/CMakeLists.txt new file mode 100644 index 0000000..9e34958 --- /dev/null +++ b/doc/scriptexamples/antiidle/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES antiidle.kvs + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/antiidle +) diff --git a/doc/scriptexamples/minesweeper/CMakeLists.txt b/doc/scriptexamples/minesweeper/CMakeLists.txt new file mode 100644 index 0000000..f65c164 --- /dev/null +++ b/doc/scriptexamples/minesweeper/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES minesweeper.kvs + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/minesweeper +) diff --git a/doc/scriptexamples/mp3share/CMakeLists.txt b/doc/scriptexamples/mp3share/CMakeLists.txt new file mode 100644 index 0000000..6aedf3b --- /dev/null +++ b/doc/scriptexamples/mp3share/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES mp3share.kvs mp3share_icon.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/mp3share +) diff --git a/doc/scriptexamples/playing/CMakeLists.txt b/doc/scriptexamples/playing/CMakeLists.txt new file mode 100644 index 0000000..e57c048 --- /dev/null +++ b/doc/scriptexamples/playing/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES playing.kvs playing_icon.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/playing +) diff --git a/doc/scriptexamples/runmenu/CMakeLists.txt b/doc/scriptexamples/runmenu/CMakeLists.txt new file mode 100644 index 0000000..bd2e564 --- /dev/null +++ b/doc/scriptexamples/runmenu/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES runmenu.kvs + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/runmenu +) diff --git a/doc/scriptexamples/simplehttp/CMakeLists.txt b/doc/scriptexamples/simplehttp/CMakeLists.txt new file mode 100644 index 0000000..db1120b --- /dev/null +++ b/doc/scriptexamples/simplehttp/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES simplehttp.kvs + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/simplehttp +) diff --git a/doc/scriptexamples/tutorial/CMakeLists.txt b/doc/scriptexamples/tutorial/CMakeLists.txt new file mode 100644 index 0000000..3c10e7a --- /dev/null +++ b/doc/scriptexamples/tutorial/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _kvs_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvs ) + +install( + FILES ${_kvs_files} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/doc/scriptexamples/tutorial +) diff --git a/icons/128x128/CMakeLists.txt b/icons/128x128/CMakeLists.txt new file mode 100644 index 0000000..3f3e84a --- /dev/null +++ b/icons/128x128/CMakeLists.txt @@ -0,0 +1,11 @@ +get_filename_component(CURRENT_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" NAME) + +install( + FILES kvirc.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/apps +) + +install( + FILES kva.png kvc.png kvs.png kvt.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/mimetypes +) diff --git a/icons/16x16/CMakeLists.txt b/icons/16x16/CMakeLists.txt new file mode 100644 index 0000000..3f3e84a --- /dev/null +++ b/icons/16x16/CMakeLists.txt @@ -0,0 +1,11 @@ +get_filename_component(CURRENT_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" NAME) + +install( + FILES kvirc.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/apps +) + +install( + FILES kva.png kvc.png kvs.png kvt.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/mimetypes +) diff --git a/icons/32x32/CMakeLists.txt b/icons/32x32/CMakeLists.txt new file mode 100644 index 0000000..a07fddb --- /dev/null +++ b/icons/32x32/CMakeLists.txt @@ -0,0 +1,11 @@ +get_filename_component(CURRENT_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" NAME) + +install( + FILES kvirc.png kvirc.xpm + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/apps +) + +install( + FILES kva.png kvc.png kvs.png kvt.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/mimetypes +) diff --git a/icons/48x48/CMakeLists.txt b/icons/48x48/CMakeLists.txt new file mode 100644 index 0000000..a07fddb --- /dev/null +++ b/icons/48x48/CMakeLists.txt @@ -0,0 +1,11 @@ +get_filename_component(CURRENT_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" NAME) + +install( + FILES kvirc.png kvirc.xpm + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/apps +) + +install( + FILES kva.png kvc.png kvs.png kvt.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/mimetypes +) diff --git a/icons/64x64/CMakeLists.txt b/icons/64x64/CMakeLists.txt new file mode 100644 index 0000000..4f0fc53 --- /dev/null +++ b/icons/64x64/CMakeLists.txt @@ -0,0 +1,11 @@ +get_filename_component(CURRENT_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" NAME) + +install( + FILES kvirc.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/apps +) + +install( + FILES kvs.png + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/mimetypes +) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt new file mode 100644 index 0000000..9bc15c7 --- /dev/null +++ b/icons/CMakeLists.txt @@ -0,0 +1,8 @@ +##### subfolders + +add_subdirectory( 16x16 ) +add_subdirectory( 32x32 ) +add_subdirectory( 48x48 ) +add_subdirectory( 64x64 ) +add_subdirectory( 128x128 ) +add_subdirectory( scalable ) diff --git a/icons/scalable/CMakeLists.txt b/icons/scalable/CMakeLists.txt new file mode 100644 index 0000000..f589c3e --- /dev/null +++ b/icons/scalable/CMakeLists.txt @@ -0,0 +1,11 @@ +get_filename_component(CURRENT_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" NAME) + +install( + FILES kvirc.svgz + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/apps +) + +install( + FILES kva.svgz kvc.svgz kvs.svgz kvt.svgz + DESTINATION ${ICON_INSTALL_DIR}/hicolor/${CURRENT_FOLDER}/mimetypes +) diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt new file mode 100644 index 0000000..0993407 --- /dev/null +++ b/pics/CMakeLists.txt @@ -0,0 +1,14 @@ +##### subfolders + +add_subdirectory( coresmall ) +add_subdirectory( helppics ) + + +##### this folder + +file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) + +install( + FILES ${_pics} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics +) diff --git a/pics/coresmall/CMakeLists.txt b/pics/coresmall/CMakeLists.txt new file mode 100644 index 0000000..b97bbe0 --- /dev/null +++ b/pics/coresmall/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) + +install( + FILES ${_pics} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics/coresmall +) diff --git a/pics/helppics/CMakeLists.txt b/pics/helppics/CMakeLists.txt new file mode 100644 index 0000000..2ca7b50 --- /dev/null +++ b/pics/helppics/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) + +install( + FILES ${_pics} + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/help/en +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..5046384 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories( + ${TQT_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### subfolders + +add_subdirectory( kvilib ) +add_subdirectory( kvirc ) +#add_subdirectory( modules ) +add_subdirectory( scripts ) +add_subdirectory( tdeconf_update ) diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt new file mode 100644 index 0000000..670332a --- /dev/null +++ b/src/kvilib/CMakeLists.txt @@ -0,0 +1,102 @@ + +# prepare includes + +file( GLOB_RECURSE _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h ) +list( SORT _includes ) +tde_process_includes( ${_includes} DESTINATION ${PROJECT_NAME} ) + + +##### kvilib (shared) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME} + ${CMAKE_CURRENT_BINARY_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +if( WITH_TDE ) + set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared ) +else( ) + set( LINK_LIBRARIES ${TQT_LIBRARIES} ) +endif( ) + +tde_add_library( kvilib SHARED AUTOMOC + SOURCES + core/kvi_error.cpp + core/kvi_heapobject.cpp + core/kvi_malloc.cpp + core/kvi_memmove.cpp + core/kvi_qstring.cpp + core/kvi_string.cpp + core/kvi_stringarray.cpp + ext/kvi_cmdformatter.cpp + ext/kvi_config.cpp + ext/kvi_crypt.cpp + ext/kvi_databuffer.cpp + ext/kvi_dcophelper.cpp + ext/kvi_doublebuffer.cpp + ext/kvi_garbage.cpp + ext/kvi_osinfo.cpp + ext/kvi_imagelib.cpp + ext/kvi_md5.cpp + ext/kvi_mediatype.cpp + ext/kvi_miscutils.cpp + ext/kvi_msgtype.cpp + ext/kvi_parameterlist.cpp + ext/kvi_pixmap.cpp + ext/kvi_proxydb.cpp + ext/kvi_regchan.cpp + ext/kvi_regusersdb.cpp + ext/kvi_sharedfiles.cpp + ext/kvi_stringconversion.cpp + file/kvi_file.cpp + file/kvi_fileutils.cpp + file/kvi_packagefile.cpp + irc/kvi_avatar.cpp + irc/kvi_avatarcache.cpp + irc/kvi_ircmask.cpp + irc/kvi_ircserver.cpp + irc/kvi_ircserverdb.cpp + irc/kvi_ircuserdb.cpp + irc/kvi_mirccntrl.cpp + irc/kvi_nickserv.cpp + irc/kvi_useridentity.cpp + net/kvi_dns.cpp + net/kvi_http.cpp + net/kvi_netutils.cpp + net/kvi_socket.cpp + net/kvi_ssl.cpp + net/kvi_url.cpp + system/kvi_env.cpp + system/kvi_locale.cpp + system/kvi_thread.cpp + system/kvi_time.cpp + tal/kvi_tal_application.cpp + tal/kvi_tal_filedialog.cpp + tal/kvi_tal_grid.cpp + tal/kvi_tal_groupbox.cpp + tal/kvi_tal_hbox.cpp + tal/kvi_tal_iconview.cpp + tal/kvi_tal_listbox.cpp + tal/kvi_tal_listview.cpp + tal/kvi_tal_mainwindow.cpp + tal/kvi_tal_menubar.cpp + tal/kvi_tal_popupmenu.cpp + tal/kvi_tal_scrollview.cpp + tal/kvi_tal_tabdialog.cpp + tal/kvi_tal_textedit.cpp + tal/kvi_tal_toolbar.cpp + tal/kvi_tal_tooltip.cpp + tal/kvi_tal_vbox.cpp + tal/kvi_tal_widgetstack.cpp + tal/kvi_tal_wizard.cpp + LINK ${LINK_LIBRARIES} + VERSION 3.0.0 + DESTINATION ${LIB_INSTALL_DIR} + DEPENDENCIES tde-includes +) diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index 283bbba..beb87de 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -69,8 +69,13 @@ #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 "?.?.?" diff --git a/src/kvilib/core/kvi_memmove.cpp b/src/kvilib/core/kvi_memmove.cpp index 504cf6c..1d477a2 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 d1319a4..d04cd6f 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_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index 829b673..6f7e8f7 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,12 +356,12 @@ 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) { unsigned int i=0; while(i < szString.length()) @@ -387,7 +387,7 @@ namespace KviTQString return ret; } - void stripRightWhiteSpace(TQString &s) + KVILIB_API void stripRightWhiteSpace(TQString &s) { unsigned int iRemove = 0; while(iRemove < s.length()) @@ -398,7 +398,7 @@ 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) { unsigned int iRemove = 0; while(iRemove < s.length()) @@ -409,7 +409,7 @@ 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) { unsigned int iRemove = 0; while(iRemove < s.length()) @@ -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 @@ -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/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp index bbeffa2..4ed8fc7 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_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp index 4d79b48..56f6557 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_regchan.h b/src/kvilib/ext/kvi_regchan.h index f447c31..5b4e755 100644 --- a/src/kvilib/ext/kvi_regchan.h +++ b/src/kvilib/ext/kvi_regchan.h @@ -51,7 +51,7 @@ public: void removeProperty(const char * name){ m_pPropertyDict->remove(name); }; }; -typedef KVILIB_API KviPointerList<KviRegisteredChannel> KviRegisteredChannelList; +typedef KviPointerList<KviRegisteredChannel> KviRegisteredChannelList; class KVILIB_API KviRegisteredChannelDataBase { diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp index 87ce9b6..8ab9aa2 100644 --- a/src/kvilib/ext/kvi_regusersdb.cpp +++ b/src/kvilib/ext/kvi_regusersdb.cpp @@ -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 69a2525..2e6da61 100644 --- a/src/kvilib/ext/kvi_sharedfiles.cpp +++ b/src/kvilib/ext/kvi_sharedfiles.cpp @@ -384,3 +384,4 @@ void KviSharedFilesManager::save(const TQString &filename) cfg.writeEntry("NEntries",idx); } +#include "kvi_sharedfiles.moc" diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp index beb4ed3..a5e66d9 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/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp index d537e3f..c6f2612 100644 --- a/src/kvilib/net/kvi_dns.cpp +++ b/src/kvilib/net/kvi_dns.cpp @@ -448,3 +448,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 81587fa..67adc38 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -1435,3 +1435,4 @@ void KviHttpRequestThread::runInternal() } } +#include "kvi_http.moc" diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp index e8a0e5b..0f456f4 100644 --- a/src/kvilib/system/kvi_locale.cpp +++ b/src/kvilib/system/kvi_locale.cpp @@ -1151,3 +1151,5 @@ static TQString fake_translations_table[]= } #endif + +#include "kvi_locale.moc" diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp index f8404bb..017e789 100644 --- a/src/kvilib/system/kvi_thread.cpp +++ b/src/kvilib/system/kvi_thread.cpp @@ -642,3 +642,4 @@ void KviSensitiveThread::terminate() // tqDebug("Exiting KviSensitiveThread::terminate (this=%d)",this); } +#include "kvi_thread.moc" diff --git a/src/kvilib/tal/kvi_tal_popupmenu.cpp b/src/kvilib/tal/kvi_tal_popupmenu.cpp index 2033453..af17183 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 4ea3f0e..210e98d 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/CMakeLists.txt b/src/kvirc/CMakeLists.txt new file mode 100644 index 0000000..f9d8879 --- /dev/null +++ b/src/kvirc/CMakeLists.txt @@ -0,0 +1,242 @@ + +# prepare includes + +file( GLOB_RECURSE _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h ) +list( SORT _includes ) +tde_process_includes( ${_includes} DESTINATION ${PROJECT_NAME} ) + + +##### kvirc (executable) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME} + ${CMAKE_CURRENT_BINARY_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +if( WITH_TDE ) + set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared ) +else( ) + set( LINK_LIBRARIES ${TQT_LIBRARIES} ) +endif( ) + +tde_add_executable( kvirc AUTOMOC + SOURCES + kernel/kvi_action.cpp + kernel/kvi_actionmanager.cpp + kernel/kvi_app.cpp + kernel/kvi_coreactions.cpp + kernel/kvi_filetransfer.cpp + kernel/kvi_app_fs.cpp + kernel/kvi_app_setup.cpp + kernel/kvi_asynchronousconnectiondata.cpp + kernel/kvi_customtoolbardescriptor.cpp + kernel/kvi_customtoolbarmanager.cpp + kernel/kvi_iconmanager.cpp + kernel/kvi_internalcmd.cpp + kernel/kvi_ipc.cpp + kernel/kvi_ircdatastreammonitor.cpp + kernel/kvi_ircconnection.cpp + kernel/kvi_ircconnectionantictcpflooddata.cpp + kernel/kvi_ircconnectionasyncwhoisdata.cpp + kernel/kvi_ircconnectionnetsplitdetectordata.cpp + kernel/kvi_ircconnectiontarget.cpp + kernel/kvi_ircconnectiontargetresolver.cpp + kernel/kvi_ircconnectionserverinfo.cpp + kernel/kvi_ircconnectionstatedata.cpp + kernel/kvi_ircconnectionstatistics.cpp + kernel/kvi_ircconnectionuserinfo.cpp + kernel/kvi_irccontext.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 + kernel/kvi_sslmaster.cpp + kernel/kvi_texticonmanager.cpp + kernel/kvi_theme.cpp + kernel/kvi_useraction.cpp + kernel/kvi_userinput.cpp + kvs/kvi_kvs.cpp + kvs/kvi_kvs_action.cpp + kvs/kvi_kvs_aliasmanager.cpp + kvs/kvi_kvs_array.cpp + kvs/kvi_kvs_arraycast.cpp + kvs/kvi_kvs_asyncdnsoperation.cpp + kvs/kvi_kvs_asyncoperation.cpp + kvs/kvi_kvs_callbackobject.cpp + kvs/kvi_kvs_corecallbackcommands.cpp + kvs/kvi_kvs_corefunctions.cpp + kvs/kvi_kvs_corefunctions_af.cpp + kvs/kvi_kvs_corefunctions_gl.cpp + kvs/kvi_kvs_corefunctions_mr.cpp + kvs/kvi_kvs_corefunctions_sz.cpp + kvs/kvi_kvs_coresimplecommands.cpp + kvs/kvi_kvs_coresimplecommands_af.cpp + kvs/kvi_kvs_coresimplecommands_gl.cpp + kvs/kvi_kvs_coresimplecommands_mr.cpp + kvs/kvi_kvs_coresimplecommands_sz.cpp + kvs/kvi_kvs_dnsmanager.cpp + kvs/kvi_kvs_event.cpp + kvs/kvi_kvs_eventhandler.cpp + kvs/kvi_kvs_eventmanager.cpp + kvs/kvi_kvs_eventtable.cpp + kvs/kvi_kvs_hash.cpp + kvs/kvi_kvs_kernel.cpp + kvs/kvi_kvs_moduleinterface.cpp + kvs/kvi_kvs_object.cpp + kvs/kvi_kvs_object_class.cpp + kvs/kvi_kvs_object_controller.cpp + kvs/kvi_kvs_object_functioncall.cpp + kvs/kvi_kvs_object_functionhandler.cpp + kvs/kvi_kvs_object_functionhandlerimpl.cpp + kvs/kvi_kvs_parameterprocessor.cpp + kvs/kvi_kvs_parser.cpp + kvs/kvi_kvs_parser_command.cpp + kvs/kvi_kvs_parser_comment.cpp + kvs/kvi_kvs_parser_dollar.cpp + kvs/kvi_kvs_parser_expression.cpp + kvs/kvi_kvs_parser_lside.cpp + kvs/kvi_kvs_parser_specialcommands.cpp + kvs/kvi_kvs_popupmanager.cpp + kvs/kvi_kvs_popupmenu.cpp + kvs/kvi_kvs_processmanager.cpp + kvs/kvi_kvs_report.cpp + kvs/kvi_kvs_runtimecall.cpp + kvs/kvi_kvs_runtimecontext.cpp + kvs/kvi_kvs_rwevaluationresult.cpp + kvs/kvi_kvs_script.cpp + kvs/kvi_kvs_scriptaddonmanager.cpp + kvs/kvi_kvs_switchlist.cpp + kvs/kvi_kvs_timermanager.cpp + kvs/kvi_kvs_treenode_aliasfunctioncall.cpp + kvs/kvi_kvs_treenode_aliassimplecommand.cpp + kvs/kvi_kvs_treenode_arraycount.cpp + kvs/kvi_kvs_treenode_arrayelement.cpp + kvs/kvi_kvs_treenode_arrayorhashelement.cpp + kvs/kvi_kvs_treenode_arrayreferenceassert.cpp + kvs/kvi_kvs_treenode_base.cpp + kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp + kvs/kvi_kvs_treenode_callbackcommand.cpp + kvs/kvi_kvs_treenode_command.cpp + kvs/kvi_kvs_treenode_commandevaluation.cpp + kvs/kvi_kvs_treenode_commandwithparameters.cpp + kvs/kvi_kvs_treenode_compositedata.cpp + kvs/kvi_kvs_treenode_constantdata.cpp + kvs/kvi_kvs_treenode_corecallbackcommand.cpp + kvs/kvi_kvs_treenode_corefunctioncall.cpp + kvs/kvi_kvs_treenode_coresimplecommand.cpp + kvs/kvi_kvs_treenode_data.cpp + kvs/kvi_kvs_treenode_datalist.cpp + kvs/kvi_kvs_treenode_expression.cpp + kvs/kvi_kvs_treenode_expressionreturn.cpp + kvs/kvi_kvs_treenode_extendedscopevariable.cpp + kvs/kvi_kvs_treenode_functioncall.cpp + kvs/kvi_kvs_treenode_globalvariable.cpp + kvs/kvi_kvs_treenode_hashcount.cpp + kvs/kvi_kvs_treenode_hashelement.cpp + kvs/kvi_kvs_treenode_hashreferenceassert.cpp + kvs/kvi_kvs_treenode_indirectdata.cpp + kvs/kvi_kvs_treenode_instruction.cpp + kvs/kvi_kvs_treenode_instructionblock.cpp + kvs/kvi_kvs_treenode_localvariable.cpp + kvs/kvi_kvs_treenode_modulecallbackcommand.cpp + kvs/kvi_kvs_treenode_modulefunctioncall.cpp + kvs/kvi_kvs_treenode_modulesimplecommand.cpp + kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp + kvs/kvi_kvs_treenode_objectfield.cpp + kvs/kvi_kvs_treenode_objectfunctioncall.cpp + kvs/kvi_kvs_treenode_operation.cpp + kvs/kvi_kvs_treenode_parameterreturn.cpp + kvs/kvi_kvs_treenode_rebindingswitch.cpp + kvs/kvi_kvs_treenode_scopeoperator.cpp + kvs/kvi_kvs_treenode_simplecommand.cpp + kvs/kvi_kvs_treenode_singleparameteridentifier.cpp + kvs/kvi_kvs_treenode_specialcommand.cpp + kvs/kvi_kvs_treenode_specialcommandbreak.cpp + kvs/kvi_kvs_treenode_specialcommandclass.cpp + kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp + kvs/kvi_kvs_treenode_specialcommanddo.cpp + kvs/kvi_kvs_treenode_specialcommandfor.cpp + kvs/kvi_kvs_treenode_specialcommandforeach.cpp + kvs/kvi_kvs_treenode_specialcommandif.cpp + kvs/kvi_kvs_treenode_specialcommandswitch.cpp + kvs/kvi_kvs_treenode_specialcommandunset.cpp + kvs/kvi_kvs_treenode_specialcommandwhile.cpp + kvs/kvi_kvs_treenode_stringcast.cpp + kvs/kvi_kvs_treenode_switchlist.cpp + kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp + kvs/kvi_kvs_treenode_variable.cpp + kvs/kvi_kvs_useraction.cpp + kvs/kvi_kvs_variant.cpp + kvs/kvi_kvs_variantlist.cpp + kvs/kvi_kvs_treenode_voidfunctioncall.cpp + module/kvi_mexlinkfilter.cpp + module/kvi_mexserverimport.cpp + module/kvi_mextoolbar.cpp + module/kvi_module.cpp + module/kvi_moduleextension.cpp + module/kvi_modulemanager.cpp + sparser/kvi_antispam.cpp + sparser/kvi_ircmessage.cpp + sparser/kvi_sparser.cpp + sparser/kvi_sp_ctcp.cpp + sparser/kvi_sp_literal.cpp + sparser/kvi_sp_numeric.cpp + sparser/kvi_sp_tables.cpp + ui/kvi_actiondrawer.cpp + ui/kvi_channel.cpp + ui/kvi_colorwin.cpp + ui/kvi_console.cpp + ui/kvi_cryptcontroller.cpp + ui/kvi_ctcppagedialog.cpp + ui/kvi_customtoolbar.cpp + ui/kvi_debugwindow.cpp + ui/kvi_dynamictooltip.cpp + ui/kvi_filedialog.cpp + ui/kvi_frame.cpp + ui/kvi_historywin.cpp + ui/kvi_htmldialog.cpp + ui/kvi_imagedialog.cpp + ui/kvi_input.cpp + ui/kvi_ipeditor.cpp + ui/kvi_irctoolbar.cpp + ui/kvi_ircview.cpp + ui/kvi_ircviewtools.cpp + ui/kvi_listview.cpp + ui/kvi_maskeditor.cpp + ui/kvi_mdicaption.cpp + ui/kvi_mdichild.cpp + ui/kvi_mdimanager.cpp + ui/kvi_menubar.cpp + ui/kvi_modeeditor.cpp + ui/kvi_modew.cpp + ui/kvi_msgbox.cpp + ui/kvi_optionswidget.cpp + ui/kvi_query.cpp + ui/kvi_scriptbutton.cpp + ui/kvi_scripteditor.cpp + ui/kvi_selectors.cpp + ui/kvi_splash.cpp + ui/kvi_statusbar.cpp + ui/kvi_statusbarapplet.cpp + ui/kvi_taskbar.cpp + ui/kvi_texticonwin.cpp + ui/kvi_themedlabel.cpp + ui/kvi_toolbar.cpp + ui/kvi_toolwindows_container.cpp + ui/kvi_topicw.cpp + ui/kvi_styled_controls.cpp + ui/kvi_userlistview.cpp + ui/kvi_window.cpp + LINK kvilib-shared ${LINK_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} + DEPENDENCIES tde-includes +) diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 57684a2..7f8c5d3 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.local8Bit()); 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 c4af1e7..ab55dd7 100644 --- a/src/kvirc/kernel/kvi_actionmanager.cpp +++ b/src/kvirc/kernel/kvi_actionmanager.cpp @@ -299,7 +299,7 @@ KviAction * KviActionManager::getAction(const TQString &szName) } // try to preload the module that might register this action... TQString szModule = szName.left(idx); - if(!g_pModuleManager->getModule(szModule))return 0; + if(!g_pModuleManager->getModule(szModule.local8Bit()))return 0; return m_pActions->find(szName); } @@ -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 09f94c4..4982408 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -318,7 +318,7 @@ void KviApp::setup() // Load the proxy database g_pProxyDataBase = new KviProxyDataBase(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_PROXYDB)) - g_pProxyDataBase->load(tmp); + g_pProxyDataBase->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(54) @@ -379,7 +379,7 @@ void KviApp::setup() g_pMediaManager = new KviMediaManager(); g_pMediaManager->lock(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_MEDIATYPES)) - g_pMediaManager->load(tmp); + g_pMediaManager->load(tmp.local8Bit()); g_pMediaManager->unlock(); @@ -388,39 +388,39 @@ void KviApp::setup() // registered user data base g_pRegisteredUserDataBase = new KviRegisteredUserDataBase(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_REGUSERDB)) - g_pRegisteredUserDataBase->load(tmp); + g_pRegisteredUserDataBase->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(84) // registered channel data base g_pRegisteredChannelDataBase = new KviRegisteredChannelDataBase(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_REGCHANDB)) - g_pRegisteredChannelDataBase->load(tmp); + g_pRegisteredChannelDataBase->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(85) // file trader g_pSharedFilesManager = new KviSharedFilesManager(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_SHAREDFILES)) - g_pSharedFilesManager->load(tmp); + g_pSharedFilesManager->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(86) // nick serv data base g_pNickServRuleSet = new KviNickServRuleSet(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_NICKSERVDATABASE)) - g_pNickServRuleSet->load(tmp); + g_pNickServRuleSet->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(88) g_pInputHistory = new KviInputHistory(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_INPUTHISTORY)) - g_pInputHistory->load(tmp); + g_pInputHistory->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(89) KviAvatarCache::init(); if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_AVATARCACHE)) - KviAvatarCache::instance()->load(tmp); + KviAvatarCache::instance()->load(tmp.local8Bit()); KVI_SPLASH_SET_PROGRESS(90) @@ -1329,7 +1329,7 @@ void KviApp::saveAvatarCache() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_AVATARCACHE); - KviAvatarCache::instance()->save(tmp); + KviAvatarCache::instance()->save(tmp.local8Bit()); } @@ -1337,7 +1337,7 @@ void KviApp::saveToolBars() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_CUSTOMTOOLBARS); - KviCustomToolBarManager::instance()->save(tmp); + KviCustomToolBarManager::instance()->save(tmp.local8Bit()); } void KviApp::savePopups() @@ -1353,7 +1353,7 @@ void KviApp::saveInputHistory() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_INPUTHISTORY); - g_pInputHistory->save(tmp); + g_pInputHistory->save(tmp.local8Bit()); } } @@ -1396,7 +1396,7 @@ void KviApp::saveMediaTypes() TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_MEDIATYPES); g_pMediaManager->lock(); - g_pMediaManager->save(tmp); + g_pMediaManager->save(tmp.local8Bit()); g_pMediaManager->unlock(); } @@ -1404,56 +1404,56 @@ void KviApp::saveIrcServerDataBase() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SERVERDB); - g_pIrcServerDataBase->save(tmp); + g_pIrcServerDataBase->save(tmp.local8Bit()); } void KviApp::saveProxyDataBase() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_PROXYDB); - g_pProxyDataBase->save(tmp); + g_pProxyDataBase->save(tmp.local8Bit()); } void KviApp::saveRegisteredUsers() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_REGUSERDB); - g_pRegisteredUserDataBase->save(tmp); + g_pRegisteredUserDataBase->save(tmp.local8Bit()); } void KviApp::saveRegisteredChannels() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_REGCHANDB); - g_pRegisteredChannelDataBase->save(tmp); + g_pRegisteredChannelDataBase->save(tmp.local8Bit()); } void KviApp::saveNickServ() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_NICKSERVDATABASE); - g_pNickServRuleSet->save(tmp); + g_pNickServRuleSet->save(tmp.local8Bit()); } void KviApp::saveSharedFiles() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SHAREDFILES); - g_pSharedFilesManager->save(tmp); + g_pSharedFilesManager->save(tmp.local8Bit()); } void KviApp::saveActions() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_USERACTIONS); - KviActionManager::instance()->save(tmp); + KviActionManager::instance()->save(tmp.local8Bit()); } void KviApp::saveIdentities() { TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_IDENTITIES); - KviUserIdentityManager::instance()->save(tmp); + KviUserIdentityManager::instance()->save(tmp.local8Bit()); } void KviApp::saveConfiguration() @@ -1739,12 +1739,12 @@ KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iConte void KviApp::registerWindow(KviWindow *wnd) { - g_pGlobalWindowDict->insert(wnd->id(),wnd); + g_pGlobalWindowDict->insert(wnd->id().local8Bit(),wnd); } void KviApp::unregisterWindow(KviWindow *wnd) { - g_pGlobalWindowDict->remove(wnd->id()); + g_pGlobalWindowDict->remove(wnd->id().local8Bit()); } diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 240c1da..be19a2a 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().local8Bit()); 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().local8Bit()); b->setPopup(m_pPopup); b->setShowSubmenuIndicator(true); @@ -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().local8Bit()); 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 35d8428..200649f 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 6d9f328..00d93b2 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -610,7 +610,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const TQString &szName) TQString szRetPath; - if(g_pApp->findImage(szRetPath,szName)) + if(g_pApp->findImage(szRetPath,szName.local8Bit())) { pix = new TQPixmap(szRetPath); if(pix->isNull()) @@ -645,7 +645,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const TQString & TQString szRetPath; - if(g_pApp->findImage(szRetPath,szName)) + if(g_pApp->findImage(szRetPath,szName.local8Bit())) { pix = new TQPixmap(szRetPath); if(pix->isNull()) @@ -842,7 +842,7 @@ TQPixmap * KviIconManager::loadSmallIcon(int idx) else KviTQString::appendFormatted(szFileName,"0%d.png",fileidx); TQString buffer; - if(g_pApp->findImageThemeOnlyCompat(buffer,szFileName)) + if(g_pApp->findImageThemeOnlyCompat(buffer,szFileName.local8Bit())) { KviImageLibrary l1(buffer,16,16); @@ -863,7 +863,7 @@ TQPixmap * KviIconManager::loadSmallIcon(int idx) TQString szPath; KviTQString::sprintf(szPath,KVI_SMALLICONS_PREFIX "%s.png",g_szIconNames[idx]); - g_pApp->findSmallIcon(buffer,szPath); + g_pApp->findSmallIcon(buffer,szPath.local8Bit()); m_smallIcons[idx] = new TQPixmap(buffer); //if(m_smallIcon[idx]->isNull()) diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 22b3b2d..ffc17f5 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -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.local8Bit()); 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_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 0b6eeb5..862abdc 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -271,7 +271,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *) __tr2qs("Proxy hostname resolved to %Q"),&szFirstIpAddress); m_pTarget->proxy()->m_szIp = m_pProxyDns->firstIpAddress(); - g_pProxyDataBase->updateProxyIp(m_pTarget->proxy()->m_szIp.ptr(),szFirstIpAddress); + g_pProxyDataBase->updateProxyIp(m_pTarget->proxy()->m_szIp.ptr(),szFirstIpAddress.local8Bit()); if(m_pProxyDns->hostnameCount() > 1) { @@ -555,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 2195a10..1379121 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 3d9e045..909671a 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -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 3c87453..38aa800 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().local8Bit(),&ircInAddr)) tqDebug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION"); TQ_UINT32 host=(TQ_UINT32)ircInAddr.s_addr; @@ -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().local8Bit(),&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()); @@ -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_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 69a0fb3..ed3ffa6 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -1168,7 +1168,7 @@ namespace KviTheme TQString szBuffer; if(!szVal.isEmpty()) { - g_pApp->findImage(szBuffer,szVal); + g_pApp->findImage(szBuffer,szVal.local8Bit()); } else { szBuffer = szVal; } @@ -1348,7 +1348,7 @@ bool KviApp::setOptionValue(const char * optName,const TQString &value) TQString szBuffer; if(!szVal.isEmpty()) { - findImage(szBuffer,szVal); + findImage(szBuffer,szVal.local8Bit()); } else { szBuffer = szVal; } diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/kvi_kvs_action.cpp index 82972d3..c83a89a 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 06c0c4e..5c56ee6 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 19e4656..e3b479f 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 93880f5..8790e21 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.local8Bit(),"KviWindowScriptButton"); if(KVSCCC_pCallback->code().isEmpty()) { @@ -451,14 +451,14 @@ namespace KviKvsCoreCallbackCommands if(!pButton) { - pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName); + pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName.local8Bit()); pButton->show(); } KviTalToolTip::remove(pButton); if(!szLabel.isEmpty()) { - pButton->setButtonText(szLabel); + pButton->setButtonText(szLabel.local8Bit()); KviTalToolTip::add(pButton,szLabel); } @@ -466,7 +466,7 @@ namespace KviKvsCoreCallbackCommands if(!szIcon.isEmpty()) { - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix) { pButton->setButtonPixmap(*pix); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 6968c1e..c9d93ae 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.local8Bit(),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 b78c0be..8c53bcf 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -705,7 +705,7 @@ namespace KviKvsCoreFunctions KviMessageCatalogue * pCat = KviLocale::getLoadedCatalogue(szCatalogue); if(pCat) { - translation = pCat->translateToTQString(szString); + translation = pCat->translateToTQString(szString.local8Bit()); } 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.local8Bit(),szCatalogue.local8Bit()); } } else { - translation = __tr2qs_no_xgettext(szString); + translation = __tr2qs_no_xgettext(szString.local8Bit()); } // epilogue: set the return value diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 66d3d96..94a6ec4 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -409,7 +409,7 @@ namespace KviKvsCoreSimpleCommands return true; } - pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName,"KviWindowScriptButton"); + pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName.local8Bit(),"KviWindowScriptButton"); if(!pButton) { @@ -427,12 +427,12 @@ namespace KviKvsCoreSimpleCommands case 't': KviTalToolTip::remove(pButton); KviTalToolTip::add(pButton,tbPar); - pButton->setButtonText(tbPar); + pButton->setButtonText(tbPar.local8Bit()); break; case 'i': if(!tbPar.isEmpty()) { - TQPixmap * pix = g_pIconManager->getImage(tbPar); + TQPixmap * pix = g_pIconManager->getImage(tbPar.local8Bit()); if(pix) { pButton->setButtonPixmap(*pix); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 2b973b5..18e1c3b 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.local8Bit(),szValue))KVSCSC_pContext->warning(__tr2qs("Option setting error: Unknown option or invalid value for option type")); } return true; diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index 2f5c28b..32575ce 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 c7663cf..2c81166 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 4ec97bc..efdf0a2 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.local8Bit()); 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.local8Bit()); 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 9b98621..563e207 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.local8Bit(),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.local8Bit()); 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.local8Bit()); TQVariant var(val); - m_pObject->setProperty(szName,var); + m_pObject->setProperty(szName.local8Bit(),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.local8Bit(),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.local8Bit(),TQVariant((unsigned int)i)); } break; case TQVariant::Bool: - m_pObject->setProperty(szName,TQVariant(v->asBoolean())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(v->asBoolean())); break; case TQVariant::String: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s)); + m_pObject->setProperty(szName.local8Bit(),TQVariant(s)); } break; case TQVariant::CString: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s.utf8())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(s.utf8())); } 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.local8Bit(),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.local8Bit(),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.local8Bit(),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.local8Bit(),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.local8Bit(),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.local8Bit(),TQVariant(TQPixmap())); else - m_pObject->setProperty(szName,TQVariant(TQIconSet())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQIconSet())); } else { KviKvsObject * pix = KviKvsKernel::instance()->objectController()->lookupObject(v->hobject()); if(!pix->inherits("KviScriptPixmapObject")) @@ -1285,21 +1285,21 @@ 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.local8Bit(),pixv); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(pixv.toPixmap()))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQIconSet(pixv.toPixmap()))); } } } else { TQString szStr; v->asString(szStr); - TQPixmap * pPix = g_pIconManager->getImage(szStr); + TQPixmap * pPix = g_pIconManager->getImage(szStr.local8Bit()); if(pPix) { if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(*pPix)); + m_pObject->setProperty(szName.local8Bit(),TQVariant(*pPix)); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(*pPix))); + m_pObject->setProperty(szName.local8Bit(),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.local8Bit(),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.local8Bit()); 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 6c95b2a..25ae689 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -224,7 +224,7 @@ TQPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLe TQString szRet; vRet.asString(szRet); - TQPixmap * p = g_pIconManager->getImage(szRet); + TQPixmap * p = g_pIconManager->getImage(szRet.local8Bit()); if(!p)pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs("Can't find the icon \"%Q\": ignoring"),&szRet); return p; } @@ -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 4657110..80b43f0 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_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp index 9d9a2a4..ba0b3f7 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_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp index 8df45a3..3e1abb9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp @@ -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.local8Bit()); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp index 457e3f6..ce29be4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp @@ -63,7 +63,7 @@ void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix) 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.local8Bit()); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp index 1834399..aca369b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp @@ -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.local8Bit()); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp index b59ac3d..a5367c0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp @@ -56,8 +56,8 @@ void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix) tqDebug("%s SpecialCommandDo",prefix); TQString tmp = prefix; tmp.append(" "); - m_pExpression->dump(tmp); - if(m_pInstruction)m_pInstruction->dump(tmp); + m_pExpression->dump(tmp.local8Bit()); + if(m_pInstruction)m_pInstruction->dump(tmp.local8Bit()); } bool KviKvsTreeNodeSpecialCommandDo::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 9a77d51..937be97 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.local8Bit()); } 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 14608be..e190beb 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -598,7 +598,7 @@ void KviKvsVariant::asString(TQString &szBuffer) const case KviKvsVariantData::Boolean: szBuffer.setNum(m_pData->m_u.bBoolean ? 1 : 0); break; case KviKvsVariantData::HObject: if(m_pData->m_u.hObject) - KviTQString::sprintf(szBuffer,"object[%lx]",m_pData->m_u.hObject); + KviTQString::sprintf(szBuffer,"object[%p]",m_pData->m_u.hObject); else szBuffer = "null-object"; break; @@ -626,18 +626,18 @@ void KviKvsVariant::dump(const char * prefix) const { if(!m_pData) { - tqDebug("%s Nothing [this=0x%lx]",prefix,this); + tqDebug("%s Nothing [this=0x%p]",prefix,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,m_pData->m_u.pString->utf8().data(),this); break; + case KviKvsVariantData::Array: tqDebug("%s Array(ptr=0x%p) [this=0x%p]",prefix,m_pData->m_u.pArray,this); break; + case KviKvsVariantData::Hash: tqDebug("%s Hash(ptr=0x%p,dict=0x%p) [this=0x%p]",prefix,m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break; + case KviKvsVariantData::Integer: tqDebug("%s Integer(%ld) [this=0x%p]",prefix,m_pData->m_u.iInteger,this); break; + case KviKvsVariantData::Real: tqDebug("%s Real(%f) [this=0x%p]",prefix,*(m_pData->m_u.pReal),this); break; + case KviKvsVariantData::Boolean: tqDebug("%s Boolean(%s) [this=0x%p]",prefix,m_pData->m_u.bBoolean ? "true" : "false",this); break; + case KviKvsVariantData::HObject: tqDebug("%s HObject(%p) [this=0x%p]",prefix,m_pData->m_u.hObject,this); break; default: /* make gcc happy */ break; } } diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/kvi_mexlinkfilter.cpp index b479d3c..32cf209 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 59ac15e..eebb80b 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 ccae2f3..235804f 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_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index 4d83edd..2b30f2c 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -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).local8Bit()); } } @@ -367,3 +367,5 @@ void KviModuleManager::unloadAllModules() for(KviModule * pModule = lModulesToUnload.first();pModule;pModule = lModulesToUnload.next()) unloadModule(pModule); } + +#include "kvi_modulemanager.moc" diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index a6c8f46..de389e1 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 = pOut->decodeText(req.local8Bit()); + TQString szTag = pOut->decodeText(msg->szTag.local8Bit()); TQString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : TQString("CTCP"); if(msg->bIsFlood) @@ -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().local8Bit()); } 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).local8Bit()); 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.local8Bit(),szReply); if(!a->isRemote()) @@ -1748,8 +1748,8 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) __tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%s %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->msg->console()->decodeText(msg->szTag.local8Bit()), + 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 a878075..9ae38ba 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -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.utf8().data(),szNick.utf8().data(),szNewNick.utf8().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); @@ -1703,7 +1703,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz case 'k': if(bSet)aParam = msg->safeParam(curParam++); else aParam = ""; - chan->setChannelKey(aParam); + chan->setChannelKey(aParam.local8Bit()); if(bSet) { if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnKeySet,chan,szNick,szUser,szHost,aParam)) @@ -1726,7 +1726,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz case 'l': if(bSet)aParam = msg->safeParam(curParam++); else aParam = ""; - chan->setChannelLimit(aParam); + chan->setChannelLimit(aParam.local8Bit()); if(bSet) { if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnLimitSet,chan,szNick,szUser,szHost,aParam)) diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index 2637d4d..248cdb2 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 c304165..03d7f39 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -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.local8Bit(),m_szChannelKey.local8Bit(),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(); diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 3a1e7a6..87b019d 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -656,7 +656,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c if(wnd->type() == KVI_WINDOW_TYPE_CHANNEL) { - if(((KviChannel *)wnd)->isHighlightedUser(nick)) + if(((KviChannel *)wnd)->isHighlightedUser(nick.local8Bit())) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,nick); // FIXME: this is for userhighlighing diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 24259c2..618940f 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 7065179..ec209c7 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 5f9fdf1..6fb8a83 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -235,7 +235,7 @@ void KviFrame::restoreModuleExtensionToolBars() { TQString szMod = szEntry.left(idx); szEntry.remove(0,idx + 1); - g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod); + g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod.local8Bit()); } } } @@ -535,7 +535,7 @@ void KviFrame::closeWindow(KviWindow *wnd) TQString group; wnd->getConfigGroupName(group); // not uses default settings : store it always - saveWindowProperties(wnd,group); + saveWindowProperties(wnd,group.local8Bit()); } // forget it... @@ -1080,7 +1080,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } else { if(!ico.isEmpty()) { - TQPixmap * pix = g_pIconManager->getImage(d->iconId()); + TQPixmap * pix = g_pIconManager->getImage(d->iconId().local8Bit()); if(pix) { id = p->insertItem(*pix,label); diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 1833054..da92abb 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 4d79b93..a62273a 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -347,7 +347,7 @@ void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) if(szImageId.at(0) == TQChar('$')) m_szSelectedImage = szImageId; // it's $icon(something) else - g_pApp->mapImageFile(m_szSelectedImage,i->imageId()); // it's a file and we need to map it to our filesystem view + g_pApp->mapImageFile(m_szSelectedImage,i->imageId().local8Bit()); // it's a file and we need to map it to our filesystem view accept(); } } @@ -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_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 9422296..6c50f3f 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -485,7 +485,7 @@ void KviIrcView::dropEvent(TQDropEvent *e) #ifndef COMPILE_ON_WINDOWS if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for TQt bug (?!?) #endif - emit fileDropped(tmp); + emit fileDropped(tmp.local8Bit()); } } } @@ -503,7 +503,7 @@ void KviIrcView::stopLogging() if(m_pLogFile) { TQString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); + szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###").local8Bit(),TQDateTime::currentDateTime().toString().local8Bit()); add2Log(szLogEnd); m_pLogFile->close(); @@ -677,7 +677,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) } TQString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); + szLogStart.sprintf(__tr2qs("### Log session started at %s ###").local8Bit(),TQDateTime::currentDateTime().toString().local8Bit()); add2Log(szLogStart); if(bPrependCurBuffer) { diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index e71e1ab..7fc44a3 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 4a459e5..7352f5b 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 6276f82..d9954ac 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 6f4e894..fd1b57a 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 07013f7..1fea6ad 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_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 16037a8..2fcb6ea 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -270,7 +270,7 @@ void KviPixmapSelector::choosePixmap() TQString tmp; if(KviFileDialog::askForOpenFileName(tmp,__tr("Choose an Image File - KVIrc"))) { - setImagePath(tmp); + setImagePath(tmp.local8Bit()); } } diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 2ec878b..682c2e2 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.local8Bit()); 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 3a23bd3..2e61024 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_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index e4f6fb5..34feb54 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 0a2ec1a..a526237 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_window.cpp b/src/kvirc/ui/kvi_window.cpp index 013e521..b3ec16f 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -105,7 +105,7 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * // FIXME: REMOVE THIS - setName(name); + setName(name.local8Bit()); // END FIXME m_szName = name; @@ -847,10 +847,10 @@ void KviWindow::savePropertiesAsDefault() TQString group; getConfigGroupName(group); - if(!kvi_strEqualCI(group,typeString())) + if(!kvi_strEqualCI(group.local8Bit(),typeString())) { // save also the settings for THIS specialized window - g_pFrame->saveWindowProperties(this,group); + g_pFrame->saveWindowProperties(this,group.local8Bit()); } g_pFrame->saveWindowProperties(this,typeString()); diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 608a90e..04e5733 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.local8Bit()); if(!p)return; m_pSmallIconEdit->setText(s); m_pSmallIconButton->setPixmap(*p); diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 1e06971..6b1a88f 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -70,7 +70,7 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox( g_pDialogModuleDialogList->append(this); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix)setIconPixmap(*pix); else { @@ -208,7 +208,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( TQGridLayout * g = new TQGridLayout(this,2,3,5,5); - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix) { diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 3e2f7d1..e81145f 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -210,7 +210,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd,const TQString &szImageId,co TQString szMessage=szText; szMessage.replace( TQRegExp("\r([^\r])*\r([^\r])+\r"), "\\2" ); if(szImageId.isEmpty())pIcon = 0; - else pIcon = g_pIconManager->getImage(szImageId); + else pIcon = g_pIconManager->getImage(szImageId.local8Bit()); KviNotifierMessage * m = new KviNotifierMessage(this,pIcon ? new TQPixmap(*pIcon) : 0,szMessage); diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index db4ee3e..915b49d 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -145,7 +145,7 @@ bool KviKvsObject_button::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if (!widget()) return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix){ ((TQPushButton *)widget())->setIconSet(TQIconSet(*pix,TQIconSet::Small)); } diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index c393943..85a757a 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -383,7 +383,7 @@ bool KviKvsObject_label::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if(!widget())return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix) ((TQLabel *)widget())->setPixmap(*pix); return true; } diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 3216300..1cc822e 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -202,7 +202,7 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c) int id=0; if(!szIcon.isEmpty()) { - pix = g_pIconManager->getImage(szIcon); + pix = g_pIconManager->getImage(szIcon.local8Bit()); if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szItem); else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon); @@ -259,7 +259,7 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c) int id=0; if(!szIcon.isEmpty()) { - pix = g_pIconManager->getImage(szIcon); + pix = g_pIconManager->getImage(szIcon.local8Bit()); if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szLabel,((KviTalPopupMenu *)(ob->object()))); else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon); diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index b068b38..d7015af 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -118,7 +118,7 @@ bool KviKvsObject_radiobutton::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon_id",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if (!widget()) return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix)widget()->setIcon(*pix); return true; } diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 5196573..6c6b4fe 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -213,7 +213,7 @@ bool KviKvsObject_tabwidget::functionaddTab(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't add a non-widget object")); return true; } - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix){ ((TQTabWidget *)widget())->addTab(((TQWidget *)(ob->object())),TQIconSet(*pix,TQIconSet::Small),szLabel); @@ -251,7 +251,7 @@ bool KviKvsObject_tabwidget::functioninsertTab(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't add a non-widget object")); return true; } - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix){ ((TQTabWidget *)widget())->insertTab(((TQWidget *)(ob->object())),TQIconSet(*pix,TQIconSet::Small),szLabel,uIndex); } @@ -489,7 +489,7 @@ bool KviKvsObject_tabwidget::functionchangeTab(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't find the tab ")); return true; } - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix){ ((TQTabWidget *)widget())->changeTab(((TQWidget *)(ob->object())),TQIconSet(*pix,TQIconSet::Small),szLabel); } diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 8ff37ea..96ec49b 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -141,7 +141,7 @@ bool KviKvsObject_toolbutton::functionsetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon_id",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if (!widget()) return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon).local8Bit(); if(pix){ ((TQToolButton *)widget())->setIconSet(TQIconSet(*pix,TQIconSet::Small)); } diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index f3b11d2..005ecd8 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1592,7 +1592,7 @@ bool KviKvsObject_widget::function_setIcon(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if(!widget())return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix)widget()->setIcon(*pix); return true; } @@ -1604,7 +1604,7 @@ bool KviKvsObject_widget::function_setBackgroundImage(KviKvsObjectFunctionCall * KVSO_PARAMETER("image",KVS_PT_STRING,0,image) KVSO_PARAMETERS_END(c) if(!widget())return true; - TQPixmap * pix = g_pIconManager->getImage(image); + TQPixmap * pix = g_pIconManager->getImage(image.local8Bit()); if(pix)widget()->setPaletteBackgroundPixmap(*pix); return true; } diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 1a5265c..e405756 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -163,7 +163,7 @@ void KviPopupListViewItem::setIcon(const TQString & szIcon) case ExtMenu: m_szIcon = szIcon; { - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix)setPixmap(0,*pix); else setPixmap(0,TQPixmap()); } diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index e93bfe1..7867c1f 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.local8Bit()); if(p) { m_pIconButton->setPixmap(*p); diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt new file mode 100644 index 0000000..ee22855 --- /dev/null +++ b/src/scripts/CMakeLists.txt @@ -0,0 +1,4 @@ +##### subfolders + +add_subdirectory( browser ) +add_subdirectory( helpsearch ) diff --git a/src/scripts/browser/CMakeLists.txt b/src/scripts/browser/CMakeLists.txt new file mode 100644 index 0000000..433846c --- /dev/null +++ b/src/scripts/browser/CMakeLists.txt @@ -0,0 +1,5 @@ +install( + PROGRAMS kvi_run_netscape + DESTINATION ${BIN_INSTALL_DIR} +) + diff --git a/src/scripts/helpsearch/CMakeLists.txt b/src/scripts/helpsearch/CMakeLists.txt new file mode 100644 index 0000000..fde3d5d --- /dev/null +++ b/src/scripts/helpsearch/CMakeLists.txt @@ -0,0 +1,5 @@ +install( + PROGRAMS kvi_search_help + DESTINATION ${BIN_INSTALL_DIR} +) + diff --git a/src/tdeconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt new file mode 100644 index 0000000..15ddd6a --- /dev/null +++ b/src/tdeconf_update/CMakeLists.txt @@ -0,0 +1,11 @@ +##### update files + +install( + FILES kvirc_soundsystem.upd + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update +) + +install( + PROGRAMS kvirc_soundsystem_upd.sh + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update +) |