Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/basket
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/basket/

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "admin"]
-	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

CMakeL10n.txt

@@ -0,0 +1,33 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_create_template( "messages/basket" )
+
+tde_l10n_auto_add_subdirectories( )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/basket-desktops"
+    SOURCES *.desktop
+)

CMakeLists.txt

@@ -0,0 +1,96 @@
+############################################
+#                                          #
+#  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( basket )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckIncludeFileCXX    )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_GPGME          "Enable libgpgme support"                           ${WITH_ALL_OPTIONS} )
+option( WITH_LIBART         "Enable Libart support"                             ${WITH_ALL_OPTIONS} )
+option( WITH_ARTS           "Enable aRts support"                               ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL             "Build all" ON )
+option( BUILD_KONTACT_PLUGIN  "Build kontact_plugin " ${BUILD_ALL} )
+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 )
+
+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( src )
+add_subdirectory( tags )
+add_subdirectory( images )
+add_subdirectory( welcome )
+add_subdirectory( backgrounds )
+add_subdirectory( file-integration )
+add_subdirectory( backgrounds-previews )
+tde_conditional_add_subdirectory( BUILD_KONTACT_PLUGIN kontact_plugin )
+
+
+##### other data ################################
+
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )

ChangeLog

@@ -1,9 +0,0 @@
-   To see the Changes log, please visit
-http://basket.kde.org/changelog.php
-
-   To see which features will be implanted in the future versions,
-please visit the roadmap on
-http://basket.kde.org/roadmap.php
-
-   See it also to know the project status and other informations about
-it.

ConfigureChecks.cmake

@@ -0,0 +1,119 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_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 )
+
+
+##### check for the file program
+
+find_program( FILE_EXECUTABLE file )
+
+if( NOT FILE_EXECUTABLE )
+    tde_message_fatal( "the program 'file' is required to build basket, but was not found on your system" )
+endif()
+
+
+##### check for X11
+
+find_package( X11 )
+
+
+##### check for gpgme
+
+if( WITH_GPGME )
+pkg_search_module( GPGME gpgme )
+
+if( NOT GPGME_FOUND )
+    find_program( GPGME_CONFIG_EXECUTABLE gpgme-config )
+    if( NOT GPGME_CONFIG_EXECUTABLE )
+        tde_message_fatal( "Gpgme library is required but not found on your system" )
+    endif()
+
+    execute_process(
+        COMMAND ${GPGME_CONFIG_EXECUTABLE} --libs
+        OUTPUT_VARIABLE GPGME_LIBRARIES
+        ERROR_VARIABLE  GPGME_LIBRARIES
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_STRIP_TRAILING_WHITESPACE
+    )
+    execute_process(
+        COMMAND ${GPGME_CONFIG_EXECUTABLE} --cflags
+        OUTPUT_VARIABLE GPGME_CFLAGS
+        ERROR_VARIABLE  GPGME_CFLAGS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_STRIP_TRAILING_WHITESPACE
+    )
+    string( REGEX MATCHALL "-I([^ ]*)" GPGME_INCLUDE_FLAGS "${GPGME_CFLAGS}" )
+    string( REGEX REPLACE "-I" "" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_FLAGS}" )
+    set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" CACHE INTERNAL "" )
+    set( GPGME_LIBRARIES "${GPGME_LIBRARIES}" CACHE INTERNAL "" )
+    set( HAVE_LIBGPGME 1 )
+ else()
+    set( HAVE_LIBGPGME 1 )
+endif( NOT GPGME_FOUND )
+endif( WITH_GPGME )
+
+
+##### check for aRts
+
+if( WITH_ARTS )
+    pkg_search_module( ARTS  arts  )
+    pkg_search_module( ARTSC artsc )
+    find_library( ARTSKDE artskde )
+
+    if( ARTSKDE )
+        set( ARTSKDE_LIBRARIES artskde-shared )
+    endif()
+
+   if( (NOT ARTS_FOUND) OR (NOT ARTSKDE) )
+       tde_message_fatal( "aRts support has been requested but was not found on your system." )
+    else()
+       set( WITH_ARTS 1 )
+   endif()
+endif( WITH_ARTS )
+
+
+##### check for libart-lgpl
+
+if ( WITH_LIBART )
+pkg_search_module( LIBART libart libart_lgpl libart-2.0 )
+
+if( NOT LIBART_FOUND )
+    tde_message_fatal( "Libart support has been requested but was not found on your system." )
+ else()
+    set( HAVE_LIBART 1 )
+endif()
+endif( WITH_LIBART )
+
+
+##### check for kontact
+
+if( BUILD_KONTACT_PLUGIN )
+find_file( HAVE_KONTACT_HEADER "kontact/core.h" )
+
+if( NOT HAVE_KONTACT_HEADER )
+    tde_message_fatal( "kontact plugin support has been requested but kontact headers were not found on your system." )
+endif()
+endif( BUILD_KONTACT_PLUGIN )

Doxyfile

@@ -1,249 +0,0 @@
-# Doxyfile 1.4.1-KDevelop
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = basket.tdevelop
-PROJECT_NUMBER         = 1.0.3.1
-OUTPUT_DIRECTORY       = 
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = /home/seb/Programmation/basket
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.C \
-                         *.H \
-                         *.tlh \
-                         *.diff \
-                         *.patch \
-                         *.moc \
-                         *.xpm \
-                         *.dox
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = YES
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

INSTALL

@@ -1,195 +1,32 @@
-    /====================================\
-    | Quick Installation with the Wizard |
-    \====================================/
-
-Quick Instructions
-==================
-
-    The installation can easily be performed by launching the
-./installer script in a terminal and by following the instructions.
-Theire is nothing else to do.
-
-More Information
-================
-
-    In Konqueror, after having un-compressed the .tar.gz file containing
-BasKet Note Pads, choose `Open a terminal' while in the un-compressed
-folder (the same where you can read this file).
-Then, type "./installer" (without the quotes) and press Enter.
-You just have to follow the wizard.
-
-    The scrit is there just to simplify your life.
-If it does not work or you if want more control (experienced users) on
-the configure process, please read the following paragraphs.
-
-    /===================================\
-    | Standard UNIX Way of Installation |
-    \===================================/
-
 Basic Installation
 ==================
 
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Alternatively, on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
+basket relies on cmake to build.
 
-   `configure' recognizes the following options to control how it
-operates.
+Here are suggested default options:
 
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
 
-`--help'
-     Print a summary of the options to `configure', and exit.
 
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
+Requirements:
+=============
 
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+- file command (http://www.darwinsys.com/file)
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
 
-`configure' also accepts some other, not widely useful, options.
+Optional:
+=========
 
+- gpgme
+- aRts
+- libart_lgpl
+- kontact (tdepim)

Makefile.am

@@ -1,22 +0,0 @@
-SUBDIRS = $(TOPSUBDIRS)
-
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
-
-package-messages:
-	$(MAKE) -f admin/Makefile.common package-messages
-	$(MAKE) -C po merge
-
-EXTRA_DIST = admin COPYING configure.in.in
-
-dist-hook:
-	cd $(top_distdir) && perl admin/am_edit -padmin
-	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs

Makefile.cvs

@@ -1,10 +0,0 @@
-all: 
-	@echo "This Makefile is only for the CVS repository"
-	@echo "This will be deleted before making the distribution"
-	@echo ""
-	$(MAKE) -f admin/Makefile.common cvs
-
-dist:
-	$(MAKE) -f admin/Makefile.common dist
-
-.SILENT:

NEWS

@@ -1 +0,0 @@
- 

README

@@ -1,42 +0,0 @@
-    ********************
-    * BasKet Note Pads *
-    ********************
-
-  Purpose:
-************
-
-   This application provide as many baskets as you wish, and you
-can drag and drop various objects (text, URLs, images, sounds...)
-into its.
-   Objects can be edited, copied, dragged... So, you can arrange them as
-you want !
-   It's a DropDrawers clone
-(http://www.sigsoftware.com/dropdrawers/index.html) for KDE 3.
-
-   If you want to contact me, please mail me at slaout@linux62.org
-(I'm a french guy, if you prefer to speak french to me).
-
-  Project Status:
-*******************
-
-   Visit the BasKet Note Pads website at :
-http://basket.kde.org/
-   You can find screenshots of it at :
-http://basket.kde.org/screenshots.php
-   For project status, please see the TODO file of this project at :
-http://basket.kde.org/todo.php
-   You also can see the project roadmap for near versions planned
-   features at :
-http://basket.kde.org/roadmap.php
-   See changes log at :
-http://basket.kde.org/changelog.php
-   And finaly, new versions will be announced here :
-http://basket.kde.org/news.php
-   If you want to be noticed of new versions, subscribe to the RSS feed,
-   available with explanations here:
-http://basket.kde.org/rss.php
-
-  Install:
-************
-
-   Please see the INSTALL file.

README.md

@@ -0,0 +1,37 @@
+
+ basket - a multi-purpose note-taking application for TDE.
+
+
+Basket is a DropDrawers clone. (http://www.sigsoftware.com/dropdrawers)
+
+It provides as many baskets (drawers) as you wish, several kinds of
+objects (texts, URLs, images,...) can be drag-n-drop'd into it.
+
+Objects can be edited, copied, dragged, in short, they can be arranged
+according to users' will. Moreover Basket allows you to keep all objects
+you want in one place, keep data at hand, take notes...
+
+.
+
+Contributing
+--------------
+
+If you wish to contribute to basket, you might do so:
+
+- TDE Gitea Workspace (TGW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/gitea
+
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/weblate
+
+
+Translations status
+---------------------
+
+### messages
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/basket/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/basket/)
+
+### desktop files
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/basket-desktop-files/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/basket-desktop-files/)

TODO

@@ -1,9 +0,0 @@
-   To see the TODO List, please visit
-http://basket.kde.org/todo.php
-
-   To see which features will be implanted in the future versions,
-please visit the roadmap on
-http://basket.kde.org/roadmap.php
-
-   See it also to know the project status and other informations about
-it.

admin

@@ -1 +0,0 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af

backgrounds-previews/CMakeLists.txt

@@ -0,0 +1,6 @@
+file( GLOB _pngs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png )
+
+install(
+    FILES ${_pngs}
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/backgrounds/previews
+)

backgrounds-previews/Makefile.am

@@ -1,15 +0,0 @@
-backgroundspreviewsdir = $(kde_datadir)/basket/backgrounds/previews
-backgroundspreviews_DATA = \
-	abstract.png \
-	alien-artifact.png \
-	basket-title.png \
-	green-curves.png \
-	light.png \
-	painting.png \
-	pens.png \
-	pins.png \
-	rainbow-balls.png \
-	rounds-line.png \
-	strings.png \
-	todo.png \
-	working.png

backgrounds/CMakeLists.txt

@@ -0,0 +1,6 @@
+file( GLOB _pngs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png )
+
+install(
+    FILES ${_pngs} alien-artifact.png.config
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/backgrounds
+)

backgrounds/Makefile.am

@@ -1,15 +0,0 @@
-backgroundsdir = $(kde_datadir)/basket/backgrounds
-backgrounds_DATA = \
-	abstract.png \
-	alien-artifact.png alien-artifact.png.config \
-	basket-title.png \
-	green-curves.png \
-	light.png \
-	painting.png \
-	pens.png \
-	pins.png \
-	rainbow-balls.png \
-	rounds-line.png \
-	strings.png \
-	todo.png \
-	working.png

basket.spec

@@ -1,53 +0,0 @@
-%define name basket
-%define version 1.0.3.1
-%define release mantic0
-
-Summary: Taking care of your ideas.
-Name: %{name}
-Version: %{version}
-Release: %{release}
-License: GPL
-Vendor: slaout@linux62.org
-Url: http://basket.kde.org/
-Packager: packages@mantic.org
-Group: Utils
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}
-
-%description
-Taking care of your ideas.
-A note-taking application that makes it easy to write down ideas as you think, and quickly find them back later. Organizing your notes has never been so easy.
-
-%prep
-%setup
-if [ "`tde-config --prefix`" ]; then
-	CONFIGURE_PREFIX="`tde-config --prefix`"
-elif [ "${TDEDIR}" ]; then
-	CONFIGURE_PREFIX="${TDEDIR}"
-elif [ -d "/opt/kde" ]; then
-	CONFIGURE_PREFIX="/opt/kde"
-elif [ -d "/opt/trinity" ]; then
-	CONFIGURE_PREFIX="/opt/trinity"
-else
-	CONFIGURE_PREFIX="/usr"
-fi
-./configure --prefix="${CONFIGURE_PREFIX}" --enable-final
-
-%build
-%configure
-#%make
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /var/tmp/file.list.%{name}
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >>  /var/tmp/file.list.%{name}
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >>  /var/tmp/file.list.%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT/*
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-rm -rf /var/tmp/file.list.%{name}
-
-%files -f /var/tmp/file.list.%{name}

basket.tdevelop

@@ -1,293 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
-  <general>
-    <author>Sébastien Laoût</author>
-    <email>slaout@linux62.org</email>
-    <version>1.0.3.1</version>
-    <projectmanagement>KDevKDEAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>C++</keyword>
-      <keyword>Code</keyword>
-      <keyword>Qt</keyword>
-      <keyword>KDE</keyword>
-    </keywords>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description>Taking care of your ideas.</description>
-    <ignoreparts>
-      <part>kdevfileview</part>
-      <part>kdevfileselector</part>
-    </ignoreparts>
-    <secondaryLanguages/>
-    <versioncontrol>kdevsubversion</versioncontrol>
-    <projectname>basket</projectname>
-    <defaultencoding></defaultencoding>
-  </general>
-  <kdevautoproject>
-    <general>
-      <activetarget>src/basket</activetarget>
-      <useconfiguration>debug</useconfiguration>
-    </general>
-    <run>
-      <mainprogram>/home/seb/Programmation/basket/debug/src/.libs/basket</mainprogram>
-      <directoryradio>build</directoryradio>
-      <customdirectory>/</customdirectory>
-      <programargs>--nofork --use-drkonquy --data-folder ~/.trinity/share/apps/basket-debug</programargs>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <envvars>
-        <envvar value="en_US" name="KDE_LANG" />
-        <envvar value="$HOME/kde-debug/lib:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" />
-        <envvar value="$HOME/kde-debug:$PATH" name="PATH" />
-      </envvars>
-      <runarguments>
-        <basket/>
-      </runarguments>
-      <globaldebugarguments></globaldebugarguments>
-      <globalcwd>/home/seb/Programmation/basket/debug</globalcwd>
-      <useglobalprogram>true</useglobalprogram>
-      <autoinstall>false</autoinstall>
-      <autotdesu>false</autotdesu>
-    </run>
-    <configurations>
-      <optimized>
-        <builddir>optimized</builddir>
-        <ccompiler>GccOptions</ccompiler>
-        <cxxcompiler>GppOptions</cxxcompiler>
-        <f77compiler>G77Options</f77compiler>
-        <cxxflags>-O2 -g0</cxxflags>
-      </optimized>
-      <debug>
-        <configargs>--enable-debug=full --without-arts --prefix=$HOME/kde-debug</configargs>
-        <builddir>debug</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
-        <cxxflags>-O0 -g3</cxxflags>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cflags/>
-        <f77flags/>
-        <envvars/>
-      </debug>
-    </configurations>
-    <make>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-      <abortonerror>true</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-      <runmultiplejobs>false</runmultiplejobs>
-    </make>
-  </kdevautoproject>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*.po;*.ts" name="Translations" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <showvcsfields>false</showvcsfields>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>gtk</toc>
-      <toc>gnustep</toc>
-      <toc>python</toc>
-      <toc>php</toc>
-      <toc>perl</toc>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash_bugs</toc>
-      <toc>bash</toc>
-      <toc>gnome1</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>perl_bugs</toc>
-      <toc>php_bugs</toc>
-      <toc>python_bugs</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>sw</toc>
-      <toc>wxwindows_bugs</toc>
-    </ignoretocs>
-    <projectdoc>
-      <userdocDir>html/</userdocDir>
-      <apidocDir>html/</apidocDir>
-    </projectdoc>
-    <ignoreqt_xml/>
-    <ignoredoxygen/>
-    <ignorekdocs/>
-    <ignoredevhelp>
-      <toc>atk</toc>
-      <toc>gdk</toc>
-      <toc>libgimpbase</toc>
-      <toc>libgimpcolor</toc>
-      <toc>libgimp</toc>
-      <toc>libgimpmath</toc>
-      <toc>libgimpmodule</toc>
-      <toc>libgimpwidgets</toc>
-      <toc>glib</toc>
-      <toc>gobject</toc>
-      <toc>gtk</toc>
-      <toc>pango</toc>
-      <toc>gdk-pixbuf</toc>
-    </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell>libtool</dbgshell>
-      <programargs>-d --nofork --use-drkonquy --data-folder ~/.trinity/share/apps/basket-debug</programargs>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>true</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
-    <cvsoptions>-f</cvsoptions>
-    <commitoptions/>
-    <addoptions/>
-    <logoptions/>
-    <updateoptions>-dP</updateoptions>
-    <removeoptions>-f</removeoptions>
-    <revertoptions>-C -d -P</revertoptions>
-    <diffoptions>-u3 -p</diffoptions>
-    <rshoptions/>
-  </kdevcvs>
-  <kdevcppsupport>
-    <references>
-      <pcs>Qt</pcs>
-    </references>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>true</includeTypedefs>
-      <automaticCodeCompletion>false</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>100</codeCompletionDelay>
-      <argumentsHintDelay>100</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
-      <completionBoxItemOrder>0</completionBoxItemOrder>
-      <howEvaluationContextMenu>true</howEvaluationContextMenu>
-      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
-      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
-      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
-      <processPrimaryTypes>true</processPrimaryTypes>
-      <processFunctionArguments>true</processFunctionArguments>
-      <preProcessAllHeaders>false</preProcessAllHeaders>
-      <parseMissingHeaders>false</parseMissingHeaders>
-      <resolveIncludePaths>true</resolveIncludePaths>
-      <alwaysParseInBackground>true</alwaysParseInBackground>
-      <usePermanentCaching>true</usePermanentCaching>
-      <alwaysIncludeNamespaces>true</alwaysIncludeNamespaces>
-      <includePaths>.;</includePaths>
-    </codecompletion>
-    <creategettersetter>
-      <prefixGet></prefixGet>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>value</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <qt>
-      <used>true</used>
-      <version>3</version>
-      <root>/usr/share/qt3</root>
-      <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake>/usr/bin/qmake-qt3</qmake>
-      <designer>/usr/bin/designer-qt3</designer>
-      <designerpluginpaths/>
-    </qt>
-    <splitheadersource>
-      <enabled>false</enabled>
-      <synchronize>true</synchronize>
-      <orientation>Vertical</orientation>
-    </splitheadersource>
-  </kdevcppsupport>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem/>
-      <docurl/>
-      <usermanualurl/>
-    </projectdoc>
-  </kdevdocumentation>
-  <dist>
-    <custom>false</custom>
-    <bzip>false</bzip>
-    <archname>basket-%v.tar.gz</archname>
-    <appname>basket</appname>
-    <version>1.0.3.1</version>
-    <release/>
-    <vendor/>
-    <licence/>
-    <summary/>
-    <group/>
-    <packager/>
-    <description>Taking care of your ideas.</description>
-    <changelog/>
-    <devpackage>false</devpackage>
-    <docspackage>false</docspackage>
-    <appicon>false</appicon>
-    <arch>0</arch>
-    <genHTML>false</genHTML>
-    <useRPM>false</useRPM>
-    <ftpkde>false</ftpkde>
-    <appskde>false</appskde>
-    <url/>
-  </dist>
-  <ctagspart>
-    <customArguments/>
-    <customTagfilePath/>
-  </ctagspart>
-</tdevelop>

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

config.h.cmake

@@ -0,0 +1,17 @@
+#define VERSION "@VERSION@"
+
+// 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@
+
+/* Defined if you have the libgpgme library */ 
+#cmakedefine HAVE_LIBGPGME 1
+
+/* Defined if you have the aRts library */
+#cmakedefine WITH_ARTS 1
+
+/* Defined if you have the libart-lgpl library */
+#cmakedefine HAVE_LIBART 1

config.h.in

@@ -1,253 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-#undef HAVE_CARBON_CARBON_H
-
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#undef HAVE_CRT_EXTERNS_H
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if libgpgme is available */
-#undef HAVE_LIBGPGME
-
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
-
-/* Define if you have res_init */
-#undef HAVE_RES_INIT
-
-/* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Define a safe value for MAXPATHLEN */
-#undef KDEMAXPATHLEN
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Defined if compiling without arts */
-#undef WITHOUT_ARTS
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-
-#if !defined(HAVE_RES_INIT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int res_init(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCAT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcat(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCPY_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcpy(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-
-
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-
-
-/* type to use in place of socklen_t if not defined */
-#undef kde_socklen_t
-
-/* type to use in place of socklen_t if not defined (deprecated, use
-   kde_socklen_t) */
-#undef ksize_t

configure.files

@@ -1,3 +0,0 @@
-./admin/configure.in.min
-configure.in.in
-configure.in.bot

configure.in

@@ -1,217 +0,0 @@
-dnl =======================================================
-dnl FILE: ./admin/configure.in.min
-dnl =======================================================
-
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
- 
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
- 
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
- 
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl    Boston, MA 02110-1301, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(basket, '1.0.3.1') dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-KDE_USE_QT(3.0.0)
-AC_PATH_KDE
-dnl =======================================================
-dnl FILE: configure.in.in
-dnl =======================================================
-
-#MIN_CONFIG(3.0.0)
-
-dnl PACKAGE set before
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-KDE_CHECK_LARGEFILE
-
-dnl -----------------------------------------------------------------
-dnl AC_LIB_GPGME([ACTION-IF-TRUE], [ACTION-IF-FALSE])
-dnl -----------------------------------------------------------------
-
-OPTION="  --with-encryption=yes/no   compile with encryption support (gpgme)"
-
-AC_DEFUN([AC_ENCRYPTION], [
-  AH_TEMPLATE([HAVE_LIBGPGME], [Define if libgpgme is available])
-
-  AC_ARG_WITH(encryption, [$OPTION], [
-    if test "$withval" = "no"; then
-      ac_gpg=
-      $2
-    elif test "$withval" = "yes"; then
-      ac_gpg=yes
-    else
-      ac_gpg=yes
-    fi
-  ],[ac_gpg=yes])
-
-  if test "$ac_gpg" != ""; then
-    AM_PATH_GPGME(1.0.0, ac_libgpgme=yes, ac_libgpgme=no)
-    AM_PATH_GPG_ERROR(1.0, ac_libgpgerror=yes, ac_libgpgerror=no)
-
-    if test "$ac_libgpgme" != "no" -a "$ac_libgpgerror" != "no"; then
-      AC_DEFINE([HAVE_LIBGPGME])
-      ac_have_gpgme="yes"
-      $1
-    else
-      :
-      $2
-    fi
-  fi
-  AM_CONDITIONAL(HAVE_LIBGPGME, test "$ac_have_gpgme" = "yes")
-])
-
-AC_ENCRYPTION([], [basket_warning_gpgme=yes])
-
-KDE_CHECK_HEADER(kontact/core.h, [KONTACT_SUBDIR="yes"], [KONTACT_SUBDIR="no"])
-
-if test "$KONTACT_SUBDIR" = "no"; then
-	basket_warning_kontact=yes
-	DO_NOT_COMPILE="$DO_NOT_COMPILE kontact_plugin"
-fi
-
-KDE_CREATE_SUBDIRSLIST
-AC_CONFIG_FILES([ Makefile ])
-AC_CONFIG_FILES([ backgrounds/Makefile ])
-AC_CONFIG_FILES([ backgrounds-previews/Makefile ])
-AC_CONFIG_FILES([ doc/Makefile ])
-AC_CONFIG_FILES([ doc/en/Makefile ])
-AC_CONFIG_FILES([ file-integration/Makefile ])
-AC_CONFIG_FILES([ images/Makefile ])
-AC_CONFIG_FILES([ kontact_plugin/Makefile ])
-AC_CONFIG_FILES([ po/Makefile ])
-AC_CONFIG_FILES([ src/Makefile ])
-AC_CONFIG_FILES([ tags/Makefile ])
-AC_CONFIG_FILES([ welcome/Makefile ])
-AC_OUTPUT
-# configure.in.bot
-# This file is used for printing important messages at the end of configure
-
-echo ""
-
-if test x$basket_warning_gpgme = xyes; then
-    echo " ===================================="
-    echo " ===  BasKet Note Pads - WARNING  ==================================="
-    echo " ===================================="
-    echo " ="
-    echo " = BasKet Note Pads requires gpgme version 1.0 and"
-    echo " = libgpg-error version 1.0."
-    echo " = BasKet Note Pads will still be built, but there is no encryption."
-    echo " ="
-    echo " = Packages you need to install if you want encryption:"
-    echo " =  Suse:         gpgme-devel"
-    echo " =  Kubuntu:      libgpgme11-dev"
-    echo " =  Fedora Core:  gpgme-devel"
-    echo " =  Mandriva:     libgpgme11-devel"
-    echo " =  Gentoo:       app-crypt/gpgme"
-    echo " ="
-fi
-
-if test x$basket_warning_kontact = xyes; then
-    echo " ===================================="
-    echo " ===  BasKet Note Pads - WARNING  ==================================="
-    echo " ===================================="
-    echo " ="
-    echo " = BasKet Note Pads requires tdepim."
-    echo " = BasKet Note Pads will still be built, but there is no"
-    echo " = Kontact integration."
-    echo " ="
-    echo " = Packages you need to install if you want Kontact integration:"
-    echo " =  Suse:         tdepim3-devel"
-    echo " =  Kubuntu:      tdepim-dev"
-    echo " =  Fedora Core:  tdepim-devel"
-    echo " =  Mandriva:     libtdepim2-common-devel & libtdepim2-kontact-devel"
-    echo " =  Gentoo:       kde-base/kontact"
-    echo " ="
-fi
-# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
-if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
-  # And if so, warn when they don't match
-  if test "$kde_libs_prefix" != "$given_prefix"; then
-    # And if kde doesn't know about the prefix yet
-    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
-    if test $? -ne 0; then
-      echo ""
-      echo "Warning: you chose to install this package in $given_prefix,"
-      echo "but KDE was found in $kde_libs_prefix."
-      echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
-      echo "Then restart KDE."
-      echo ""
-    fi
-  fi
-fi
-
-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
-  echo ""
-  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
-  echo "was not included. Therefore, GCC symbol visibility support remains disabled."
-  echo ""
-  echo "For better performance, consider including the Qt visibility supporting patch"
-  echo "located at:"
-  echo ""
-  echo "http://bugs.kde.org/show_bug.cgi?id=109386"
-  echo ""
-  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
-  echo "everything will continue to work just fine without it."
-  echo ""
-fi
-
-if test "$all_tests" = "bad"; then
-  if test ! "$cache_file" = "/dev/null"; then
-    echo ""
-    echo "Please remove the file $cache_file after changing your setup"
-    echo "so that configure will find the changes next time."
-    echo ""
-  fi
-else
-  echo ""
-  echo "Good - your configure finished. Start make now"
-  echo ""
-fi

configure.in.bot

@@ -1,40 +0,0 @@
-# configure.in.bot
-# This file is used for printing important messages at the end of configure
-
-echo ""
-
-if test x$basket_warning_gpgme = xyes; then
-    echo " ===================================="
-    echo " ===  BasKet Note Pads - WARNING  ==================================="
-    echo " ===================================="
-    echo " ="
-    echo " = BasKet Note Pads requires gpgme version 1.0 and"
-    echo " = libgpg-error version 1.0."
-    echo " = BasKet Note Pads will still be built, but there is no encryption."
-    echo " ="
-    echo " = Packages you need to install if you want encryption:"
-    echo " =  Suse:         gpgme-devel"
-    echo " =  Kubuntu:      libgpgme11-dev"
-    echo " =  Fedora Core:  gpgme-devel"
-    echo " =  Mandriva:     libgpgme11-devel"
-    echo " =  Gentoo:       app-crypt/gpgme"
-    echo " ="
-fi
-
-if test x$basket_warning_kontact = xyes; then
-    echo " ===================================="
-    echo " ===  BasKet Note Pads - WARNING  ==================================="
-    echo " ===================================="
-    echo " ="
-    echo " = BasKet Note Pads requires tdepim."
-    echo " = BasKet Note Pads will still be built, but there is no"
-    echo " = Kontact integration."
-    echo " ="
-    echo " = Packages you need to install if you want Kontact integration:"
-    echo " =  Suse:         tdepim3-devel"
-    echo " =  Kubuntu:      tdepim-dev"
-    echo " =  Fedora Core:  tdepim-devel"
-    echo " =  Mandriva:     libtdepim2-common-devel & libtdepim2-kontact-devel"
-    echo " =  Gentoo:       kde-base/kontact"
-    echo " ="
-fi

configure.in.in

@@ -1,55 +0,0 @@
-#MIN_CONFIG(3.0.0)
-
-KDE_ENABLE_HIDDEN_VISIBILITY
-
-AM_INIT_AUTOMAKE(basket, '1.0.3.1')
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-KDE_CHECK_LARGEFILE
-
-dnl -----------------------------------------------------------------
-dnl AC_LIB_GPGME([ACTION-IF-TRUE], [ACTION-IF-FALSE])
-dnl -----------------------------------------------------------------
-
-OPTION="  --with-encryption=yes/no   compile with encryption support (gpgme)"
-
-AC_DEFUN([AC_ENCRYPTION], [
-  AH_TEMPLATE([HAVE_LIBGPGME], [Define if libgpgme is available])
-
-  AC_ARG_WITH(encryption, [$OPTION], [
-    if test "$withval" = "no"; then
-      ac_gpg=
-      $2
-    elif test "$withval" = "yes"; then
-      ac_gpg=yes
-    else
-      ac_gpg=yes
-    fi
-  ],[ac_gpg=yes])
-
-  if test "$ac_gpg" != ""; then
-    AM_PATH_GPGME(1.0.0, ac_libgpgme=yes, ac_libgpgme=no)
-    AM_PATH_GPG_ERROR(1.0, ac_libgpgerror=yes, ac_libgpgerror=no)
-
-    if test "$ac_libgpgme" != "no" -a "$ac_libgpgerror" != "no"; then
-      AC_DEFINE([HAVE_LIBGPGME])
-      ac_have_gpgme="yes"
-      $1
-    else
-      :
-      $2
-    fi
-  fi
-  AM_CONDITIONAL(HAVE_LIBGPGME, test "$ac_have_gpgme" = "yes")
-])
-
-AC_ENCRYPTION([], [basket_warning_gpgme=yes])
-
-KDE_CHECK_HEADER(kontact/core.h, [KONTACT_SUBDIR="yes"], [KONTACT_SUBDIR="no"])
-
-if test "$KONTACT_SUBDIR" = "no"; then
-	basket_warning_kontact=yes
-	DO_NOT_COMPILE="$DO_NOT_COMPILE kontact_plugin"
-fi
-

doc/Makefile.am

@@ -1,6 +0,0 @@
-# the SUBDIRS is filled automatically by am_edit. If files are 
-# in this directory they are installed into the english dir
-
-KDE_LANG = en
-KDE_DOCS = basket
-SUBDIRS = $(AUTODIRS)  

doc/en/Makefile.am

@@ -1,2 +0,0 @@
-KDE_DOCS = basket
-KDE_LANG = en

doc/man/basket.1

@@ -0,0 +1,171 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH BasKet "1" "February 2007" "BasKet 1.0"
+.SH NAME
+BasKet
+.SH SYNOPSIS
+.B basket
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfile\fR]
+.SH DESCRIPTION
+BasKet is a application to allow you to quickly take notes, save your ideas and assist in quickly find them later.
+Organizing your notes has never been so easy.
+Basket also allows integration with Kontact and rest of TDE environment.
+
+.SH OPTIONS
+.SS "BasKet options:"
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Show the debug window
+.HP
+\fB\-f\fR, \fB\-\-data\-folder\fR <folder> Custom folder where to load and save basket data and application data (useful for debugging purpose)
+.TP
+\fB\-h\fR, \fB\-\-start\-hidden\fR
+Hide the main window in the system tray icon on startup
+.TP
+\fB\-k\fR, \fB\-\-use\-drkonquy\fR
+When crashing, use the standard TDE report dialog instead of sending an email
+.SS "Arguments:"
+.TP
+file
+Open basket archive or template
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-tqt\fR
+Show TQt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "TQt options:"
+.TP
+\fB\-\-display\fR <displayname>
+Use the X\-server display 'displayname'
+.TP
+\fB\-\-session\fR <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+\fB\-\-cmap\fR
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+\fB\-\-ncols\fR <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+\fB\-\-nograb\fR
+tells TQt to never grab the mouse or the keyboard
+.TP
+\fB\-\-dograb\fR
+running under a debugger can cause an implicit
+\fB\-nograb\fR, use \fB\-dograb\fR to override
+.TP
+\fB\-\-sync\fR
+switches to synchronous mode for debugging
+.TP
+\fB\-\-fn\fR, \fB\-\-font\fR <fontname>
+defines the application font
+.TP
+\fB\-\-bg\fR, \fB\-\-background\fR <color> sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.HP
+\fB\-\-fg\fR, \fB\-\-foreground\fR <color> sets the default foreground color
+.TP
+\fB\-\-btn\fR, \fB\-\-button\fR <color>
+sets the default button color
+.TP
+\fB\-\-name\fR <name>
+sets the application name
+.TP
+\fB\-\-title\fR <title>
+sets the application title (caption)
+.TP
+\fB\-\-visual\fR TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+\fB\-\-inputstyle\fR <inputstyle> sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+\fB\-\-im\fR <XIM server>
+set XIM server
+.TP
+\fB\-\-noxim\fR
+disable XIM
+.TP
+\fB\-\-reverse\fR
+mirrors the whole layout of widgets
+.SS "TDE options:"
+.TP
+\fB\-\-caption\fR <caption>
+Use 'caption' as name in the titlebar
+.TP
+\fB\-\-icon\fR <icon>
+Use 'icon' as the application icon
+.TP
+\fB\-\-miniicon\fR <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+\fB\-\-config\fR <filename>
+Use alternative configuration file
+.TP
+\fB\-\-dcopserver\fR <server>
+Use the DCOP Server specified by 'server'
+.TP
+\fB\-\-nocrashhandler\fR
+Disable crash handler, to get core dumps
+.TP
+\fB\-\-waitforwm\fR
+Waits for a WM_NET compatible windowmanager
+.TP
+\fB\-\-style\fR <style>
+sets the application GUI style
+.TP
+\fB\-\-geometry\fR <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.TP
+\fB\-\-nofork\fR
+Don't run in the background.
+.SH "SEE ALSO"
+The full documentation for
+.B BasKet:
+is maintained as a TDE help file. 
+If TDE, Konqueror and KHelpcenter is fully installed on your computer, accessing
+.IP
+.B help:/basket
+.PP
+should give you access to the complete manual.
+.SH "AUTHOR"
+.B BasKet 
+Note Pads was written by
+.IP
+S\['e]bastien Lao\[^u]t <slaout@linux62.org>
+.IP
+Petri Damst\['e]n <damu@iki.fi>
+.IP
+Alex Gontmakher <gsasha@cs.technion.ac.il>
+.IP
+Marco Martin <m4rt@libero.it>
+.PP
+Please report bugs to slaout@linux62.org.
+.SH "OTHER"
+This manpage is derived from help2man by Sune Vuorela <debian@pusling.com> for the Debian project (But may be used by others). License: GPL2 like BasKet

file-integration/CMakeLists.txt

@@ -0,0 +1,62 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### basketthumbcreator (kpart)
+
+tde_add_kpart( basketthumbcreator MODULE AUTOMOC
+
+  SOURCES
+        basketthumbcreator.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kjs-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons()
+
+
+##### other data
+
+add_custom_command(
+  OUTPUT basket.magic.mgc
+  COMMAND ${FILE_EXECUTABLE} -C -m ${CMAKE_CURRENT_SOURCE_DIR}/basket.magic
+)
+
+add_custom_target(
+  basket_magic_mgc
+  ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/basket.magic.mgc
+)
+
+install(
+    FILES basket.magic ${CMAKE_CURRENT_BINARY_DIR}/basket.magic.mgc
+    DESTINATION ${CONFIG_INSTALL_DIR}/magic
+)
+
+tde_create_translated_desktop(
+    SOURCE x-basket-archive.desktop x-basket-template.desktop
+    DESTINATION ${MIME_INSTALL_DIR}/application
+)
+
+tde_create_translated_desktop(
+    SOURCE basketthumbcreator.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)

file-integration/Makefile.am

@@ -1,23 +0,0 @@
-# MIME Types Information:
-applicationmimedir = $(kde_mimedir)/application
-applicationmime_DATA = x-basket-archive.desktop x-basket-template.desktop
-
-# Magic MIME Types Discovery:
-magicdir = $(kde_confdir)/magic
-magic_DATA = basket.magic
-
-# Thumbnail Creator:
-INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = basketthumbcreator.la
-basketthumbcreator_la_SOURCES = basketthumbcreator.cpp
-basketthumbcreator_la_LIBADD = $(LIB_TDEIO)
-basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
-kde_services_DATA = basketthumbcreator.desktop
-
-# Icons:
-KDE_ICON = AUTO
-#kde_icon_KDEICON = \
-#	cr128-mimetype-baskets.png cr16-mimetype-baskets.png cr22-mimetype-baskets.png \
-#	cr32-mimetype-baskets.png  cr48-mimetype-baskets.png cr64-mimetype-baskets.png \
-#	cr128-mimetype-baskett.png cr16-mimetype-baskett.png cr22-mimetype-baskett.png \
-#	cr32-mimetype-baskett.png  cr48-mimetype-baskett.png cr64-mimetype-baskett.png

file-integration/basketthumbcreator.desktop

@@ -1,18 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=Service
 Name=Basket Archives & Templates
-Name[de]=Korbarchiv und Korbvorlagen
-Name[es]=Archivo de cestas y plantillas
-Name[fr]=Archive de paniers et modèles
-Name[it]=Archivi e modelli di canestri
-Name[ja]=バスケットアーカイブとテンプレート
-Name[nb]=Kurvarkiv og kurvmaler
-Name[nn]=Korgarkiv og korgmalar
-Name[pt]=Arquivos e modelos de cestos
-Name[ru]=Шаблоны и контейнеры Basket
-Name[tr]=Basket Arşivleri & Şablonları
-X-TDE-ServiceTypes=ThumbCreator
+
+Type=Service
+Encoding=UTF-8
 MimeTypes=application/x-basket-archive,application/x-basket-template
 CacheThumbnail=true
+X-TDE-ServiceTypes=ThumbCreator
 X-TDE-Library=basketthumbcreator

file-integration/x-basket-archive.desktop

@@ -1,17 +1,8 @@
 [Desktop Entry]
+Comment=Basket Archive
+
+Type=MimeType
 Encoding=UTF-8
 MimeType=application/x-basket-archive
-Type=MimeType
-Comment=Basket Archive
-Comment[de]=Korbarchiv
-Comment[es]=Archivo de cestas
-Comment[fr]=Archive de paniers
-Comment[it]=Archivio di canestri
-Comment[ja]=バスケットアーカイブ
-Comment[nb]=Kurvarkiv
-Comment[nn]=Korgarkiv
-Comment[pt]=Ficheiro de cestos
-Comment[ru]=Контейнер Basket
-Comment[tr]=Basket Arşivi
 Icon=baskets
 Patterns=*.baskets

file-integration/x-basket-template.desktop

@@ -1,17 +1,8 @@
 [Desktop Entry]
+Comment=Basket Template
+
+Type=MimeType
 Encoding=UTF-8
 MimeType=application/x-basket-template
-Type=MimeType
-Comment=Basket Template
-Comment[de]=Korbvorlage
-Comment[es]=Plantilla de cesta
-Comment[fr]=Modèle de panier
-Comment[it]=Modello di canestri
-Comment[ja]=バスケットテンプレート
-Comment[nb]=Kurvmal
-Comment[nn]=Korgmal
-Comment[pt]=Modelo de cesto
-Comment[ru]=Шаблон корзины
-Comment[tr]=Basket Şabolonu
 Icon=baskett
 Patterns=*.baskett

images/CMakeLists.txt

@@ -0,0 +1,6 @@
+file( GLOB _pngs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png )
+
+install(
+    FILES ${_pngs}
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/images
+)

images/Makefile.am

@@ -1,4 +0,0 @@
-imagesdir = $(kde_datadir)/basket/images
-images_DATA = insertion_help.png \
-              tag_export_help.png \
-              tag_export_on_every_lines_help.png

installer

@@ -1,233 +0,0 @@
-#!/bin/bash
-
-function error
-{
-  echo ""
-  echo "    ========================================================================  "
-  echo "  ((                      An Error has Been Encountered                     ))"
-  echo "    ========================================================================  "
-  echo ""
-  echo ""
-  echo "        In the most cases, some libraries are missing or cannot be found."
-  echo "      Think to install the *-dev or *-devel packages of your distribution."
-  echo "                     For example, if libmng cannot be found,"
-  echo "  please check if libmng AND libmng-devel packages are installed on your system."
-  echo "      See the reported errors to know which librarie need to be installed."
-  echo ""
-  echo $'\a' # Beep to avert user of the error
-  exit 1
-}
-
-##echo "  ((                      An error has been encountered                     ))"
-##echo "  ((654321 987654321 987654321 98765432  23456789 123456789 123456789 123456))"
-##echo" ((654321 987654321 987654321 98765432  23456789 123456789 123456789 123456))"
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((                    BasKet Note Pads Quick Installer                    ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-echo "              Welcome to the BasKet Note Pads installer assistant."
-echo "             It will configure, build and install BasKet Note Pads."
-echo ""
-echo ""
-echo "                             What do you want to do?"
-echo ""
-echo "  1/ Install BasKet Note Pads system wide (you will need the root password)"
-echo "  2/ Install BasKet Note Pads in your user folder"
-#echo "  3/ Uninstall BasKet Note Pads (you should not: it is so fantastic ;-) )"
-echo ""
-
-echo -n "Your choice (default is 1): "
-read -n 1 WHAT_TO_DO
-echo ""
-
-if [ "_$WHAT_TO_DO" == "_2" ]; then
-  SYS_WIDE=0
-  WHAT_TO_DO=2 # To transform it from string to int
-else
-#  if [ $WHAT_TO_DO == 3 ]; then
-#    SYS_WIDE=1
-#  else  # [ WHAT_TO_DO == 1 ] or default
-    SYS_WIDE=1
-    WHAT_TO_DO=1 # If user entered another number than those he should
-#  fi
-fi
-
-if [ $SYS_WIDE == 0 ]; then
-  prefix=`tde-config --localprefix --expandvars`
-else
-  prefix=`tde-config --prefix --expandvars`
-fi
-
-# Uninstall of BasKet:
-if [ $WHAT_TO_DO == 3 ]; then
-  # Search installed basket:
-  prefix=`tde-config --localprefix --expandvars` # First loacally
-  if [ -f $prefix/bin/basket ]; then
-    SYS_WIDE=0
-  else
-    prefix=`tde-config --prefix --expandvars`    # And then system wide
-    if [ -f $prefix/bin/basket ]; then
-      SYS_WIDE=1
-    else
-      echo "BasKet Note Pads does not seem to be installed."
-      exit 1
-    fi
-  fi
-  # TODO: Also definitively remove your baskets?
-  # At this stage, SYS_WIDE and prefix are set and uninstall can begin:
-  if [ $SYS_WIDE == 1 ]; then
-    su
-    make uninstall || ./configure --prefix=$prefix && make uninstall
-    logout
-  else
-    make uninstall || ./configure --prefix=$prefix && make uninstall
-  fi
-  exit 0
-fi
-
-appVersion=$(cat basket.spec | grep "%define version " | cut -d " " -f 3)
-isDevel=$(echo "$appVersion" | grep -i -E "(alpha|beta|pre|rc|svn)")
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((                    BasKet Note Pads Quick Installer                    ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-echo ""
-echo ""
-echo "      If you do not know what they are, you can ignore errors or warnings."
-echo ""
-echo "                      The process can take several minutes."
-echo "                  A beep will notify you when it will be done."
-echo "                              Press ENTER to start."
-echo ""
-echo ""
-
-read -s -n 1 # read 1 character without echo, ended by ENTER
-
-if [ ! -e configure ]; then
-  clear
-  echo ""
-  echo "    ========================================================================  "
-  echo "  ((                          Preparation from SVN                          ))"
-  echo "    ========================================================================  "
-  echo ""
-  echo ""
-
-  echo "make -f Makefile.cvs"
-  make -f Makefile.cvs || error
-fi
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((                       Step 1 / 3 : Configuration                       ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-
-if [ "_$isDevel" == "_" ]; then
-  echo "./configure --prefix=$prefix"
-  ./configure --prefix=$prefix || error
-else
-  echo "./configure --enable-debug=full --prefix=$prefix"
-  ./configure --enable-debug=full --prefix=$prefix || error
-fi
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((                        Step 2 / 3 : Compilation                        ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-
-echo "make"
-make || error
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((                        Step 3 / 3 : Installation                       ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-echo "                 The application has successfuly been compiled."
-echo ""
-echo ""
-
-echo $'\a' # Beep to avert user the configuration/compilation is ended and he must act to enter the password
-
-if [ "_$SYS_WIDE" == "_n" ]; then
-  # First make the bin folder to not copy basket file to bin file if bin/ doesn't exist
-  mkdir $prefix/bin
-  make install
-else
-  echo "            Please now enter the root password in order to install "
-  echo "                        BasKet Note Pads on the system."
-  echo ""
-  sudo make install || exit 1
-  echo ""
-  echo ""
-fi
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((                  End of BasKet Note Pads Installation                  ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-echo "                    Do you want to run BasKet Note Pads now?"
-echo "       If an older version is currently running it will be exited before."
-echo ""
-echo "   Notice that you willn't have to exit BasKet : it will be restored each time"
-echo "                               you log in to KDE."
-echo ""
-echo ""
-
-echo -n "Start or restart BasKet Note Pads? [y/n] (default is y): "
-read -n 1 RESTART
-if [ "_$RESTART" != "_" ]; then # If pressed Enter, a new line was already print
-  echo ""
-fi
-
-if [ "_$RESTART" != "_n" ]; then
-  # Get the pid of the process basket, if currently running
-  pid=`ps aux | awk '$11 == "basket" { print $2 }'`
-  if [ "_$pid" == "_" ]; then
-    dummy=0
-  else
-    kill -s SIGTERM $pid
-  fi
-
-  if [ "_$SYS_WIDE" == "_n" ]; then
-    echo "$prefix/bin/basket"
-    $prefix/bin/basket
-  else
-    echo "basket"
-    basket
-  fi
-fi
-
-clear
-echo ""
-echo "    ========================================================================  "
-echo "  ((   Congratulation: BasKet Note Pads is now Installed onto your System   ))"
-echo "    ========================================================================  "
-echo ""
-echo ""
-echo "   In the future, if you want to uninstall BasKet Note Pads, you will have to"
-if [ "_$SYS_WIDE" == "_n" ]; then
-  echo "                enter the command make uninstall in this folder."
-else
-  echo "            enter the command su -c 'make uninstall' in this folder."
-fi
-echo ""
-echo ""

kontact_plugin/CMakeLists.txt

@@ -0,0 +1,73 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}kontact_plugin
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+###### basketdcopiface stub for kontact plugin
+
+set( KIDL_OUTPUT    basketdcopiface.kidl )
+
+add_custom_command(
+    OUTPUT  ${KIDL_OUTPUT}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/basketdcopiface.h > ${KIDL_OUTPUT}
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/basketdcopiface.h
+)
+add_custom_target(
+    kontact-basketdcopiface-kidl
+    DEPENDS ${KIDL_OUTPUT}
+)
+
+add_custom_command(
+    OUTPUT  basketdcopiface_stub.cpp basketdcopiface_stub.h
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KIDL_OUTPUT}
+    DEPENDS kontact-basketdcopiface-kidl
+)
+add_custom_target(
+    kontact-basketdcopiface-stub
+    DEPENDS basketdcopiface_stub.cpp basketdcopiface_stub.h
+)
+
+
+##### libkontact_basket (kpart)
+
+tde_add_kpart( libkontact_basket AUTOMOC
+
+  SOURCES
+        basket_plugin.cpp
+        uniqueapphandler.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/basketdcopiface_stub.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     kpinterfaces
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+
+  DEPENDENCIES kontact-basketdcopiface-stub
+)
+
+
+##### other data
+
+install(
+    FILES kontact_basketplugin.setdlg
+    DESTINATION ${DATA_INSTALL_DIR}/kontact/ksettingsdialog
+)
+
+tde_create_translated_desktop(
+    SOURCE basket.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kontact
+)
+ 

kontact_plugin/Makefile.am

@@ -1,18 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir) $(all_includes) -I$(kde_includes)/tde
-
-kde_module_LTLIBRARIES = libkontact_basket.la
-libkontact_basket_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_basket_la_LIBADD = -lkpinterfaces $(LIB_QT) -lDCOP -ltdecore -ltdeui
-
-noinst_HEADERS = basket_plugin.h uniqueapphandler.h
-libkontact_basket_la_SOURCES = basket_plugin.cpp uniqueapphandler.cpp basketdcopiface.stub
-
-METASOURCES = AUTO
-
-basketdcopiface_DIR = $(top_srcdir)/src
-
-servicedir = $(kde_servicesdir)/kontact
-service_DATA = basket.desktop basket_v4.desktop
-
-basketsetdlgdir = $(kde_datadir)/kontact/ksettingsdialog
-basketsetdlg_DATA = kontact_basketplugin.setdlg

kontact_plugin/basket.desktop

@@ -1,42 +1,22 @@
 [Desktop Entry]
-Encoding=UTF-8
+Name=Baskets
+
+Comment=Basket Note Pads plugin for Kontact
+
 Type=Service
+Encoding=UTF-8
 Icon=basket
-X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 X-TDE-Library=libkontact_basket
+
 X-TDE-KontactPluginVersion=5
 X-TDE-KontactPartLibraryName=libbasketpart
 X-TDE-KontactPartExecutableName=basket
 X-TDE-KontactPartLoadOnStart=true
 X-TDE-KontactPluginHasSummary=false
 
-X-TDE-PluginInfo-Website=http://basket.kde.org/
 X-TDE-PluginInfo-Name=kontact_basketplugin
 X-TDE-PluginInfo-Version=1.0.3.1
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=true
-
-Comment=Basket Note Pads plugin for Kontact
-Comment[de]=Plugin Basket Notizblätter für Kontact
-Comment[es]=Complemento de los blocs de notas Basket para Kontact
-Comment[fr]=Module Blocs notes Basket pour Kontact
-Comment[it]=Plugin Blocco appunti Basket per Kontact
-Comment[ja]=Basket メモパッドの Kontact 統合プラグイン
-Comment[nb]=Kurvnotat-tillegg for Kontakt
-Comment[nn]=Korgnotat-tillegg for Kontakt
-Comment[pt]=Plugin do Bloco de Notas Basket para o Kontact
-Comment[ru]=Модуль Альбом заметок Basket для Kontact
-Comment[tr]=Kontact için Basket Not Tutucu Eklentisi
-
-Name=Baskets
-Name[de]=Körbe
-Name[es]=Cestas
-Name[fr]=Paniers
-Name[it]=Canestri
-Name[ja]=バスケット
-Name[nb]=Kurver
-Name[nn]=Korger
-Name[pt]=Cestos
-Name[ru]=Корзины
-Name[tr]=Sepetler

kontact_plugin/basket_plugin.cpp

@@ -34,11 +34,11 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_basket,
                             BasketPluginFactory( "kontact_basketplugin" ) )
 
 BasketPlugin::BasketPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, TQT_TQOBJECT(core), "basket" )
+  : Kontact::Plugin( core, core, "basket" )
 {
 	setInstance( BasketPluginFactory::instance() );
 	insertNewAction(new TDEAction( i18n("&New Basket..."), "basket", CTRL+SHIFT+Key_B,
-					this, TQT_SLOT(newBasket()), actionCollection(), "basket_new" ));
+					this, TQ_SLOT(newBasket()), actionCollection(), "basket_new" ));
 
 	m_uniqueAppWatcher = new Kontact::UniqueAppWatcher(
 		new Kontact::UniqueAppHandlerFactory<BasketUniqueAppHandler>(), this);
@@ -55,7 +55,7 @@ KParts::ReadOnlyPart* BasketPlugin::createPart()
 		return 0;
 
 	m_stub = new BasketDcopInterface_stub(dcopClient(), "basket", "BasketIface");
-	connect(part, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart()));
+	connect(part, TQ_SIGNAL(showPart()), this, TQ_SLOT(showPart()));
 	return part;
 }
 

kontact_plugin/basket_plugin.h

@@ -39,7 +39,7 @@ class BasketUniqueAppHandler : public Kontact::UniqueAppHandler
 
 class BasketPlugin : public Kontact::Plugin
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:

kontact_plugin/basket_v4.desktop

@@ -1,43 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Service
-Icon=basket
-X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
-
-X-TDE-Library=libkontact_basket
-X-TDE-KontactPluginVersion=4
-X-TDE-KontactPartLibraryName=libbasketpart
-X-TDE-KontactPartExecutableName=basket
-X-TDE-KontactPartLoadOnStart=true
-X-TDE-KontactPluginHasSummary=false
-
-X-TDE-PluginInfo-Website=http://basket.kde.org/
-X-TDE-PluginInfo-Name=kontact_basketplugin
-X-TDE-PluginInfo-Version=1.0.3.1
-X-TDE-PluginInfo-License=GPL
-X-TDE-PluginInfo-EnabledByDefault=true
-
-Comment=BasKet Note Pads plugin for Kontact
-Comment[de]=Plugin BasKet Notizblätter für Kontact
-Comment[es]=Complemento de los blocs de notas BasKet para Kontact
-Comment[fr]=Module Blocs notes BasKet pour Kontact
-Comment[it]=Plugin Blocco appunti BasKet per Kontact
-Comment[ja]=BasKet メモパッドの Kontact 統合プラグイン
-Comment[nb]=Kurvnotat-tillegg for Kontakt
-Comment[nn]=Korgnotat-tillegg for Kontakt
-Comment[pt]=Plugin do Bloco de Notas BasKet para o Kontact
-Comment[ru]=Модуль Альбом заметок Basket для Kontact
-Comment[tr]=Kontact için Basket Not Tutucu Eklentisi
-
-Name=Baskets
-Name[de]=Körbe
-Name[es]=Cestas
-Name[fr]=Paniers
-Name[it]=Canestri
-Name[ja]=バスケット
-Name[nb]=Kurver
-Name[nn]=Korger
-Name[pt]=Cestos
-Name[ru]=Корзины
-Name[tr]=Sepetler
-

kontact_plugin/uniqueapphandler.cpp

@@ -70,10 +70,10 @@ using namespace Kontact;
 
 int UniqueAppHandler::newInstance()
 {
-  // This bit is duplicated from KUniqueApplication::newInstance()
-  if ( kapp->mainWidget() ) {
-    kapp->mainWidget()->show();
-    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+  // This bit is duplicated from TDEUniqueApplication::newInstance()
+  if ( tdeApp->mainWidget() ) {
+    tdeApp->mainWidget()->show();
+    KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
     TDEStartupInfo::appStarted();
   }
 
@@ -91,13 +91,13 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
     TDECmdLineArgs::reset(); // forget options defined by other "applications"
     loadCommandLineOptions();
 
-    // This bit is duplicated from KUniqueApplication::processDelayed()
+    // This bit is duplicated from TDEUniqueApplication::processDelayed()
     TQDataStream ds( data, IO_ReadOnly );
     TDECmdLineArgs::loadAppArgs( ds );
     if ( !ds.atEnd() ) { // backwards compatibility
       TQCString asn_id;
       ds >> asn_id;
-      kapp->setStartupId( asn_id );
+      tdeApp->setStartupId( asn_id );
     }
 
     TQDataStream _replyStream( replyData, IO_WriteOnly );
@@ -133,16 +133,16 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
     : TQObject( plugin ), mFactory( factory ), mPlugin( plugin )
 {
   // The app is running standalone if 1) that name is known to DCOP
-  mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() );
+  mRunningStandalone = tdeApp->dcopClient()->isApplicationRegistered( plugin->name() );
 
   // and 2) it's not registered by kontact (e.g. in another plugin)
-  if ( mRunningStandalone && kapp->dcopClient()->findLocalClient( plugin->name() ) )
+  if ( mRunningStandalone && tdeApp->dcopClient()->findLocalClient( plugin->name() ) )
       mRunningStandalone = false;
 
   if ( mRunningStandalone ) {
-    kapp->dcopClient()->setNotifications( true );
-    connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-             this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+    tdeApp->dcopClient()->setNotifications( true );
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+             this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
   } else {
     mFactory->createHandler( mPlugin );
   }
@@ -151,7 +151,7 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
 UniqueAppWatcher::~UniqueAppWatcher()
 {
   if ( mRunningStandalone )
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
 
   delete mFactory;
 }
@@ -159,11 +159,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
 void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( appId == mPlugin->name() && mRunningStandalone ) {
-    disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-                this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+    disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+                this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
     kdDebug(5601) << k_funcinfo << appId << endl;
     mFactory->createHandler( mPlugin );
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
     mRunningStandalone = false;
   }
 }

kontact_plugin/uniqueapphandler.h

@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 #include <kontact/plugin.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 namespace Kontact
 {
@@ -36,7 +36,7 @@ namespace Kontact
  * By default this means simply bringing the main window to the front,
  * but newInstance can be reimplemented.
  */
-class KDE_EXPORT UniqueAppHandler : public DCOPObject
+class TDE_EXPORT UniqueAppHandler : public DCOPObject
 {
   K_DCOP
 
@@ -86,9 +86,9 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
  * Kontact takes over from there.
  *
  */
-class KDE_EXPORT UniqueAppWatcher : public TQObject
+class TDE_EXPORT UniqueAppWatcher : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:

links.sh

@@ -1,223 +0,0 @@
-#!/bin/bash
-
-TARGET=`pwd`
-if [ -e $TARGET'/debug' ]; then
-    BUILD=$TARGET'/debug'
-else
-    BUILD=$TARGET
-fi
-LINKS=`echo ~`'/kde-debug'
-HOME=`echo ~`
-
-dest_files=(
-    "$LINKS/share/apps/basket/backgrounds/abstract.png"
-    "$LINKS/share/apps/basket/backgrounds/alien-artifact.png"
-    "$LINKS/share/apps/basket/backgrounds/alien-artifact.png.config"
-    "$LINKS/share/apps/basket/backgrounds/basket-title.png"
-    "$LINKS/share/apps/basket/backgrounds/green-curves.png"
-    "$LINKS/share/apps/basket/backgrounds/light.png"
-    "$LINKS/share/apps/basket/backgrounds/painting.png"
-    "$LINKS/share/apps/basket/backgrounds/pens.png"
-    "$LINKS/share/apps/basket/backgrounds/pins.png"
-    "$LINKS/share/apps/basket/backgrounds/rainbow-balls.png"
-    "$LINKS/share/apps/basket/backgrounds/rounds-line.png"
-    "$LINKS/share/apps/basket/backgrounds/todo.png"
-    "$LINKS/share/apps/basket/backgrounds/working.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/abstract.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/alien-artifact.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/basket-title.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/green-curves.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/light.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/painting.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/pens.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/pins.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/rainbow-balls.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/rounds-line.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/todo.png"
-    "$LINKS/share/apps/basket/backgrounds/previews/working.png"
-    "$LINKS/share/apps/basket/images/insertion_help.png"
-    "$LINKS/share/apps/basket/images/tag_export_help.png"
-    "$LINKS/share/apps/basket/basket_part.rc"
-    "$LINKS/share/apps/basket/basketui.rc"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_high.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_important.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_medium.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_000.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_bad.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_050.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_fun.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_025.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_075.png"
-    "$LINKS/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_low.png"
-    "$LINKS/share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg"
-    "$LINKS/share/services/kontact/basket.desktop"
-    "$LINKS/share/services/basket_config_general.desktop"
-    "$LINKS/share/services/basket_config_baskets.desktop"
-    "$LINKS/share/services/basket_config_new_notes.desktop"
-    "$LINKS/share/services/basket_config_notes_appearance.desktop"
-    "$LINKS/share/services/basket_config_apps.desktop"
-    "$LINKS/share/services/basket_part.desktop"
-    "$LINKS/share/applnk/Utilities/basket.desktop"
-    "$LINKS/lib/trinity/libkontact_basket.so"
-    "$LINKS/lib/trinity/libkontact_basket.la"
-    "$LINKS/lib/trinity/kcm_basket.so"
-    "$LINKS/lib/trinity/kcm_basket.la"
-    "$LINKS/lib/trinity/libbasketpart.so"
-    "$LINKS/lib/trinity/libbasketpart.la"
-    "$LINKS/lib/libbasketcommon.so"
-    "$LINKS/lib/libbasketcommon.la"
-    "$LINKS/bin/basket"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/likeback_dislike.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/likeback_like.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/likeback_configure.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_priority_high.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_important.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_for_later.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_priority_medium.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_progress_000.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_progress_100.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_preference_bad.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_preference_good.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_checkbox.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_progress_050.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_fun.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_progress_025.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_progress_075.png"
-	"$LINKS/share/icons/crystalsvg/16x16/actions/tag_priority_low.png"
-	"$LINKS/share/icons/crystalsvg/16x16/apps/basket.png"
-	"$LINKS/share/icons/crystalsvg/128x128/apps/basket.png"
-	"$LINKS/share/icons/crystalsvg/64x64/apps/basket.png"
-	"$LINKS/share/icons/crystalsvg/48x48/apps/basket.png"
-	"$LINKS/share/icons/crystalsvg/22x22/apps/basket.png"
-	"$LINKS/share/icons/crystalsvg/32x32/apps/basket.png"
-	"$LINKS/share/icons/crystalsvg/scalable/apps/basket.svg"
-)
-
-source_files=(
-    "$TARGET/backgrounds/abstract.png"
-    "$TARGET/backgrounds/alien-artifact.png"
-    "$TARGET/backgrounds/alien-artifact.png.config"
-    "$TARGET/backgrounds/basket-title.png"
-    "$TARGET/backgrounds/green-curves.png"
-    "$TARGET/backgrounds/light.png"
-    "$TARGET/backgrounds/painting.png"
-    "$TARGET/backgrounds/pens.png"
-    "$TARGET/backgrounds/pins.png"
-    "$TARGET/backgrounds/rainbow-balls.png"
-    "$TARGET/backgrounds/rounds-line.png"
-    "$TARGET/backgrounds/todo.png"
-    "$TARGET/backgrounds/working.png"
-    "$TARGET/backgrounds-previews/abstract.png"
-    "$TARGET/backgrounds-previews/alien-artifact.png"
-    "$TARGET/backgrounds-previews/basket-title.png"
-    "$TARGET/backgrounds-previews/green-curves.png"
-    "$TARGET/backgrounds-previews/light.png"
-    "$TARGET/backgrounds-previews/painting.png"
-    "$TARGET/backgrounds-previews/pens.png"
-    "$TARGET/backgrounds-previews/pins.png"
-    "$TARGET/backgrounds-previews/rainbow-balls.png"
-    "$TARGET/backgrounds-previews/rounds-line.png"
-    "$TARGET/backgrounds-previews/todo.png"
-    "$TARGET/backgrounds-previews/working.png"
-    "$TARGET/images/insertion_help.png"
-    "$TARGET/images/tag_export_help.png"
-    "$TARGET/src/basket_part.rc"
-    "$TARGET/src/basketui.rc"
-    "$TARGET/tags/cr16-action-tag_priority_high.png"
-    "$TARGET/tags/cr16-action-tag_important.png"
-    "$TARGET/tags/cr16-action-tag_for_later.png"
-    "$TARGET/tags/cr16-action-tag_preference_excelent.png"
-    "$TARGET/tags/cr16-action-tag_priority_medium.png"
-    "$TARGET/tags/cr16-action-tag_progress_000.png"
-    "$TARGET/tags/cr16-action-tag_progress_100.png"
-    "$TARGET/tags/cr16-action-tag_preference_bad.png"
-    "$TARGET/tags/cr16-action-tag_preference_good.png"
-    "$TARGET/tags/cr16-action-tag_checkbox.png"
-    "$TARGET/tags/cr16-action-tag_progress_050.png"
-    "$TARGET/tags/cr16-action-tag_fun.png"
-    "$TARGET/tags/cr16-action-tag_progress_025.png"
-    "$TARGET/tags/cr16-action-tag_checkbox_checked.png"
-    "$TARGET/tags/cr16-action-tag_progress_075.png"
-    "$TARGET/tags/cr16-action-tag_priority_low.png"
-    "$TARGET/kontact_plugin/kontact_basketplugin.setdlg"
-    "$TARGET/kontact_plugin/basket.desktop"
-    "$TARGET/src/basket_config_general.desktop"
-    "$TARGET/src/basket_config_baskets.desktop"
-    "$TARGET/src/basket_config_new_notes.desktop"
-    "$TARGET/src/basket_config_notes_appearance.desktop"
-    "$TARGET/src/basket_config_apps.desktop"
-    "$TARGET/src/basket_part.desktop"
-    "$TARGET/src/basket.desktop"
-    "$BUILD/kontact_plugin/.libs/libkontact_basket.so"
-    "$BUILD/kontact_plugin/.libs/libkontact_basket.la"
-    "$BUILD/src/.libs/kcm_basket.so"
-    "$BUILD/src/.libs/kcm_basket.la"
-    "$BUILD/src/.libs/libbasketpart.so"
-    "$BUILD/src/.libs/libbasketpart.la"
-    "$BUILD/src/.libs/libbasketcommon.so"
-    "$BUILD/src/.libs/libbasketcommon.la"
-    "$BUILD/src/.libs/basket"
-	"$TARGET/src/cr16-action-likeback_dislike.png"
-	"$TARGET/src/cr16-action-likeback_like.png"
-	"$TARGET/src/cr16-action-likeback_configure.png"
-	"$TARGET/tags/cr16-action-tag_priority_high.png"
-	"$TARGET/tags/cr16-action-tag_important.png"
-	"$TARGET/tags/cr16-action-tag_for_later.png"
-	"$TARGET/tags/cr16-action-tag_preference_excelent.png"
-	"$TARGET/tags/cr16-action-tag_priority_medium.png"
-	"$TARGET/tags/cr16-action-tag_progress_000.png"
-	"$TARGET/tags/cr16-action-tag_progress_100.png"
-	"$TARGET/tags/cr16-action-tag_preference_bad.png"
-	"$TARGET/tags/cr16-action-tag_preference_good.png"
-	"$TARGET/tags/cr16-action-tag_checkbox.png"
-	"$TARGET/tags/cr16-action-tag_progress_050.png"
-	"$TARGET/tags/cr16-action-tag_fun.png"
-	"$TARGET/tags/cr16-action-tag_progress_025.png"
-	"$TARGET/tags/cr16-action-tag_checkbox_checked.png"
-	"$TARGET/tags/cr16-action-tag_progress_075.png"
-	"$TARGET/tags/cr16-action-tag_priority_low.png"
-	"$TARGET/src/cr16-app-basket.png"
-	"$TARGET/src/cr128-app-basket.png"
-	"$TARGET/src/cr64-app-basket.png"
-	"$TARGET/src/cr48-app-basket.png"
-	"$TARGET/src/cr22-app-/basket.png"
-	"$TARGET/src/cr32-app-/basket.png"
-	"$TARGET/src/crsc-app-basket.svg"
-)
-
-function makedir()
-{
-  if [ ! -d $1 ]; then
-    echo "Making dir: $1"
-    mkdir -p $1
-  fi
-}
-
-function softlink()
-{
-  if [ -L $2 ]; then
-    rm $2
-  fi
-  makedir `dirname $2`
-  echo "Linking: $2->$1"
-  ln -s $1 $2
-}
-
-index=0
-element_count=${#source_files[@]}
-
-while [ "$index" -lt "$element_count" ]; do
-  softlink "${source_files[$index]}" "${dest_files[$index]}"
-  let "index = $index + 1"
-done
-
-softlink "$LINKS/lib" "$LINKS/lib64"
-

po/Makefile.am

@@ -1,2 +0,0 @@
-POFILES = AUTO
-noinst_HEADERS = basket.pot fr.po nl.po de.po nn.po zh_TW.po zh_CN.po pl_PL.po es.po pt.po

src/CMakeLists.txt

@@ -0,0 +1,132 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${GPGME_INCLUDE_DIRS}
+  ${ARTS_INCLUDE_DIRS}
+  ${LIBART_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${GPGME_LIBRARY_DIRS}
+  ${ARTS_LIBRARY_DIRS}
+  ${LIBART_LIBRARY_DIRS}
+)
+
+
+##### basketcommon (shared)
+
+tde_add_library( basketcommon SHARED AUTOMOC
+
+  SOURCES
+        kicondialogui.ui passwordlayout.ui basketdcopiface.skel
+        archive.cpp bnpview.cpp settings.cpp basket.cpp
+        basketproperties.cpp linklabel.cpp variouswidgets.cpp
+        xmlwork.cpp keyboard.cpp global.cpp exporterdialog.cpp
+        htmlexporter.cpp notefactory.cpp softwareimporters.cpp
+        focusedwidgets.cpp popupmenu.cpp basketfactory.cpp
+        tag.cpp qeffects.cpp kcolorcombo2.cpp newbasketdialog.cpp
+        tagsedit.cpp formatimporter.cpp note.cpp notecontent.cpp
+        notedrag.cpp noteedit.cpp filter.cpp tools.cpp
+        backgroundmanager.cpp regiongrabber.cpp kicondialog.cpp
+        kiconcanvas.cpp kgpgme.cpp likeback.cpp crashhandler.cpp
+        password.cpp colorpicker.cpp basketlistview.cpp
+        debugwindow.cpp systemtray.cpp aboutdata.cpp
+        basketstatusbar.cpp clickablelabel.cpp backup.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     kjs-shared
+     ${ARTSC_LIBRARIES}
+     ${ARTSKDE_LIBRARIES}
+     ${GPGME_LIBRARIES}
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### basket (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+  SOURCES
+        main.cpp
+        mainwindow.cpp
+        application.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeutils-shared
+     kjs-shared
+     ${ARTSC_LIBRARIES}
+     ${ARTSKDE_LIBRARIES}
+     basketcommon-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### libbasketpart (kpart)
+
+tde_add_kpart( libbasketpart MODULE AUTOMOC
+
+  SOURCES
+        basket_part.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeparts-shared
+     kjs-shared
+     ${ARTSC_LIBRARIES}
+     ${ARTSKDE_LIBRARIES}
+     basketcommon-shared
+     
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_basket (kpart)
+
+tde_add_kpart( kcm_basket MODULE AUTOMOC
+
+  SOURCES
+        kcm_basket.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     kjs-shared
+     ${ARTSC_LIBRARIES}
+     ${ARTSKDE_LIBRARIES}
+     basketcommon-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons()
+
+
+##### other data
+
+install(
+    FILES basketui.rc basket_part.rc
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+tde_create_translated_desktop(
+    SOURCE basket_part.desktop basket_config_general.desktop
+           basket_config_baskets.desktop basket_config_new_notes.desktop
+           basket_config_notes_appearance.desktop basket_config_apps.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+tde_create_translated_desktop( ${PROJECT_NAME}.desktop )

src/Makefile.am

@@ -1,104 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = $(all_includes)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/basket.pot
-
-KDE_ICON = AUTO
-
-# these are the headers for your project
-
-noinst_HEADERS = basket.h basketproperties.h mainwindow.h basket_part.h \
-							debugwindow.h 	linklabel.h variouswidgets.h xmlwork.h keyboard.h global.h settings.h \
-							focusedwidgets.h popupmenu.h basketfactory.h exporterdialog.h tag.h kcolorcombo2.h \
-							newbasketdialog.h tagsedit.h note.h notecontent.h 	notedrag.h noteedit.h notefactory.h \
-							filter.h tools.h backgroundmanager.h regiongrabber.h softwareimporters.h \
-							kicondialog.h kiconcanvas.h kgpgme.h crashhandler.h password.h bnpview.h \
-							systemtray.h clickablelabel.h colorpicker.h basketlistview.h qeffects.h likeback.h \
-							formatimporter.h aboutdata.h basketstatusbar.h basketdcopiface.h basket_options.h \
-					likeback_private.h application.h archive.h htmlexporter.h backup.h
-
-#########################################################################
-# COMMON FILES SECTION
-#########################################################################
-
-lib_LTLIBRARIES = libbasketcommon.la
-
-AM_CPPFLAGS = $(GPGME_CFLAGS)
-
-libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
-
-libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -ltdeio $(LIB_TDEUI) $(LIB_TDECORE) \
-	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx -ldl -lartsc
-
-libbasketcommon_la_SOURCES = \
-	archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \
-	linklabel.cpp variouswidgets.cpp xmlwork.cpp keyboard.cpp \
-	global.cpp exporterdialog.cpp htmlexporter.cpp notefactory.cpp softwareimporters.cpp \
-	focusedwidgets.cpp popupmenu.cpp basketfactory.cpp \
-	tag.cpp qeffects.cpp kcolorcombo2.cpp newbasketdialog.cpp tagsedit.cpp \
-	formatimporter.cpp note.cpp notecontent.cpp notedrag.cpp noteedit.cpp \
-	filter.cpp tools.cpp backgroundmanager.cpp regiongrabber.cpp \
-	kicondialogui.ui kicondialog.cpp kiconcanvas.cpp kgpgme.cpp likeback.cpp \
-	crashhandler.cpp passwordlayout.ui password.cpp colorpicker.cpp \
-	basketlistview.cpp debugwindow.cpp systemtray.cpp aboutdata.cpp \
-	basketstatusbar.cpp clickablelabel.cpp basketdcopiface.skel backup.cpp
-
-#########################################################################
-# APPLICATION SECTION
-#########################################################################
-# this is the program that gets installed.  it's name is used for all
-# of the other Makefile.am variables
-bin_PROGRAMS = basket
-
-# the application source, library search path, and link libraries
-basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
-basket_LDADD = libbasketcommon.la
-
-# this is where the desktop file will go
-shelldesktopdir = $(xdg_appsdir)
-shelldesktop_DATA = basket.desktop
-
-# this is where the shell's XML-GUI resource file goes
-rcdir = $(kde_datadir)/basket
-rc_DATA = basketui.rc
-
-basket_SOURCES = main.cpp mainwindow.cpp application.cpp
-
-kde_icon_KDEICON = cr128-app-basket.png cr16-app-basket.png cr22-app-basket.png \
-	cr32-app-basket.png cr48-app-basket.png cr64-app-basket.png hi16-app-basket_old.png \
-	hi32-app-basket_old.png crsc-app-basket.svg \
-	cr16-action-likeback_like.png cr16-action-likeback_dislike.png \
-	cr16-action-likeback_bug.png cr16-action-likeback_feature.png
-
-##################
-# KPART SECTION
-##################
-
-kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
-
-libbasketpart_la_SOURCES = basket_part.cpp
-libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
-libbasketpart_la_LIBADD  = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
-
-kcm_basket_la_SOURCES = kcm_basket.cpp
-kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde
-kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_TDECORE) $(LIB_QT) -ltdeui -lDCOP
-
-# this is where the desktop file will go
-partdesktopdir   = $(kde_servicesdir)
-partdesktop_DATA = basket_part.desktop
-
-# this is where the part's XML-GUI resource file goes
-partdir   = $(kde_datadir)/basket
-part_DATA = basket_part.rc
-
-kde_services_DATA = \
-	basket_config_general.desktop \
-	basket_config_baskets.desktop \
-	basket_config_new_notes.desktop \
-	basket_config_notes_appearance.desktop \
-	basket_config_apps.desktop

src/aboutdata.cpp

@@ -18,11 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "aboutdata.h"
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
+#include "aboutdata.h"
+
 static const char description[] = I18N_NOOP(
 	"<p><b>Taking care of your ideas.</b></p>"
 	"<p>A note-taking application that makes it easy to record ideas as you think, and quickly find them later. "
@@ -33,9 +34,7 @@ static const char description[] = I18N_NOOP(
 AboutData::AboutData()
  : TDEAboutData( "basket", I18N_NOOP("BasKet Note Pads"),
    VERSION, description, TDEAboutData::License_GPL_V2,
-   "(c) 2003-2007, S\303\251bastien Lao\303\273t", 0,
-   "http://basket.kde.org/",
-   "basket-devel@lists.sourceforge.net" )
+   "(c) 2003-2007, S\303\251bastien Lao\303\273t", NULL, NULL, NULL)
 {
 	addAuthor( "Kelvie Wong",
 		   I18N_NOOP("Maintainer"),

src/aboutdata.h

@@ -26,7 +26,7 @@
 	@author Sébastien Laoût <slaout@linux62.org>
 */
 
-class AboutData : public TDEAboutData
+class TDE_EXPORT AboutData : public TDEAboutData
 {
   public:
 	AboutData();

src/application.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tdecmdlineargs.h>
 #include <tqstring.h>
 #include <tqfile.h>
@@ -29,7 +33,7 @@
 #include "bnpview.h"
 
 Application::Application()
- : KUniqueApplication()
+ : TDEUniqueApplication()
 {
 }
 
@@ -39,7 +43,7 @@ Application::~Application()
 
 int Application::newInstance()
 {
-	KUniqueApplication::newInstance();
+	TDEUniqueApplication::newInstance();
 
 	// Open the basket archive or template file supplied as argument:
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -51,7 +55,7 @@ int Application::newInstance()
 				// Tags are not loaded until Global::bnpView::lateInit() is called.
 				// It is called 0ms after the application start.
 				BNPView::s_fileToOpen = fileName;
-				TQTimer::singleShot( 100, Global::bnpView, TQT_SLOT(delayedOpenArchive()) );
+				TQTimer::singleShot( 100, Global::bnpView, TQ_SLOT(delayedOpenArchive()) );
 //				Global::bnpView->openArchive(fileName);
 				args->clear();
 			}

src/application.h

@@ -21,13 +21,13 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tqstring.h>
 
 /**
  * @author Sébastien Laoût <slaout@linux62.org>
  */
-class Application : public KUniqueApplication
+class Application : public TDEUniqueApplication
 {
   public:
 	Application();

src/archive.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
@@ -28,7 +32,7 @@
 #include <tdemessagebox.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kprogress.h>
@@ -99,7 +103,7 @@ void Archive::save(Basket *basket, bool withSubBaskets, const TQString &destinat
 		State::List states = (*it)->states();
 		for (State::List::iterator it2 = states.begin(); it2 != states.end(); ++it2) {
 			State *state = (*it2);
-			TQPixmap icon = kapp->iconLoader()->loadIcon(state->emblem(), TDEIcon::Small, 16, TDEIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
+			TQPixmap icon = tdeApp->iconLoader()->loadIcon(state->emblem(), TDEIcon::Small, 16, TDEIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
 			if (!icon.isNull()) {
 				icon.save(tempIconFile, "PNG");
 				TQString iconFileName = state->emblem().replace('/', '_');
@@ -132,7 +136,7 @@ void Archive::save(Basket *basket, bool withSubBaskets, const TQString &destinat
 	painter.end();
 	TQImage previewImage = previewPixmap.convertToImage();
 	const int PREVIEW_SIZE = 256;
-	previewImage = previewImage.scale(PREVIEW_SIZE, PREVIEW_SIZE, TQ_ScaleMin);
+	previewImage = previewImage.scale(PREVIEW_SIZE, PREVIEW_SIZE, TQImage::ScaleMin);
 	previewImage.save(tempFolder + "preview.png", "PNG");
 
 	// Finaly Save to the Real Destination file:
@@ -193,7 +197,7 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS
 	// Save basket icon:
 	TQString tempIconFile = tempFolder + "icon.png";
 	if (!basket->icon().isEmpty() && basket->icon() != "basket") {
-		TQPixmap icon = kapp->iconLoader()->loadIcon(basket->icon(), TDEIcon::Small, 16, TDEIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon(basket->icon(), TDEIcon::Small, 16, TDEIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
 		if (!icon.isNull()) {
 			icon.save(tempIconFile, "PNG");
 			TQString iconFileName = basket->icon().replace('/', '_');
@@ -220,11 +224,12 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS
 	}
 
 	progress->advance(1); // Basket exportation finished
-	std::cout << basket->basketName() << " finished" << std::endl;
+	std::cout << basket->basketName().local8Bit() << " finished" << std::endl;
 
 	// Recursively save child baskets:
 	BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket);
-	if (recursive && item->firstChild()) {
+	if (recursive && item && item->firstChild())
+	{
 		for (BasketListViewItem *child = (BasketListViewItem*) item->firstChild(); child; child = (BasketListViewItem*) child->nextSibling()) {
 			saveBasketToArchive(child->basket(), recursive, tar, backgrounds, tempFolder, progress);
 		}
@@ -313,7 +318,7 @@ void Archive::open(const TQString &path)
 						     "It can be opened but not every information will be available to you. "
 						     "For instance, some notes may be missing because they are of a type only available in new versions. "
 						     "When saving the file back, consider to save it to another file, to preserve the original one.")
-							.arg(kapp->aboutData()->programName()),
+							.arg(tdeApp->aboutData()->programName()),
 						i18n("Basket Archive Error")
 					);
 				}
@@ -321,7 +326,7 @@ void Archive::open(const TQString &path)
 					KMessageBox::error(
 						0,
 						i18n("This file was created with a recent version of %1. Please upgrade to a newer version to be able to open that file.")
-							.arg(kapp->aboutData()->programName()),
+							.arg(tdeApp->aboutData()->programName()),
 						i18n("Basket Archive Error")
 					);
 					file.close();
@@ -432,7 +437,7 @@ void Archive::importTagEmblems(const TQString &extractionFolder)
 				if ( (!subElement.isNull()) && subElement.tagName() == "state" ) {
 					TQString emblemName = XMLWork::getElementText(subElement, "emblem");
 					if (!emblemName.isEmpty()) {
-						TQPixmap emblem = kapp->iconLoader()->loadIcon(emblemName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
+						TQPixmap emblem = tdeApp->iconLoader()->loadIcon(emblemName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
 						// The icon does not exists on that computer, import it:
 						if (emblem.isNull()) {
 							// Of the emblem path was eg. "/home/seb/emblem.png", it was exported as "tag-emblems/_home_seb_emblem.png".
@@ -547,7 +552,7 @@ void Archive::importBasketIcon(TQDomElement properties, const TQString &extracti
 {
 	TQString iconName = XMLWork::getElementText(properties, "icon");
 	if (!iconName.isEmpty() && iconName != "basket") {
-		TQPixmap icon = kapp->iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
 		// The icon does not exists on that computer, import it:
 		if (icon.isNull()) {
 			TQDir dir;

src/backgroundmanager.cpp

@@ -20,8 +20,8 @@
 
 #include <kurl.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <tqpainter.h>
 #include <tqdir.h>
 #include <tqimage.h>
@@ -83,7 +83,7 @@ BackgroundManager::BackgroundManager()
 ///	for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it)
 ///		std::cout << "* " << (*it)->location << "  [ref: " << (*it)->name << "]" << std::endl;
 
-	connect( &m_garbageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doGarbage()) );
+	connect( &m_garbageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doGarbage()) );
 }
 
 BackgroundManager::~BackgroundManager()
@@ -120,7 +120,7 @@ bool BackgroundManager::subscribe(const TQString &image)
 			// Try to load the pixmap:
 			entry->pixmap = new TQPixmap(entry->location);
 			// Try to figure out if it's a tiled background image or not (default to NO):
-			KSimpleConfig config(entry->location + ".config", /*readOnly=*/true);
+			TDESimpleConfig config(entry->location + ".config", /*readOnly=*/true);
 			config.setGroup("BasKet Background Image Configuration");
 			entry->tiled = config.readBoolEntry("tiled", false);
 		}
@@ -258,7 +258,7 @@ TQPixmap* BackgroundManager::preview(const TQString &image)
 
 	if (!entry) {
 ///		std::cout << "BackgroundManager: Requested the preview of an unexisting image: " << image << std::endl;
-		return false;
+		return 0;
 	}
 
 	// The easiest way: already computed:
@@ -287,7 +287,7 @@ TQPixmap* BackgroundManager::preview(const TQString &image)
 		// Because, as we are loading the pixmap we ALSO need to know if it's a tile or not, in case that image will soon be used (and not destroyed by the garbager):
 		entry->pixmap = new TQPixmap(entry->location);
 		// Try to figure out if it's a tiled background image or not (default to NO):
-		KSimpleConfig config(entry->location + ".config", /*readOnly=*/true);
+		TDESimpleConfig config(entry->location + ".config", /*readOnly=*/true);
 		config.setGroup("BasKet Background Image Configuration");
 		entry->tiled = config.readBoolEntry("tiled", false);
 	}

src/backgroundmanager.h

@@ -87,7 +87,7 @@ class OpaqueBackgroundEntry
   */
 class BackgroundManager : private TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   private:
 	/// LIST OF IMAGES:

src/backup.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "backup.h"
 
 #include "global.h"
@@ -64,7 +68,7 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name)
 	TQString savesFolder = Global::savesFolder();
 	savesFolder = savesFolder.left(savesFolder.length() - 1); // savesFolder ends with "/"
 
-	TQGroupBox *folderGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Save Folder"), page);
+	TQGroupBox *folderGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Save Folder"), page);
 	new TQLabel("<qt><nobr>" + i18n("Your baskets are currently stored in that folder:<br><b>%1</b>").arg(savesFolder), folderGroup);
 	TQWidget *folderWidget = new TQWidget(folderGroup);
 	TQHBoxLayout *folderLayout = new TQHBoxLayout(folderWidget, 0, spacingHint());
@@ -77,18 +81,18 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name)
 		"In this case, mount the shared-folder to the local file system and ask %2 to use that mount point.<br>"
 		"Warning: you should not run %3 at the same time on both computers, or you risk to loss data while the two applications are desynced.</li>"
 		"</ul><p>Please remember that you should not change the content of that folder manually (eg. adding a file in a basket folder will not add that file to the basket).</p>")
-			.arg(kapp->aboutData()->programName())
-			.arg(kapp->aboutData()->programName())
-			.arg(kapp->aboutData()->programName()),
+			.arg(tdeApp->aboutData()->programName())
+			.arg(tdeApp->aboutData()->programName())
+			.arg(tdeApp->aboutData()->programName()),
 		folderWidget);
 	folderLayout->addWidget(moveFolder);
 	folderLayout->addWidget(useFolder);
 	folderLayout->addWidget(helpLabel);
 	folderLayout->addStretch();
-	connect( moveFolder, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveToAnotherFolder())      );
-	connect( useFolder,  TQT_SIGNAL(clicked()), this, TQT_SLOT(useAnotherExistingFolder()) );
+	connect( moveFolder, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveToAnotherFolder())      );
+	connect( useFolder,  TQ_SIGNAL(clicked()), this, TQ_SLOT(useAnotherExistingFolder()) );
 
-	TQGroupBox *backupGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Backups"), page);
+	TQGroupBox *backupGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Backups"), page);
 	TQWidget *backupWidget = new TQWidget(backupGroup);
 	TQHBoxLayout *backupLayout = new TQHBoxLayout(backupWidget, 0, spacingHint());
 	TQPushButton *backupButton  = new TQPushButton(i18n("&Backup..."),           backupWidget);
@@ -98,8 +102,8 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name)
 	backupLayout->addWidget(restoreButton);
 	backupLayout->addWidget(m_lastBackup);
 	backupLayout->addStretch();
-	connect( backupButton,  TQT_SIGNAL(clicked()), this, TQT_SLOT(backup())  );
-	connect( restoreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(restore()) );
+	connect( backupButton,  TQ_SIGNAL(clicked()), this, TQ_SLOT(backup())  );
+	connect( restoreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(restore()) );
 
 	populateLastBackup();
 
@@ -114,7 +118,7 @@ void BackupDialog::populateLastBackup()
 {
 	TQString lastBackupText = i18n("Last backup: never");
 	if (Settings::lastBackup().isValid())
-		lastBackupText = i18n("Last backup: %1").arg(Settings::lastBackup().toString(Qt::LocalDate));
+		lastBackupText = i18n("Last backup: %1").arg(Settings::lastBackup().toString(TQt::LocalDate));
 
 	m_lastBackup->setText(lastBackupText);
 }
@@ -170,7 +174,7 @@ void BackupDialog::backup()
 	config->setGroup("Backups");
 	TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
 	TQString fileName = i18n("Backup filename (without extension), %1 is the date", "Baskets_%1")
-		.arg(TQDate::currentDate().toString(Qt::ISODate));
+		.arg(TQDate::currentDate().toString(TQt::ISODate));
 	TQString url = folder + fileName;
 
 	// Ask a file name & path to the user:
@@ -212,7 +216,7 @@ void BackupDialog::backup()
 	thread.start();
 	while (thread.running()) {
 		progress->advance(1); // Or else, the animation is not played!
-		kapp->processEvents();
+		tdeApp->processEvents();
 		usleep(300); // Not too long because if the backup process is finished, we wait for nothing
 	}
 
@@ -270,14 +274,14 @@ void BackupDialog::restore()
 	thread.start();
 	while (thread.running()) {
 		progress->advance(1); // Or else, the animation is not played!
-		kapp->processEvents();
+		tdeApp->processEvents();
 		usleep(300); // Not too long because if the restore process is finished, we wait for nothing
 	}
 
 	dialog->hide(); // The restore is finished, do not continue to show it while telling the user the application is going to be restarted
 	delete dialog; // If we only hidden it, it reappeared just after having restored a small backup... Very strange.
 	dialog = 0;    // This was annoying since it is modal and the "BasKet Note Pads is going to be restarted" message was not reachable.
-	//kapp->processEvents();
+	//tdeApp->processEvents();
 
 	// Check for errors:
 	if (!thread.success()) {
@@ -334,12 +338,12 @@ void Backup::setFolderAndRestart(const TQString &folder, const TQString &message
 		0,
 		"<qt>" + message.arg(
 			(folder.endsWith("/") ? folder.left(folder.length() - 1) : folder),
-			kapp->aboutData()->programName()),
+			tdeApp->aboutData()->programName()),
 		i18n("Restart")
 	);
 
 	// Restart the application:
-	KRun::runCommand(binaryPath, kapp->aboutData()->programName(), kapp->iconName());
+	KRun::runCommand(binaryPath, tdeApp->aboutData()->programName(), tdeApp->iconName());
 	exit(0);
 }
 

src/backup.h

@@ -30,7 +30,7 @@
  */
 class BackupDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	BackupDialog(TQWidget *parent = 0, const char *name = 0);
@@ -48,7 +48,7 @@ class BackupDialog : public KDialogBase
 /**
  * @author Sébastien Laoût <slaout@linux62.org>
  */
-class Backup
+class TDE_EXPORT Backup
 {
   public:
 	static void figureOutBinaryPath(const char *argv0, TQApplication &app);

src/basket.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqdragobject.h>
 #include <tqdom.h>
 #include <tqpainter.h>
@@ -36,7 +40,7 @@
 #include <kopenwith.h>
 #include <kservice.h>
 #include <tdelocale.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -77,7 +81,6 @@
 #include "tools.h"
 #include "debugwindow.h"
 #include "exporterdialog.h"
-#include "config.h"
 #include "popupmenu.h"
 #ifdef HAVE_LIBGPGME
 #include "kgpgme.h"
@@ -199,13 +202,13 @@ DecoratedBasket::DecoratedBasket(TQWidget *parent, const TQString &folderName, c
 	m_filter->setShown(true);
 	m_basket->setFocus(); // To avoid the filter bar have focus on load
 
-	connect( m_filter, TQT_SIGNAL(newFilter(const FilterData&)), m_basket, TQT_SLOT(newFilter(const FilterData&)) );
-	connect( m_filter, TQT_SIGNAL(escapePressed()),              m_basket, TQT_SLOT(cancelFilter())               );
-	connect( m_filter, TQT_SIGNAL(returnPressed()),              m_basket, TQT_SLOT(validateFilter())             );
+	connect( m_filter, TQ_SIGNAL(newFilter(const FilterData&)), m_basket, TQ_SLOT(newFilter(const FilterData&)) );
+	connect( m_filter, TQ_SIGNAL(escapePressed()),              m_basket, TQ_SLOT(cancelFilter())               );
+	connect( m_filter, TQ_SIGNAL(returnPressed()),              m_basket, TQ_SLOT(validateFilter())             );
 
-	connect( m_basket, TQT_SIGNAL(postMessage(const TQString&)),      Global::bnpView, TQT_SLOT(postStatusbarMessage(const TQString&)) );
-	connect( m_basket, TQT_SIGNAL(setStatusBarText(const TQString&)), Global::bnpView, TQT_SLOT(setStatusBarHint(const TQString&))     );
-	connect( m_basket, TQT_SIGNAL(resetStatusBarText()),             Global::bnpView, TQT_SLOT(updateStatusBarHint())                );
+	connect( m_basket, TQ_SIGNAL(postMessage(const TQString&)),      Global::bnpView, TQ_SLOT(postStatusbarMessage(const TQString&)) );
+	connect( m_basket, TQ_SIGNAL(setStatusBarText(const TQString&)), Global::bnpView, TQ_SLOT(setStatusBarHint(const TQString&))     );
+	connect( m_basket, TQ_SIGNAL(resetStatusBarText()),             Global::bnpView, TQ_SLOT(updateStatusBarHint())                );
 }
 
 DecoratedBasket::~DecoratedBasket()
@@ -254,7 +257,7 @@ void DecoratedBasket::resetFilter()
 TransparentWidget::TransparentWidget(Basket *basket)
  : TQWidget(basket->viewport(), "", TQt::WNoAutoErase), m_basket(basket)
 {
-	setFocusPolicy(TQ_NoFocus);
+	setFocusPolicy(TQWidget::NoFocus);
 	setWFlags(TQt::WNoAutoErase);
 	setMouseTracking(true); // To receive mouseMoveEvents
 
@@ -343,7 +346,7 @@ void debugZone(int zone)
 				s = "Emblem0+" + TQString::number(zone - Note::Emblem0);
 			break;
 	}
-	std::cout << s << std::endl;
+	std::cout << s.local8Bit() << std::endl;
 }
 
 #define FOR_EACH_NOTE(noteVar) \
@@ -725,9 +728,9 @@ void Basket::loadNotes(const TQDomElement &notes, Note *parent)
 			appendNoteIn(note, parent); // ... And insert it.
 			// Load dates:
 			if (e.hasAttribute("added"))
-				note->setAddedDate(           TQDateTime::fromString(e.attribute("added"),            Qt::ISODate));
+				note->setAddedDate(           TQDateTime::fromString(e.attribute("added"),            TQt::ISODate));
 			if (e.hasAttribute("lastModification"))
-				note->setLastModificationDate(TQDateTime::fromString(e.attribute("lastModification"), Qt::ISODate));
+				note->setLastModificationDate(TQDateTime::fromString(e.attribute("lastModification"), TQt::ISODate));
 		}
 		// If we successfully loaded a note:
 		if (note) {
@@ -755,7 +758,7 @@ void Basket::loadNotes(const TQDomElement &notes, Note *parent)
 				}
 			}
 		}
-//		kapp->processEvents();
+//		tdeApp->processEvents();
 	}
 }
 
@@ -780,8 +783,8 @@ void Basket::saveNotes(TQDomDocument &document, TQDomElement &element, Note *par
 		// Save Content:
 		if (note->content()) {
 			// Save Dates:
-			noteElement.setAttribute("added",            note->addedDate().toString(Qt::ISODate)           );
-			noteElement.setAttribute("lastModification", note->lastModificationDate().toString(Qt::ISODate));
+			noteElement.setAttribute("added",            note->addedDate().toString(TQt::ISODate)           );
+			noteElement.setAttribute("lastModification", note->lastModificationDate().toString(TQt::ISODate));
 			// Save Content:
 			noteElement.setAttribute("type", note->content()->lowerTypeName());
 			TQDomElement content = document.createElement("content");
@@ -911,7 +914,7 @@ void Basket::setAppearance(const TQString &icon, const TQString &name, const TQS
 	m_action->setText("BASKET SHORTCUT: " + name);
 
 	// Basket should ALWAYS have an icon (the "basket" icon by default):
-	TQPixmap iconTest = kapp->iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
+	TQPixmap iconTest = tdeApp->iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
 	if (iconTest.isNull())
 		m_icon = "basket";
 
@@ -1073,7 +1076,7 @@ void Basket::equalizeColumnSizes()
 void Basket::enableActions()
 {
 	Global::bnpView->enableActions();
-	setFocusPolicy(isLocked() ? TQ_NoFocus : TQ_StrongFocus);
+	setFocusPolicy(isLocked() ? TQWidget::NoFocus : TQWidget::StrongFocus);
 	if (isLocked())
 		viewport()->setCursor(TQt::ArrowCursor); // When locking, the cursor stays the last form it was
 }
@@ -1121,7 +1124,7 @@ void Basket::aboutToBeActivated()
 		setFocusedNote(0); // So that during the focusInEvent that will come shortly, the FIRST note is focused.
 
 		if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all!
-			animateLoad();//TQTimer::singleShot( 0, this, TQT_SLOT(animateLoad()) );
+			animateLoad();//TQTimer::singleShot( 0, this, TQ_SLOT(animateLoad()) );
 
 		m_finishLoadOnFirstShow = false;
 	}
@@ -1169,7 +1172,7 @@ void Basket::load()
 	// Now that the background image is loaded and subscribed, we display it during the load process:
 	delete doc;
 	updateContents();
-//	kapp->processEvents();
+//	tdeApp->processEvents();
 
 	//BEGIN Compatibility with 0.6.0 Pre-Alpha versions:
 	TQDomElement notes = XMLWork::getElement(docElem, "notes");
@@ -1213,7 +1216,7 @@ void Basket::load()
 	focusANote();
 
 	if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all!
-		animateLoad();//TQTimer::singleShot( 0, this, TQT_SLOT(animateLoad()) );
+		animateLoad();//TQTimer::singleShot( 0, this, TQ_SLOT(animateLoad()) );
 	else
 		m_loaded = true;
 	enableActions();
@@ -1229,7 +1232,7 @@ void Basket::filterAgain(bool andEnsureVisible/* = true*/)
 
 void Basket::filterAgainDelayed()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT(filterAgain()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(filterAgain()) );
 }
 
 void Basket::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/)
@@ -1305,7 +1308,7 @@ void Basket::setShortcut(TDEShortcut shortcut, int action)
 	m_shortcutAction = action;
 
 	if (action > 0)
-		Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), /*configurable=*/false);
+		Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), this, TQ_SLOT(activatedShortcut()), /*configurable=*/false);
 	Global::globalAccel->updateConnections();
 }
 
@@ -1354,13 +1357,13 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
    m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false)
 {
 	TQString sAction = "local_basket_activate_" + folderName;
-	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction);
+	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), this, TQ_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction.utf8());
 	m_action->setShortcutConfigurable(false); // We do it in the basket properties dialog (and keep it in sync with the global one)
 
 	if (!m_folderName.endsWith("/"))
 		m_folderName += "/";
 
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
 	setWFlags(TQt::WNoAutoErase);
 	setDragAutoScroll(true);
 
@@ -1374,18 +1377,18 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
 	viewport()->setBackgroundMode(NoBackground); // Do not clear the widget before paintEvent() because we always draw every pixels (faster and flicker-free)
 
 	// File Watcher:
-	m_watcher = new KDirWatch(TQT_TQOBJECT(this));
-	connect( m_watcher,       TQT_SIGNAL(dirty(const TQString&)),   this, TQT_SLOT(watchedFileModified(const TQString&)) );
-	connect( m_watcher,       TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(watchedFileDeleted(const TQString&))  );
-	connect( &m_watcherTimer, TQT_SIGNAL(timeout()),               this, TQT_SLOT(updateModifiedNotes())               );
+	m_watcher = new KDirWatch(this);
+	connect( m_watcher,       TQ_SIGNAL(dirty(const TQString&)),   this, TQ_SLOT(watchedFileModified(const TQString&)) );
+	connect( m_watcher,       TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(watchedFileDeleted(const TQString&))  );
+	connect( &m_watcherTimer, TQ_SIGNAL(timeout()),               this, TQ_SLOT(updateModifiedNotes())               );
 
 	// Various Connections:
-	connect( &m_animationTimer,           TQT_SIGNAL(timeout()),   this, TQT_SLOT(animateObjects())            );
-	connect( &m_autoScrollSelectionTimer, TQT_SIGNAL(timeout()),   this, TQT_SLOT(doAutoScrollSelection())     );
-	connect( &m_timerCountsChanged,       TQT_SIGNAL(timeout()),   this, TQT_SLOT(countsChangedTimeOut())      );
-	connect( &m_inactivityAutoSaveTimer,  TQT_SIGNAL(timeout()),   this, TQT_SLOT(inactivityAutoSaveTimeout()) );
-	connect( &m_inactivityAutoLockTimer,  TQT_SIGNAL(timeout()),   this, TQT_SLOT(inactivityAutoLockTimeout()) );
-	connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(contentsMoved()) );
+	connect( &m_animationTimer,           TQ_SIGNAL(timeout()),   this, TQ_SLOT(animateObjects())            );
+	connect( &m_autoScrollSelectionTimer, TQ_SIGNAL(timeout()),   this, TQ_SLOT(doAutoScrollSelection())     );
+	connect( &m_timerCountsChanged,       TQ_SIGNAL(timeout()),   this, TQ_SLOT(countsChangedTimeOut())      );
+	connect( &m_inactivityAutoSaveTimer,  TQ_SIGNAL(timeout()),   this, TQ_SLOT(inactivityAutoSaveTimeout()) );
+	connect( &m_inactivityAutoLockTimer,  TQ_SIGNAL(timeout()),   this, TQ_SLOT(inactivityAutoLockTimeout()) );
+	connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(contentsMoved()) );
 #ifdef HAVE_LIBGPGME
 	m_gpg = new KGpgMe();
 #endif
@@ -1395,7 +1398,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
 void Basket::contentsMoved()
 {
 	// This slot is called BEFORE the content move, so we delay the hover effects:
-	TQTimer::singleShot(0, this, TQT_SLOT(doHoverEffects()));
+	TQTimer::singleShot(0, this, TQ_SLOT(doHoverEffects()));
 }
 
 void Basket::enterEvent(TQEvent *)
@@ -1423,7 +1426,7 @@ void Basket::leaveEvent(TQEvent *)
 
 void Basket::setFocusIfNotInPopupMenu()
 {
-	if (!kapp->activePopupWidget()) {
+	if (!tdeApp->activePopupWidget()) {
 		if (isDuringEdit()) {
 			m_editor->widget()->setFocus();
 		}
@@ -1440,7 +1443,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	// the interface flicker by showing the focused rectangle (as the basket gets focus)
 	// and immediatly removing it (because the popup menu now have focus).
 	if (!isDuringEdit())
-		TQTimer::singleShot(0, this, TQT_SLOT(setFocusIfNotInPopupMenu()));
+		TQTimer::singleShot(0, this, TQ_SLOT(setFocusIfNotInPopupMenu()));
 
 	// Convenient variables:
 	bool controlPressed = event->stateAfter() & TQt::ControlButton;
@@ -1448,12 +1451,12 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 
 	// Do nothing if we disabled the click some milliseconds sooner.
 	// For instance when a popup menu has been closed with click, we should not do action:
-	if (event->button() == Qt::LeftButton && (kapp->activePopupWidget() || m_lastDisableClick.msecsTo(TQTime::currentTime()) <= 80)) {
+	if (event->button() == TQt::LeftButton && (tdeApp->activePopupWidget() || m_lastDisableClick.msecsTo(TQTime::currentTime()) <= 80)) {
 		doHoverEffects();
 		m_noActionOnMouseRelease = true;
 		// But we allow to select:
 		// The code is the same as at the bottom of this method:
-		if (event->button() == Qt::LeftButton) {
+		if (event->button() == TQt::LeftButton) {
 			m_selectionStarted = true;
 			m_selectionBeginPoint = event->pos();
 			m_selectionInvert = controlPressed || shiftPressed;
@@ -1466,7 +1469,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	Note::Zone zone = (clicked ? clicked->zoneAt( event->pos() - TQPoint(clicked->x(), clicked->y()) ) : Note::None);
 
 	// Popup Tags menu:
-	if (zone == Note::TagsArrow && !controlPressed && !shiftPressed && event->button() != Qt::MidButton) {
+	if (zone == Note::TagsArrow && !controlPressed && !shiftPressed && event->button() != TQt::MidButton) {
 		if (!clicked->isSelected())
 			unselectAllBut(clicked);
 		setFocusedNote(clicked); /// /// ///
@@ -1476,7 +1479,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 		return;
 	}
 
-	if (event->button() == Qt::LeftButton) {
+	if (event->button() == TQt::LeftButton) {
 		// Prepare to allow drag and drop when moving mouse further:
 		if ( (zone == Note::Handle || zone == Note::Group) ||
 		     (clicked && clicked->isSelected() &&
@@ -1561,7 +1564,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	}
 
 	// Popup menu for tag emblems:
-	if (event->button() == Qt::RightButton && zone >= Note::Emblem0) {
+	if (event->button() == TQt::RightButton && zone >= Note::Emblem0) {
 		if (!clicked->isSelected())
 			unselectAllBut(clicked);
 		setFocusedNote(clicked); /// /// ///
@@ -1572,7 +1575,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	}
 
 	// Insertion Popup Menu:
-	if ( (event->button() == Qt::RightButton) &&
+	if ( (event->button() == TQt::RightButton) &&
 	     ((!clicked && isFreeLayout()) ||
 	      (clicked && (zone == Note::TopInsert || zone == Note::TopGroup || zone == Note::BottomInsert || zone == Note::BottomGroup || zone == Note::BottomColumn))) ) {
 		unselectAll();
@@ -1584,10 +1587,10 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 			menu->removeItem(/*id=*/120);
 		menu->insertTitle((zone == Note::TopGroup || zone == Note::BottomGroup ? i18n("The verb (Group New Note)", "Group") : i18n("The verb (Insert New Note)", "Insert")), /*id=*/120, /*index=*/0);
 		setInsertPopupMenu();
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(delayedCancelInsertPopupMenu()) );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())               );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())             );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(hideInsertPopupMenu())          );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(delayedCancelInsertPopupMenu()) );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())               );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())             );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(hideInsertPopupMenu())          );
 		doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually!
 		m_lockedHovering = true;
 		menu->exec(TQCursor::pos());
@@ -1596,7 +1599,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	}
 
 	// Note Context Menu:
-	if (event->button() == Qt::RightButton && clicked && !clicked->isColumn() && zone != Note::Resizer) {
+	if (event->button() == TQt::RightButton && clicked && !clicked->isColumn() && zone != Note::Resizer) {
 		if (!clicked->isSelected())
 			unselectAllBut(clicked);
 		setFocusedNote(clicked); /// /// ///
@@ -1606,8 +1609,8 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 		}
 		m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked);
 		TQPopupMenu* menu = Global::bnpView->popupMenu("note_popup");
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())   );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick()) );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())   );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick()) );
 		doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually!
 		m_lockedHovering = true;
 		menu->exec(TQCursor::pos());
@@ -1616,7 +1619,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	}
 
 	// Paste selection under cursor (but not "create new primary note under cursor" because this is on moveRelease):
-	if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
+	if (event->button() == TQt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
 		if ((Settings::middleAction() != 0) && (event->state() == TQt::ShiftButton)) {
 			m_clickedToInsert = clicked;
 			m_zoneToInsert    = zone;
@@ -1676,7 +1679,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	 * and if it's larger, switching to m_isSelecting mode: we can draw the selection rectangle.
 	 */
 	// Prepare selection:
-	if (event->button() == Qt::LeftButton) {
+	if (event->button() == TQt::LeftButton) {
 		m_selectionStarted = true;
 		m_selectionBeginPoint = event->pos();
 		// We usualy invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key.
@@ -1687,7 +1690,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 
 void Basket::delayedCancelInsertPopupMenu()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT(cancelInsertPopupMenu()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(cancelInsertPopupMenu()) );
 }
 
 void Basket::contentsContextMenuEvent(TQContextMenuEvent *event)
@@ -1697,9 +1700,9 @@ void Basket::contentsContextMenuEvent(TQContextMenuEvent *event)
 			TQRect basketRect( mapToGlobal(TQPoint(0,0)), size() );
 			TQPopupMenu *menu = Global::bnpView->popupMenu("insert_popup");
 			setInsertPopupMenu();
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(delayedCancelInsertPopupMenu()) );
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())               );
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())             );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(delayedCancelInsertPopupMenu()) );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())               );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())             );
 			removeInserter();
 			m_lockedHovering = true;
 			PopupMenu::execAtRectCenter(*menu, basketRect); // Popup at center or the basket
@@ -1710,8 +1713,8 @@ void Basket::contentsContextMenuEvent(TQContextMenuEvent *event)
 			m_startOfShiftSelectionNote = (m_focusedNote->isGroup() ? m_focusedNote->firstRealChild() : m_focusedNote);
 			// Popup at bottom (or top) of the focused note, if visible :
 			TQPopupMenu *menu = Global::bnpView->popupMenu("note_popup");
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())   );
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick()) );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())   );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick()) );
 			doHoverEffects(m_focusedNote, Note::Content); // In the case where another popup menu was open, we should do that manually!
 			m_lockedHovering = true;
 			PopupMenu::execAtRectBottom(*menu, noteVisibleRect(m_focusedNote), true);
@@ -1853,7 +1856,7 @@ void Basket::insertNote(Note *note, Note *clicked, int zone, const TQPoint &pos,
 void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/int zone)
 {
 	Note *note;
-	if (event->button() == Qt::MidButton)
+	if (event->button() == TQt::MidButton)
 		note = NoteFactory::dropNote(TDEApplication::clipboard()->data(TQClipboard::Selection), this);
 	else
 		note = NoteFactory::createNoteText("", this);
@@ -1865,7 +1868,7 @@ void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/i
 
 //	ensureNoteVisible(lastInsertedNote()); // TODO: in insertNote()
 
-	if (event->button() != Qt::MidButton) {
+	if (event->button() != TQt::MidButton) {
 		removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it.
 		closeEditor();
 		noteEdit(note, /*justAdded=*/true);
@@ -1965,7 +1968,7 @@ void Basket::contentsDropEvent(TQDropEvent *event)
 		// If moved a note on bottom, contentsHeight has been disminished, then view scrolled up, and we should re-scroll the view down:
 		ensureNoteVisible(note);
 
-//		if (event->button() != Qt::MidButton) {
+//		if (event->button() != TQt::MidButton) {
 //			removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it.
 //		}
 
@@ -2144,7 +2147,7 @@ void Basket::resetInsertionData()
 
 void Basket::hideInsertPopupMenu()
 {
-	TQTimer::singleShot( 50/*ms*/, this, TQT_SLOT(timeoutHideInsertPopupMenu()) );
+	TQTimer::singleShot( 50/*ms*/, this, TQ_SLOT(timeoutHideInsertPopupMenu()) );
 }
 
 void Basket::timeoutHideInsertPopupMenu()
@@ -2225,7 +2228,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
 
 
 
-	if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
+	if (event->button() == TQt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
 		if ((Settings::middleAction() != 0) && (event->stateAfter() == TQt::ShiftButton)) {
 			m_clickedToInsert = clicked;
 			m_zoneToInsert    = zone;
@@ -2261,7 +2264,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
 
 //	Note *clicked = noteAt(event->pos().x(), event->pos().y());
 	if ( ! clicked ) {
-		if (isFreeLayout() && event->button() == Qt::LeftButton) {
+		if (isFreeLayout() && event->button() == TQt::LeftButton) {
 			clickedToInsert(event);
 			save();
 		}
@@ -2288,7 +2291,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
 
 	// Switch tag states:
 	if (zone >= Note::Emblem0) {
-		if (event->button() == Qt::LeftButton) {
+		if (event->button() == TQt::LeftButton) {
 			int icons = -1;
 			for (State::List::iterator it = clicked->states().begin(); it != clicked->states().end(); ++it) {
 				if ( ! (*it)->emblem().isEmpty() )
@@ -2310,7 +2313,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
 				}
 			}
 			return;
-		}/* else if (event->button() == Qt::RightButton) {
+		}/* else if (event->button() == TQt::RightButton) {
 		popupEmblemMenu(clicked, zone - Note::Emblem0);
 		return;
 	}*/
@@ -2321,9 +2324,9 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
 //	Note *note;
 	TQString  link;
 	//int zone = zone;
-	if (event->button() == Qt::MidButton && zone == Note::Resizer)
+	if (event->button() == TQt::MidButton && zone == Note::Resizer)
 		return; //zone = clicked->zoneAt( event->pos() - TQPoint(clicked->x(), clicked->y()), true );
-	if (event->button() == Qt::RightButton && (clicked->isColumn() || zone == Note::Resizer))
+	if (event->button() == TQt::RightButton && (clicked->isColumn() || zone == Note::Resizer))
 		return;
 	if (clicked->isGroup() && zone == Note::None)
 		return;
@@ -2397,7 +2400,7 @@ void Basket::contentsMouseDoubleClickEvent(TQMouseEvent *event)
 	Note *clicked = noteAt(event->pos().x(), event->pos().y());
 	Note::Zone zone = (clicked ? clicked->zoneAt( event->pos() - TQPoint(clicked->x(), clicked->y()) ) : Note::None);
 
-	if (event->button() == Qt::LeftButton && (zone == Note::Group || zone == Note::Handle)) {
+	if (event->button() == TQt::LeftButton && (zone == Note::Group || zone == Note::Handle)) {
 		doCopy(CopyToSelection);
 		m_noActionOnMouseRelease = true;
 	} else
@@ -2412,8 +2415,8 @@ void Basket::contentsMouseMoveEvent(TQMouseEvent *event)
 		m_isSelecting      = false; // Don't draw selection rectangle ater drag!
 		m_selectionStarted = false;
 		NoteSelection *selection = selectedNotes();
-		if (selection->firstStacked()) {
-			TQDragObject *d = NoteDrag::dragObject(selection, /*cutting=*/false, /*source=*/this); // d will be deleted by QT
+		if (selection && selection->firstStacked()) {
+			TQDragObject *d = NoteDrag::dragObject(selection, /*cutting=*/false, /*source=*/this); // d will be deleted by TQt
 		/*bool shouldRemove = */d->drag();
 //		delete selection;
 
@@ -2533,7 +2536,7 @@ void Basket::doAutoScrollSelection()
 		dx = pos.x() - visibleWidth() + AUTO_SCROLL_MARGIN;
 
 	if (dx || dy) {
-		kapp->sendPostedEvents(); // Do the repaints, because the scrolling will make the area to repaint to be wrong
+		tdeApp->sendPostedEvents(); // Do the repaints, because the scrolling will make the area to repaint to be wrong
 		scrollBy(dx, dy);
 		if (!m_autoScrollSelectionTimer.isActive())
 			m_autoScrollSelectionTimer.start(AUTO_SCROLL_DELAY);
@@ -2688,7 +2691,7 @@ void Basket::doHoverEffects(const TQPoint &pos)
 	// Don't do hover effects when a popup menu is opened.
 	// Primarily because the basket area will only receive mouseEnterEvent and mouveLeaveEvent.
 	// It willn't be noticed of mouseMoveEvent, which would result in a apparently broken application state:
-	if (kapp->activePopupWidget())
+	if (tdeApp->activePopupWidget())
 		underMouse = false;
 
 	// Compute which note is hovered:
@@ -2701,7 +2704,7 @@ void Basket::doHoverEffects(const TQPoint &pos)
 
 void Basket::mouseEnteredEditorWidget()
 {
-	if (!m_lockedHovering && !kapp->activePopupWidget())
+	if (!m_lockedHovering && !tdeApp->activePopupWidget())
 		doHoverEffects(editedNote(), Note::Content, TQPoint());
 }
 
@@ -3038,7 +3041,7 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
 
 void Basket::unlock()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT(load()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(load()) );
 }
 
 void Basket::inactivityAutoLockTimeout()
@@ -3052,7 +3055,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 	if (!m_loadingLaunched)
 	{
 		if(!m_locked)
-			TQTimer::singleShot( 0, this, TQT_SLOT(load()) );
+			TQTimer::singleShot( 0, this, TQ_SLOT(load()) );
 		else {
 			Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar
 		}
@@ -3076,14 +3079,14 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 			m_button = new TQPushButton( m_decryptBox, "button" );
 			m_button->setText( i18n( "&Unlock" ) );
 			layout->addWidget( m_button, 1, 2 );
-			connect( m_button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( unlock() ) );
+			connect( m_button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( unlock() ) );
 #endif
 			TQLabel* label = new TQLabel( m_decryptBox, "label" );
 			TQString text = "<b>" + i18n("Password protected basket.") + "</b><br/>";
 #ifdef HAVE_LIBGPGME
 			label->setText( text + i18n("Press Unlock to access it.") );
 #else
-			label->setText( text + i18n("Encryption is not supported by<br/>this version of %1.").arg(kapp->aboutData()->programName()) );
+			label->setText( text + i18n("Encryption is not supported by<br/>this version of %1.").arg(tdeApp->aboutData()->programName()) );
 #endif
 			label->setAlignment( int( TQLabel::AlignTop ) );
 			layout->addMultiCellWidget( label, 0, 0, 1, 2 );
@@ -3407,9 +3410,9 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 	if (sequenceOnDelete)
 		menu.setAccel(sequence, 1);
 
-	connect( &menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggledStateInMenu(int)) );
-	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())        );
-	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())      );
+	connect( &menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggledStateInMenu(int)) );
+	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())        );
+	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())      );
 
 	m_lockedHovering = true;
 	menu.exec(TQCursor::pos());
@@ -3513,9 +3516,9 @@ void Basket::popupTagsMenu(Note *note)
 // 	if (!selectedNotesHaveTags())//note->states().isEmpty())
 // 		menu.setItemEnabled(2, false);
 //
-// 	connect( &menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggledTagInMenu(int)) );
-// 	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())      );
-// 	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())    );
+// 	connect( &menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggledTagInMenu(int)) );
+// 	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())      );
+// 	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())    );
 
 	Global::bnpView->populateTagsMenu(menu, note);
 
@@ -3814,7 +3817,7 @@ void Basket::placeEditor(bool /*andEnsureVisible*/ /*= false*/)
 }
 
 #include <iostream>
-#include <tqrichtext_p.h>
+#include <private/tqrichtext_p.h>
 void Basket::editorCursorPositionChanged()
 {
 	if (!isDuringEdit())
@@ -3832,7 +3835,7 @@ void Basket::editorCursorPositionChanged()
 void Basket::closeEditorDelayed()
 {
 	setFocus();
-	TQTimer::singleShot( 0, this, TQT_SLOT(closeEditor()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(closeEditor()) );
 }
 
 bool Basket::closeEditor()
@@ -3844,13 +3847,13 @@ bool Basket::closeEditor()
 		return true;
 
 	if (m_redirectEditActions) {
-		disconnect( m_editor->widget(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChangedInEditor()) );
+		disconnect( m_editor->widget(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChangedInEditor()) );
 		if (m_editor->textEdit()) {
-			disconnect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(selectionChangedInEditor()) );
-			disconnect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(contentChangedInEditor())   );
+			disconnect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(selectionChangedInEditor()) );
+			disconnect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(contentChangedInEditor())   );
 		} else if (m_editor->lineEdit()) {
-			disconnect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(selectionChangedInEditor()) );
-			disconnect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(contentChangedInEditor())   );
+			disconnect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(selectionChangedInEditor()) );
+			disconnect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(contentChangedInEditor())   );
 		}
 	}
 	m_editor->widget()->disconnect();
@@ -3899,7 +3902,7 @@ bool Basket::closeEditor()
 
 	emit resetStatusBarText(); // Remove the "Editing. ... to validate." text.
 
-	//if (kapp->activeWindow() == Global::mainContainer)
+	//if (tdeApp->activeWindow() == Global::mainContainer)
 
 	// Set focus to the basket, unless the user pressed a letter key in the filter bar and the currently edited note came hidden, then editing closed:
 	if (!decoration()->filterBar()->lineEdit()->hasFocus())
@@ -3951,7 +3954,7 @@ void debugSel(NoteSelection* sel, int n = 0)
 	for (NoteSelection *node = sel; node; node = node->next) {
 		for (int i = 0; i < n; i++)
 			std::cout << "-";
-		std::cout << (node->firstChild ? "Group" : node->note->content()->toText("")) << std::endl;
+		std::cout << (node->firstChild ? "Group" : node->note->content()->toText("").local8Bit()) << std::endl;
 		if (node->firstChild)
 			debugSel(node->firstChild, n+1);
 	}
@@ -4030,7 +4033,7 @@ void Basket::noteEdit(Note *note, bool justAdded, const TQPoint &clickedPoint) /
 	}
 
 	if (justAdded && isFiltering()) {
-		TQTimer::singleShot( 0, this, TQT_SLOT(showEditedNoteWhileFiltering()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(showEditedNoteWhileFiltering()) );
 	}
 
 	doHoverEffects(note, Note::Content); // Be sure (in the case Edit was triggered by menu or Enter key...): better feedback!
@@ -4050,37 +4053,37 @@ void Basket::noteEdit(Note *note, bool justAdded, const TQPoint &clickedPoint) /
 		placeEditorAndEnsureVisible(); //       placeEditor(); // FIXME: After?
 		m_redirectEditActions = m_editor->lineEdit() || m_editor->textEdit();
 		if (m_redirectEditActions) {
-			connect( m_editor->widget(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChangedInEditor()) );
+			connect( m_editor->widget(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChangedInEditor()) );
 			// In case there is NO text, "Select All" is disabled. But if the user press a key the there is now a text:
 			// selection has not changed but "Select All" should be re-enabled:
 			if (m_editor->textEdit()) {
-				connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(selectionChangedInEditor()) );
-				connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(contentChangedInEditor())   );
+				connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(selectionChangedInEditor()) );
+				connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(contentChangedInEditor())   );
 			} else if (m_editor->lineEdit()) {
-				connect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(selectionChangedInEditor()) );
-				connect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(contentChangedInEditor())   );
+				connect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(selectionChangedInEditor()) );
+				connect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(contentChangedInEditor())   );
 			}
 		}
 		m_editor->widget()->show();
 		//m_editor->widget()->raise();
 		m_editor->widget()->setFocus();
-		connect( m_editor, TQT_SIGNAL(askValidation()),            this, TQT_SLOT(closeEditorDelayed())       );
-		connect( m_editor, TQT_SIGNAL(mouseEnteredEditorWidget()), this, TQT_SLOT(mouseEnteredEditorWidget()) );
+		connect( m_editor, TQ_SIGNAL(askValidation()),            this, TQ_SLOT(closeEditorDelayed())       );
+		connect( m_editor, TQ_SIGNAL(mouseEnteredEditorWidget()), this, TQ_SLOT(mouseEnteredEditorWidget()) );
 		if (m_editor->textEdit()) {
-			connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(placeEditorAndEnsureVisible()) );
+			connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(placeEditorAndEnsureVisible()) );
 			if (clickedPoint != TQPoint()) {
 				TQPoint pos(clickedPoint.x() - note->x() - note->contentX() + m_editor->textEdit()->frameWidth() + 4   - m_editor->textEdit()->frameWidth(),
 				           clickedPoint.y() - note->y()   - m_editor->textEdit()->frameWidth());
-				// Do it right before the kapp->processEvents() to not have the cursor to quickly flicker at end (and sometimes stay at end AND where clicked):
+				// Do it right before the tdeApp->processEvents() to not have the cursor to quickly flicker at end (and sometimes stay at end AND where clicked):
 				m_editor->textEdit()->moveCursor(KTextEdit::MoveHome, false);
 				m_editor->textEdit()->ensureCursorVisible();
 				m_editor->textEdit()->placeCursor(pos);
 				updateEditorAppearance();
 			}
 		}
-//		kapp->processEvents();     // Show the editor toolbar before ensuring the note is visible
+//		tdeApp->processEvents();     // Show the editor toolbar before ensuring the note is visible
 		ensureNoteVisible(note);   //  because toolbar can create a new line and then partially hide the note
-		m_editor->widget()->setFocus(); // When clicking in the basket, a TQTimer::singleShot(0, ...) focus the basket! So we focus the the widget after kapp->processEvents()
+		m_editor->widget()->setFocus(); // When clicking in the basket, a TQTimer::singleShot(0, ...) focus the basket! So we focus the the widget after tdeApp->processEvents()
 		emit resetStatusBarText(); // Display "Editing. ... to validate."
 	} else {
 		// Delete the note user have canceled the addition:
@@ -4201,11 +4204,11 @@ void Basket::doCopy(CopyMode copyMode)
 
 	NoteSelection *selection = selectedNotes();
 	int countCopied = countSelecteds();
-	if (selection->firstStacked()) {
-		TQDragObject *d = NoteDrag::dragObject(selection, copyMode == CutToClipboard, /*source=*/0); // d will be deleted by QT
+	if (selection && selection->firstStacked()) {
+		TQDragObject *d = NoteDrag::dragObject(selection, copyMode == CutToClipboard, /*source=*/0); // d will be deleted by TQt
 //		/*bool shouldRemove = */d->drag();
 //		delete selection;
-		cb->setData(d, mode); // NoteMultipleDrag will be deleted by QT
+		cb->setData(d, mode); // NoteMultipleDrag will be deleted by TQt
 //		if (copyMode == CutToClipboard && !note->useFile()) // If useFile(), NoteDrag::dragObject() will delete it TODO
 //			note->slotDelete();
 
@@ -4285,7 +4288,7 @@ void Basket::noteOpen(Note *note)
   */
 bool KRun__displayOpenWithDialog(const KURL::List& lst, bool tempFiles, const TQString &text)
 {
-	if (kapp && !kapp->authorizeTDEAction("openwith")) {
+	if (tdeApp && !tdeApp->authorizeTDEAction("openwith")) {
 		KMessageBox::sorry(0L, i18n("You are not authorized to open this file.")); // TODO: Better message, i18n freeze :-(
 		return false;
 	}
@@ -4466,12 +4469,20 @@ void Basket::noteUngroup()
 
 void Basket::unplugSelection(NoteSelection *selection)
 {
+	if (!selection)
+	{
+		return;
+	}
 	for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked())
 		unplugNote(toUnplug->note);
 }
 
 void Basket::insertSelection(NoteSelection *selection, Note *after)
 {
+	if (!selection)
+	{
+		return;
+	}
 	for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
 		if (toUnplug->note->isGroup()) {
 			Note *group = new Note(this);
@@ -4493,6 +4504,10 @@ void Basket::insertSelection(NoteSelection *selection, Note *after)
 
 void Basket::selectSelection(NoteSelection *selection)
 {
+	if (!selection)
+	{
+		return;
+	}
 	for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
 		if (toUnplug->note->isGroup())
 			selectSelection(toUnplug);
@@ -5091,7 +5106,7 @@ void Basket::focusInEvent(TQFocusEvent*)
 	// Focus cannot be get with Tab when locked, but a click can focus the basket!
 	if (isLocked()) {
 		if (m_button)
-			TQTimer::singleShot( 0, m_button, TQT_SLOT(setFocus()) );
+			TQTimer::singleShot( 0, m_button, TQ_SLOT(setFocus()) );
 	} else
 		focusANote();      // hasFocus() is true at this stage, note will be focused
 }
@@ -5398,7 +5413,7 @@ bool Basket::saveToFile(const TQString& fullPath, const TQByteArray& array, TQ_U
 						: i18n("File permissions are bad for <b>%1</b>. Please check that you have write access to it and the parent folders.")
 							.arg(fullPath)
 					),
-					TQT_TQWIDGET(kapp->activeWindow())
+					tdeApp->activeWindow()
 				);
 			}
 			if (!dialog->isShown())
@@ -5406,7 +5421,7 @@ bool Basket::saveToFile(const TQString& fullPath, const TQByteArray& array, TQ_U
 			const int retryDelay = 1000/*ms*/;
 			const int sleepDelay = 50/*ms*/;
 			for (int i = 0; i < retryDelay / sleepDelay; ++i) {
-				kapp->processEvents();
+				tdeApp->processEvents();
 				usleep(sleepDelay);
 			}
 		}
@@ -5440,7 +5455,7 @@ DiskErrorDialog::DiskErrorDialog(const TQString &titleMessage, const TQString &m
 	//enableButtonOK(false);
 	setModal(true);
 	TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), /*margin=*/0, spacingHint());
-	TQPixmap icon = kapp->iconLoader()->loadIcon("hdd_unmount", TDEIcon::NoGroup, 64, TDEIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
+	TQPixmap icon = tdeApp->iconLoader()->loadIcon("drive-harddisk-unmounted", TDEIcon::NoGroup, 64, TDEIcon::DefaultState, /*path_store=*/0L, /*canReturnNull=*/true);
 	TQLabel *iconLabel  = new TQLabel(plainPage());
 	iconLabel->setPixmap(icon);
 	iconLabel->setFixedSize(iconLabel->sizeHint());
@@ -5520,7 +5535,6 @@ void Basket::lock()
 #include <tqstringlist.h>
 #include <klineedit.h>
 
-#include <config.h>
 #include <tqtextcodec.h>
 
 #include "basket.h"

src/basket.desktop

@@ -1,37 +1,15 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=Application
+Name=Basket Note Pads
+
+GenericName=Note Manager
+
+Comment=Taking care of your ideas.
 
+Type=Application
+Encoding=UTF-8
 Exec=basket %f
 MimeType=application/x-basket-archive;application/x-basket-template
 Icon=basket
-
-Name=Basket Note Pads
-Name[de]=Basket Notizblätter
-Name[es]=Blocs de notas Basket
-Name[fr]=Blocs notes Basket
-Name[it]=Blocco appunti Basket
-Name[ja]=Basket メモパッド
-Name[nb]=Kurvnotat
-Name[nn]=Korgnotat
-Name[pt]=Bloco de Notas Basket
-Name[ru]=Альбом заметок Basket
-Name[xx]=xxBasket Note Padsxx
-Name[tr]=Basket
-
-Comment=Taking care of your ideas.
-Comment[de]=Bewahren Sie Ihre Ideen.
-Comment[es]=Cuidando de sus ideas.
-Comment[fr]=Prendre soin de vos idées.
-Comment[it]=Ci prendiamo cura delle tue idee
-Comment[nb]=Ta vare på tankene dine.
-Comment[nn]=Ta vare på tankane dine.
-Comment[ja]=あなたのアイデアのお世話をします。
-Comment[pt]=Cuidando das suas ideias.
-Comment[ru]=Заботимся о ваших идеях.
-Comment[xx]=xxTaking care of your ideas.xx
-Comment[tr]=Not Tutma Aracı
 Categories=TDE;Application;Office;
 
-GenericName=Note Manager
 X-DocPath=basket/index.html

src/basket.h

@@ -36,7 +36,6 @@
 
 #include "filter.h"
 #include "note.h" // For Note::Zone
-#include "config.h"
 
 #define BASKET_USE_DRKONQI
 
@@ -58,7 +57,7 @@ class KGpgMe;
   */
 class DiskErrorDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	DiskErrorDialog(const TQString &titleMessage, const TQString &message, TQWidget *parent = 0);
@@ -127,7 +126,7 @@ class HtmlExportData
   */
 class DecoratedBasket : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	DecoratedBasket(TQWidget *parent, const TQString &folderName, const char *name = 0, WFlags fl = 0);
@@ -147,12 +146,12 @@ class DecoratedBasket : public TQWidget
 
 class TransparentWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	TransparentWidget(Basket *basket);
 	void setPosition(int x, int y);
-	//void reparent(TQWidget *parent, WFlags f, const TQPoint &p, bool showIt = FALSE);
+	//void reparent(TQWidget *parent, WFlags f, const TQPoint &p, bool showIt = false);
   protected:
 	void paintEvent(TQPaintEvent*);
 	void mouseMoveEvent(TQMouseEvent *event);
@@ -169,7 +168,7 @@ class TransparentWidget : public TQWidget
 class Basket : public TQScrollView, public TQToolTip
 {
 /// CONSTRUCTOR AND DESTRUCTOR:
-  Q_OBJECT
+  TQ_OBJECT
   
 	public:
 		enum EncryptionTypes {
@@ -741,7 +740,7 @@ class FileEvent
   */
 clas   s Bas    ket : public TQScrollView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	/** Construtor and destructor */

src/basket.lsm

@@ -1,14 +0,0 @@
-Begin4
-Title:          Basket Note Pads
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    A multi-purpose note-taking program
-Keywords:       TDE Qt Basket Note Pad Item Drop Paste Checklist Stack
-Author:         Sébastien Laoût <slaout@linux62.org>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://basket.kde.org/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

src/basket_config_apps.desktop

@@ -1,9 +1,13 @@
 [Desktop Entry]
+Name=Applications
+
+Comment=Applications
+
+Type=Service
 Encoding=UTF-8
 Icon=system-run
-Type=Service
-X-TDE-ServiceTypes=TDECModule
 
+X-TDE-ServiceTypes=TDECModule
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
 X-TDE-FactoryName=basket_config_apps
@@ -12,26 +16,3 @@ X-TDE-ParentApp=basket
 X-TDE-ParentComponents=basket,kontact_basketplugin
 X-TDE-CfgDlgHierarchy=Basket
 X-TDE-Weight=30
-
-Name=Applications
-Name[de]=Anwendungen
-Name[es]=Aplicaciones
-Name[fr]=Applications
-Name[it]=Applicazioni
-Name[ja]=アプリケーション
-Name[nb]=Programmer
-Name[nn]=Program
-Name[pt]=Aplicações
-Name[ru]=Приложения
-Name[tr]=Uygulamalar
-Comment=Applications
-Comment[de]=Anwendungen
-Comment[es]=Aplicaciones
-Comment[fr]=Applications
-Comment[it]=Applicazioni
-Comment[ja]=アプリケーション
-Comment[nb]=Programmer
-Comment[nn]=Program
-Comment[pt]=Aplicações
-Comment[ru]=Приложения
-Comment[tr]=Uygulamalar

src/basket_config_baskets.desktop

@@ -1,9 +1,13 @@
 [Desktop Entry]
+Name=Baskets
+
+Comment=Baskets
+
+Type=Service
 Encoding=UTF-8
 Icon=basket
-Type=Service
-X-TDE-ServiceTypes=TDECModule
 
+X-TDE-ServiceTypes=TDECModule
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
 X-TDE-FactoryName=basket_config_baskets
@@ -12,26 +16,3 @@ X-TDE-ParentApp=basket
 X-TDE-ParentComponents=basket,kontact_basketplugin
 X-TDE-CfgDlgHierarchy=Basket
 X-TDE-Weight=10
-
-Name=Baskets
-Name[de]=Körbe
-Name[es]=Cestas
-Name[fr]=Paniers
-Name[it]=Canestri
-Name[ja]=バスケット
-Name[nb]=Kurver
-Name[nn]=Korger
-Name[pt]=Cestos
-Name[ru]=Корзины
-Name[tr]=Sepetler
-Comment=Baskets
-Comment[de]=Körbe
-Comment[es]=Cestas
-Comment[fr]=Paniers
-Comment[it]=Canestri
-Comment[ja]=バスケット
-Comment[nb]=Kurver
-Comment[nn]=Korger
-Comment[pt]=Cestos
-Comment[ru]=Корзины
-Comment[tr]=Sepetler

src/basket_config_general.desktop

@@ -1,9 +1,13 @@
 [Desktop Entry]
+Name=General
+
+Comment=General
+
+Type=Service
 Encoding=UTF-8
 Icon=configure
-Type=Service
-X-TDE-ServiceTypes=TDECModule
 
+X-TDE-ServiceTypes=TDECModule
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
 X-TDE-FactoryName=basket_config_general
@@ -12,26 +16,3 @@ X-TDE-ParentApp=basket
 X-TDE-ParentComponents=basket,kontact_basketplugin
 X-TDE-CfgDlgHierarchy=Basket
 X-TDE-Weight=10
-
-Name=General
-Name[de]=Allgemein
-Name[es]=General
-Name[fr]=Général
-Name[it]=Generale
-Name[ja]=全般
-Name[nb]=Generelt
-Name[nn]=Generelt
-Name[pt]=Geral
-Name[ru]=Общие
-Name[tr]=Genel
-Comment=General
-Comment[de]=Allgemein
-Comment[es]=General
-Comment[fr]=Général
-Comment[it]=Generale
-Comment[ja]=全般
-Comment[nb]=Generelt
-Comment[nn]=Generelt
-Comment[pt]=Geral
-Comment[ru]=Общие
-Comment[de]=Genel

src/basket_config_new_notes.desktop

@@ -1,9 +1,13 @@
 [Desktop Entry]
+Name=New Notes
+
+Comment=New Notes
+
+Type=Service
 Encoding=UTF-8
 Icon=document-new
-Type=Service
-X-TDE-ServiceTypes=TDECModule
 
+X-TDE-ServiceTypes=TDECModule
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
 X-TDE-FactoryName=basket_config_new_notes
@@ -12,26 +16,3 @@ X-TDE-ParentApp=basket
 X-TDE-ParentComponents=basket,kontact_basketplugin
 X-TDE-CfgDlgHierarchy=Basket
 X-TDE-Weight=10
-
-Name=New Notes
-Name[de]=Neue Notizen
-Name[es]=Notas nuevas
-Name[fr]=Nouvelles notes
-Name[it]=Nuove note
-Name[ja]=新しいメモ
-Name[nb]=Nye notat
-Name[nn]=Nye notat
-Name[pt]=Anotações novas
-Name[ru]=Новые заметки
-Name[tr]=Yeni Notlar
-Comment=New Notes
-Comment[de]=Neue Notizen
-Comment[es]=Notas nuevas
-Comment[fr]=Nouvelles notes
-Comment[it]=Nuove note
-Comment[ja]=新しいメモ
-Comment[nb]=Nye notat
-Comment[nn]=Nye notat
-Comment[pt]=Anotações novas
-Comment[ru]=Новые заметки
-Comment[tr]=Yeni Notlar

src/basket_config_notes_appearance.desktop

@@ -1,9 +1,13 @@
 [Desktop Entry]
+Name=Notes Appearance
+
+Comment=Notes Appearance
+
+Type=Service
 Encoding=UTF-8
 Icon=colorize
-Type=Service
-X-TDE-ServiceTypes=TDECModule
 
+X-TDE-ServiceTypes=TDECModule
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
 X-TDE-FactoryName=basket_config_notes_appearance
@@ -12,24 +16,3 @@ X-TDE-ParentApp=basket
 X-TDE-ParentComponents=basket,kontact_basketplugin
 X-TDE-CfgDlgHierarchy=Basket
 X-TDE-Weight=10
-
-Name=Notes Appearance
-Name[de]=Erscheinungsbild
-Name[es]=Apariencia de las notas
-Name[fr]=Apparence des notes
-Name[it]=Aspetto delle note
-Name[ja]=メモの外観
-Name[nb]=Notatutseende
-Name[nn]=Notatutsjånad
-Name[ru]=Вид
-Name[tr]=Not Görünümleri
-Comment=Notes Appearance
-Comment[de]=Erscheinungsbild der Notizen
-Comment[es]=Apariencia de las notas
-Comment[fr]=Apparence des notes
-Comment[it]=Aspetto delle note
-Comment[ja]=メモの外観
-Comment[nb]=Notatutseende
-Comment[nn]=Notatutsjånad
-Comment[ru]=Вид
-Comment[tr]=Not Görünümleri

src/basket_part.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "basket_part.h"
 
 #include <kinstance.h>
@@ -45,9 +49,9 @@ BasketPart::BasketPart( TQWidget *parentWidget, const char *,
 	BasketStatusBar* bar = new BasketStatusBar(new KParts::StatusBarExtension(this));
   // this should be your custom internal widget
 	m_view = new BNPView(parentWidget, "BNPViewPart", this, actionCollection(), bar);
-	connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &)));
-	connect(m_view, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart()));
-	m_view->setFocusPolicy(TQ_ClickFocus);
+	connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(setCaption(const TQString &)));
+	connect(m_view, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart()));
+	m_view->setFocusPolicy(TQWidget::ClickFocus);
 
   // notify the part that this is our internal widget
 	setWidget(m_view);

src/basket_part.desktop

@@ -1,21 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=basketPart
-Name[br]=Perzhbasket
-Name[ca]=Part per a basket
-Name[el]=Τμήμαbasket
-Name[es]=Componente de Basket
-Name[et]=basket komponent
-Name[it]=Componente basket
-Name[ja]=basket パート
-Name[nb]=kurvDel
-Name[nn]=korgDel
-Name[pt_BR]=Parte basket
-Name[sv]=basket-del
-Name[ta]=basketபாகம்
-Name[tr]=basket Bileşeni
-Name[ru]=Модуль basket
+
+Type=Service
+Encoding=UTF-8
 MimeType=application/x-basket;
+
 X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libbasketpart
-Type=Service

src/basket_part.h

@@ -40,7 +40,7 @@ class BNPView;
  */
 class BasketPart : public KParts::ReadWritePart
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**

src/basketfactory.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqdir.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>

src/basketlistview.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "basketlistview.h"
 #include <tqregexp.h>
 #include <tdeglobalsettings.h>
@@ -136,7 +140,7 @@ void BasketListViewItem::setup()
 	int height = MARGIN + TQMAX(BASKET_ICON_SIZE, textRect.height()) + MARGIN;
 	setHeight(height);
 
-	TQPixmap icon = kapp->iconLoader()->loadIcon(m_basket->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
+	TQPixmap icon = tdeApp->iconLoader()->loadIcon(m_basket->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
 
 	setPixmap(/*column=*/0, icon);
 
@@ -580,12 +584,12 @@ void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*col
 		effectiveWidth += countPixmap.width() + MARGIN;
 	}
 	if (showLoadingIcon) {
-		TQPixmap icon = kapp->iconLoader()->loadIcon("edit-find", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon("edit-find", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
 		thePainter.drawPixmap(effectiveWidth, 0, icon);
 		effectiveWidth += BASKET_ICON_SIZE + MARGIN;
 	}
 	if (showEncryptedIcon && !showLoadingIcon) {
-		TQPixmap icon = kapp->iconLoader()->loadIcon("encrypted", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon("encrypted", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
 		thePainter.drawPixmap(effectiveWidth, 0, icon);
 	}
 
@@ -639,7 +643,7 @@ BasketTreeListView::BasketTreeListView(TQWidget *parent, const char *name)
 	setWFlags(TQt::WStaticContents | WNoAutoErase);
 	clearWFlags(TQt::WStaticContents | WNoAutoErase);
 	//viewport()->clearWFlags(TQt::WStaticContents);
-	connect( &m_autoOpenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoOpen()) );
+	connect( &m_autoOpenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoOpen()) );
 
 	new BasketTreeListView_ToolTip(this);
 }
@@ -792,7 +796,7 @@ void BasketTreeListView::paintEmptyArea(TQPainter *painter, const TQRect &rect)
 	}
 }
 
-/** We should NEVER get focus (because of TQ_NoFocus focusPolicy())
+/** We should NEVER get focus (because of TQWidget::NoFocus focusPolicy())
  * but TDEListView can programatically give us the focus.
  * So we give it to the basket.
  */

src/basketlistview.h

@@ -76,7 +76,7 @@ class BasketListViewItem : public TQListViewItem
 
 class BasketTreeListView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		BasketTreeListView(TQWidget *parent = 0, const char *name = 0);

src/basketproperties.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <kicondialog.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
@@ -67,7 +71,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent)
 	topLayout->addLayout(nameLayout);
 
 	// Appearance:
-	TQGroupBox *appearance = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), page);
+	TQGroupBox *appearance = new TQGroupBox(1, TQt::Horizontal, i18n("Appearance"), page);
 	TQWidget *appearanceWidget = new TQWidget(appearance);
 	TQGridLayout *grid = new TQGridLayout(appearanceWidget, /*nRows=*/3, /*nCols=*/2, /*margin=*/0, spacingHint());
 	m_backgroundImage = new TQComboBox(appearanceWidget);
@@ -99,7 +103,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent)
 		}
 	}
 //	m_backgroundImage->insertItem(i18n("Other..."), -1);
-	int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin);
+	int BUTTON_MARGIN = tdeApp->style().pixelMetric(TQStyle::PM_ButtonMargin);
 	m_backgroundImage->setSizeLimit(50/*75 * 6 / m_backgroundImage->sizeHint().height()*/);
 	m_backgroundImage->setMinimumHeight(75 + 2 * BUTTON_MARGIN);
 
@@ -111,7 +115,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent)
 	m_columnCount = new KIntNumInput(m_basket->columnsCount(), columnsWidget);
 	m_columnCount->setRange(1, 20, /*step=*/1, /*slider=*/false);
 	m_columnCount->setValue(m_basket->columnsCount());
-	connect( m_columnCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(selectColumnsLayout()) );
+	connect( m_columnCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(selectColumnsLayout()) );
 	dispoLayout->addWidget(radio);
 	dispoLayout->addWidget(m_columnCount);
 	m_disposition->insert(radio);
@@ -145,7 +149,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent)
 	shortcutLayout->addWidget(m_shortcut);
 	shortcutLayout->addStretch();
 	shortcutLayout->addWidget(helpLabel);
-	connect( m_shortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(capturedShortcut(const TDEShortcut&)) );
+	connect( m_shortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQ_SLOT(capturedShortcut(const TDEShortcut&)) );
 	new TQRadioButton(i18n("S&how this basket"),                        m_shortcutRole);
 	new TQRadioButton(i18n("Show this basket (&global shortcut)"),      m_shortcutRole);
 	new TQRadioButton(i18n("S&witch to this basket (global shortcut)"), m_shortcutRole);

src/basketproperties.h

@@ -41,7 +41,7 @@ class KColorCombo2;
   */
 class BasketPropertiesDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	BasketPropertiesDialog(Basket *basket, TQWidget *parent = 0);

src/basketstatusbar.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tdeparts/statusbarextension.h>
 #include <kstatusbar.h>
 #include <tdelocale.h>
@@ -77,7 +81,7 @@ void BasketStatusBar::setupStatusBar()
 		addWidget( m_basketStatus, 1, false ); // Fit all extra space and is hiddable
 	}
 	else
-		m_basketStatus = static_cast<TQLabel*>(TQT_TQWIDGET(lst->at(0)));
+		m_basketStatus = static_cast<TQLabel*>(lst->at(0));
 	delete lst;
 
 	m_selectionStatus = new TQLabel(i18n("Loading..."), parent);
@@ -87,7 +91,7 @@ void BasketStatusBar::setupStatusBar()
 	m_lockStatus->setMinimumSize(18, 18);
 	m_lockStatus->setAlignment(TQt::AlignCenter);
 //	addWidget( m_lockStatus, 0, true );
-	connect( m_lockStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) );
+	connect( m_lockStatus, TQ_SIGNAL(clicked()), Global::bnpView, TQ_SLOT(lockBasket()) );
 
 	m_savedStatusPixmap = SmallIcon("document-save");
 	m_savedStatus = new TQLabel(parent);

src/basketstatusbar.h

@@ -32,9 +32,9 @@ class ClickableLabel;
 /**
 	@author Sébastien Laoût <slaout@linux62.org>
 */
-class BasketStatusBar : public TQObject
+class TDE_EXPORT BasketStatusBar : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     BasketStatusBar(KStatusBar *bar);

src/bnpview.cpp

@@ -18,7 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
- /// NEW:
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <tqwidgetstack.h>
 #include <tqregexp.h>
@@ -37,14 +39,14 @@
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 #include <twin.h>
 #include <tdeaccel.h>
 #include <kpassivepopup.h>
 #include <kxmlguifactory.h>
 #include <tdecmdlineargs.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdeapplication.h>
 #include <kkeydialog.h>
 #include <dcopclient.h>
@@ -82,7 +84,7 @@ const int BNPView::c_delayTooltipTime = 275;
 
 BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
 				 TDEActionCollection *actionCollection, BasketStatusBar *bar)
-	: DCOPObject("BasketIface"), TQSplitter(Qt::Horizontal, parent, name), m_actLockBasket(0), m_actPassBasket(0),
+	: DCOPObject("BasketIface"), TQSplitter(TQt::Horizontal, parent, name), m_actLockBasket(0), m_actPassBasket(0),
 	m_loading(true), m_newBasketPopup(false), m_firstShow(true),
 	m_regionGrabber(0), m_passiveDroppedSelection(0), m_passivePopup(0), m_actionCollection(actionCollection),
 	m_guiClient(aGUIClient), m_statusbar(bar), m_tryHideTimer(0), m_hideTimer(0)
@@ -93,12 +95,12 @@ BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
 	Global::bnpView = this;
 
 	// Needed when loading the baskets:
-	Global::globalAccel       = new TDEGlobalAccel(TQT_TQOBJECT(this)); // FIXME: might be null (KPart case)!
+	Global::globalAccel       = new TDEGlobalAccel(this); // FIXME: might be null (KPart case)!
 	Global::backgroundManager = new BackgroundManager();
 
 	setupGlobalShortcuts();
 	initialize();
-	TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(lateInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(lateInit()));
 }
 
 BNPView::~BNPView()
@@ -139,7 +141,7 @@ void BNPView::lateInit()
 	{
 		if (Settings::useSystray() && TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden"))
 			if(Global::mainWindow()) Global::mainWindow()->hide();
-		else if (Settings::useSystray() && kapp->isRestored())
+		else if (Settings::useSystray() && tdeApp->isRestored())
 			if(Global::mainWindow()) Global::mainWindow()->setShown(!Settings::startDocked());
 		else
 			showMainWindow();
@@ -152,7 +154,7 @@ void BNPView::lateInit()
 
 	/* System tray icon */
 	Global::systemTray = new SystemTray(Global::mainWindow());
-	connect( Global::systemTray, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart()) );
+	connect( Global::systemTray, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart()) );
 	if (Settings::useSystray())
 		Global::systemTray->show();
 
@@ -186,8 +188,8 @@ void BNPView::lateInit()
 
 	m_tryHideTimer = new TQTimer(this);
 	m_hideTimer    = new TQTimer(this);
-	connect( m_tryHideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(timeoutTryHide()) );
-	connect( m_hideTimer,    TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(timeoutHide())    );
+	connect( m_tryHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutTryHide()) );
+	connect( m_hideTimer,    TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutHide())    );
 
 	// Preload every baskets for instant filtering:
 /*StopWatch::start(100);
@@ -195,7 +197,7 @@ void BNPView::lateInit()
 	while (it.current()) {
 		BasketListViewItem *item = ((BasketListViewItem*)it.current());
 		item->basket()->load();
-		kapp->processEvents();
+		tdeApp->processEvents();
 		++it;
 	}
 StopWatch::check(100);*/
@@ -248,7 +250,7 @@ void BNPView::onFirstShow()
 //	LikeBack::setWindowNamesListing(LikeBack:: / *NoListing* / / *WarnUnnamedWindows* / AllWindows);
 */
 
-	// In late init, because we need kapp->mainWidget() to be set!
+	// In late init, because we need tdeApp->mainWidget() to be set!
 	if (!isPart())
 		connectTagsMenu();
 
@@ -274,62 +276,62 @@ void BNPView::setupGlobalShortcuts()
 		globalAccel->insert( "global_show_hide_main_window", i18n("Show/hide main window"),
 							i18n("Allows you to show main Window if it is hidden, and to hide it if it is shown."),
 							TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_W, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_W,
-							TQT_TQOBJECT(basketMainWindow), TQT_SLOT(changeActive()),           true, true );
+							basketMainWindow, TQ_SLOT(changeActive()),           true, true );
 	}
 	globalAccel->insert( "global_paste", i18n("Paste clipboard contents in current basket"),
 						 i18n("Allows you to paste clipboard contents in the current basket without having to open the main window."),
 						 TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_V, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_V,
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(globalPasteInCurrentBasket()), true, true );
+						 Global::bnpView, TQ_SLOT(globalPasteInCurrentBasket()), true, true );
 	globalAccel->insert( "global_show_current_basket", i18n("Show current basket name"),
 						 i18n("Allows you to know basket is current without opening the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(showPassiveContentForced()), true, true );
+						 Global::bnpView, TQ_SLOT(showPassiveContentForced()), true, true );
 	globalAccel->insert( "global_paste_selection", i18n("Paste selection in current basket"),
 						 i18n("Allows you to paste clipboard selection in the current basket without having to open the main window."),
 						 TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_S, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_S,
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(pasteSelInCurrentBasket()),  true, true );
+						 Global::bnpView, TQ_SLOT(pasteSelInCurrentBasket()),  true, true );
 	globalAccel->insert( "global_new_basket", i18n("Create a new basket"),
 						 i18n("Allows you to create a new basket without having to open the main window (you then can use the other global shortcuts to add a note, paste clipboard or paste selection in this new basket)."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(askNewBasket()),       true, true );
+						 Global::bnpView, TQ_SLOT(askNewBasket()),       true, true );
 	globalAccel->insert( "global_previous_basket", i18n("Go to previous basket"),
 						 i18n("Allows you to change current basket to the previous one without having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView),    TQT_SLOT(goToPreviousBasket()), true, true );
+						 Global::bnpView,    TQ_SLOT(goToPreviousBasket()), true, true );
 	globalAccel->insert( "global_next_basket", i18n("Go to next basket"),
 						 i18n("Allows you to change current basket to the next one without having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView),    TQT_SLOT(goToNextBasket()),     true, true );
+						 Global::bnpView,    TQ_SLOT(goToNextBasket()),     true, true );
 //	globalAccel->insert( "global_note_add_text", i18n("Insert plain text note"),
 //						 i18n("Add a plain text note to the current basket without having to open the main window."),
 //						 "", "", //TQt::CTRL+TQt::ALT+TQt::Key_T, TQt::CTRL+TQt::ALT+TQt::Key_T,
-//						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(addNoteText()),        true, true );
+//						 Global::bnpView, TQ_SLOT(addNoteText()),        true, true );
 	globalAccel->insert( "global_note_add_html", i18n("Insert text note"),
 						 i18n("Add a text note to the current basket without having to open the main window."),
 						 TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_T, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_T, //"", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(addNoteHtml()),        true, true );
+						 Global::bnpView, TQ_SLOT(addNoteHtml()),        true, true );
 	globalAccel->insert( "global_note_add_image", i18n("Insert image note"),
 						 i18n("Add an image note to the current basket without having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(addNoteImage()),       true, true );
+						 Global::bnpView, TQ_SLOT(addNoteImage()),       true, true );
 	globalAccel->insert( "global_note_add_link", i18n("Insert link note"),
 						 i18n("Add a link note to the current basket without having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(addNoteLink()),        true, true );
+						 Global::bnpView, TQ_SLOT(addNoteLink()),        true, true );
 	globalAccel->insert( "global_note_add_color", i18n("Insert color note"),
 						 i18n("Add a color note to the current basket without having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(addNoteColor()),       true, true );
+						 Global::bnpView, TQ_SLOT(addNoteColor()),       true, true );
 	globalAccel->insert( "global_note_pick_color", i18n("Pick color from screen"),
 						 i18n("Add a color note picked from one pixel on screen to the current basket without "
 								 "having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(slotColorFromScreenGlobal()), true, true );
+						 Global::bnpView, TQ_SLOT(slotColorFromScreenGlobal()), true, true );
 	globalAccel->insert( "global_note_grab_screenshot", i18n("Grab screen zone"),
 						 i18n("Grab a screen zone as an image in the current basket without "
 								 "having to open the main window."),
 						 "", "",
-						 TQT_TQOBJECT(Global::bnpView), TQT_SLOT(grabScreenshotGlobal()), true, true );
+						 Global::bnpView, TQ_SLOT(grabScreenshotGlobal()), true, true );
 	globalAccel->readSettings();
 	globalAccel->updateConnections();
 }
@@ -346,7 +348,7 @@ void BNPView::initialize()
 	m_tree->setTreeStepSize(16);
 	m_tree->setLineWidth(1);
 	m_tree->setMidLineWidth(0);
-	m_tree->setFocusPolicy(TQ_NoFocus);
+	m_tree->setFocusPolicy(TQWidget::NoFocus);
 
 	/// Configure the List View Drag and Drop:
 	m_tree->setDragEnabled(true);
@@ -367,21 +369,21 @@ void BNPView::initialize()
 	setResizeMode(m_stack, TQSplitter::Stretch);
 
 	/// Configure the List View Signals:
-	connect( m_tree, TQT_SIGNAL(returnPressed(TQListViewItem*)),    TQT_TQOBJECT(this), TQT_SLOT(slotPressed(TQListViewItem*)) );
-	connect( m_tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotPressed(TQListViewItem*)) );
-	connect( m_tree, TQT_SIGNAL(pressed(TQListViewItem*)),          TQT_TQOBJECT(this), TQT_SLOT(slotPressed(TQListViewItem*)) );
-	connect( m_tree, TQT_SIGNAL(expanded(TQListViewItem*)),         TQT_TQOBJECT(this), TQT_SLOT(needSave(TQListViewItem*))    );
-	connect( m_tree, TQT_SIGNAL(collapsed(TQListViewItem*)),        TQT_TQOBJECT(this), TQT_SLOT(needSave(TQListViewItem*))    );
-	connect( m_tree, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),      TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))      );
-	connect( m_tree, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), TQT_TQOBJECT(this), TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
-	connect( m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_TQOBJECT(this), TQT_SLOT(slotShowProperties(TQListViewItem*, const TQPoint&, int)) );
-
-	connect( m_tree, TQT_SIGNAL(expanded(TQListViewItem*)),  this, TQT_SIGNAL(basketChanged()) );
-	connect( m_tree, TQT_SIGNAL(collapsed(TQListViewItem*)), this, TQT_SIGNAL(basketChanged()) );
-	connect( this,   TQT_SIGNAL(basketNumberChanged(int)),  this, TQT_SIGNAL(basketChanged()) );
-
-	connect( this, TQT_SIGNAL(basketNumberChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotBasketNumberChanged(int)) );
-	connect( this, TQT_SIGNAL(basketChanged()),          TQT_TQOBJECT(this), TQT_SLOT(slotBasketChanged())          );
+	connect( m_tree, TQ_SIGNAL(returnPressed(TQListViewItem*)),    this, TQ_SLOT(slotPressed(TQListViewItem*)) );
+	connect( m_tree, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotPressed(TQListViewItem*)) );
+	connect( m_tree, TQ_SIGNAL(pressed(TQListViewItem*)),          this, TQ_SLOT(slotPressed(TQListViewItem*)) );
+	connect( m_tree, TQ_SIGNAL(expanded(TQListViewItem*)),         this, TQ_SLOT(needSave(TQListViewItem*))    );
+	connect( m_tree, TQ_SIGNAL(collapsed(TQListViewItem*)),        this, TQ_SLOT(needSave(TQListViewItem*))    );
+	connect( m_tree, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),      this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))      );
+	connect( m_tree, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
+	connect( m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotShowProperties(TQListViewItem*, const TQPoint&, int)) );
+
+	connect( m_tree, TQ_SIGNAL(expanded(TQListViewItem*)),  this, TQ_SIGNAL(basketChanged()) );
+	connect( m_tree, TQ_SIGNAL(collapsed(TQListViewItem*)), this, TQ_SIGNAL(basketChanged()) );
+	connect( this,   TQ_SIGNAL(basketNumberChanged(int)),  this, TQ_SIGNAL(basketChanged()) );
+
+	connect( this, TQ_SIGNAL(basketNumberChanged(int)), this, TQ_SLOT(slotBasketNumberChanged(int)) );
+	connect( this, TQ_SIGNAL(basketChanged()),          this, TQ_SLOT(slotBasketChanged())          );
 
 	/* LikeBack */
 	Global::likeBack = new LikeBack(LikeBack::AllButtons, /*showBarByDefault=*/false, Global::config(), Global::about());
@@ -410,91 +412,91 @@ void BNPView::initialize()
 void BNPView::setupActions()
 {
 	m_actSaveAsArchive = new TDEAction( i18n("&Basket Archive..."),  "baskets", 0,
-	                                  TQT_TQOBJECT(this), TQT_SLOT(saveAsArchive()), actionCollection(), "basket_export_basket_archive" );
+	                                  this, TQ_SLOT(saveAsArchive()), actionCollection(), "basket_export_basket_archive" );
 	m_actOpenArchive   = new TDEAction( i18n("&Basket Archive..."),  "baskets", 0,
-	                                  TQT_TQOBJECT(this), TQT_SLOT(openArchive()),   actionCollection(), "basket_import_basket_archive" );
+	                                  this, TQ_SLOT(openArchive()),   actionCollection(), "basket_import_basket_archive" );
 
 	m_actHideWindow = new TDEAction( i18n("&Hide Window"), "", TDEStdAccel::shortcut(TDEStdAccel::Close),
-								   TQT_TQOBJECT(this), TQT_SLOT(hideOnEscape()), actionCollection(), "window_hide" );
+								   this, TQ_SLOT(hideOnEscape()), actionCollection(), "window_hide" );
 	m_actHideWindow->setEnabled(Settings::useSystray()); // Init here !
 
 	m_actExportToHtml = new TDEAction( i18n("&HTML Web Page..."), "text-html", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(exportToHTML()),      actionCollection(), "basket_export_html" );
+	             this, TQ_SLOT(exportToHTML()),      actionCollection(), "basket_export_html" );
 	new TDEAction( i18n("K&Notes"), "knotes", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importKNotes()),      actionCollection(), "basket_import_knotes" );
+	             this, TQ_SLOT(importKNotes()),      actionCollection(), "basket_import_knotes" );
 	new TDEAction( i18n("K&Jots"), "kjots", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importKJots()),       actionCollection(), "basket_import_kjots" );
+	             this, TQ_SLOT(importKJots()),       actionCollection(), "basket_import_kjots" );
 	new TDEAction( i18n("&KnowIt..."), "knowit", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importKnowIt()),      actionCollection(), "basket_import_knowit" );
+	             this, TQ_SLOT(importKnowIt()),      actionCollection(), "basket_import_knowit" );
 	new TDEAction( i18n("Tux&Cards..."), "tuxcards", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importTuxCards()),    actionCollection(), "basket_import_tuxcards" );
+	             this, TQ_SLOT(importTuxCards()),    actionCollection(), "basket_import_tuxcards" );
 	new TDEAction( i18n("&Sticky Notes"), "gnome", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importStickyNotes()), actionCollection(), "basket_import_sticky_notes" );
+	             this, TQ_SLOT(importStickyNotes()), actionCollection(), "basket_import_sticky_notes" );
 	new TDEAction( i18n("&Tomboy"), "tintin", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importTomboy()),      actionCollection(), "basket_import_tomboy" );
+	             this, TQ_SLOT(importTomboy()),      actionCollection(), "basket_import_tomboy" );
 	new TDEAction( i18n("Text &File..."), "text-plain", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(importTextFile()),    actionCollection(), "basket_import_text_file" );
+	             this, TQ_SLOT(importTextFile()),    actionCollection(), "basket_import_text_file" );
 
 	new TDEAction( i18n("&Backup && Restore..."), "", 0,
-	             TQT_TQOBJECT(this), TQT_SLOT(backupRestore()), actionCollection(), "basket_backup_restore" );
+	             this, TQ_SLOT(backupRestore()), actionCollection(), "basket_backup_restore" );
 
 	/** Note : ****************************************************************/
 
 	m_actDelNote  = new TDEAction( i18n("D&elete"), "edit-delete", "Delete",
-								 TQT_TQOBJECT(this), TQT_SLOT(delNote()), actionCollection(), "edit_delete" );
-	m_actCutNote  = KStdAction::cut(   TQT_TQOBJECT(this), TQT_SLOT(cutNote()),               actionCollection() );
-	m_actCopyNote = KStdAction::copy(  TQT_TQOBJECT(this), TQT_SLOT(copyNote()),              actionCollection() );
+								 this, TQ_SLOT(delNote()), actionCollection(), "edit_delete" );
+	m_actCutNote  = KStdAction::cut(   this, TQ_SLOT(cutNote()),               actionCollection() );
+	m_actCopyNote = KStdAction::copy(  this, TQ_SLOT(copyNote()),              actionCollection() );
 
-	m_actSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection() );
+	m_actSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection() );
 	m_actSelectAll->setStatusText( i18n( "Selects all notes" ) );
-	m_actUnselectAll = new TDEAction( i18n( "U&nselect All" ), "", TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ),
+	m_actUnselectAll = new TDEAction( i18n( "U&nselect All" ), "", this, TQ_SLOT( slotUnselectAll() ),
 									actionCollection(), "edit_unselect_all" );
 	m_actUnselectAll->setStatusText( i18n( "Unselects all selected notes" ) );
 	m_actInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
-										TQT_TQOBJECT(this), TQT_SLOT( slotInvertSelection() ),
+										this, TQ_SLOT( slotInvertSelection() ),
 										actionCollection(), "edit_invert_selection" );
 	m_actInvertSelection->setStatusText( i18n( "Inverts the current selection of notes" ) );
 
 	m_actEditNote         = new TDEAction( i18n("Verb; not Menu", "&Edit..."), "edit",   "Return",
-										 TQT_TQOBJECT(this), TQT_SLOT(editNote()), actionCollection(), "note_edit" );
+										 this, TQ_SLOT(editNote()), actionCollection(), "note_edit" );
 
-	m_actOpenNote         = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(openNote()), actionCollection(), "note_open" );
+	m_actOpenNote         = KStdAction::open( this, TQ_SLOT(openNote()), actionCollection(), "note_open" );
 	m_actOpenNote->setIcon("window-new");
 	m_actOpenNote->setText(i18n("&Open"));
 	m_actOpenNote->setShortcut("F9");
 
 	m_actOpenNoteWith     = new TDEAction( i18n("Open &With..."), "", "Shift+F9",
-										 TQT_TQOBJECT(this), TQT_SLOT(openNoteWith()), actionCollection(), "note_open_with" );
-	m_actSaveNoteAs       = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(saveNoteAs()), actionCollection(), "note_save_to_file" );
+										 this, TQ_SLOT(openNoteWith()), actionCollection(), "note_open_with" );
+	m_actSaveNoteAs       = KStdAction::saveAs( this, TQ_SLOT(saveNoteAs()), actionCollection(), "note_save_to_file" );
 	m_actSaveNoteAs->setIcon("");
 	m_actSaveNoteAs->setText(i18n("&Save to File..."));
 	m_actSaveNoteAs->setShortcut("F10");
 
 	m_actGroup        = new TDEAction( i18n("&Group"),          "attach",     "Ctrl+G",
-									 TQT_TQOBJECT(this), TQT_SLOT(noteGroup()),    actionCollection(), "note_group" );
+									 this, TQ_SLOT(noteGroup()),    actionCollection(), "note_group" );
 	m_actUngroup      = new TDEAction( i18n("U&ngroup"),        "",           "Ctrl+Shift+G",
-									 TQT_TQOBJECT(this), TQT_SLOT(noteUngroup()),  actionCollection(), "note_ungroup" );
+									 this, TQ_SLOT(noteUngroup()),  actionCollection(), "note_ungroup" );
 
 	m_actMoveOnTop    = new TDEAction( i18n("Move on &Top"),    "2uparrow",   "Ctrl+Shift+Home",
-									 TQT_TQOBJECT(this), TQT_SLOT(moveOnTop()),    actionCollection(), "note_move_top" );
+									 this, TQ_SLOT(moveOnTop()),    actionCollection(), "note_move_top" );
 	m_actMoveNoteUp   = new TDEAction( i18n("Move &Up"),        "1uparrow",   "Ctrl+Shift+Up",
-									 TQT_TQOBJECT(this), TQT_SLOT(moveNoteUp()),   actionCollection(), "note_move_up" );
+									 this, TQ_SLOT(moveNoteUp()),   actionCollection(), "note_move_up" );
 	m_actMoveNoteDown = new TDEAction( i18n("Move &Down"),      "1downarrow", "Ctrl+Shift+Down",
-									 TQT_TQOBJECT(this), TQT_SLOT(moveNoteDown()), actionCollection(), "note_move_down" );
+									 this, TQ_SLOT(moveNoteDown()), actionCollection(), "note_move_down" );
 	m_actMoveOnBottom = new TDEAction( i18n("Move on &Bottom"), "2downarrow", "Ctrl+Shift+End",
-									 TQT_TQOBJECT(this), TQT_SLOT(moveOnBottom()), actionCollection(), "note_move_bottom" );
+									 this, TQ_SLOT(moveOnBottom()), actionCollection(), "note_move_bottom" );
 #if KDE_IS_VERSION( 3, 1, 90 ) // KDE 3.2.x
-	m_actPaste = KStdAction::pasteText( TQT_TQOBJECT(this), TQT_SLOT(pasteInCurrentBasket()), actionCollection() );
+	m_actPaste = KStdAction::pasteText( this, TQ_SLOT(pasteInCurrentBasket()), actionCollection() );
 #else
-	m_actPaste = KStdAction::paste(     TQT_TQOBJECT(this), TQT_SLOT(pasteInCurrentBasket()), actionCollection() );
+	m_actPaste = KStdAction::paste(     this, TQ_SLOT(pasteInCurrentBasket()), actionCollection() );
 #endif
 
 	/** Insert : **************************************************************/
 
-	TQSignalMapper *insertEmptyMapper  = new TQSignalMapper(TQT_TQOBJECT(this));
-	TQSignalMapper *insertWizardMapper = new TQSignalMapper(TQT_TQOBJECT(this));
-	connect( insertEmptyMapper,  TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(insertEmpty(int))  );
-	connect( insertWizardMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(insertWizard(int)) );
+	TQSignalMapper *insertEmptyMapper  = new TQSignalMapper(this);
+	TQSignalMapper *insertWizardMapper = new TQSignalMapper(this);
+	connect( insertEmptyMapper,  TQ_SIGNAL(mapped(int)), this, TQ_SLOT(insertEmpty(int))  );
+	connect( insertWizardMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(insertWizard(int)) );
 
 //	m_actInsertText   = new TDEAction( i18n("Plai&n Text"), "text",     "Ctrl+T", actionCollection(), "insert_text"     );
 	m_actInsertHtml   = new TDEAction( i18n("&Text"),       "text-html",     "Insert", actionCollection(), "insert_html"     );
@@ -507,12 +509,12 @@ void BNPView::setupActions()
 	m_actImportIcon   = new TDEAction( i18n("Im&port Icon..."),                   "icons",      "", actionCollection(), "insert_icon"      );
 	m_actLoadFile     = new TDEAction( i18n("Load From &File..."),                "fileimport", "", actionCollection(), "insert_from_file" );
 
-//	connect( m_actInsertText,     TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
-	connect( m_actInsertHtml,     TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
-	connect( m_actInsertImage,    TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
-	connect( m_actInsertLink,     TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
-	connect( m_actInsertColor,    TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
-	connect( m_actInsertLauncher, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
+//	connect( m_actInsertText,     TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) );
+	connect( m_actInsertHtml,     TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) );
+	connect( m_actInsertImage,    TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) );
+	connect( m_actInsertLink,     TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) );
+	connect( m_actInsertColor,    TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) );
+	connect( m_actInsertLauncher, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) );
 //	insertEmptyMapper->setMapping(m_actInsertText,     NoteType::Text    );
 	insertEmptyMapper->setMapping(m_actInsertHtml,     NoteType::Html    );
 	insertEmptyMapper->setMapping(m_actInsertImage,    NoteType::Image   );
@@ -520,23 +522,23 @@ void BNPView::setupActions()
 	insertEmptyMapper->setMapping(m_actInsertColor,    NoteType::Color   );
 	insertEmptyMapper->setMapping(m_actInsertLauncher, NoteType::Launcher);
 
-	connect( m_actImportKMenu, TQT_SIGNAL(activated()), insertWizardMapper, TQT_SLOT(map()) );
-	connect( m_actImportIcon,  TQT_SIGNAL(activated()), insertWizardMapper, TQT_SLOT(map()) );
-	connect( m_actLoadFile,    TQT_SIGNAL(activated()), insertWizardMapper, TQT_SLOT(map()) );
+	connect( m_actImportKMenu, TQ_SIGNAL(activated()), insertWizardMapper, TQ_SLOT(map()) );
+	connect( m_actImportIcon,  TQ_SIGNAL(activated()), insertWizardMapper, TQ_SLOT(map()) );
+	connect( m_actLoadFile,    TQ_SIGNAL(activated()), insertWizardMapper, TQ_SLOT(map()) );
 	insertWizardMapper->setMapping(m_actImportKMenu,  1 );
 	insertWizardMapper->setMapping(m_actImportIcon,   2 );
 	insertWizardMapper->setMapping(m_actLoadFile,     3 );
 
 	m_colorPicker = new DesktopColorPicker();
 	m_actColorPicker = new TDEAction( i18n("C&olor from Screen"), "kcolorchooser", "",
-									TQT_TQOBJECT(this), TQT_SLOT(slotColorFromScreen()), actionCollection(), "insert_screen_color" );
-	connect( m_colorPicker, TQT_SIGNAL(pickedColor(const TQColor&)), TQT_TQOBJECT(this), TQT_SLOT(colorPicked(const TQColor&)) );
-	connect( m_colorPicker, TQT_SIGNAL(canceledPick()),             TQT_TQOBJECT(this), TQT_SLOT(colorPickingCanceled())     );
+									this, TQ_SLOT(slotColorFromScreen()), actionCollection(), "insert_screen_color" );
+	connect( m_colorPicker, TQ_SIGNAL(pickedColor(const TQColor&)), this, TQ_SLOT(colorPicked(const TQColor&)) );
+	connect( m_colorPicker, TQ_SIGNAL(canceledPick()),             this, TQ_SLOT(colorPickingCanceled())     );
 
 	m_actGrabScreenshot = new TDEAction( i18n("Grab Screen &Zone"), "ksnapshot", "",
-									   TQT_TQOBJECT(this), TQT_SLOT(grabScreenshot()), actionCollection(), "insert_screen_capture" );
-	//connect( m_actGrabScreenshot, TQT_SIGNAL(regionGrabbed(const TQPixmap&)), TQT_TQOBJECT(this), TQT_SLOT(screenshotGrabbed(const TQPixmap&)) );
-	//connect( m_colorPicker, TQT_SIGNAL(canceledPick()),             TQT_TQOBJECT(this), TQT_SLOT(colorPickingCanceled())     );
+									   this, TQ_SLOT(grabScreenshot()), actionCollection(), "insert_screen_capture" );
+	//connect( m_actGrabScreenshot, TQ_SIGNAL(regionGrabbed(const TQPixmap&)), this, TQ_SLOT(screenshotGrabbed(const TQPixmap&)) );
+	//connect( m_colorPicker, TQ_SIGNAL(canceledPick()),             this, TQ_SLOT(colorPickingCanceled())     );
 
 //	m_insertActions.append( m_actInsertText     );
 	m_insertActions.append( m_actInsertHtml     );
@@ -552,7 +554,7 @@ void BNPView::setupActions()
 
 	/** Basket : **************************************************************/
 
-	// At this stage, main.cpp has not set kapp->mainWidget(), so Global::runInsideKontact()
+	// At this stage, main.cpp has not set tdeApp->mainWidget(), so Global::runInsideKontact()
 	// returns true. We do it ourself:
 	bool runInsideKontact = true;
 	TQWidget *parentWidget = (TQWidget*) parent();
@@ -564,69 +566,69 @@ void BNPView::setupActions()
 
 	// Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon
 	actNewBasket        = new TDEAction( i18n("&New Basket..."), (runInsideKontact ? "basket" : "document-new"), TDEStdAccel::shortcut(TDEStdAccel::New),
-									   TQT_TQOBJECT(this), TQT_SLOT(askNewBasket()), actionCollection(), "basket_new" );
+									   this, TQ_SLOT(askNewBasket()), actionCollection(), "basket_new" );
 	actNewSubBasket     = new TDEAction( i18n("New &Sub-Basket..."), "", "Ctrl+Shift+N",
-									   TQT_TQOBJECT(this), TQT_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" );
+									   this, TQ_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" );
 	actNewSiblingBasket = new TDEAction( i18n("New Si&bling Basket..."), "", "",
-									   TQT_TQOBJECT(this), TQT_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" );
+									   this, TQ_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" );
 
 	TDEActionMenu *newBasketMenu = new TDEActionMenu(i18n("&New"), "document-new", actionCollection(), "basket_new_menu");
 	newBasketMenu->insert(actNewBasket);
 	newBasketMenu->insert(actNewSubBasket);
 	newBasketMenu->insert(actNewSiblingBasket);
-	connect( newBasketMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(askNewBasket()) );
+	connect( newBasketMenu, TQ_SIGNAL(activated()), this, TQ_SLOT(askNewBasket()) );
 
 	m_actPropBasket = new TDEAction( i18n("&Properties..."), "misc", "F2",
-								   TQT_TQOBJECT(this), TQT_SLOT(propBasket()), actionCollection(), "basket_properties" );
+								   this, TQ_SLOT(propBasket()), actionCollection(), "basket_properties" );
 	m_actDelBasket  = new TDEAction( i18n("Remove Basket", "&Remove"), "", 0,
-								   TQT_TQOBJECT(this), TQT_SLOT(delBasket()), actionCollection(), "basket_remove" );
+								   this, TQ_SLOT(delBasket()), actionCollection(), "basket_remove" );
 #ifdef HAVE_LIBGPGME
 	m_actPassBasket = new TDEAction( i18n("Password protection", "Pass&word..."), "", 0,
-								   TQT_TQOBJECT(this), TQT_SLOT(password()), actionCollection(), "basket_password" );
+								   this, TQ_SLOT(password()), actionCollection(), "basket_password" );
 	m_actLockBasket = new TDEAction( i18n("Lock Basket", "&Lock"), "", "Ctrl+L",
-								   TQT_TQOBJECT(this), TQT_SLOT(lockBasket()), actionCollection(), "basket_lock" );
+								   this, TQ_SLOT(lockBasket()), actionCollection(), "basket_lock" );
 #endif
 	/** Edit : ****************************************************************/
 
-	//m_actUndo     = KStdAction::undo(  TQT_TQOBJECT(this), TQT_SLOT(undo()),                 actionCollection() );
+	//m_actUndo     = KStdAction::undo(  this, TQ_SLOT(undo()),                 actionCollection() );
 	//m_actUndo->setEnabled(false); // Not yet implemented !
-	//m_actRedo     = KStdAction::redo(  TQT_TQOBJECT(this), TQT_SLOT(redo()),                 actionCollection() );
+	//m_actRedo     = KStdAction::redo(  this, TQ_SLOT(redo()),                 actionCollection() );
 	//m_actRedo->setEnabled(false); // Not yet implemented !
 
 	m_actShowFilter  = new TDEToggleAction( i18n("&Filter"), "filter", TDEStdAccel::shortcut(TDEStdAccel::Find),
 										  actionCollection(), "edit_filter" );
-	connect( m_actShowFilter, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(showHideFilterBar(bool)) );
+	connect( m_actShowFilter, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showHideFilterBar(bool)) );
 
 	m_actFilterAllBaskets = new TDEToggleAction( i18n("Filter all &Baskets"), "edit-find", "Ctrl+Shift+F",
 											   actionCollection(), "edit_filter_all_baskets" );
-	connect( m_actFilterAllBaskets, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(toggleFilterAllBaskets(bool)) );
+	connect( m_actFilterAllBaskets, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleFilterAllBaskets(bool)) );
 
 	m_actResetFilter = new TDEAction( i18n( "&Reset Filter" ), "locationbar_erase", "Ctrl+R",
-									TQT_TQOBJECT(this), TQT_SLOT( slotResetFilter() ), actionCollection(), "edit_filter_reset" );
+									this, TQ_SLOT( slotResetFilter() ), actionCollection(), "edit_filter_reset" );
 
 	/** Go : ******************************************************************/
 
 	m_actPreviousBasket = new TDEAction( i18n( "&Previous Basket" ), "go-up",   "Alt+Up",
-									   TQT_TQOBJECT(this), TQT_SLOT(goToPreviousBasket()), actionCollection(), "go_basket_previous" );
+									   this, TQ_SLOT(goToPreviousBasket()), actionCollection(), "go_basket_previous" );
 	m_actNextBasket     = new TDEAction( i18n( "&Next Basket" ),     "go-down", "Alt+Down",
-									   TQT_TQOBJECT(this), TQT_SLOT(goToNextBasket()),     actionCollection(), "go_basket_next"     );
+									   this, TQ_SLOT(goToNextBasket()),     actionCollection(), "go_basket_next"     );
 	m_actFoldBasket     = new TDEAction( i18n( "&Fold Basket" ),     "back",    "Alt+Left",
-									   TQT_TQOBJECT(this), TQT_SLOT(foldBasket()),         actionCollection(), "go_basket_fold"     );
+									   this, TQ_SLOT(foldBasket()),         actionCollection(), "go_basket_fold"     );
 	m_actExpandBasket   = new TDEAction( i18n( "&Expand Basket" ),   "forward", "Alt+Right",
-									   TQT_TQOBJECT(this), TQT_SLOT(expandBasket()),       actionCollection(), "go_basket_expand"   );
+									   this, TQ_SLOT(expandBasket()),       actionCollection(), "go_basket_expand"   );
 	// FOR_BETA_PURPOSE:
 //	m_convertTexts = new TDEAction( i18n("Convert text notes to rich text notes"), "compfile", "",
-//								  TQT_TQOBJECT(this), TQT_SLOT(convertTexts()), actionCollection(), "beta_convert_texts" );
+//								  this, TQ_SLOT(convertTexts()), actionCollection(), "beta_convert_texts" );
 
 	InlineEditors::instance()->initToolBars(actionCollection());
 
-	actConfigGlobalShortcuts = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsSettingsDialog()),
+	actConfigGlobalShortcuts = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsSettingsDialog()),
 			actionCollection(), "options_configure_global_keybinding");
 	actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts..."));
 
 	/** Help : ****************************************************************/
 
-	new TDEAction( i18n("&Welcome Baskets"), "", "", TQT_TQOBJECT(this), TQT_SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" );
+	new TDEAction( i18n("&Welcome Baskets"), "", "", this, TQ_SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" );
 }
 
 TQListViewItem* BNPView::firstListViewItem()
@@ -642,7 +644,7 @@ void BNPView::slotShowProperties(TQListViewItem *item, const TQPoint&, int)
 
 void BNPView::slotMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &/*pos*/, int /*column*/)
 {
-	if (item && (button & Qt::MidButton)) {
+	if (item && (button & TQt::MidButton)) {
 		// TODO: Paste into ((BasketListViewItem*)listViewItem)->basket()
 	}
 }
@@ -668,7 +670,7 @@ void BNPView::slotContextMenu(TDEListView */*listView*/, TQListViewItem *item, c
 	}
 
 	TQPopupMenu *menu = popupMenu(menuName);
-	connect( menu, TQT_SIGNAL(aboutToHide()),  TQT_TQOBJECT(this), TQT_SLOT(aboutToHideNewBasketPopup()) );
+	connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(aboutToHideNewBasketPopup()) );
 	menu->exec(pos);
 }
 
@@ -794,11 +796,11 @@ Basket* BNPView::loadBasket(const TQString &folderName)
 	DecoratedBasket *decoBasket = new DecoratedBasket(m_stack, folderName);
 	Basket          *basket     = decoBasket->basket();
 	m_stack->addWidget(decoBasket);
-	connect( basket, TQT_SIGNAL(countsChanged(Basket*)), TQT_TQOBJECT(this), TQT_SLOT(countsChanged(Basket*)) );
+	connect( basket, TQ_SIGNAL(countsChanged(Basket*)), this, TQ_SLOT(countsChanged(Basket*)) );
 	// Important: Create listViewItem and connect signal BEFORE loadProperties(), so we get the listViewItem updated without extra work:
-	connect( basket, TQT_SIGNAL(propertiesChanged(Basket*)), TQT_TQOBJECT(this), TQT_SLOT(updateBasketListViewItem(Basket*)) );
+	connect( basket, TQ_SIGNAL(propertiesChanged(Basket*)), this, TQ_SLOT(updateBasketListViewItem(Basket*)) );
 
-	connect( basket->decoration()->filterBar(), TQT_SIGNAL(newFilter(const FilterData&)), TQT_TQOBJECT(this), TQT_SLOT(newFilterFromFilterBar()) );
+	connect( basket->decoration()->filterBar(), TQ_SIGNAL(newFilter(const FilterData&)), this, TQ_SLOT(newFilterFromFilterBar()) );
 
 	return basket;
 }
@@ -1004,7 +1006,7 @@ void BNPView::toggleFilterAllBaskets(bool doFilter)
 	newFilter();
 }
 
-/** This function can be called recursively because we call kapp->processEvents().
+/** This function can be called recursively because we call tdeApp->processEvents().
  * If this function is called whereas another "instance" is running,
  * this new "instance" leave and set up a flag that is read by the first "instance"
  * to know it should re-begin the work.
@@ -1040,7 +1042,7 @@ void BNPView::newFilter()
 	// Show/hide the "little filter icons" (during basket load)
 	// or the "little numbers" (to show number of found notes in the baskets) is the tree:
 	m_tree->triggerUpdate();
-	kapp->processEvents();
+	tdeApp->processEvents();
 
 	// Load every baskets for filtering, if they are not already loaded, and if necessary:
 	if (filterData.isFiltering) {
@@ -1054,7 +1056,7 @@ void BNPView::newFilter()
 					basket->load();
 				basket->filterAgain();
 				m_tree->triggerUpdate();
-				kapp->processEvents();
+				tdeApp->processEvents();
 				if (shouldRestart) {
 					alreadyEntered = false;
 					shouldRestart  = false;
@@ -1067,7 +1069,7 @@ void BNPView::newFilter()
 	}
 
 	m_tree->triggerUpdate();
-//	kapp->processEvents();
+//	tdeApp->processEvents();
 
 	alreadyEntered = false;
 	shouldRestart  = false;
@@ -1076,7 +1078,7 @@ void BNPView::newFilter()
 void BNPView::newFilterFromFilterBar()
 {
 	if (isFilteringAllBaskets())
-		TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(newFilter())); // Keep time for the TQLineEdit to display the filtered character and refresh correctly!
+		TQTimer::singleShot(0, this, TQ_SLOT(newFilter())); // Keep time for the TQLineEdit to display the filtered character and refresh correctly!
 }
 
 bool BNPView::isFilteringAllBaskets()
@@ -1189,7 +1191,7 @@ void BNPView::setTreePlacement(bool onLeft)
 	else
 		moveToLast(m_tree);
 	//updateGeometry();
-	kapp->postEvent( this, new TQResizeEvent(size(), size()) );
+	tdeApp->postEvent( this, new TQResizeEvent(size(), size()) );
 }
 
 void BNPView::relayoutAllBaskets()
@@ -1241,7 +1243,7 @@ void BNPView::filterPlacementChanged(bool onTop)
 	TQListViewItemIterator it(m_tree);
 	while (it.current()) {
 		BasketListViewItem *item        = static_cast<BasketListViewItem*>(it.current());
-		DecoratedBasket    *decoration  = static_cast<DecoratedBasket*>(TQT_TQWIDGET(item->basket()->parent()));
+		DecoratedBasket    *decoration  = static_cast<DecoratedBasket*>(item->basket()->parent());
 		decoration->setFilterBarPosition(onTop);
 		++it;
 	}
@@ -1268,7 +1270,7 @@ void BNPView::needSave(TQListViewItem*)
 {
 	if (!m_loading)
 		// A basket has been collapsed/expanded or a new one is select: this is not urgent:
-		TQTimer::singleShot(500/*ms*/, TQT_TQOBJECT(this), TQT_SLOT(save()));
+		TQTimer::singleShot(500/*ms*/, this, TQ_SLOT(save()));
 }
 
 void BNPView::slotPressed(TQListViewItem *item, const TQPoint &/*pos*/, int /*column*/)
@@ -1429,7 +1431,7 @@ void BNPView::updateNotesActions()
 }
 } else if (m_type != Color) {
 	popupMenu->insertSeparator();
-	popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save a copy as..."), TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), 0, 10 );
+	popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save a copy as..."), this, TQ_SLOT(slotSaveAs()), 0, 10 );
 }*/
 }
 
@@ -1450,8 +1452,8 @@ void BNPView::slotColorFromScreen(bool global)
 		m_colorPicker->pickColor();
 
 /*	m_gettingColorFromScreen = true;
-		kapp->processEvents();
-		TQTimer::singleShot( 100, TQT_TQOBJECT(this), TQT_SLOT(grabColorFromScreen()) );*/
+		tdeApp->processEvents();
+		TQTimer::singleShot( 100, this, TQ_SLOT(grabColorFromScreen()) );*/
 }
 
 void BNPView::slotColorFromScreenGlobal()
@@ -1544,7 +1546,7 @@ TQPopupMenu* BNPView::popupMenu(const TQString &menuName)
 							"<p>As last ressort, if you are sure the application is correctly installed "
 							"but you had a preview version of it, try to remove the "
 							"file %5basketui.rc</p>")
-							.arg(kapp->aboutData()->programName(), kapp->aboutData()->programName(),
+							.arg(tdeApp->aboutData()->programName(), tdeApp->aboutData()->programName(),
 								stdDirs.saveLocation("data", "basket/")).arg(stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")),
 					i18n("Ressource not Found"), KMessageBox::AllowLink );
 		}
@@ -1599,7 +1601,7 @@ void BNPView::grabScreenshot(bool global)
 	// In this case, global is true, and we don't wait.
 	// In the future, if global is also defined for other cases, check for
 	// enum TDEAction::ActivationReason { UnknownActivation, EmulatedActivation, AccelActivation, PopupMenuActivation, ToolBarActivation };
-	int delay = (isMainWindowActive() ? 500 : (global/*kapp->activePopupWidget()*/ ? 0 : 200));
+	int delay = (isMainWindowActive() ? 500 : (global/*tdeApp->activePopupWidget()*/ ? 0 : 200));
 
 	m_colorPickWasGlobal = global;
 	if (isMainWindowActive()) {
@@ -1610,7 +1612,7 @@ void BNPView::grabScreenshot(bool global)
 
 		currentBasket()->saveInsertionData();
 		m_regionGrabber = new RegionGrabber(delay);
-		connect( m_regionGrabber, TQT_SIGNAL(regionGrabbed(const TQPixmap&)), TQT_TQOBJECT(this), TQT_SLOT(screenshotGrabbed(const TQPixmap&)) );
+		connect( m_regionGrabber, TQ_SIGNAL(regionGrabbed(const TQPixmap&)), this, TQ_SLOT(screenshotGrabbed(const TQPixmap&)) );
 }
 
 void BNPView::grabScreenshotGlobal()
@@ -1765,7 +1767,7 @@ void BNPView::doBasketDeletion(Basket *basket)
 void BNPView::password()
 {
 #ifdef HAVE_LIBGPGME
-	PasswordDlg dlg(TQT_TQWIDGET(kapp->activeWindow()), "Password");
+	PasswordDlg dlg(tdeApp->activeWindow(), "Password");
 	Basket *cur = currentBasket();
 
 	dlg.setType(cur->encryptionType());
@@ -1937,7 +1939,7 @@ void BNPView::showPassiveDropped(const TQString &title)
 		// TODO: Keep basket, so that we show the message only if something was added to a NOT visible basket
 		m_passiveDroppedTitle     = title;
 		m_passiveDroppedSelection = currentBasket()->selectedNotes();
-		TQTimer::singleShot( c_delayTooltipTime, TQT_TQOBJECT(this), TQT_SLOT(showPassiveDroppedDelayed()) );
+		TQTimer::singleShot( c_delayTooltipTime, this, TQ_SLOT(showPassiveDroppedDelayed()) );
 		// DELAY IT BELOW:
 	} else
 		showPassiveImpossible(i18n("No note was added."));
@@ -1957,7 +1959,7 @@ void BNPView::showPassiveDroppedDelayed()
 	m_passivePopup->setView(
 			title.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())),
 	(contentsPixmap.isNull() ? "" : "<img src=\"_passivepopup_image_\">"),
-	kapp->iconLoader()->loadIcon(currentBasket()->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
+	tdeApp->iconLoader()->loadIcon(currentBasket()->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
 	m_passivePopup->show();
 }
 
@@ -1970,7 +1972,7 @@ void BNPView::showPassiveImpossible(const TQString &message)
 			.arg(i18n("Basket <i>%1</i> is locked"))
 			.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())),
 	message,
-	kapp->iconLoader()->loadIcon(currentBasket()->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
+	tdeApp->iconLoader()->loadIcon(currentBasket()->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
 	m_passivePopup->show();
 }
 
@@ -1990,12 +1992,12 @@ void BNPView::showPassiveContent(bool forceShow/* = false*/)
 	delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time)
 	m_passivePopup = new KPassivePopup(Settings::useSystray() ? (TQWidget*)Global::systemTray : (TQWidget*)this);
 	m_passivePopup->setView(
-			"<qt>" + kapp->makeStdCaption( currentBasket()->isLocked()
+			"<qt>" + tdeApp->makeStdCaption( currentBasket()->isLocked()
 			? TQString("%1 <font color=gray30>%2</font>")
 			.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)"))
 	: Tools::textToHTMLWithoutP(currentBasket()->basketName()) ),
 	message,
-	kapp->iconLoader()->loadIcon(currentBasket()->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
+	tdeApp->iconLoader()->loadIcon(currentBasket()->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
 	m_passivePopup->show();
 }
 
@@ -2009,7 +2011,7 @@ void BNPView::showPassiveLoading(Basket *basket)
 	m_passivePopup->setView(
 			Tools::textToHTMLWithoutP(basket->basketName()),
 	i18n("Loading..."),
-	kapp->iconLoader()->loadIcon(basket->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
+	tdeApp->iconLoader()->loadIcon(basket->icon(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true));
 	m_passivePopup->show();
 }
 
@@ -2021,7 +2023,7 @@ void BNPView::addNoteColor() { showMainWindow(); currentBasket()->insertEmptyNot
 
 void BNPView::aboutToHideNewBasketPopup()
 {
-	TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(cancelNewBasketPopup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cancelNewBasketPopup()));
 }
 
 void BNPView::cancelNewBasketPopup()
@@ -2078,7 +2080,7 @@ void BNPView::setActive(bool active)
 
 #if KDE_IS_VERSION( 3, 2, 90 )   // KDE 3.3.x
 	if (active) {
-		kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
+		tdeApp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
 		Global::systemTray->setActive();   //  FIXME: add this in the places it need
 	} else
 		Global::systemTray->setInactive();
@@ -2095,7 +2097,7 @@ void BNPView::setActive(bool active)
 			KWin::setOnDesktop(winId(), KWin::currentDesktop());
 		win->raise();
 		// Code from me: expected and correct behavviour:
-		kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
+		tdeApp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
 		KWin::activateWindow(win->winId());
 	} else
 		win->hide();
@@ -2198,16 +2200,16 @@ void BNPView::leaveEvent(TQEvent*)
 void BNPView::timeoutTryHide()
 {
 	// If a menu is displayed, do nothing for the moment
-	if (kapp->activePopupWidget() != 0L)
+	if (tdeApp->activePopupWidget() != 0L)
 		return;
 
-	if (kapp->widgetAt(TQCursor::pos()) != 0L)
+	if (tdeApp->widgetAt(TQCursor::pos()) != 0L)
 		m_hideTimer->stop();
 	else if ( ! m_hideTimer->isActive() ) // Start only one time
 		m_hideTimer->start(Settings::timeToHideOnMouseOut() * 100, true);
 
 	// If a sub-dialog is oppened, we musn't hide the main window:
-	if (kapp->activeWindow() != 0L && kapp->activeWindow() != Global::mainWindow())
+	if (tdeApp->activeWindow() != 0L && tdeApp->activeWindow() != Global::mainWindow())
 		m_hideTimer->stop();
 }
 
@@ -2275,7 +2277,7 @@ void BNPView::populateTagsMenu()
 	populateTagsMenu(*menu, referenceNote);
 
 	m_lastOpenedTagsMenu = menu;
-//	connect( menu, TQT_SIGNAL(aboutToHide()), TQT_TQOBJECT(this), TQT_SLOT(disconnectTagsMenu()) );
+//	connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disconnectTagsMenu()) );
 }
 
 void BNPView::populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote)
@@ -2323,15 +2325,15 @@ void BNPView::populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote)
 	if (!currentBasket()->selectedNotesHaveTags())
 		menu.setItemEnabled(2, false);
 
-	connect( &menu, TQT_SIGNAL(activated(int)), currentBasket(), TQT_SLOT(toggledTagInMenu(int)) );
-	connect( &menu, TQT_SIGNAL(aboutToHide()),  currentBasket(), TQT_SLOT(unlockHovering())      );
-	connect( &menu, TQT_SIGNAL(aboutToHide()),  currentBasket(), TQT_SLOT(disableNextClick())    );
+	connect( &menu, TQ_SIGNAL(activated(int)), currentBasket(), TQ_SLOT(toggledTagInMenu(int)) );
+	connect( &menu, TQ_SIGNAL(aboutToHide()),  currentBasket(), TQ_SLOT(unlockHovering())      );
+	connect( &menu, TQ_SIGNAL(aboutToHide()),  currentBasket(), TQ_SLOT(disableNextClick())    );
 }
 
 void BNPView::connectTagsMenu()
 {
-	connect( popupMenu("tags"), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(populateTagsMenu())   );
-	connect( popupMenu("tags"), TQT_SIGNAL(aboutToHide()), TQT_TQOBJECT(this), TQT_SLOT(disconnectTagsMenu()) );
+	connect( popupMenu("tags"), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(populateTagsMenu())   );
+	connect( popupMenu("tags"), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disconnectTagsMenu()) );
 }
 
 /*
@@ -2346,7 +2348,7 @@ void BNPView::connectTagsMenu()
 void BNPView::showEvent(TQShowEvent*)
 {
 	if (isPart())
-		TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(connectTagsMenu()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(connectTagsMenu()) );
 
 	if (m_firstShow) {
 		m_firstShow = false;
@@ -2360,8 +2362,8 @@ void BNPView::showEvent(TQShowEvent*)
 void BNPView::hideEvent(TQHideEvent*)
 {
 	if (isPart()) {
-		disconnect( popupMenu("tags"), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(populateTagsMenu())   );
-		disconnect( popupMenu("tags"), TQT_SIGNAL(aboutToHide()), TQT_TQOBJECT(this), TQT_SLOT(disconnectTagsMenu()) );
+		disconnect( popupMenu("tags"), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(populateTagsMenu())   );
+		disconnect( popupMenu("tags"), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disconnectTagsMenu()) );
 	}
 
 	if (isPart())
@@ -2370,14 +2372,14 @@ void BNPView::hideEvent(TQHideEvent*)
 
 void BNPView::disconnectTagsMenu()
 {
-	TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(disconnectTagsMenuDelayed()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(disconnectTagsMenuDelayed()) );
 }
 
 void BNPView::disconnectTagsMenuDelayed()
 {
-	disconnect( m_lastOpenedTagsMenu, TQT_SIGNAL(activated(int)), currentBasket(), TQT_SLOT(toggledTagInMenu(int)) );
-	disconnect( m_lastOpenedTagsMenu, TQT_SIGNAL(aboutToHide()),  currentBasket(), TQT_SLOT(unlockHovering())      );
-	disconnect( m_lastOpenedTagsMenu, TQT_SIGNAL(aboutToHide()),  currentBasket(), TQT_SLOT(disableNextClick())    );
+	disconnect( m_lastOpenedTagsMenu, TQ_SIGNAL(activated(int)), currentBasket(), TQ_SLOT(toggledTagInMenu(int)) );
+	disconnect( m_lastOpenedTagsMenu, TQ_SIGNAL(aboutToHide()),  currentBasket(), TQ_SLOT(unlockHovering())      );
+	disconnect( m_lastOpenedTagsMenu, TQ_SIGNAL(aboutToHide()),  currentBasket(), TQ_SLOT(disableNextClick())    );
 }
 
 void BNPView::showGlobalShortcutsSettingsDialog()

src/bnpview.h

@@ -54,9 +54,9 @@ class Tag;
 class State;
 class Note;
 
-class BNPView : public TQSplitter, virtual public BasketDcopInterface
+class TDE_EXPORT BNPView : public TQSplitter, virtual public BasketDcopInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 	/// CONSTRUCTOR AND DESTRUCTOR:

src/clickablelabel.cpp

@@ -22,7 +22,7 @@
 
 void ClickableLabel::mousePressEvent(TQMouseEvent *event)
 {
-	if (event->button() & Qt::LeftButton)
+	if (event->button() & TQt::LeftButton)
 		emit clicked();
 }
 

src/clickablelabel.h

@@ -28,7 +28,7 @@
   */
 class ClickableLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	/** Construtor, initializer and destructor */

src/colorpicker.cpp

@@ -28,7 +28,7 @@
 
 /* From TQt documentation:
  * " Note that only visible widgets can grab mouse input.
- *   If isVisible() returns FALSE for a widget, that widget cannot call grabMouse(). "
+ *   If isVisible() returns false for a widget, that widget cannot call grabMouse(). "
  * So, we should use an always visible widget to be able to pick a color from screen,
  * even by first hidding the main window (user seldomly want to grab a color from BasKet!)
  * or use a global shortcut (main window can be hidden when hitting that shortcut).
@@ -37,7 +37,7 @@
 DesktopColorPicker::DesktopColorPicker()
  : TQDesktopWidget()
 {
-	TQT_TQWIDGET(this)->setName("DesktopColorPicker");
+	this->setName("DesktopColorPicker");
 	m_gettingColorFromScreen = false;
 }
 
@@ -49,7 +49,7 @@ void DesktopColorPicker::pickColor()
 {
 	m_gettingColorFromScreen = true;
 //	Global::mainContainer->setActive(false);
-	TQTimer::singleShot( 50, this, TQT_SLOT(slotDelayedPick()) );
+	TQTimer::singleShot( 50, this, TQ_SLOT(slotDelayedPick()) );
 }
 
 /* When firered from basket context menu, and not from menu, grabMouse doesn't work!

src/colorpicker.h

@@ -28,7 +28,7 @@
   */
 class DesktopColorPicker : public TQDesktopWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	/** Construtor, initializer and destructor */

src/crashhandler.cpp

@@ -82,7 +82,7 @@
                     "But, all is not lost! You could potentially help us fix the crash. "
                     "Information describing the crash is below, so just click send, "
                     "or if you have time, write a brief description of how the crash happened first.\n\n"
-                    "Many thanks." ).arg(kapp->aboutData()->programName()) + "\n\n";
+                    "Many thanks." ).arg(tdeApp->aboutData()->programName()) + "\n\n";
             body += "\n\n\n\n\n\n" + i18n(
                     "The information below is to help the developers identify the problem, "
                     "please do not modify it." ) + "\n\n\n\n";
@@ -192,7 +192,7 @@
 //                body += kdBacktrace();
 
                 //TODO startup notification
-                kapp->invokeMailer(
+                tdeApp->invokeMailer(
                         /*to*/          "kelvie@ieee.org",
                         /*cc*/          TQString(),
                         /*bcc*/         TQString(),
@@ -206,7 +206,7 @@
 				std::cout << ("\n" + i18n( "%1 has crashed! We're sorry about this.\n\n"
                                           "But, all is not lost! Perhaps an upgrade is already available "
                                           "which fixes the problem. Please check your distribution's software repository." )
-						.arg(kapp->aboutData()->programName())).local8Bit().data() << std::endl;
+						.arg(tdeApp->aboutData()->programName())).local8Bit().data() << std::endl;
             }
 
             //_exit() exits immediately, otherwise this

src/crashhandler.h

@@ -13,7 +13,7 @@
 #ifndef CRASH_H
 #define CRASH_H
 
-#include <kcrash.h> //for main.cpp
+#include <tdecrash.h> //for main.cpp
 
     /**
      * @author Max Howell

src/debugwindow.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqlayout.h>
 #include <tqtextbrowser.h>
 #include <tqstring.h>

src/debugwindow.h

@@ -33,7 +33,7 @@ class TQCloseEvent;
   */
 
 class DebugWindow : public TQWidget  {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	/** Construtor and destructor */

src/exporterdialog.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <tdefiledialog.h>

src/exporterdialog.h

@@ -34,7 +34,7 @@ class Basket;
   */
 class ExporterDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	ExporterDialog(Basket *basket, TQWidget *parent = 0, const char *name = 0);

src/filter.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqlayout.h>
 //#include <tdetoolbarbutton.h>
 #include <tqtoolbutton.h>
@@ -51,13 +55,13 @@ FilterBar::FilterBar(TQWidget *parent, const char *name)
 	TQHBoxLayout *hBox  = new TQHBoxLayout(this, /*margin*/0, /*spacing*/0);
 
 	// Create every widgets:
-	TQIconSet resetIconSet = kapp->iconLoader()->loadIconSet("locationbar_erase", TDEIcon::Toolbar);
-	TQIconSet inAllIconSet = kapp->iconLoader()->loadIconSet("edit-find",         TDEIcon::Toolbar);
+	TQIconSet resetIconSet = tdeApp->iconLoader()->loadIconSet("locationbar_erase", TDEIcon::Toolbar);
+	TQIconSet inAllIconSet = tdeApp->iconLoader()->loadIconSet("edit-find",         TDEIcon::Toolbar);
 
 
 	m_resetButton        = new TQToolButton(this);
 	m_resetButton->setIconSet(resetIconSet);
-	m_resetButton->setTextLabel(i18n("Reset Filter"));//, /*groupText=*/"", this, TQT_SLOT(reset()), 0);
+	m_resetButton->setTextLabel(i18n("Reset Filter"));//, /*groupText=*/"", this, TQ_SLOT(reset()), 0);
 	m_resetButton->setAutoRaise(true);
 			//new TDEToolBarButton("locationbar_erase", /*id=*/1230, this, /*name=*/0, i18n("Reset Filter"));
 	m_lineEdit           = new FocusedLineEdit(this);
@@ -66,7 +70,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name)
 	TQLabel *label2       = new TQLabel(m_tagsBox, i18n("T&ag: "), this);
 	m_inAllBasketsButton = new TQToolButton(this);
 	m_inAllBasketsButton->setIconSet(inAllIconSet);
-	m_inAllBasketsButton->setTextLabel(i18n("Filter all Baskets"));//, /*groupText=*/"", this, TQT_SLOT(inAllBaskets()), 0);
+	m_inAllBasketsButton->setTextLabel(i18n("Filter all Baskets"));//, /*groupText=*/"", this, TQ_SLOT(inAllBaskets()), 0);
 	m_inAllBasketsButton->setAutoRaise(true);
 
 	// Configure the Reset button:
@@ -96,18 +100,18 @@ FilterBar::FilterBar(TQWidget *parent, const char *name)
 
 	m_data = new FilterData(); // TODO: Not a pointer! and return a const &  !!
 
-//	connect( &m_blinkTimer,         TQT_SIGNAL(timeout()),                   this, TQT_SLOT(blinkBar())                  );
-	connect(  m_resetButton,        TQT_SIGNAL(clicked()),                   this, TQT_SLOT(reset())                     );
-	connect(  m_lineEdit,           TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)) );
-	connect(  m_tagsBox,            TQT_SIGNAL(activated(int)),              this, TQT_SLOT(tagChanged(int))             );
+//	connect( &m_blinkTimer,         TQ_SIGNAL(timeout()),                   this, TQ_SLOT(blinkBar())                  );
+	connect(  m_resetButton,        TQ_SIGNAL(clicked()),                   this, TQ_SLOT(reset())                     );
+	connect(  m_lineEdit,           TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&)) );
+	connect(  m_tagsBox,            TQ_SIGNAL(activated(int)),              this, TQ_SLOT(tagChanged(int))             );
 
-//	connect(  m_inAllBasketsButton, TQT_SIGNAL(clicked()),                   this, TQT_SLOT(inAllBaskets())              );
-	connect(  m_inAllBasketsButton, TQT_SIGNAL(toggled(bool)), Global::bnpView, TQT_SLOT(toggleFilterAllBaskets(bool)) );
+//	connect(  m_inAllBasketsButton, TQ_SIGNAL(clicked()),                   this, TQ_SLOT(inAllBaskets())              );
+	connect(  m_inAllBasketsButton, TQ_SIGNAL(toggled(bool)), Global::bnpView, TQ_SLOT(toggleFilterAllBaskets(bool)) );
 
-	connect( m_lineEdit, TQT_SIGNAL(escapePressed()),  this, TQT_SIGNAL(escapePressed()) );
-	connect( m_lineEdit, TQT_SIGNAL(returnPressed()),  this, TQT_SIGNAL(returnPressed()) );
-	connect( m_tagsBox,  TQT_SIGNAL(escapePressed()),  this, TQT_SIGNAL(escapePressed()) );
-	connect( m_tagsBox,  TQT_SIGNAL(returnPressed2()), this, TQT_SIGNAL(returnPressed()) );
+	connect( m_lineEdit, TQ_SIGNAL(escapePressed()),  this, TQ_SIGNAL(escapePressed()) );
+	connect( m_lineEdit, TQ_SIGNAL(returnPressed()),  this, TQ_SIGNAL(returnPressed()) );
+	connect( m_tagsBox,  TQ_SIGNAL(escapePressed()),  this, TQ_SIGNAL(escapePressed()) );
+	connect( m_tagsBox,  TQ_SIGNAL(returnPressed2()), this, TQ_SIGNAL(returnPressed()) );
 }
 
 FilterBar::~FilterBar()
@@ -168,7 +172,7 @@ void FilterBar::repopulateTagsComnbo()
 			text = state->name();
 			icon = state->emblem();
 		}
-		emblem = kapp->iconLoader()->loadIcon(icon, TDEIcon::Desktop, ICON_SIZE, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
+		emblem = tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Desktop, ICON_SIZE, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
 		m_tagsBox->insertItem(emblem, text, index);
 		// Update the mapping:
 		m_tagsMap.insert(index, tag);
@@ -180,7 +184,7 @@ void FilterBar::repopulateTagsComnbo()
 				// Insert the state:
 				text = state->name();
 				icon = state->emblem();
-				emblem = kapp->iconLoader()->loadIcon(icon, TDEIcon::Desktop, ICON_SIZE, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
+				emblem = tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Desktop, ICON_SIZE, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true);
 				// Indent the emblem to show the hierarchy relation:
 				if (!emblem.isNull())
 					emblem = Tools::indentPixmap(emblem, /*depth=*/1, /*deltaX=*/2 * ICON_SIZE / 3);

src/filter.h

@@ -55,7 +55,7 @@ class FilterData
   */
 class FilterBar : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FilterBar(TQWidget *parent = 0, const char *name = 0);

src/focusedwidgets.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqpopupmenu.h>
 #include <tdelocale.h>
 
@@ -113,7 +117,7 @@ void FocusedTextEdit::adaptClipboardText(TQClipboard::Mode mode)
 
 	if ( (textFormat() == TQt::RichText) && (!clipboard->data(mode)->provides("application/x-qrichtext")) ) {
 		TQString text = clipboard->text(mode);
-		if (text) {
+		if (!text.isEmpty()) {
 			text = text.replace("\n", TQChar(0x2028));
 			clipboard->setText(text, mode);
 		}

src/focusedwidgets.h

@@ -31,7 +31,7 @@
 
 class FocusedTextEdit : public KTextEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FocusedTextEdit(bool disableUpdatesOnKeyPress, TQWidget *parent = 0, const char *name = 0);
@@ -54,7 +54,7 @@ class FocusedTextEdit : public KTextEdit
 // TODO: Rename to EscapableKColorCombo
 class FocusedColorCombo : public KColorCombo
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FocusedColorCombo(TQWidget *parent = 0, const char *name = 0);
@@ -69,7 +69,7 @@ class FocusedColorCombo : public KColorCombo
 // TODO: Rename to EscapableTDEFontCombo
 class FocusedFontCombo : public TDEFontCombo
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FocusedFontCombo(TQWidget *parent = 0, const char *name = 0);
@@ -84,7 +84,7 @@ class FocusedFontCombo : public TDEFontCombo
 // TODO: Rename to EscapableKComboBox
 class FocusedComboBox : public KComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FocusedComboBox(TQWidget *parent = 0, const char *name = 0);
@@ -99,7 +99,7 @@ class FocusedComboBox : public KComboBox
 // TODO: Rename to EscapableKLineEdit
 class FocusedLineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FocusedLineEdit(TQWidget *parent = 0, const char *name = 0);

src/formatimporter.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
@@ -59,18 +63,18 @@ void FormatImporter::copyFolder(const TQString &folder, const TQString &newFolde
 {
 	copyFinished = false;
 	TDEIO::CopyJob *copyJob = TDEIO::copyAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false);
-	connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCopyingDone(TDEIO::Job*)) );
+	connect( copyJob,  TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotCopyingDone(TDEIO::Job*)) );
 	while (!copyFinished)
-		kapp->processEvents();
+		tdeApp->processEvents();
 }
 
 void FormatImporter::moveFolder(const TQString &folder, const TQString &newFolder)
 {
 	copyFinished = false;
 	TDEIO::CopyJob *copyJob = TDEIO::moveAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false);
-	connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCopyingDone(TDEIO::Job*)) );
+	connect( copyJob,  TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotCopyingDone(TDEIO::Job*)) );
 	while (!copyFinished)
-		kapp->processEvents();
+		tdeApp->processEvents();
 }
 
 void FormatImporter::slotCopyingDone(TDEIO::Job *)
@@ -129,7 +133,7 @@ void FormatImporter::importBaskets()
 		// Move the folder to the new repository (normal basket) or copy the folder (mirorred folder):
 		TQString folderName = *it;
 		if (folderName.startsWith("/")) { // It was a folder mirror:
-			KMessageBox::information(0, i18n("<p>Folder mirroring is not possible anymore (see <a href='http://basket.kde.org/'>basket.kde.org</a> for more information).</p>"
+			KMessageBox::information(0, i18n("<p>Folder mirroring is not possible anymore.</p>"
 				"<p>The folder <b>%1</b> has been copied for the basket needs. You can either delete this folder or delete the basket, or use both. But remember that "
 				"modifying one will not modify the other anymore as they are now separate entities.</p>").arg(folderName), i18n("Folder Mirror Import"),
 				"", KMessageBox::AllowLink);
@@ -197,7 +201,7 @@ TQDomElement FormatImporter::importBasket(const TQString &folderName)
 	disposition.setAttribute("mindMap",     "false");
 	disposition.setAttribute("columnCount", "1");
 	disposition.setAttribute("free",        "false");
-	bool isCheckList = XMLWork::trueOrFalse( XMLWork::getElementText(properties, "showCheckBoxes", false) );
+	bool isCheckList = XMLWork::trueOrFalse( XMLWork::getElementText(properties, "showCheckBoxes", "") );
 
 	// Insert all notes in a group (column): 1/ rename "items" to "group", 2/ add "notes" to root, 3/ move "group" into "notes"
 	TQDomElement column = XMLWork::getElement(docElem, "items");

src/formatimporter.h

@@ -34,7 +34,7 @@ namespace TDEIO {
   */
 class FormatImporter : TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	static bool shouldImportBaskets();

src/global.cpp

@@ -18,8 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqstring.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
@@ -83,7 +87,7 @@ TQString Global::openNoteIcon() // FIXME: Now an edit icon
 
 TDEMainWindow* Global::mainWindow()
 {
-	TQWidget* res = kapp->mainWidget();
+	TQWidget* res = tdeApp->mainWidget();
 
 	if(res && res->inherits("TDEMainWindow"))
 	{

src/global.h

@@ -38,7 +38,7 @@ class TDEAboutData;
   * the .h files of variables he use.
   * @author S<EFBFBD>astien Laot
   */
-class Global
+class TDE_EXPORT Global
 {
   private:
 	static TQString s_customSavesFolder;

src/htmlexporter.cpp

@@ -18,13 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "htmlexporter.h"
 #include "bnpview.h"
 #include "basketlistview.h"
 #include "basket.h"
 #include "note.h"
 #include "tools.h"
-#include "config.h"
 #include "tag.h"
 
 #include <tdeapplication.h>
@@ -100,7 +103,7 @@ void HTMLExporter::prepareExport(Basket *basket, const TQString &fullPath)
 {
 	progress->setTotalSteps(/*Preparation:*/1 + /*Finishing:*/1 + /*Basket:*/1 + /*SubBaskets:*/Global::bnpView->basketCount(Global::bnpView->listViewItemForBasket(basket)));
 	progress->setValue(0);
-	kapp->processEvents();
+	tdeApp->processEvents();
 
 	// Remember the file path choosen by the user:
 	filePath = fullPath;
@@ -154,18 +157,18 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket)
 	imagesFolderName  = (isSubBasket ? "../" : filesFolderName) + i18n("HTML export folder (images)",  "images")  + "/"; // eg.: "foo.html_files/images/"  or "../images/"
 
 	std::cout << "Exporting ================================================" << std::endl;
-	std::cout << "  filePath:" << filePath << std::endl;
-	std::cout << "  basketFilePath:" << basketFilePath << std::endl;
-	std::cout << "  filesFolderPath:" << filesFolderPath << std::endl;
-	std::cout << "  filesFolderName:" << filesFolderName << std::endl;
-	std::cout << "  iconsFolderPath:" << iconsFolderPath << std::endl;
-	std::cout << "  iconsFolderName:" << iconsFolderName << std::endl;
-	std::cout << "  imagesFolderPath:" << imagesFolderPath << std::endl;
-	std::cout << "  imagesFolderName:" << imagesFolderName << std::endl;
-	std::cout << "  dataFolderPath:" << dataFolderPath << std::endl;
-	std::cout << "  dataFolderName:" << dataFolderName << std::endl;
-	std::cout << "  basketsFolderPath:" << basketsFolderPath << std::endl;
-	std::cout << "  basketsFolderName:" << basketsFolderName << std::endl;
+	std::cout << "  filePath:" << filePath.local8Bit() << std::endl;
+	std::cout << "  basketFilePath:" << basketFilePath.local8Bit() << std::endl;
+	std::cout << "  filesFolderPath:" << filesFolderPath.local8Bit() << std::endl;
+	std::cout << "  filesFolderName:" << filesFolderName.local8Bit() << std::endl;
+	std::cout << "  iconsFolderPath:" << iconsFolderPath.local8Bit() << std::endl;
+	std::cout << "  iconsFolderName:" << iconsFolderName.local8Bit() << std::endl;
+	std::cout << "  imagesFolderPath:" << imagesFolderPath.local8Bit() << std::endl;
+	std::cout << "  imagesFolderName:" << imagesFolderName.local8Bit() << std::endl;
+	std::cout << "  dataFolderPath:" << dataFolderPath.local8Bit() << std::endl;
+	std::cout << "  dataFolderName:" << dataFolderName.local8Bit() << std::endl;
+	std::cout << "  basketsFolderPath:" << basketsFolderPath.local8Bit() << std::endl;
+	std::cout << "  basketsFolderName:" << basketsFolderName.local8Bit() << std::endl;
 
 	// Create the data folder for this basket:
 	TQDir dir;
@@ -197,7 +200,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket)
 	TQFile file(basketFilePath);
 	if (!file.open(IO_WriteOnly))
 		return;
-	stream.setDevice(TQT_TQIODEVICE(&file));
+	stream.setDevice(&file);
 	stream.setEncoding(TQTextStream::UnicodeUTF8);
 
 	// Compute the colors to draw dragient for notes:
@@ -214,7 +217,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket)
 		"<html>\n"
 		" <head>\n"
 		"  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n"
-		"  <meta name=\"Generator\" content=\"" << kapp->aboutData()->programName() << " " << VERSION << " http://basket.kde.org/\">\n"
+		"  <meta name=\"Generator\" content=\"" << tdeApp->aboutData()->programName() << " " << VERSION << "\">\n"
 		"  <style type=\"text/css\">\n"
 //		"   @media print {\n"
 //		"    span.printable { display: inline; }\n"
@@ -317,8 +320,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket)
 		"  </div>\n"
 		"  <p class=\"credits\">%1</p>\n").arg(
 			i18n("Made with %1, a TDE tool to take notes and keep information at hand.")
-				.arg("<a href=\"http://basket.kde.org/\">%1</a> %2")
-				.arg(kapp->aboutData()->programName(), VERSION));
+				.arg(tdeApp->aboutData()->programName(), VERSION));
 
 	// Copy a transparent GIF image in the folder, needed for the JavaScript hack:
 	TQString gifFileName = "spacer.gif";

src/kcm_basket.cpp

@@ -28,7 +28,7 @@
 //----------------------------
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_basket_config_general(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_basket_config_general(TQWidget *parent, const char *)
 	{
 		GeneralPage *page = new GeneralPage(parent, "kcmbasket_config_general");
 		return page;
@@ -37,7 +37,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_basket_config_baskets(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_basket_config_baskets(TQWidget *parent, const char *)
 	{
 		BasketsPage *page = new BasketsPage(parent, "kcmbasket_config_baskets");
 		return page;
@@ -46,7 +46,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_basket_config_new_notes(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_basket_config_new_notes(TQWidget *parent, const char *)
 	{
 		NewNotesPage *page = new NewNotesPage(parent, "kcmbasket_config_new_notes");
 		return page;
@@ -55,7 +55,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_basket_config_notes_appearance(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_basket_config_notes_appearance(TQWidget *parent, const char *)
 	{
 		NotesAppearancePage *page = new NotesAppearancePage(parent, "kcmbasket_config_notes_appearance");
 		return page;
@@ -64,7 +64,7 @@ extern "C"
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_basket_config_apps(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_basket_config_apps(TQWidget *parent, const char *)
 	{
 		ApplicationsPage *page = new ApplicationsPage(parent, "kcmbasket_config_apps");
 		return page;

src/kcolorcombo2.cpp

@@ -685,7 +685,7 @@ bool KColorCombo2::eventFilter(TQObject */*object*/, TQEvent *event)
 		case TQEvent::MouseButtonDblClick:
 		case TQEvent::MouseButtonPress:
 			mouseEvent = (TQMouseEvent*)event;
-			if ( !TQT_TQRECT_OBJECT(m_popup->rect()).contains(mouseEvent->pos()) ) {
+			if ( !m_popup->rect().contains(mouseEvent->pos()) ) {
 				TQPoint globalPos = m_popup->mapToGlobal(mouseEvent->pos());
 				if (TQApplication::widgetAt(globalPos, /*child=*/true) == this) {
 					// The popup is being closed by a click on the KColorCombo2 widget.
@@ -706,7 +706,7 @@ void KColorCombo2::mousePressEvent(TQMouseEvent *event)
 {
 	m_dragStartPos = event->pos();
 
-	if (event->button() == Qt::LeftButton && m_discardNextMousePress)
+	if (event->button() == TQt::LeftButton && m_discardNextMousePress)
 		m_discardNextMousePress = false;
 	else
 		TQComboBox::mousePressEvent(event);
@@ -714,7 +714,7 @@ void KColorCombo2::mousePressEvent(TQMouseEvent *event)
 
 void KColorCombo2::mouseMoveEvent(TQMouseEvent *event)
 {
-	if( (event->state() & Qt::LeftButton) &&
+	if( (event->state() & TQt::LeftButton) &&
 	    (event->pos() - m_dragStartPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
 		// Drag color object:
 		KColorDrag *colorDrag = new KColorDrag(effectiveColor(), this);

src/kcolorcombo2.h

@@ -75,7 +75,7 @@ class KColorPopup;
  */
 class KColorCombo2 : public TQComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY(TQColor color        READ color        WRITE setColor)
   TQ_PROPERTY(TQColor defaultColor READ defaultColor WRITE setDefaultColor)
@@ -311,7 +311,7 @@ class KColorCombo2 : public TQComboBox
 
 class KColorPopup : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	KColorPopup(KColorCombo2 *parent);

src/kgpgme.cpp

@@ -18,7 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kgpgme.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #ifdef HAVE_LIBGPGME
 
@@ -37,6 +39,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "kgpgme.h"
+
 // KGpgSelKey class based on class in KGpg with the same name
 
 class KGpgSelKey : public KDialogBase
@@ -120,7 +124,7 @@ KGpgMe::~KGpgMe()
 
 void KGpgMe::clearCache()
 {
-	if(m_cache.size() > 0)
+	if(m_cache.length() > 0)
 	{
 		m_cache.fill('\0');
 		m_cache.truncate(0);
@@ -138,7 +142,7 @@ void KGpgMe::init(gpgme_protocol_t proto)
 
 	err = gpgme_engine_check_version(proto);
 	if(err) {
-		KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2")
+		KMessageBox::error(tdeApp->activeWindow(), TQString("%1: %2")
 			.arg(gpgme_strsource(err)).arg(gpgme_strerror(err)));
 	}
 }
@@ -178,7 +182,7 @@ TQString KGpgMe::checkForUtf8(TQString txt)
 
 TQString KGpgMe::selectKey(TQString previous)
 {
-	KGpgSelKey dlg(TQT_TQWIDGET(kapp->activeWindow()), "", previous, *this);
+	KGpgSelKey dlg(tdeApp->activeWindow(), "", previous, *this);
 
 	if(dlg.exec())
 		return dlg.key();
@@ -220,13 +224,13 @@ KGpgKeyList KGpgMe::keys(bool privateKeys /* = false */) const
 	}
 
 	if(err) {
-		KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2")
+		KMessageBox::error(tdeApp->activeWindow(), TQString("%1: %2")
 			.arg(gpgme_strsource(err)).arg(gpgme_strerror(err)));
 	}
 	else {
 		result = gpgme_op_keylist_result(m_ctx);
 		if (result->truncated) {
-			KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
+			KMessageBox::error(tdeApp->activeWindow(),
 				i18n("Key listing unexpectedly truncated."));
 		}
 	}
@@ -262,7 +266,7 @@ bool KGpgMe::encrypt(const TQByteArray& inBuffer, TQ_ULONG length,
 					if(!err) {
 						result = gpgme_op_encrypt_result(m_ctx);
 						if (result->invalid_recipients) {
-							KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2")
+							KMessageBox::error(tdeApp->activeWindow(), TQString("%1: %2")
 								.arg(i18n("That public key is not meant for encryption"))
 								.arg(result->invalid_recipients->fpr));
 						}
@@ -275,7 +279,7 @@ bool KGpgMe::encrypt(const TQByteArray& inBuffer, TQ_ULONG length,
 		}
 	}
 	if(err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) {
-		KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2")
+		KMessageBox::error(tdeApp->activeWindow(), TQString("%1: %2")
 			.arg(gpgme_strsource(err)).arg(gpgme_strerror(err)));
 	}
 	if(err != GPG_ERR_NO_ERROR)
@@ -305,7 +309,7 @@ bool KGpgMe::decrypt(const TQByteArray& inBuffer, TQByteArray* outBuffer)
 				if(!err) {
 					result = gpgme_op_decrypt_result(m_ctx);
 					if(result->unsupported_algorithm) {
-						KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2")
+						KMessageBox::error(tdeApp->activeWindow(), TQString("%1: %2")
 							.arg(i18n("Unsupported algorithm"))
 							.arg(result->unsupported_algorithm));
 					}
@@ -317,7 +321,7 @@ bool KGpgMe::decrypt(const TQByteArray& inBuffer, TQByteArray* outBuffer)
 		}
 	}
 	if(err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) {
-		KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2")
+		KMessageBox::error(tdeApp->activeWindow(), TQString("%1: %2")
 			.arg(gpgme_strsource(err)).arg(gpgme_strerror(err)));
 	}
 	if(err != GPG_ERR_NO_ERROR)
@@ -378,12 +382,12 @@ void KGpgMe::setPassphraseCb()
 		if (agent_info.find(':'))
 			agent = true;
 		if(agent_info.startsWith("disable:"))
-			setenv("GPG_AGENT_INFO", agent_info.mid(8), 1);
+			setenv("GPG_AGENT_INFO", agent_info.mid(8).local8Bit(), 1);
 	}
 	else
 	{
 		if(!agent_info.startsWith("disable:"))
-			setenv("GPG_AGENT_INFO", "disable:" + agent_info, 1);
+			setenv("GPG_AGENT_INFO", "disable:" + agent_info.local8Bit(), 1);
 	}
 	if (agent)
 		gpgme_set_passphrase_cb(m_ctx, 0, 0);
@@ -420,7 +424,7 @@ gpgme_error_t KGpgMe::passphrase(const char* uid_hint,
 		s += gpg_hint;
 
 	if(m_cache.isEmpty()){
-		TQCString password;
+		TQString password;
 
 		if(m_saving)
 			result = KPasswordDialog::getNewPassword(password, s);
@@ -434,7 +438,8 @@ gpgme_error_t KGpgMe::passphrase(const char* uid_hint,
 		result = KPasswordDialog::Accepted;
 
 	if(result == KPasswordDialog::Accepted) {
-		write(fd, m_cache.data(), m_cache.length());
+		TQCString m_cache2 = m_cache.local8Bit();
+		write(fd, m_cache2.data(), m_cache2.length());
 		res = 0;
 	}
 	write(fd, "\n", 1);

src/kgpgme.h

@@ -20,10 +20,6 @@
 #ifndef KGPGME_H
 #define KGPGME_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef HAVE_LIBGPGME
 
 #include <gpgme.h>
@@ -69,7 +65,7 @@ class KGpgMe
 		TQString m_text;
 		bool m_saving;
 		bool m_useGnuPGAgent;
-		TQCString m_cache;
+		TQString m_cache;
 
 		void init(gpgme_protocol_t proto);
 		gpgme_error_t readToBuffer(gpgme_data_t in, TQByteArray* outBuffer) const;

src/kiconcanvas.cpp

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
@@ -13,24 +12,25 @@
  * exact licensing terms.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "kiconcanvas.h"
 #include "kicondialog.h"
 
-#include <config.h>
-
 #include <kiconviewsearchline.h>
 
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kimagefilepreview.h>
 #include <kurldrag.h>
 #include <tdemultipledrag.h>
 
-#include <tqsortedlist.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqtimer.h>
@@ -41,8 +41,7 @@
 #include <algorithm>
 
 #ifdef HAVE_LIBART
-#include <svgicons/ksvgiconengine.h>
-#include <svgicons/ksvgiconpainter.h>
+#include <ksvgiconengine.h>
 #endif
 
 class TDEIconCanvasItem : public TQIconViewItem
@@ -80,7 +79,7 @@ class TDEIconCanvas::TDEIconCanvasPrivate
     TQString mSetCurrent;
     int mSize;
 #ifdef HAVE_LIBART
-    KSvgIconEngine mSvgEngine;
+    KSVGIconEngine mSvgEngine;
 #endif
     bool mStrictIconSize;
 };
@@ -95,9 +94,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name)
     d = new TDEIconCanvasPrivate;
     mpLoader = TDEGlobal::iconLoader();
     mpTimer = new TQTimer(this);
-    connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles()));
-    connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)),
-	    TQT_SLOT(slotCurrentChanged(TQIconViewItem *)));
+    connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles()));
+    connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)),
+	    TQ_SLOT(slotCurrentChanged(TQIconViewItem *)));
     setAcceptDrops(false);
     setShowToolTips(true);
     setStrictIconSize(false);
@@ -127,7 +126,7 @@ void TDEIconCanvas::loadIcon(const TQString &name)
 #ifdef HAVE_LIBART
    else
        if (d->mSvgEngine.load(maxSize, maxSize, path))
-        img = *d->mSvgEngine.painter()->image();
+        img = *d->mSvgEngine.image();
 #endif
 
    if (img.isNull())
@@ -178,7 +177,7 @@ void TDEIconCanvas::slotLoadFiles()
     {
         loadIcon(*it);
 
-        // Calling kapp->processEvents() makes the iconview flicker like hell
+        // Calling tdeApp->processEvents() makes the iconview flicker like hell
         // (it's being repainted once for every new item), so we don't do this.
         // Instead, we directly repaint the progress bar without going through
         // the event-loop. We do that just once for every 10th item so that

src/kiconcanvas.h

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
@@ -31,7 +30,7 @@ class TQIconLoader;
 class TDEIO_EXPORT TDEIconCanvas: public TDEIconView
 /* NOTE: Why export this? */
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:

src/kicondialog.cpp

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
@@ -25,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
 #include <kiconview.h>
@@ -36,7 +35,6 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqsortedlist.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
@@ -120,14 +118,14 @@ void TDEIconDialog::init()
     // Hack standard Gui item, as KDevDesigner won't let us
     d->ui->browseButton->setText(i18n("&Browse..."));
 
-    connect(d->ui->browseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse()));
-    connect(d->ui->listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotContext(int)));
-    connect(d->ui->iconCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotOk()));
-    connect(d->ui->iconCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotOk()));
-    connect(d->ui->iconCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int)));
-    connect(d->ui->iconCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int)));
-    connect(d->ui->iconCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished()));
-    connect(this, TQT_SIGNAL(hidden()), d->ui->iconCanvas, TQT_SLOT(stopLoading()));
+    connect(d->ui->browseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse()));
+    connect(d->ui->listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotContext(int)));
+    connect(d->ui->iconCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotOk()));
+    connect(d->ui->iconCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotOk()));
+    connect(d->ui->iconCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int)));
+    connect(d->ui->iconCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int)));
+    connect(d->ui->iconCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished()));
+    connect(this, TQ_SIGNAL(hidden()), d->ui->iconCanvas, TQ_SLOT(stopLoading()));
 
     // NOTE: this must be consistent with the IconType enum (see above)
     d->ui->listBox->insertItem(i18n("(All Icons)"));
@@ -445,7 +443,7 @@ void TDEIconButton::init( TDEIconLoader *loader )
 
     mpLoader = loader;
     mpDialog = 0L;
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon()));
 }
 
 TDEIconButton::~TDEIconButton()
@@ -500,7 +498,7 @@ void TDEIconButton::setIcon(const TQString& icon)
     if (!mpDialog)
     {
         mpDialog = new TDEIconDialog(mpLoader, this);
-        connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
+        connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&)));
     }
 }
 
@@ -514,7 +512,7 @@ void TDEIconButton::setCustomLocation(const TQString &custom)
     if (!mpDialog)
     {
         mpDialog = new TDEIconDialog(mpLoader, this);
-        connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
+        connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&)));
     }
 
     mpDialog->setCustomLocation(custom);
@@ -531,7 +529,7 @@ void TDEIconButton::slotChangeIcon()
     if (!mpDialog)
     {
         mpDialog = new TDEIconDialog(mpLoader, this);
-        connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
+        connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&)));
     }
 
     mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser, d->lockUser, d->lockCustom );

src/kicondialog.h

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2006 Luke Sandell <lasandell@gmail.com>
@@ -43,7 +42,7 @@ class TDEIconLoader;
  */
 class TDEIO_EXPORT TDEIconDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -218,7 +217,7 @@ private:
  */
 class TDEIO_EXPORT TDEIconButton: public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
     TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize)

src/kicondialogui.ui

@@ -156,9 +156,6 @@
             <property name="text">
                 <string>&amp;Open...</string>
             </property>
-            <property name="accel">
-                <string>Alt+O</string>
-            </property>
             <property name="on">
                 <bool>false</bool>
             </property>
@@ -233,11 +230,11 @@
     <tabstop>searchLine</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kiconcanvas.h</includehint>
-    <includehint>kiconviewsearchline.h</includehint>
-    <includehint>kprogress.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+    <include location="global" impldecl="in implementation">kiconcanvas.h</include>
+    <include location="global" impldecl="in implementation">kiconviewsearchline.h</include>
+</includes>
 </UI>

src/likeback.cpp

@@ -65,40 +65,40 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
 {
 	TQHBoxLayout *layout = new TQHBoxLayout(this);
 
-	TQIconSet likeIconSet    = kapp->iconLoader()->loadIconSet("likeback_like",    TDEIcon::Small);
-	TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", TDEIcon::Small);
-	TQIconSet bugIconSet     = kapp->iconLoader()->loadIconSet("likeback_bug",     TDEIcon::Small);
-	TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature", TDEIcon::Small);
+	TQIconSet likeIconSet    = tdeApp->iconLoader()->loadIconSet("likeback_like",    TDEIcon::Small);
+	TQIconSet dislikeIconSet = tdeApp->iconLoader()->loadIconSet("likeback_dislike", TDEIcon::Small);
+	TQIconSet bugIconSet     = tdeApp->iconLoader()->loadIconSet("likeback_bug",     TDEIcon::Small);
+	TQIconSet featureIconSet = tdeApp->iconLoader()->loadIconSet("likeback_feature", TDEIcon::Small);
 
 	m_likeButton = new TQToolButton(this, "likeback_like");
 	m_likeButton->setIconSet(likeIconSet);
 	m_likeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you like"));
 	m_likeButton->setAutoRaise(true);
-	connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedLike()) );
+	connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedLike()) );
 	layout->add(m_likeButton);
 
 	m_dislikeButton = new TQToolButton(this, "likeback_dislike");
 	m_dislikeButton->setIconSet(dislikeIconSet);
 	m_dislikeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you dislike"));
 	m_dislikeButton->setAutoRaise(true);
-	connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedDislike()) );
+	connect( m_dislikeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedDislike()) );
 	layout->add(m_dislikeButton);
 
 	m_bugButton = new TQToolButton(this, "likeback_bug");
 	m_bugButton->setIconSet(bugIconSet);
 	m_bugButton->setTextLabel("<p>" + i18n("Send application developers a comment about an improper behavior of the application"));
 	m_bugButton->setAutoRaise(true);
-	connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedBug()) );
+	connect( m_bugButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedBug()) );
 	layout->add(m_bugButton);
 
 	m_featureButton = new TQToolButton(this, "likeback_feature");
 	m_featureButton->setIconSet(featureIconSet);
 	m_featureButton->setTextLabel("<p>" + i18n("Send application developers a comment about a new feature you desire"));
 	m_featureButton->setAutoRaise(true);
-	connect( m_featureButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedFeature()) );
+	connect( m_featureButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedFeature()) );
 	layout->add(m_featureButton);
 
-	connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) );
+	connect( &m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoMove()) );
 
 	LikeBack::Button buttons = likeBack->buttons();
 	m_likeButton->setShown(    buttons & LikeBack::Like    );
@@ -125,7 +125,7 @@ void LikeBackBar::autoMove()
 {
 	static TQWidget *lastWindow = 0;
 
-	TQWidget *window = TQT_TQWIDGET(kapp->activeWindow());
+	TQWidget *window = tdeApp->activeWindow();
 	// When a Kicker applet has the focus, like the Commandline TQLineEdit,
 	// the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon.
 	// It's obviously bad ;-) :
@@ -137,9 +137,9 @@ void LikeBackBar::autoMove()
 
 		if (window != lastWindow && m_likeBack->windowNamesListing() != LikeBack::NoListing) {
 			if (tqstricmp(window->name(), "") == 0 || tqstricmp(window->name(), "unnamed") == 0) {
-				std::cout << "===== LikeBack ===== UNNAMED ACTIVE WINDOW OF TYPE " << window->className() << " ======" << LikeBack::activeWindowPath() << std::endl;
+				std::cout << "===== LikeBack ===== UNNAMED ACTIVE WINDOW OF TYPE " << window->className() << " ======" << LikeBack::activeWindowPath().local8Bit() << std::endl;
 			} else if (m_likeBack->windowNamesListing() == LikeBack::AllWindows) {
-				std::cout << "LikeBack: Active Window: " << LikeBack::activeWindowPath() << std::endl;
+				std::cout << "LikeBack: Active Window: " << LikeBack::activeWindowPath().local8Bit() << std::endl;
 			}
 		}
 		lastWindow = window;
@@ -220,9 +220,9 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, con
 
 	// Use default TDEApplication config and aboutData if not provided:
 	if (d->config == 0)
-		d->config = kapp->config();
+		d->config = tdeApp->config();
 	if (d->aboutData == 0)
-		d->aboutData = kapp->aboutData();
+		d->aboutData = tdeApp->aboutData();
 
 	// Initialize properties (2/2) [Needs aboutData to be set]:
 	d->showBar          = userWantsToShowBar();
@@ -244,7 +244,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, con
 
 	// Show the bar if that's wanted by the developer or the user:
 	if (d->showBar)
-		TQTimer::singleShot( 0, d->bar, TQT_SLOT(startTimer()) );
+		TQTimer::singleShot( 0, d->bar, TQ_SLOT(startTimer()) );
 
 #if 0
 	disableBar();
@@ -379,7 +379,7 @@ TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent)
 	if (d->action == 0)
 		d->action = new TDEAction(
 			i18n("&Send a Comment to Developers"), /*icon=*/"mail-message-new", /*shortcut=*/"",
-			this, TQT_SLOT(execCommentDialog()),
+			this, TQ_SLOT(execCommentDialog()),
 			parent, "likeback_send_a_comment"
 		);
 
@@ -412,10 +412,10 @@ void LikeBack::setUserWantsToShowBar(bool showBar)
 void LikeBack::showInformationMessage()
 {
 	// Load and register the images needed by the message:
-	TQPixmap likeIcon    = kapp->iconLoader()->loadIcon("likeback_like",    TDEIcon::Small);
-	TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small);
-	TQPixmap bugIcon     = kapp->iconLoader()->loadIcon("likeback_bug",     TDEIcon::Small);
-	TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature", TDEIcon::Small);
+	TQPixmap likeIcon    = tdeApp->iconLoader()->loadIcon("likeback_like",    TDEIcon::Small);
+	TQPixmap dislikeIcon = tdeApp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small);
+	TQPixmap bugIcon     = tdeApp->iconLoader()->loadIcon("likeback_bug",     TDEIcon::Small);
+	TQPixmap featureIcon = tdeApp->iconLoader()->loadIcon("likeback_feature", TDEIcon::Small);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like",    likeIcon);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug",     bugIcon);
@@ -491,7 +491,7 @@ TQString LikeBack::activeWindowPath()
 {
 	// Compute the window hierarchy (from the latest to the oldest):
 	TQStringList windowNames;
-	TQWidget *window = TQT_TQWIDGET(kapp->activeWindow());
+	TQWidget *window = tdeApp->activeWindow();
 	while (window) {
 		TQString name = window->name();
 		// Append the class name to the window name if it is unnamed:
@@ -559,7 +559,7 @@ void LikeBack::askEmailAddress()
 		"<p><b>" + i18n("Please provide your email address.") + "</b></p>" +
 		"<p>" + i18n("It will only be used to contact you back if more information is needed about your comments, ask you how to reproduce the bugs you report, send bug corrections for you to test, etc.") + "</p>" +
 		"<p>" + i18n("The email address is optional. If you do not provide any, your comments will be sent anonymously.") + "</p>",
-		currentEmailAddress, &ok, TQT_TQWIDGET(kapp->activeWindow()), /*name=*/(const char*)0, &emailValidator);
+		currentEmailAddress, &ok, tdeApp->activeWindow(), /*name=*/(const char*)0, &emailValidator);
 	enableBar();
 
 	if (ok)
@@ -585,7 +585,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 		return;
 	m_process = new TDEProcess();
 	*m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
-	connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(fetchUserEmail()) );
+	connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(fetchUserEmail()) );
 	if (!m_process->start()) {
 		kdDebug() << "Couldn't start tdecmshell.." << endl;
 		delete m_process;
@@ -632,7 +632,7 @@ void LikeBack::fetchUserEmail()
 
 LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialComment, const TQString &windowPath, const TQString &context, LikeBack *likeBack)
  : KDialogBase(KDialogBase::Swallow, i18n("Send a Comment to Developers"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Default,
-               KDialogBase::Ok, TQT_TQWIDGET(kapp->activeWindow()), /*name=*/"_likeback_feedback_window_", /*modal=*/true, /*separator=*/true)
+               KDialogBase::Ok, tdeApp->activeWindow(), /*name=*/"_likeback_feedback_window_", /*modal=*/true, /*separator=*/true)
  , m_likeBack(likeBack)
  , m_windowPath(windowPath)
  , m_context(context)
@@ -668,7 +668,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 	TQWidget *buttons = new TQWidget(box);
 	TQGridLayout *buttonsGrid = new TQGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint());
 	if (m_likeBack->buttons() & LikeBack::Like) {
-		TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+		TQPixmap likePixmap = tdeApp->iconLoader()->loadIcon("likeback_like", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *likeIcon = new TQLabel(buttons);
 		likeIcon->setPixmap(likePixmap);
 		likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -678,7 +678,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		m_group->insert(likeButton, LikeBack::Like);
 	}
 	if (m_likeBack->buttons() & LikeBack::Dislike) {
-		TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+		TQPixmap dislikePixmap = tdeApp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *dislikeIcon = new TQLabel(buttons);
 		dislikeIcon->setPixmap(dislikePixmap);
 		dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -688,7 +688,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		m_group->insert(dislikeButton, LikeBack::Dislike);
 	}
 	if (m_likeBack->buttons() & LikeBack::Bug) {
-		TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+		TQPixmap bugPixmap = tdeApp->iconLoader()->loadIcon("likeback_bug", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *bugIcon = new TQLabel(buttons);
 		bugIcon->setPixmap(bugPixmap);
 		bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -698,7 +698,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		m_group->insert(bugButton, LikeBack::Bug);
 	}
 	if (m_likeBack->buttons() & LikeBack::Feature) {
-		TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
+		TQPixmap featurePixmap = tdeApp->iconLoader()->loadIcon("likeback_feature", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *featureIcon = new TQLabel(buttons);
 		featureIcon->setPixmap(featurePixmap);
 		featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -718,19 +718,19 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 	m_showButtons = new TQCheckBox(i18n("Show comment buttons below &window titlebars"), page);
 	m_showButtons->setChecked(m_likeBack->userWantsToShowBar());
 	pageLayout->addWidget(m_showButtons);
-	connect( m_showButtons, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changeButtonBarVisible()) );
+	connect( m_showButtons, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changeButtonBarVisible()) );
 
 	setButtonOK(KGuiItem(i18n("&Send Comment"), "mail-send"));
 	enableButtonOK(false);
-	connect( m_comment, TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) );
+	connect( m_comment, TQ_SIGNAL(textChanged()), this, TQ_SLOT(commentChanged()) );
 
 	setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic"));
 
-	resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint()));
+	resize(TQSize(tdeApp->desktop()->width() * 1 / 2, tdeApp->desktop()->height() * 3 / 5).expandedTo(sizeHint()));
 
 	TQAction *sendShortcut = new TQAction(this);
 	sendShortcut->setAccel(TQString("Ctrl+Return"));
-	connect( sendShortcut, TQT_SIGNAL(activated()), actionButton(Ok), TQT_SLOT(animateClick()) );
+	connect( sendShortcut, TQ_SIGNAL(activated()), actionButton(Ok), TQ_SLOT(animateClick()) );
 
 	setMainWidget(page);
 }
@@ -818,9 +818,9 @@ void LikeBackDialog::send()
 		"email="    + KURL::encode_string(emailAddress);
 	TQHttp *http = new TQHttp(m_likeBack->hostName(), m_likeBack->hostPort());
 
-	std::cout << "http://" << m_likeBack->hostName() << ":" << m_likeBack->hostPort() << m_likeBack->remotePath() << std::endl;
-	std::cout << data << std::endl;
-	connect( http, TQT_SIGNAL(requestFinished(int, bool)), this, TQT_SLOT(requestFinished(int, bool)) );
+	std::cout << "http://" << m_likeBack->hostName().local8Bit() << ":" << m_likeBack->hostPort() << m_likeBack->remotePath().local8Bit() << std::endl;
+	std::cout << data.local8Bit() << std::endl;
+	connect( http, TQ_SIGNAL(requestFinished(int, bool)), this, TQ_SLOT(requestFinished(int, bool)) );
 
 	TQHttpRequestHeader header("POST", m_likeBack->remotePath());
 	header.setValue("Host", m_likeBack->hostName());
@@ -851,5 +851,5 @@ void LikeBackDialog::requestFinished(int /*id*/, bool error)
 	KDialogBase::slotOk();
 }
 
-#include "likeback_private.moc.cpp"
+#include "likeback_private.moc"
 #include "likeback.moc"

src/likeback.h

@@ -57,7 +57,7 @@ class LikeBackDialog;
  * Here is an example of code to call to quickly setup LikeBack on the client:
  * @code
  *     // Instanciate the LikeBack system, and show the first-use information dialog if the button-bar is shown:
- *     LikeBack *likeBack = new LikeBack(LikeBack::AllButtons, LikeBack::isDevelopmentVersion(kapp->aboutData->version())); // Show button-bar only in beta-versions
+ *     LikeBack *likeBack = new LikeBack(LikeBack::AllButtons, LikeBack::isDevelopmentVersion(tdeApp->aboutData->version())); // Show button-bar only in beta-versions
  *     likeBack->setServer("myapp.kde.org", "/likeback/send.php");
  *     likeBack->setAcceptedLanguages(TQStringList::split(";", "en;fr"), i18n("Please write in English or French."));
  *
@@ -69,12 +69,11 @@ class LikeBackDialog;
  *     likeBack->sendACommentAction(actionCollection());
  * @endcode
  *
- * @see Visit http://basket.kde.org/likeback.php for more information, screenshots, a tutorial, hints, return of experiences, and to download the server-side developer interface...
  * @author Sebastien Laout <slaout@linux62.org>
  */
 class LikeBack : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	/**

src/likeback_private.h

@@ -56,7 +56,7 @@ class LikeBackPrivate
 
 class LikeBackBar : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LikeBackBar(LikeBack *likeBack);
@@ -81,7 +81,7 @@ class LikeBackBar : public TQWidget
 
 class LikeBackDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LikeBackDialog(LikeBack::Button reason, const TQString &initialComment, const TQString &windowPath, const TQString &context, LikeBack *likeBack);

src/linklabel.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqlabel.h>
 #include <kurl.h>
 #include <tqlayout.h>
@@ -212,7 +216,7 @@ void LinkLabel::setLink(const TQString &title, const TQString &icon, LinkLook *l
 	if (icon.isEmpty())
 		m_icon->clear();
 	else {
-		TQPixmap pixmap = DesktopIcon(icon, m_look->iconSize(), m_look->iconSize(), kapp);
+		TQPixmap pixmap = DesktopIcon(icon, m_look->iconSize(), m_look->iconSize(), tdeApp);
 		if (!pixmap.isNull())
 			m_icon->setPixmap(pixmap);
 	}
@@ -392,7 +396,7 @@ void LinkDisplay::setLink(const TQString &title, const TQString &icon, const TQP
 	m_font    = font;
 
 	// "Constants":
-	int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin);
+	int BUTTON_MARGIN = tdeApp->style().pixelMetric(TQStyle::PM_ButtonMargin);
 	int LINK_MARGIN   = BUTTON_MARGIN + 2;
 
 	// Recompute m_minWidth:
@@ -430,7 +434,7 @@ void LinkDisplay::setWidth(int width)
 void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height, const TQColorGroup &colorGroup,
                         bool isDefaultColor, bool isSelected, bool isHovered, bool isIconButtonHovered) const
 {
-	int BUTTON_MARGIN = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin);
+	int BUTTON_MARGIN = tdeApp->style().pixelMetric(TQStyle::PM_ButtonMargin);
 	int LINK_MARGIN   = BUTTON_MARGIN + 2;
 
 	TQPixmap pixmap;
@@ -442,14 +446,14 @@ void LinkDisplay::paint(TQPainter *painter, int x, int y, int width, int height,
 		int           iconSize   = m_look->iconSize();
 		TQString       iconName   = (isHovered ? Global::openNoteIcon() : m_icon);
 		TDEIcon::States iconState  = (isIconButtonHovered ? TDEIcon::ActiveState : TDEIcon::DefaultState);
-		pixmap = kapp->iconLoader()->loadIcon(iconName, TDEIcon::Desktop, iconSize, iconState, 0L, /*canReturnNull=*/false);
+		pixmap = tdeApp->iconLoader()->loadIcon(iconName, TDEIcon::Desktop, iconSize, iconState, 0L, /*canReturnNull=*/false);
 	}
 	int iconPreviewWidth  = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width()  : 0));
 	int pixmapX = (iconPreviewWidth - pixmap.width()) / 2;
 	int pixmapY = (height - pixmap.height()) / 2;
 	// Draw the button (if any) and the icon:
 	if (isHovered)
-		kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, painter, TQRect(-1, -1, iconPreviewWidth + 2*BUTTON_MARGIN, height + 2),
+		tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, painter, TQRect(-1, -1, iconPreviewWidth + 2*BUTTON_MARGIN, height + 2),
 		                            colorGroup, TQStyle::Style_Enabled | (isIconButtonHovered ? TQStyle::Style_MouseOver : 0));
 	painter->drawPixmap(x + BUTTON_MARGIN - 1 + pixmapX, y + pixmapY, pixmap);
 
@@ -483,7 +487,7 @@ TQPixmap LinkDisplay::feedbackPixmap(int width, int height, const TQColorGroup &
 
 bool LinkDisplay::iconButtonAt(const TQPoint &pos) const
 {
-	int BUTTON_MARGIN    = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin);
+	int BUTTON_MARGIN    = tdeApp->style().pixelMetric(TQStyle::PM_ButtonMargin);
 //	int LINK_MARGIN      = BUTTON_MARGIN + 2;
 	int iconPreviewWidth = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width()  : 0));
 
@@ -492,7 +496,7 @@ bool LinkDisplay::iconButtonAt(const TQPoint &pos) const
 
 TQRect LinkDisplay::iconButtonRect() const
 {
-	int BUTTON_MARGIN    = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin);
+	int BUTTON_MARGIN    = tdeApp->style().pixelMetric(TQStyle::PM_ButtonMargin);
 //	int LINK_MARGIN      = BUTTON_MARGIN + 2;
 	int iconPreviewWidth = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width()  : 0));
 
@@ -517,7 +521,7 @@ TQFont LinkDisplay::labelFont(TQFont font, bool isIconButtonHovered) const
 
 int LinkDisplay::heightForWidth(int width) const
 {
-	int BUTTON_MARGIN     = kapp->style().pixelMetric(TQStyle::PM_ButtonMargin);
+	int BUTTON_MARGIN     = tdeApp->style().pixelMetric(TQStyle::PM_ButtonMargin);
 	int LINK_MARGIN       = BUTTON_MARGIN + 2;
 	int iconPreviewWidth  = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.width()  : 0));
 	int iconPreviewHeight = TQMAX(m_look->iconSize(), (m_look->previewEnabled() ? m_preview.height() : 0));
@@ -614,7 +618,7 @@ LinkLookEditWidget::LinkLookEditWidget(TDECModule *module, const TQString exTitl
 		     "<p>If you do not want the application to create notes depending on the content of the files you drop, "
 		     "go to the \"General\" page and uncheck \"Image or animation\" in the \"View Content of Added Files for the Following Types\" group.</p>")
 		// TODO: Note: you can resize down maximum size of images...
-			.arg(kapp->aboutData()->programName(), kapp->aboutData()->programName()),
+			.arg(tdeApp->aboutData()->programName(), tdeApp->aboutData()->programName()),
 		this);
 	gl->addWidget(m_label,   4, 0);
 	gl->addWidget(m_preview, 4, 1);
@@ -629,21 +633,21 @@ LinkLookEditWidget::LinkLookEditWidget(TDECModule *module, const TQString exTitl
 	m_exTitle = exTitle;
 	m_exIcon  = exIcon;
 
-	connect( m_italic,      TQT_SIGNAL(stateChanged(int)),      this,   TQT_SLOT(slotChangeLook()) );
-	connect( m_bold,        TQT_SIGNAL(stateChanged(int)),      this,   TQT_SLOT(slotChangeLook()) );
-	connect( m_underlining, TQT_SIGNAL(activated(int)),         this,   TQT_SLOT(slotChangeLook()) );
-	connect( m_color,       TQT_SIGNAL(changed(const TQColor&)), this,   TQT_SLOT(slotChangeLook()) );
-	connect( m_hoverColor,  TQT_SIGNAL(changed(const TQColor&)), this,   TQT_SLOT(slotChangeLook()) );
-	connect( m_iconSize,    TQT_SIGNAL(activated(int)),         this,   TQT_SLOT(slotChangeLook()) );
-	connect( m_preview,     TQT_SIGNAL(activated(int)),         this,   TQT_SLOT(slotChangeLook()) );
-
-	connect( m_italic,      TQT_SIGNAL(stateChanged(int)),      module, TQT_SLOT(changed())        );
-	connect( m_bold,        TQT_SIGNAL(stateChanged(int)),      module, TQT_SLOT(changed())        );
-	connect( m_underlining, TQT_SIGNAL(activated(int)),         module, TQT_SLOT(changed())        );
-	connect( m_color,       TQT_SIGNAL(changed(const TQColor&)), module, TQT_SLOT(changed())        );
-	connect( m_hoverColor,  TQT_SIGNAL(changed(const TQColor&)), module, TQT_SLOT(changed())        );
-	connect( m_iconSize,    TQT_SIGNAL(activated(int)),         module, TQT_SLOT(changed())        );
-	connect( m_preview,     TQT_SIGNAL(activated(int)),         module, TQT_SLOT(changed())        );
+	connect( m_italic,      TQ_SIGNAL(stateChanged(int)),      this,   TQ_SLOT(slotChangeLook()) );
+	connect( m_bold,        TQ_SIGNAL(stateChanged(int)),      this,   TQ_SLOT(slotChangeLook()) );
+	connect( m_underlining, TQ_SIGNAL(activated(int)),         this,   TQ_SLOT(slotChangeLook()) );
+	connect( m_color,       TQ_SIGNAL(changed(const TQColor&)), this,   TQ_SLOT(slotChangeLook()) );
+	connect( m_hoverColor,  TQ_SIGNAL(changed(const TQColor&)), this,   TQ_SLOT(slotChangeLook()) );
+	connect( m_iconSize,    TQ_SIGNAL(activated(int)),         this,   TQ_SLOT(slotChangeLook()) );
+	connect( m_preview,     TQ_SIGNAL(activated(int)),         this,   TQ_SLOT(slotChangeLook()) );
+
+	connect( m_italic,      TQ_SIGNAL(stateChanged(int)),      module, TQ_SLOT(changed())        );
+	connect( m_bold,        TQ_SIGNAL(stateChanged(int)),      module, TQ_SLOT(changed())        );
+	connect( m_underlining, TQ_SIGNAL(activated(int)),         module, TQ_SLOT(changed())        );
+	connect( m_color,       TQ_SIGNAL(changed(const TQColor&)), module, TQ_SLOT(changed())        );
+	connect( m_hoverColor,  TQ_SIGNAL(changed(const TQColor&)), module, TQ_SLOT(changed())        );
+	connect( m_iconSize,    TQ_SIGNAL(activated(int)),         module, TQ_SLOT(changed())        );
+	connect( m_preview,     TQ_SIGNAL(activated(int)),         module, TQ_SLOT(changed())        );
 }
 
 void LinkLookEditWidget::set(LinkLook *look)

src/linklabel.h

@@ -99,7 +99,7 @@ class LinkLook
   */
 class LinkLabel : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LinkLabel(int hAlign, int vAlign, TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
@@ -179,7 +179,7 @@ class LinkDisplay
   */
 class LinkLookEditWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LinkLookEditWidget(TDECModule* module, const TQString exTitle, const TQString exIcon,

src/main.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <tdecmdlineargs.h>
@@ -25,9 +29,9 @@
 #include <kiconloader.h>
 #include <tqpixmap.h>
 #include <tdelocale.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -46,28 +50,6 @@
 #include "basket_options.h"
 #include "backup.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* Thanks to JuK for this Application class */
-/*#if KDE_IS_VERSION( 3, 1, 90 )
-typedef KUniqueApplication Application; // KDE 3.2 and later already re-show the main window
-#else
-class Application : public KUniqueApplication
-{
-  public:
-	Application() : KUniqueApplication(true, true, false) {}
-	virtual ~Application() {}
-	virtual int newInstance() {
-		if (win)
-			win->setActive(true);
-		return KUniqueApplication::newInstance();
-	}
-};
-#endif
-*/
-
 int main(int argc, char *argv[])
 {
 	// TDECmdLineArgs::init will modify argv[0] so we remember it:
@@ -76,8 +58,7 @@ int main(int argc, char *argv[])
 	TDECmdLineArgs::init(argc, argv, Global::about());
 	TDECmdLineArgs::addCmdLineOptions(basket_options);
 
-	KUniqueApplication::addCmdLineOptions();
-	//KUniqueApplication app;
+	TDEUniqueApplication::addCmdLineOptions();
 	Application app;
 
 	Backup::figureOutBinaryPath(argv0, app);

src/mainwindow.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqtabwidget.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
@@ -37,7 +41,7 @@
 #include <kiconeffect.h>
 #include <tqiconset.h>
 #include <tdeaction.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <tdelocale.h>
 #include <tdemenubar.h>
 #include <kedittoolbar.h>
@@ -48,7 +52,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqdir.h>
 #include <tqstringlist.h>
 #include <tdemessagebox.h>
@@ -56,7 +60,7 @@
 #include <tqtimer.h>
 #include <tqaction.h>
 #include <tdestdaccel.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <kkeydialog.h>
 #include <kpassivepopup.h>
 #include <tdeconfig.h>
@@ -118,7 +122,7 @@ MainWindow::MainWindow(TQWidget *parent, const char *name)
 	setAutoSaveSettings(/*groupName=*/TQString::fromLatin1("MainWindow"),true);
 
   m_actShowStatusbar->setChecked( statusBar()->isShown() );
-	connect( m_baskets,      TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &)));
+	connect( m_baskets,      TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(setCaption(const TQString &)));
 
 //	InlineEditors::instance()->richTextToolBar();
 	setStandardToolBarMenuEnabled(true);
@@ -135,23 +139,23 @@ MainWindow::~MainWindow()
 
 void MainWindow::setupActions()
 {
-	actQuit         = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection() );
+	actQuit         = KStdAction::quit( this, TQ_SLOT(quit()), actionCollection() );
 	new TDEAction(i18n("Minimize"), "", 0,
-				TQT_TQOBJECT(this), TQT_SLOT(minimizeRestore()), actionCollection(), "minimizeRestore" );
+				this, TQ_SLOT(minimizeRestore()), actionCollection(), "minimizeRestore" );
 	/** Settings : ************************************************************/
-//	m_actShowToolbar   = KStdAction::showToolbar(   TQT_TQOBJECT(this), TQT_SLOT(toggleToolBar()),   actionCollection());
-	m_actShowStatusbar = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection());
+//	m_actShowToolbar   = KStdAction::showToolbar(   this, TQ_SLOT(toggleToolBar()),   actionCollection());
+	m_actShowStatusbar = KStdAction::showStatusbar( this, TQ_SLOT(toggleStatusBar()), actionCollection());
 
 //	m_actShowToolbar->setCheckedState( KGuiItem(i18n("Hide &Toolbar")) );
 
-	(void) KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(showShortcutsSettingsDialog()), actionCollection() );
+	(void) KStdAction::keyBindings( this, TQ_SLOT(showShortcutsSettingsDialog()), actionCollection() );
 
-	(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), actionCollection() );
+	(void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars()), actionCollection() );
 
-	//TDEAction *actCfgNotifs = KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection() );
+	//TDEAction *actCfgNotifs = KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection() );
 	//actCfgNotifs->setEnabled(false); // Not yet implemented !
 
-	actAppConfig = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection() );
+	actAppConfig = KStdAction::preferences( this, TQ_SLOT(showSettingsDialog()), actionCollection() );
 }
 
 /*void MainWindow::toggleToolBar()
@@ -179,7 +183,7 @@ void MainWindow::configureToolbars()
 	saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
 
 	KEditToolbar dlg(actionCollection());
-	connect( &dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) );
+	connect( &dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
 	dlg.exec();
 }
 
@@ -203,7 +207,7 @@ void MainWindow::slotNewToolbarConfig() // This is called when OK or Apply is cl
 void MainWindow::showSettingsDialog()
 {
 	if(m_settings == 0)
-		m_settings = new KSettings::Dialog(TQT_TQWIDGET(kapp->activeWindow()));
+		m_settings = new KSettings::Dialog(tdeApp->activeWindow());
 	if (Global::mainWindow()) {
 		m_settings->dialog()->showButton(KDialogBase::Help,    false); // Not implemented!
 		m_settings->dialog()->showButton(KDialogBase::Default, false); // Not implemented!
@@ -228,8 +232,8 @@ void MainWindow::polish()
 	//  - Keep the window manager placing the window where it want and save this
 	if (Settings::mainWindowSize().isEmpty()) {
 //		std::cout << "Main Window Position: Initial Set in show()" << std::endl;
-		int defaultWidth  = kapp->desktop()->width()  * 5 / 6;
-		int defaultHeight = kapp->desktop()->height() * 5 / 6;
+		int defaultWidth  = tdeApp->desktop()->width()  * 5 / 6;
+		int defaultHeight = tdeApp->desktop()->height() * 5 / 6;
 		resize(defaultWidth, defaultHeight); // sizeHint() is bad (too small) and we want the user to have a good default area size
 		shouldSave = true;
 	} else {
@@ -294,7 +298,7 @@ bool MainWindow::queryClose()
 /*	if (m_shuttingDown) // Set in askForQuit(): we don't have to ask again
 	return true;*/
 
-	if (kapp->sessionSaving()) {
+	if (tdeApp->sessionSaving()) {
 		Settings::setStartDocked(false); // If queryClose() is called it's because the window is shown
 		Settings::saveConfig();
 		return true;
@@ -310,7 +314,7 @@ bool MainWindow::queryClose()
 
 bool MainWindow::askForQuit()
 {
-	TQString message = i18n("<p>Do you really want to quit %1?</p>").arg(kapp->aboutData()->programName());
+	TQString message = i18n("<p>Do you really want to quit %1?</p>").arg(tdeApp->aboutData()->programName());
 	if (Settings::useSystray())
 		message += i18n("<p>Notice that you do not have to quit the application before ending your TDE session. "
 				"If you end your session while the application is still running, the application will be reloaded the next time you log in.</p>");
@@ -338,7 +342,7 @@ void MainWindow::minimizeRestore()
 void MainWindow::changeActive()
 {
 #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
-	kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
+	tdeApp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray"
 	Global::systemTray->toggleActive();
 #else
 	setActive( ! isActiveWindow() );

src/mainwindow.h

@@ -59,7 +59,7 @@ namespace KSettings { class Dialog; };
   */
 class MainWindow : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	/** Construtor, initializer and destructor */

src/newbasketdialog.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <kicondialog.h>
 #include <tqlineedit.h>
 #include <kiconview.h>
@@ -49,8 +53,8 @@
 SingleSelectionTDEIconView::SingleSelectionTDEIconView(TQWidget *parent, const char *name, WFlags f)
  : TDEIconView(parent, name, f), m_lastSelected(0)
 {
-	connect( this, TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQIconViewItem*)) );
-	connect( this, TQT_SIGNAL(selectionChanged()),               this, TQT_SLOT(slotSelectionChanged())               );
+	connect( this, TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQIconViewItem*)) );
+	connect( this, TQ_SIGNAL(selectionChanged()),               this, TQ_SLOT(slotSelectionChanged())               );
 }
 
 TQDragObject* SingleSelectionTDEIconView::dragObject()
@@ -103,7 +107,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 	TQToolTip::add(m_icon, i18n("Icon"));
 	m_name = new TQLineEdit(/*i18n("Basket"), */page);
 	m_name->setMinimumWidth(m_name->fontMetrics().maxWidth()*20);
-	connect( m_name, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(nameChanged(const TQString&)) );
+	connect( m_name, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(nameChanged(const TQString&)) );
 	enableButtonOK(false);
 	TQToolTip::add(m_name, i18n("Name"));
 	m_backgroundColor = new KColorCombo2(TQColor(), TDEGlobalSettings::baseColor(), page);
@@ -118,7 +122,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 
 	TQHBoxLayout *layout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint());
 	KPushButton *button = new KPushButton( KGuiItem(i18n("&Manage Templates..."), "configure"), page );
-	connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(manageTemplates()) );
+	connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(manageTemplates()) );
 	button->hide();
 
 	// Compute the right template to use as the default:
@@ -229,8 +233,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 	m_basketsMap.insert(/*index=*/0, /*basket=*/0L);
 	populateBasketsList(Global::bnpView->firstListViewItem(), /*indent=*/1, /*index=*/1);
 
-	connect( m_templates, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(slotOk())        );
-	connect( m_templates, TQT_SIGNAL(returnPressed(TQIconViewItem*)), this, TQT_SLOT(returnPressed()) );
+	connect( m_templates, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQ_SLOT(slotOk())        );
+	connect( m_templates, TQ_SIGNAL(returnPressed(TQIconViewItem*)), this, TQ_SLOT(returnPressed()) );
 
 	if (parentBasket) {
 		int index = 0;
@@ -262,7 +266,7 @@ int NewBasketDialog::populateBasketsList(TQListViewItem *item, int indent, int i
 	while (item) {
 		// Get the basket data:
 		Basket *basket = ((BasketListViewItem*)item)->basket();
-		TQPixmap icon = kapp->iconLoader()->loadIcon(basket->icon(), TDEIcon::NoGroup, ICON_SIZE, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon(basket->icon(), TDEIcon::NoGroup, ICON_SIZE, TDEIcon::DefaultState, 0L, /*canReturnNull=*/false);
 		icon = Tools::indentPixmap(icon, indent, 2 * ICON_SIZE / 3);
 
 		// Append item to the list:

src/newbasketdialog.h

@@ -40,7 +40,7 @@ class KColorCombo2;
   */
 class SingleSelectionTDEIconView : public TDEIconView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	SingleSelectionTDEIconView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
@@ -77,7 +77,7 @@ struct NewBasketDefaultProperties
   */
 class NewBasketDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *parent = 0);

src/note.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqpainter.h>
 #include <tdeglobalsettings.h>
 #include <tqstyle.h>
@@ -1282,7 +1286,7 @@ void drawGradient( TQPainter *p, const TQColor &colorTop, const TQColor & colorB
 void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &background, bool expand, Basket *basket)
 {
 	// If the current style is a TDEStyle, use it to draw the expander (plus or minus):
-	if (dynamic_cast<TDEStyle*>(&(kapp->style())) != NULL) {
+	if (dynamic_cast<TDEStyle*>(&(tdeApp->style())) != NULL) {
 		// Set the 4 rounded corners background to background color:
 		TQColorGroup cg(basket->colorGroup());
 		cg.setColor(TQColorGroup::Base, background);
@@ -1292,7 +1296,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro
 		painter->fillRect(x, y, 9, 9, brush);
 
 		// Draw it:
-		((TDEStyle&)(kapp->style())).drawTDEStylePrimitive( TDEStyle::KPE_ListViewExpander,
+		((TDEStyle&)(tdeApp->style())).drawTDEStylePrimitive( TDEStyle::KPE_ListViewExpander,
 		painter,
 		basket->viewport(),
 		TQRect(x, y, 9, 9),
@@ -1972,7 +1976,7 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect)
 	int xIcon = HANDLE_WIDTH + NOTE_MARGIN;
 	for (State::List::Iterator it = m_states.begin(); it != m_states.end(); ++it) {
 		if (!(*it)->emblem().isEmpty()) {
-			TQPixmap stateEmblem = kapp->iconLoader()->loadIcon((*it)->emblem(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, false);
+			TQPixmap stateEmblem = tdeApp->iconLoader()->loadIcon((*it)->emblem(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, false);
 			painter2.drawPixmap(xIcon, yIcon, stateEmblem);
 			xIcon += NOTE_MARGIN + EMBLEM_SIZE;
 		}
@@ -2578,7 +2582,7 @@ void Note::debug()
 	else if (isGroup())
 		std::cout << ": Group";
 	else
-		std::cout << ": Content[" << content()->lowerTypeName() << "]: " << toText("");
+		std::cout << ": Content[" << content()->lowerTypeName().local8Bit() << "]: " << toText("").local8Bit();
 	std::cout << std::endl;
 }
 
@@ -2835,7 +2839,7 @@ TQString Note::toHtml(const TQString &imageName)
 					image = pixmap()->convertToImage();
 				else
 					image = movie()->framePixmap().convertToImage();
-				image = image.smoothScale(200, 150, TQ_ScaleMin);
+				image = image.smoothScale(200, 150, TQImage::ScaleMin);
 				TQPixmap pixmap = TQPixmap(image);
 				TQMimeSourceFactory::defaultFactory()->setPixmap(imageName, pixmap);
 				return "<img src=" + imageName + ">"; ///
@@ -2848,7 +2852,7 @@ TQString Note::toHtml(const TQString &imageName)
 					image = pixmap()->convertToImage();
 				else
 					image = movie()->framePixmap().convertToImage();
-				image = image.smoothScale(200, 150, TQ_ScaleMin);
+				image = image.smoothScale(200, 150, TQImage::ScaleMin);
 				TQPixmap pixmap = TQPixmap(image);
 				TQMimeSourceFactory::defaultFactory()->setPixmap(imageName, pixmap);
 				return "<img src=" + imageName + ">"; ///

src/notecontent.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqdom.h>
@@ -67,12 +71,11 @@
 #include "kcolorcombo2.h"
 #include "htmlexporter.h"
 
-#include "config.h"
-#ifndef WITHOUT_ARTS
-	#include <arts/kplayobject.h>
-	#include <arts/kplayobjectfactory.h>
-	#include <arts/kartsserver.h>
-	#include <arts/kartsdispatcher.h>
+#ifdef WITH_ARTS
+#include <arts/kplayobject.h>
+#include <arts/kplayobjectfactory.h>
+#include <arts/kartsserver.h>
+#include <arts/kartsdispatcher.h>
 #endif
 
 /** class NoteContent:
@@ -405,7 +408,7 @@ TQPixmap ImageContent::feedbackPixmap(int width, int height)
 	} else { // Scalled down
 		TQImage imageToScale = m_pixmap.convertToImage();
 		TQPixmap pmScaled;
-		pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQ_ScaleMin));
+		pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQImage::ScaleMin));
 		if (pmScaled.hasAlpha()) {
 			TQPixmap opaque(pmScaled.width(), pmScaled.height());
 			opaque.fill(note()->backgroundColor().dark(FEEDBACK_DARKING));
@@ -426,7 +429,7 @@ TQPixmap AnimationContent::feedbackPixmap(int width, int height)
 	else { // Scalled down
 		TQImage imageToScale = pixmap.convertToImage();
 		TQPixmap pmScaled;
-		pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQ_ScaleMin));
+		pmScaled.convertFromImage(imageToScale./*smoothScale*/scale(width, height, TQImage::ScaleMin));
 		return pmScaled;
 	}
 }
@@ -538,7 +541,7 @@ bool TextContent::loadFromFile(bool lazyLoad)
 	if (success)
 		setText(content, lazyLoad);
 	else {
-		std::cout << "FAILED TO LOAD TextContent: " << fullPath() << std::endl;
+		std::cout << "FAILED TO LOAD TextContent: " << fullPath().local8Bit() << std::endl;
 		setText("", lazyLoad);
 		if (!TQFile::exists(fullPath()))
 			saveToFile(); // Reserve the fileName so no new note will have the same name!
@@ -647,7 +650,7 @@ bool HtmlContent::loadFromFile(bool lazyLoad)
 	if (success)
 		setHtml(content, lazyLoad);
 	else {
-		std::cout << "FAILED TO LOAD HtmlContent: " << fullPath() << std::endl;
+		std::cout << "FAILED TO LOAD HtmlContent: " << fullPath().local8Bit() << std::endl;
 		setHtml("", lazyLoad);
 		if (!TQFile::exists(fullPath()))
 			saveToFile(); // Reserve the fileName so no new note will have the same name!
@@ -770,7 +773,7 @@ bool ImageContent::finishLazyLoad()
 		TQBuffer buffer(content);
 
 		buffer.open(IO_ReadOnly);
-		m_format = (char* /* from const char* */)TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer)); // See TQImageIO to know what formats can be supported.
+		m_format = (char* /* from const char* */)TQImageIO::imageFormat(&buffer); // See TQImageIO to know what formats can be supported.
 		buffer.close();
 		if (m_format) {
 			m_pixmap.loadFromData(content);
@@ -779,7 +782,7 @@ bool ImageContent::finishLazyLoad()
 		}
 	}
 
-	std::cout << "FAILED TO LOAD ImageContent: " << fullPath() << std::endl;
+	std::cout << "FAILED TO LOAD ImageContent: " << fullPath().local8Bit() << std::endl;
 	m_format = (char*)"PNG"; // If the image is set later, it should be saved without destruction, so we use PNG by default.
 	m_pixmap.resize(1, 1); // Create a 1x1 pixels image instead of an undefined one.
 	m_pixmap.fill();
@@ -927,9 +930,9 @@ bool AnimationContent::setMovie(const TQMovie &movie)
 		return false;
 	}
 	m_movie = movie;
-	m_movie.connectUpdate( this, TQT_SLOT(movieUpdated(const TQRect&)) );
-	m_movie.connectResize( this, TQT_SLOT(movieResized(const TQSize&)) );
-	m_movie.connectStatus( this, TQT_SLOT(movieStatus(int))           );
+	m_movie.connectUpdate( this, TQ_SLOT(movieUpdated(const TQRect&)) );
+	m_movie.connectResize( this, TQ_SLOT(movieResized(const TQSize&)) );
+	m_movie.connectStatus( this, TQ_SLOT(movieStatus(int))           );
 	contentChanged(  m_movie.framePixmap().width() + 1  ); // TODO
 	return true;
 }
@@ -971,10 +974,10 @@ void AnimationContent::movieStatus(int status)
 		note()->setContent(new ImageContent(note(), fileName()));
 		basket()->save();
 		//delete this; // CRASH, as always !!!!!!!!!
-		//TQTimer::singleShot(0,   this, TQT_SLOT(loadContent()));    // Delayed to avoid crash!
-		//TQTimer::singleShot(100, this, TQT_SLOT(saveProperties())); // We should save it's an image and not an animation
+		//TQTimer::singleShot(0,   this, TQ_SLOT(loadContent()));    // Delayed to avoid crash!
+		//TQTimer::singleShot(100, this, TQ_SLOT(saveProperties())); // We should save it's an image and not an animation
 //		if (note()->isFocused())
-//			TQTimer::singleShot(25, note(), TQT_SLOT(delayedEnsureVisible()));
+//			TQTimer::singleShot(25, note(), TQ_SLOT(delayedEnsureVisible()));
 	}
 	else
 		m_oldStatus = status;
@@ -1135,8 +1138,8 @@ void FileContent::startFetchingUrlPreview()
 		KURL::List urlList;
 		urlList.append(filteredUrl);
 		m_previewJob = TDEIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize());
-		connect( m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(newPreview(const KFileItem*, const TQPixmap&)) );
-		connect( m_previewJob, TQT_SIGNAL(failed(const KFileItem*)),                     this, TQT_SLOT(removePreview(const KFileItem*))              );
+		connect( m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(newPreview(const KFileItem*, const TQPixmap&)) );
+		connect( m_previewJob, TQ_SIGNAL(failed(const KFileItem*)),                     this, TQ_SLOT(removePreview(const KFileItem*))              );
 	}
 }
 
@@ -1164,11 +1167,7 @@ TQString SoundContent::zoneTip(int zone)
 
 void SoundContent::setHoveredZone(int oldZone, int newZone)
 {
-#ifdef WITHOUT_ARTS
-	Q_UNUSED(oldZone);
-	if (newZone == Note::Custom0 || newZone == Note::Content)
-		std::cout << "Compiled without aRts: sound is not played." << std::endl;
-#else
+#ifdef WITH_ARTS
 	static KArtsDispatcher        *s_dispatcher  = new KArtsDispatcher(); // Needed for s_playObj (we don't use it directly)
 	static KArtsServer            *s_playServer  = new KArtsServer();
 	static KDE::PlayObjectFactory *s_playFactory = new KDE::PlayObjectFactory(s_playServer);
@@ -1189,6 +1188,10 @@ void SoundContent::setHoveredZone(int oldZone, int newZone)
 			s_playObj = 0;
 		}
 	}
+#else
+	Q_UNUSED(oldZone);
+	if (newZone == Note::Custom0 || newZone == Note::Content)
+		std::cout << "Compiled without aRts: sound is not played." << std::endl;
 #endif
 }
 
@@ -1347,8 +1350,8 @@ void LinkContent::startFetchingUrlPreview()
 		KURL::List urlList;
 		urlList.append(filteredUrl);
 		m_previewJob = TDEIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize());
-		connect( m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(newPreview(const KFileItem*, const TQPixmap&)) );
-		connect( m_previewJob, TQT_SIGNAL(failed(const KFileItem*)),                     this, TQT_SLOT(removePreview(const KFileItem*))              );
+		connect( m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(newPreview(const KFileItem*, const TQPixmap&)) );
+		connect( m_previewJob, TQ_SIGNAL(failed(const KFileItem*)),                     this, TQ_SLOT(removePreview(const KFileItem*))              );
 	}
 }
 
@@ -1888,14 +1891,14 @@ void UnknownContent::addAlternateDragObjects(KMultipleDrag *dragObject)
 		TQ_UINT64     size; // TODO: It was TQ_UINT32 in version 0.5.0 !
 		TQByteArray  *array;
 		TQStoredDrag *storedDrag;
-		for (uint i = 0; i < mimes.count(); ++i) {
+		for (TQValueList<TQString>::iterator it = mimes.begin(); it != mimes.end(); ++it) {
 			// Get the size:
 			stream >> size;
 			// Allocate memory to retreive size bytes and store them:
 			array = new TQByteArray(size);
 			stream.readRawBytes(array->data(), size);
 			// Creata and add the TQDragObject:
-			storedDrag = new TQStoredDrag(*(mimes.at(i)));
+			storedDrag = new TQStoredDrag((*it).utf8());
 			storedDrag->setEncodedData(*array);
 			dragObject->addDragObject(storedDrag);
 			delete array; // FIXME: Should we?

src/notecontent.h

@@ -275,7 +275,7 @@ class ImageContent : public NoteContent
  */
 class AnimationContent : public TQObject, public NoteContent // TQObject to be able to receive TQMovie signals
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	// Constructor and destructor:
@@ -324,7 +324,7 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a
  */
 class FileContent : public TQObject, public NoteContent
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	// Constructor and destructor:
@@ -378,7 +378,7 @@ class FileContent : public TQObject, public NoteContent
  */
 class SoundContent : public FileContent // A sound is a file with just a bit different user interaction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	// Constructor and destructor:
@@ -410,7 +410,7 @@ class SoundContent : public FileContent // A sound is a file with just a bit dif
  */
 class LinkContent : public TQObject, public NoteContent
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	// Constructor and destructor:

src/notedrag.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqdragobject.h>
 #include <tqdir.h>
 #include <tqpainter.h>
@@ -302,7 +306,7 @@ TQPixmap NoteDrag::feedbackPixmap(NoteSelection *noteList)
 			bgColor   = node->note->basket()->backgroundColor();
 			needSpace = false;
 		} else {
-			pixmap    = node->note->content()->feedbackPixmap(/*maxWidth=*/kapp->desktop()->width() / 2, /*maxHeight=*/96);
+			pixmap    = node->note->content()->feedbackPixmap(/*maxWidth=*/tdeApp->desktop()->width() / 2, /*maxHeight=*/96);
 			bgColor   = node->note->backgroundColor();
 			needSpace = node->note->content()->needSpaceForFeedbackPixmap();
 		}
@@ -315,7 +319,7 @@ TQPixmap NoteDrag::feedbackPixmap(NoteSelection *noteList)
 			height += (i > 0 && needSpace ? 1 : 0) + pixmap.height() + SPACING + (needSpace ? 1 : 0);
 			if (elipsisImage)
 				break;
-			if (height > kapp->desktop()->height() / 2)
+			if (height > tdeApp->desktop()->height() / 2)
 				elipsisImage = true;
 		}
 	}
@@ -484,8 +488,8 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF
 					note->content()->setFileName(newFileName);
 					TDEIO::FileCopyJob *copyJob = TDEIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                                           /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
-					parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)),
-					                 parent,  TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
+					parent->connect( copyJob, TQ_SIGNAL(result(TDEIO::Job *)),
+					                 parent,  TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 				}
 				note->setGroupWidth(groupWidth);
 				note->setParentNote(0);
@@ -510,8 +514,8 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF
 				else
 					copyJob = TDEIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                         /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
-				parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)),
-				                 parent,  TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
+				parent->connect( copyJob, TQ_SIGNAL(result(TDEIO::Job *)),
+				                 parent,  TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 				note->setGroupWidth(groupWidth);
 				note->setAddedDate(addedDate);
 				note->setLastModificationDate(lastModificationDate);

src/notedrag.h

@@ -80,7 +80,7 @@ class NoteDrag
   */
 class ExtendedTextDrag : public TQTextDrag
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	static bool decode(const TQMimeSource *e, TQString &str);
@@ -92,7 +92,7 @@ class ExtendedTextDrag : public TQTextDrag
 #include <kurldrag.h>
 class KURLDrag2 : public KURLDrag
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	KURLDrag2(const KURL::List &urls) : KURLDrag(urls) {}

src/noteedit.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
@@ -142,15 +146,15 @@ TextEditor::TextEditor(TextContent *textContent, TQWidget *parent)
 	if (Settings::spellCheckTextNotes())
 		textEdit->setCheckSpellingEnabled(true);
 	textEdit->setText(m_textContent->text());
-	textEdit->moveCursor(KTextEdit::MoveEnd, false); // FIXME: Sometimes, the cursor flicker at ends before being positionned where clicked (because kapp->processEvents() I think)
+	textEdit->moveCursor(KTextEdit::MoveEnd, false); // FIXME: Sometimes, the cursor flicker at ends before being positionned where clicked (because tdeApp->processEvents() I think)
 	textEdit->verticalScrollBar()->setCursor(TQt::ArrowCursor);
 	setInlineEditor(textEdit);
-	connect( textEdit, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(askValidation())            );
-	connect( textEdit, TQT_SIGNAL(mouseEntered()),  this, TQT_SIGNAL(mouseEnteredEditorWidget()) );
+	connect( textEdit, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(askValidation())            );
+	connect( textEdit, TQ_SIGNAL(mouseEntered()),  this, TQ_SIGNAL(mouseEnteredEditorWidget()) );
 
-	connect( textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), textContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) );
+	connect( textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), textContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) );
 	// In case it is a very big note, the top is displayed and Enter is pressed: the cursor is on bottom, we should enure it visible:
-	TQTimer::singleShot( 0, textContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) );
+	TQTimer::singleShot( 0, textContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) );
 }
 
 TextEditor::~TextEditor()
@@ -216,58 +220,58 @@ HtmlEditor::HtmlEditor(HtmlContent *htmlContent, TQWidget *parent)
 	textEdit->verticalScrollBar()->setCursor(TQt::ArrowCursor);
 	setInlineEditor(textEdit);
 
-	connect( textEdit,                                    TQT_SIGNAL(mouseEntered()),  this, TQT_SIGNAL(mouseEnteredEditorWidget()) );
-	connect( textEdit,                                    TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(askValidation()) );
+	connect( textEdit,                                    TQ_SIGNAL(mouseEntered()),  this, TQ_SIGNAL(mouseEnteredEditorWidget()) );
+	connect( textEdit,                                    TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(askValidation()) );
 
-	connect( InlineEditors::instance()->richTextFont,     TQT_SIGNAL(textChanged(const TQString&)), textEdit, TQT_SLOT(setFamily(const TQString&)) );
-	connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(sizeChanged(int)),            textEdit, TQT_SLOT(setPointSize(int))         );
-	connect( InlineEditors::instance()->richTextColor,    TQT_SIGNAL(activated(const TQColor&)),    textEdit, TQT_SLOT(setColor(const TQColor&))   );
+	connect( InlineEditors::instance()->richTextFont,     TQ_SIGNAL(textChanged(const TQString&)), textEdit, TQ_SLOT(setFamily(const TQString&)) );
+	connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(sizeChanged(int)),            textEdit, TQ_SLOT(setPointSize(int))         );
+	connect( InlineEditors::instance()->richTextColor,    TQ_SIGNAL(activated(const TQColor&)),    textEdit, TQ_SLOT(setColor(const TQColor&))   );
 
-	connect( InlineEditors::instance()->richTextFont,     TQT_SIGNAL(escapePressed()),  textEdit, TQT_SLOT(setFocus()) );
-	connect( InlineEditors::instance()->richTextFont,     TQT_SIGNAL(returnPressed2()), textEdit, TQT_SLOT(setFocus()) );
-	connect( InlineEditors::instance()->richTextFont,     TQT_SIGNAL(activated(int)),   textEdit, TQT_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextFont,     TQ_SIGNAL(escapePressed()),  textEdit, TQ_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextFont,     TQ_SIGNAL(returnPressed2()), textEdit, TQ_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextFont,     TQ_SIGNAL(activated(int)),   textEdit, TQ_SLOT(setFocus()) );
 
-	connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(escapePressed()),  textEdit, TQT_SLOT(setFocus()) );
-	connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(returnPressed2()), textEdit, TQT_SLOT(setFocus()) );
-	connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(activated(int)),   textEdit, TQT_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(escapePressed()),  textEdit, TQ_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(returnPressed2()), textEdit, TQ_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(activated(int)),   textEdit, TQ_SLOT(setFocus()) );
 
-	connect( InlineEditors::instance()->richTextColor,    TQT_SIGNAL(escapePressed()),  textEdit, TQT_SLOT(setFocus()) );
-	connect( InlineEditors::instance()->richTextColor,    TQT_SIGNAL(returnPressed2()), textEdit, TQT_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextColor,    TQ_SIGNAL(escapePressed()),  textEdit, TQ_SLOT(setFocus()) );
+	connect( InlineEditors::instance()->richTextColor,    TQ_SIGNAL(returnPressed2()), textEdit, TQ_SLOT(setFocus()) );
 
-	connect( textEdit,  TQT_SIGNAL(cursorPositionChanged(int, int)),  this, TQT_SLOT(cursorPositionChanged())   );
-	connect( textEdit,  TQT_SIGNAL(clicked(int, int)),                this, TQT_SLOT(cursorPositionChanged())   );
-	connect( textEdit,  TQT_SIGNAL(currentFontChanged(const TQFont&)), this, TQT_SLOT(fontChanged(const TQFont&)) );
-//	connect( textEdit,  TQT_SIGNAL(currentVerticalAlignmentChangedQt::VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged()) );
+	connect( textEdit,  TQ_SIGNAL(cursorPositionChanged(int, int)),  this, TQ_SLOT(cursorPositionChanged())   );
+	connect( textEdit,  TQ_SIGNAL(clicked(int, int)),                this, TQ_SLOT(cursorPositionChanged())   );
+	connect( textEdit,  TQ_SIGNAL(currentFontChanged(const TQFont&)), this, TQ_SLOT(fontChanged(const TQFont&)) );
+//	connect( textEdit,  TQ_SIGNAL(currentVerticalAlignmentChanged(TQTextEdit::VerticalAlignment)), this, TQ_SLOT(slotVerticalAlignmentChanged()) );
 
-	connect( InlineEditors::instance()->richTextBold,      TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setBold(bool)) );
-	connect( InlineEditors::instance()->richTextItalic,    TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setItalic(bool)) );
-	connect( InlineEditors::instance()->richTextUnderline, TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setUnderline(bool)) );
+	connect( InlineEditors::instance()->richTextBold,      TQ_SIGNAL(toggled(bool)),    textEdit, TQ_SLOT(setBold(bool)) );
+	connect( InlineEditors::instance()->richTextItalic,    TQ_SIGNAL(toggled(bool)),    textEdit, TQ_SLOT(setItalic(bool)) );
+	connect( InlineEditors::instance()->richTextUnderline, TQ_SIGNAL(toggled(bool)),    textEdit, TQ_SLOT(setUnderline(bool)) );
 	//REMOVE:
-	//connect( InlineEditors::instance()->richTextBold,      TQT_SIGNAL(activated()), this, TQT_SLOT(setBold())      );
-	//connect( InlineEditors::instance()->richTextItalic,    TQT_SIGNAL(activated()), this, TQT_SLOT(setItalic())    );
-	//connect( InlineEditors::instance()->richTextUnderline, TQT_SIGNAL(activated()), this, TQT_SLOT(setUnderline()) );
-	connect( InlineEditors::instance()->richTextLeft,      TQT_SIGNAL(activated()), this, TQT_SLOT(setLeft())      );
-	connect( InlineEditors::instance()->richTextCenter,    TQT_SIGNAL(activated()), this, TQT_SLOT(setCentered())  );
-	connect( InlineEditors::instance()->richTextRight,     TQT_SIGNAL(activated()), this, TQT_SLOT(setRight())     );
-	connect( InlineEditors::instance()->richTextJustified, TQT_SIGNAL(activated()), this, TQT_SLOT(setBlock())     );
+	//connect( InlineEditors::instance()->richTextBold,      TQ_SIGNAL(activated()), this, TQ_SLOT(setBold())      );
+	//connect( InlineEditors::instance()->richTextItalic,    TQ_SIGNAL(activated()), this, TQ_SLOT(setItalic())    );
+	//connect( InlineEditors::instance()->richTextUnderline, TQ_SIGNAL(activated()), this, TQ_SLOT(setUnderline()) );
+	connect( InlineEditors::instance()->richTextLeft,      TQ_SIGNAL(activated()), this, TQ_SLOT(setLeft())      );
+	connect( InlineEditors::instance()->richTextCenter,    TQ_SIGNAL(activated()), this, TQ_SLOT(setCentered())  );
+	connect( InlineEditors::instance()->richTextRight,     TQ_SIGNAL(activated()), this, TQ_SLOT(setRight())     );
+	connect( InlineEditors::instance()->richTextJustified, TQ_SIGNAL(activated()), this, TQ_SLOT(setBlock())     );
 
 //	InlineEditors::instance()->richTextToolBar()->show();
 	cursorPositionChanged();
 	fontChanged(textEdit->currentFont());
-	//TQTimer::singleShot( 0, this, TQT_SLOT(cursorPositionChanged()) );
+	//TQTimer::singleShot( 0, this, TQ_SLOT(cursorPositionChanged()) );
 	InlineEditors::instance()->enableRichTextToolBar();
 
-	connect( InlineEditors::instance()->richTextUndo,      TQT_SIGNAL(activated()), textEdit, TQT_SLOT(undo())         );
-	connect( InlineEditors::instance()->richTextRedo,      TQT_SIGNAL(activated()), textEdit, TQT_SLOT(redo())         );
-	connect( textEdit, TQT_SIGNAL(undoAvailable(bool)), InlineEditors::instance()->richTextUndo, TQT_SLOT(setEnabled(bool)) );
-	connect( textEdit, TQT_SIGNAL(redoAvailable(bool)), InlineEditors::instance()->richTextRedo, TQT_SLOT(setEnabled(bool)) );
-	connect( textEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged()));
+	connect( InlineEditors::instance()->richTextUndo,      TQ_SIGNAL(activated()), textEdit, TQ_SLOT(undo())         );
+	connect( InlineEditors::instance()->richTextRedo,      TQ_SIGNAL(activated()), textEdit, TQ_SLOT(redo())         );
+	connect( textEdit, TQ_SIGNAL(undoAvailable(bool)), InlineEditors::instance()->richTextUndo, TQ_SLOT(setEnabled(bool)) );
+	connect( textEdit, TQ_SIGNAL(redoAvailable(bool)), InlineEditors::instance()->richTextRedo, TQ_SLOT(setEnabled(bool)) );
+	connect( textEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(textChanged()));
 	InlineEditors::instance()->richTextUndo->setEnabled(false);
 	InlineEditors::instance()->richTextRedo->setEnabled(false);
 
-	connect( textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), htmlContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) );
+	connect( textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), htmlContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) );
 	// In case it is a very big note, the top is displayed and Enter is pressed: the cursor is on bottom, we should enure it visible:
-	TQTimer::singleShot( 0, htmlContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) );
+	TQTimer::singleShot( 0, htmlContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) );
 }
 
 void HtmlEditor::cursorPositionChanged()
@@ -422,9 +426,9 @@ FileEditor::FileEditor(FileContent *fileContent, TQWidget *parent)
 	lineEdit->setText(m_fileContent->fileName());
 	lineEdit->selectAll();
 	setInlineEditor(lineEdit);
-	connect( lineEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(askValidation())            );
-	connect( lineEdit, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(askValidation())            );
-	connect( lineEdit, TQT_SIGNAL(mouseEntered()),  this, TQT_SIGNAL(mouseEnteredEditorWidget()) );
+	connect( lineEdit, TQ_SIGNAL(returnPressed()), this, TQ_SIGNAL(askValidation())            );
+	connect( lineEdit, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(askValidation())            );
+	connect( lineEdit, TQ_SIGNAL(mouseEntered()),  this, TQ_SIGNAL(mouseEnteredEditorWidget()) );
 }
 
 FileEditor::~FileEditor()
@@ -586,11 +590,11 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQK
 	layout->addWidget(wid,     2, 1, TQt::AlignVCenter);
 
 	m_isAutoModified = false;
-	connect( m_url,   TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(urlChanged(const TQString&))     );
-	connect( m_title, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(doNotAutoTitle(const TQString&)) );
-	connect( m_icon,  TQT_SIGNAL(iconChanged(TQString))       , this, TQT_SLOT(doNotAutoIcon(TQString))         );
-	connect( m_autoTitle, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessTitle()) );
-	connect( m_autoIcon,  TQT_SIGNAL(clicked()), this, TQT_SLOT(guessIcon())  );
+	connect( m_url,   TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(urlChanged(const TQString&))     );
+	connect( m_title, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(doNotAutoTitle(const TQString&)) );
+	connect( m_icon,  TQ_SIGNAL(iconChanged(TQString))       , this, TQ_SLOT(doNotAutoIcon(TQString))         );
+	connect( m_autoTitle, TQ_SIGNAL(clicked()), this, TQ_SLOT(guessTitle()) );
+	connect( m_autoIcon,  TQ_SIGNAL(clicked()), this, TQ_SLOT(guessIcon())  );
 
 	TQWidget *stretchWidget = new TQWidget(page);
 	stretchWidget->setSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space
@@ -600,7 +604,7 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQK
 	urlChanged("");
 
 //	if (ke)
-//		kapp->postEvent(m_url->lineEdit(), ke);
+//		tdeApp->postEvent(m_url->lineEdit(), ke);
 }
 
 LinkEditDialog::~LinkEditDialog()
@@ -737,7 +741,7 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *p
 	stretchWidget->setSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space
 	layout->addWidget(stretchWidget, 3, 1, TQt::AlignVCenter);
 
-	connect( guessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessIcon()) );
+	connect( guessButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(guessIcon()) );
 }
 
 LauncherEditDialog::~LauncherEditDialog()
@@ -818,7 +822,7 @@ void InlineEditors::initToolBars(TDEActionCollection *actionCollection)
 	richTextColor = new FocusedColorCombo(Global::mainWindow());
 	richTextColor->setFixedWidth(richTextColor->sizeHint().height() * 2);
 	richTextColor->setColor(textColor);
-	action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color");
+	action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQ_SLOT(), actionCollection, "richtext_color");
 
 	richTextBold      = new TDEToggleAction( i18n("Bold"),        "format-text-bold",   "Ctrl+B", actionCollection, "richtext_bold"      );
 	richTextItalic    = new TDEToggleAction( i18n("Italic"),      "format-text-italic", "Ctrl+I", actionCollection, "richtext_italic"    );

src/noteedit.h

@@ -60,7 +60,7 @@ class FocusedColorCombo;
   */
 class NoteEditor : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	NoteEditor(NoteContent *noteContent);
@@ -100,7 +100,7 @@ class NoteEditor : public TQObject
 
 class TextEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	TextEditor(TextContent *textContent, TQWidget *parent);
@@ -113,7 +113,7 @@ class TextEditor : public NoteEditor
 
 class HtmlEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	HtmlEditor(HtmlContent *htmlContent, TQWidget *parent);
@@ -139,7 +139,7 @@ class HtmlEditor : public NoteEditor
 
 class ImageEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	ImageEditor(ImageContent *imageContent, TQWidget *parent);
@@ -147,7 +147,7 @@ class ImageEditor : public NoteEditor
 
 class AnimationEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	AnimationEditor(AnimationContent *animationContent, TQWidget *parent);
@@ -155,7 +155,7 @@ class AnimationEditor : public NoteEditor
 
 class FileEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FileEditor(FileContent *fileContent, TQWidget *parent);
@@ -168,7 +168,7 @@ class FileEditor : public NoteEditor
 
 class LinkEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LinkEditor(LinkContent *linkContent, TQWidget *parent);
@@ -176,7 +176,7 @@ class LinkEditor : public NoteEditor
 
 class LauncherEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LauncherEditor(LauncherContent *launcherContent, TQWidget *parent);
@@ -184,7 +184,7 @@ class LauncherEditor : public NoteEditor
 
 class ColorEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	ColorEditor(ColorContent *colorContent, TQWidget *parent);
@@ -192,7 +192,7 @@ class ColorEditor : public NoteEditor
 
 class UnknownEditor : public NoteEditor
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	  UnknownEditor(UnknownContent *unknownContent, TQWidget *parent);
@@ -205,7 +205,7 @@ class UnknownEditor : public NoteEditor
   */
 class DebuggedLineEdit : public TQLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	DebuggedLineEdit(const TQString &text, TQWidget *parent = 0);
@@ -219,7 +219,7 @@ class DebuggedLineEdit : public TQLineEdit
   */
 class LinkEditDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LinkEditDialog(LinkContent *contentNote, TQWidget *parent = 0);
@@ -248,7 +248,7 @@ class LinkEditDialog : public KDialogBase
   */
 class LauncherEditDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	LauncherEditDialog(LauncherContent *contentNote, TQWidget *parent = 0);
@@ -271,7 +271,7 @@ class LauncherEditDialog : public KDialogBase
   */
 class InlineEditors : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	InlineEditors();

src/notefactory.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqpixmap.h>
@@ -30,7 +34,6 @@
 #include <kmimetype.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tqfile.h>
@@ -43,7 +46,7 @@
 #include <kiconloader.h>
 #include <tqfileinfo.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurifilter.h>
 
 #include <iostream>
@@ -443,9 +446,7 @@ Note* NoteFactory::dropNote(TQMimeSource *source, Basket *parent, bool fromDrop,
 	/* Unsucceful drop */
 	note = createNoteUnknown(source, parent);
 	TQString message = i18n("<p>%1 doesn't support the data you've dropped.<br>"
-			"It however created a generic note, allowing you to drag or copy it to an application that understand it.</p>"
-			"<p>If you want the support of these data, please contact developer or visit the "
-			"<a href=\"http://basket.kde.org/dropdb.php\">BasKet Drop Database</a>.</p>").arg(kapp->aboutData()->programName());
+			"It however created a generic note, allowing you to drag or copy it to an application that understand it.</p>").arg(tdeApp->aboutData()->programName());
 	KMessageBox::information(parent, message, i18n("Unsupported MIME Type(s)"),
 							 "unsupportedDropInfo", KMessageBox::AllowLink);
 	return note;
@@ -687,14 +688,14 @@ Note* NoteFactory::copyFileAndLoad(const KURL &url, Basket *parent)
 
 
 //	TDEIO::CopyJob *copyJob = TDEIO::copy(url, KURL(fullPath));
-//	parent->connect( copyJob,  TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)),
-//					 parent, TQT_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) );
+//	parent->connect( copyJob,  TQ_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)),
+//					 parent, TQ_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) );
 
 	TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(
 			url, KURL(fullPath), 0666, /*move=*/false,
 			/*overwrite=*/true, /*resume=*/true, /*showProgress=*/true );
-	parent->connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job *)),
-					 parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
+	parent->connect( copyJob,  TQ_SIGNAL(result(TDEIO::Job *)),
+					 parent, TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 
 
 	NoteType::Id type = typeForURL(url, parent); // Use the type of the original file because the target doesn't exist yet
@@ -715,14 +716,14 @@ Note* NoteFactory::moveFileAndLoad(const KURL &url, Basket *parent)
 
 
 //	TDEIO::CopyJob *copyJob = TDEIO::move(url, KURL(fullPath));
-//	parent->connect( copyJob,  TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)),
-//					 parent, TQT_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) );
+//	parent->connect( copyJob,  TQ_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)),
+//					 parent, TQ_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) );
 
 	TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(
 			url, KURL(fullPath), 0666, /*move=*/true,
 			/*overwrite=*/true, /*resume=*/true, /*showProgress=*/true );
-	parent->connect( copyJob,  TQT_SIGNAL(result(TDEIO::Job *)),
-					 parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) );
+	parent->connect( copyJob,  TQ_SIGNAL(result(TDEIO::Job *)),
+					 parent, TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) );
 
 
 	NoteType::Id type = typeForURL(url, parent); // Use the type of the original file because the target doesn't exist yet
@@ -937,7 +938,7 @@ TQString NoteFactory::iconForCommand(const TQString &command)
 
 bool NoteFactory::isIconExist(const TQString &icon)
 {
-	return ! kapp->iconLoader()->loadIcon(icon, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true).isNull();
+	return ! tdeApp->iconLoader()->loadIcon(icon, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true).isNull();
 }
 
 Note* NoteFactory::createEmptyNote(NoteType::Id type, Basket *parent)

src/notefactory.h

@@ -32,8 +32,6 @@ class TQColor;
 class Basket;
 class Note;
 
-enum NoteType::Id;
-
 /** Factory class to create (new, drop, past) or load BasketIem, and eventuelly save them (?)
   * @author Sébastien Laoût
   */

src/password.cpp

@@ -18,7 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "password.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #ifdef HAVE_LIBGPGME
 
@@ -32,6 +34,8 @@
 #include <kgpgme.h>
 #include <basket.h>
 
+#include "password.h"
+
 PasswordDlg::PasswordDlg(TQWidget *parent, const char *name)
 	:KDialogBase(Plain, i18n("Password Protection"), Ok|Cancel, Ok,
 				 parent, name, /*modal=*/true, /*separator=*/true), w(0)

src/password.h

@@ -20,10 +20,6 @@
 #ifndef PASSWORD_H
 #define PASSWORD_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef Q_MOC_RUN
 #define HAVE_LIBGPGME
 #endif
@@ -38,7 +34,7 @@
 */
 class Password : public PasswordLayout
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		Password(TQWidget *parent, const char *name = 0);
@@ -47,7 +43,7 @@ class Password : public PasswordLayout
 
 class PasswordDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		PasswordDlg(TQWidget *parent, const char *name = 0);

src/passwordlayout.ui

@@ -43,9 +43,6 @@
                     <property name="text">
                         <string>&amp;No protection</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+N</string>
-                    </property>
                 </widget>
                 <widget class="TQRadioButton">
                     <property name="name">
@@ -54,9 +51,6 @@
                     <property name="text">
                         <string>Protect basket with a &amp;password</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+P</string>
-                    </property>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
@@ -81,9 +75,6 @@
                             <property name="text">
                                 <string>Protect basket with private &amp;key:</string>
                             </property>
-                            <property name="accel">
-                                <string>Alt+K</string>
-                            </property>
                         </widget>
                         <widget class="TQComboBox">
                             <property name="name">
@@ -113,10 +104,10 @@
         </spacer>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="private">changeKey()</slot>
     <slot access="private">clearKey()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="0" margin="0"/>
 <layoutfunctions spacing="KDialog::spacingHint"/>
 </UI>

src/popupmenu.cpp

@@ -49,8 +49,8 @@ void PopupMenu::execAtRectCenter(TQPopupMenu &menu, const TQRect &rect)
 
 	// Very strange : menu.exec(point) do that clipping (but not when exec() by mouse !!! ) :
 	// If menu is partially out of the screen, move it :
-/*	int desktopWidth  = kapp->desktop()->width();
-	int desktopHeight = kapp->desktop()->height();
+/*	int desktopWidth  = tdeApp->desktop()->width();
+	int desktopHeight = tdeApp->desktop()->height();
 	if (point.x() + menuSize.width() > desktopWidth)       point.setX(desktopWidth - menuSize.width());
 	if (point.y() + menuSize.height() - 2 > desktopHeight) point.setY(desktopHeight - menuSize.height() + 2);
 	if (point.x() < 0)                                     point.setX(0);
@@ -67,14 +67,14 @@ void PopupMenu::execAtRectCenter(TQPopupMenu &menu, const TQRect &rect)
 void PopupMenu::execAtRectBottom(TQPopupMenu &menu, const TQRect &rect, bool centered)
 {
 	TQSize menuSize = menu.sizeHint() - TQSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)]
-	int desktopWidth  = kapp->desktop()->width();   //  to be compared/added/substracted with TQRects/TQPoints...
-	int desktopHeight = kapp->desktop()->height();
+	int desktopWidth  = tdeApp->desktop()->width();   //  to be compared/added/substracted with TQRects/TQPoints...
+	int desktopHeight = tdeApp->desktop()->height();
 
 	/** Paint the rect on the screen (desktop).
 	  * For test purpose only (to be sure the passed rectangle is right).
 	  * Comment this (and the qpainter and qpen includes) for a non-debug version.
 	  */
-	/*TQPainter paint(kapp->desktop(), kapp->desktop(), true);
+	/*TQPainter paint(tdeApp->desktop(), tdeApp->desktop(), true);
 	paint.setPen( TQPen(TQt::black, 1) );
 	paint.drawRect(rect);
 	paint.end();*/
@@ -109,14 +109,14 @@ void PopupMenu::execAtRectBottom(TQPopupMenu &menu, const TQRect &rect, bool cen
 void PopupMenu::execAtRectRight(TQPopupMenu &menu, const TQRect &rect, bool centered)
 {
 	TQSize menuSize = menu.sizeHint() - TQSize(1, 1); // A size is [1..n] => We want two lengths that are [0..(n-1)]
-	int desktopWidth  = kapp->desktop()->width();   //  to be compared/added/substracted with TQRects/TQPoints...
-	int desktopHeight = kapp->desktop()->height();
+	int desktopWidth  = tdeApp->desktop()->width();   //  to be compared/added/substracted with TQRects/TQPoints...
+	int desktopHeight = tdeApp->desktop()->height();
 
 	/** Paint the rect on the screen (desktop).
 	  * For test purpose only (to be sure the passed rectangle is right).
 	  * Comment this (and the qpainter and qpen includes) for a non-debug version.
 	  */
-	/*TQPainter paint(kapp->desktop(), kapp->desktop(), true);
+	/*TQPainter paint(tdeApp->desktop(), tdeApp->desktop(), true);
 	paint.setPen( TQPen(TQt::black, 1) );
 	paint.drawRect(rect);
 	paint.end();*/

src/popupmenu.h

@@ -94,11 +94,11 @@ c l a s s   P o p u p M e n u T e s t   :   p u b l i c   Q W i d g e t
 		menu.insertItem("- Shift + right click : execAtRectBottom centered");
 		menu.insertItem("- Shift + middle click : execAtRectRight centered");
 
-		if (event->button() & Qt::LeftButton)
+		if (event->button() & TQt::LeftButton)
 			PopupMenu::execAtRectCenter(menu, rect);
-		else if ((event->button() & Qt::RightButton) && (event->state() & TQt::ShiftButton))
+		else if ((event->button() & TQt::RightButton) && (event->state() & TQt::ShiftButton))
 			PopupMenu::execAtRectBottom(menu, rect, true);
-		else if (event->button() & Qt::RightButton)
+		else if (event->button() & TQt::RightButton)
 			PopupMenu::execAtRectBottom(menu, rect);
 		else if ((event->button() & TQt::MidButton) && (event->state() & TQt::ShiftButton))
 			PopupMenu::execAtRectRight(menu, rect, true);

src/qeffects.cpp

@@ -66,10 +66,10 @@ static TQAlphaWidget* q_blend = 0;
 */
 TQAlphaWidget::TQAlphaWidget( TQWidget* w, WFlags f )
 	: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
-			   "qt internal alpha effect widget", f )
+			   "tqt internal alpha effect widget", f )
 {
 #if 1 //ndef TQ_WS_WIN
-    setEnabled( FALSE );
+    setEnabled( false );
 #endif
 
     pm.setOptimization( TQPixmap::BestOptim );
@@ -103,7 +103,7 @@ void TQAlphaWidget::run( int time )
 	elapsed = 0;
 	checkTime.start();
 
-	showWidget = TRUE;
+	showWidget = true;
 	tqApp->installEventFilter( this );
 
 	widget->setWState( WState_Visible );
@@ -123,9 +123,9 @@ void TQAlphaWidget::run( int time )
 		mixed = back.copy();
 		pm = mixed;
 		show();
-		setEnabled(FALSE);
+		setEnabled(false);
 
-		connect( &anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(render()));
+		connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(render()));
 		anim.start( 1 );
 	} else {
 		duration = 0;
@@ -151,19 +151,19 @@ bool TQAlphaWidget::eventFilter( TQObject* o, TQEvent* e )
 				break;
 		case TQEvent::MouseButtonPress:
 #ifndef TQT_NO_SCROLLVIEW
-	if ( ::tqqt_cast<TQScrollView*>(o) )
+	if ( ::tqt_cast<TQScrollView*>(o) )
 	    break;
 #endif
 		case TQEvent::MouseButtonDblClick:
-			setEnabled(TRUE);
-			showWidget = FALSE;
+			setEnabled(true);
+			showWidget = false;
 			render();
 			break;
 		case TQEvent::KeyPress:
 		{
 			TQKeyEvent *ke = (TQKeyEvent*)e;
 			if ( ke->key() == Key_Escape )
-				showWidget = FALSE;
+				showWidget = false;
 			else
 				duration = 0;
 			render();
@@ -184,7 +184,7 @@ void TQAlphaWidget::closeEvent( TQCloseEvent *e )
 	if ( !q_blend )
 		return;
 
-	showWidget = FALSE;
+	showWidget = false;
 	render();
 
 	TQWidget::closeEvent( e );
@@ -215,7 +215,7 @@ void TQAlphaWidget::render()
 		if ( widget ) {
 			if ( !showWidget ) {
 #ifdef TQ_WS_WIN
-                setEnabled(TRUE);
+                setEnabled(true);
                 setFocus();
 #endif
 		widget->hide();
@@ -251,7 +251,7 @@ void TQAlphaWidget::render()
 			widget->clearWState( WState_ForceHide );
 		alphaBlend();
 		pm = mixed;
-		repaint( FALSE );
+		repaint( false );
 	}
 }
 
@@ -297,10 +297,10 @@ static TQRollEffect* q_roll = 0;
 */
 TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient )
 	: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
-			   "qt internal roll effect widget", f ), orientation(orient)
+			   "tqt internal roll effect widget", f ), orientation(orient)
 {
 #if 1 //ndef TQ_WS_WIN
-    setEnabled( FALSE );
+    setEnabled( false );
 #endif
     widget = (TQAccessWidget*) w;
     Q_ASSERT( widget );
@@ -336,7 +336,7 @@ void TQRollEffect::paintEvent( TQPaintEvent* )
 	int y = orientation & DownScroll ? TQMIN(0, currentHeight - totalHeight) : 0;
 
 	bitBlt( this, x, y, &pm,
-			0, 0, pm.width(), pm.height(), CopyROP, TRUE );
+			0, 0, pm.width(), pm.height(), CopyROP, true );
 }
 
 /*
@@ -355,22 +355,22 @@ bool TQRollEffect::eventFilter( TQObject* o, TQEvent* e )
 		case TQEvent::Close:
 			if ( o != widget || done )
 				break;
-			setEnabled(TRUE);
-			showWidget = FALSE;
-			done = TRUE;
+			setEnabled(true);
+			showWidget = false;
+			done = true;
 			scroll();
 			break;
 		case TQEvent::MouseButtonPress:
 #ifndef TQT_NO_SCROLLVIEW
-	if ( ::tqqt_cast<TQScrollView*>(o) )
+	if ( ::tqt_cast<TQScrollView*>(o) )
 	    break;
 #endif
 		case TQEvent::MouseButtonDblClick:
 			if ( done )
 				break;
-			setEnabled(TRUE);
-			showWidget = FALSE;
-			done = TRUE;
+			setEnabled(true);
+			showWidget = false;
+			done = true;
 			scroll();
 			break;
 		case TQEvent::KeyPress:
@@ -385,8 +385,8 @@ bool TQRollEffect::eventFilter( TQObject* o, TQEvent* e )
 
 
 			if ( ke->key() == Key_Escape )
-				showWidget = FALSE;
-			done = TRUE;
+				showWidget = false;
+			done = true;
 			scroll();
 			break;
 		}
@@ -404,8 +404,8 @@ void TQRollEffect::closeEvent( TQCloseEvent *e )
 	e->accept();
 	if ( done )
 		return;
-	showWidget = FALSE;
-	done = TRUE;
+	showWidget = false;
+	done = true;
 	scroll();
 
 	TQWidget::closeEvent( e );
@@ -434,7 +434,7 @@ void TQRollEffect::run( int time )
 		duration = TQMIN( TQMAX( dist/3, 50 ), 120 );
 	}
 
-	connect( &anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(scroll()));
+	connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll()));
 
 	widget->setWState( WState_Visible );
 
@@ -442,12 +442,12 @@ void TQRollEffect::run( int time )
 	resize( TQMIN( currentWidth, totalWidth ), TQMIN( currentHeight, totalHeight ) );
 
 	show();
-	setEnabled(FALSE);
+	setEnabled(false);
 
 	tqApp->installEventFilter( this );
 
-	showWidget = TRUE;
-	done = FALSE;
+	showWidget = true;
+	done = false;
 	anim.start( 1 );
 	checkTime.start();
 }
@@ -492,7 +492,7 @@ void TQRollEffect::scroll()
 		if ( orientation & DownScroll || orientation & UpScroll )
 			h = TQMIN( currentHeight, totalHeight );
 
-		setUpdatesEnabled( FALSE );
+		setUpdatesEnabled( false );
 		if ( orientation & UpScroll )
 			y = widget->geometry().y() + TQMAX( 0, totalHeight - currentHeight );
 		if ( orientation & LeftScroll )
@@ -501,8 +501,8 @@ void TQRollEffect::scroll()
 			move( x, y );
 
 		resize( w, h );
-		setUpdatesEnabled( TRUE );
-		repaint( FALSE );
+		setUpdatesEnabled( true );
+		repaint( false );
 	}
 	if ( done ) {
 		anim.stop();
@@ -510,7 +510,7 @@ void TQRollEffect::scroll()
 		if ( widget ) {
 			if ( !showWidget ) {
 #ifdef TQ_WS_WIN
-                setEnabled(TRUE);
+                setEnabled(true);
                 setFocus();
 #endif
 		widget->hide();

src/qeffects.h

@@ -114,7 +114,7 @@ class TQAccessWidget : public TQWidget
 
 class TQAlphaWidget: public TQWidget, private TQEffects
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		TQAlphaWidget( TQWidget* w, WFlags f = 0 );
@@ -153,7 +153,7 @@ class TQAlphaWidget: public TQWidget, private TQEffects
 
 class TQRollEffect : public TQWidget, private TQEffects
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		TQRollEffect( TQWidget* w, WFlags f, DirFlags orient );

src/regiongrabber.cpp

@@ -76,9 +76,9 @@ RegionGrabber::RegionGrabber(int delay)
   sizeTip = new SizeTip( ( TQWidget * )0L );
 
   tipTimer = new TQTimer( this );
-  connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) );
+  connect( tipTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateSizeTip() ) );
 
-  TQTimer::singleShot( delay, this, TQT_SLOT( initGrabber() ) );
+  TQTimer::singleShot( delay, this, TQ_SLOT( initGrabber() ) );
 }
 
 RegionGrabber::~RegionGrabber()
@@ -106,7 +106,7 @@ void RegionGrabber::initGrabber()
 
 void RegionGrabber::mousePressEvent( TQMouseEvent *e )
 {
-  if ( e->button() == Qt::LeftButton )
+  if ( e->button() == TQt::LeftButton )
   {
     mouseDown = true;
     grabRect = TQRect( e->pos(), e->pos() );
@@ -171,7 +171,7 @@ void RegionGrabber::drawRubber()
   p.setPen( TQPen( color0, 1 ) );
   p.setBrush( NoBrush );
 
-  style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
+  style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
       TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
 
   p.end();

src/regiongrabber.h

@@ -39,7 +39,7 @@ class SizeTip : public TQLabel
 
 class RegionGrabber : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:

src/settings.cpp

@@ -18,7 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqhbox.h>
@@ -40,7 +43,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kgpgme.h>
 #include <kdebug.h>
 #include <tqdatetime.h>
@@ -372,7 +375,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	label = new TQLabel(m_treeOnLeft, i18n("&Basket tree position:"), this);
 	gl->addWidget(label,        0, 0);
 	gl->addWidget(m_treeOnLeft, 0, 1);
-	connect( m_treeOnLeft, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()) );
+	connect( m_treeOnLeft, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()) );
 
 	// Filter Bar Position:
 	m_filterOnTop = new TQComboBox(this);
@@ -381,12 +384,12 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	label = new TQLabel(m_filterOnTop, i18n("&Filter bar position:"), this);
 	gl->addWidget(label,         1, 0);
 	gl->addWidget(m_filterOnTop, 1, 1);
-	connect( m_filterOnTop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()) );
+	connect( m_filterOnTop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()) );
 
 	// Use Baloons to Report Results of Global Actions:
 	hLay = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint());
 	m_usePassivePopup = new TQCheckBox(i18n("&Use balloons to report results of global actions"), this);
-	connect( m_usePassivePopup, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_usePassivePopup, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 	hLabel = new HelpLabel(
 		i18n("What are global actions?"),
 		("<p>" + i18n("You can configure global shortcuts to do some actions without having to show the main window. For instance, you can paste the clipboard content, take a color from "
@@ -394,7 +397,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 		              "on that icon to paste the current selection.") + "</p>" +
 		"<p>" + i18n("When doing so, %1 pops up a little balloon message to inform you the action has been successfully done. You can disable that balloon.") + "</p>" +
 		"<p>" + i18n("Note that those messages are smart enough to not appear if the main window is visible. This is because you already see the result of your actions in the main window.") + "</p>")
-			.arg(kapp->aboutData()->programName()),
+			.arg(tdeApp->aboutData()->programName()),
 		this);
 	hLay->addWidget(m_usePassivePopup);
 	hLay->addWidget(hLabel);
@@ -402,14 +405,14 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	layout->addLayout(hLay);
 
 	// System Tray Icon:
-	TQGroupBox *gbSys = new TQGroupBox(3, Qt::Vertical, i18n("System Tray Icon"), this);
+	TQGroupBox *gbSys = new TQGroupBox(3, TQt::Vertical, i18n("System Tray Icon"), this);
 	layout->addWidget(gbSys);
 	TQVBoxLayout *sysLay = new TQVBoxLayout(KDialogBase::spacingHint());
 
 	// Dock in System Tray:
 	m_useSystray = new TQCheckBox(i18n("&Dock in system tray"), gbSys);
 	sysLay->addWidget(m_useSystray);
-	connect( m_useSystray, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_useSystray, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	m_systray = new TQWidget(gbSys);
 	TQVBoxLayout *subSysLay = new TQVBoxLayout(m_systray, /*margin=*/0, KDialogBase::spacingHint());
@@ -418,7 +421,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	// Show Current Basket Icon in System Tray Icon:
 	m_showIconInSystray = new TQCheckBox(i18n("&Show current basket icon in system tray icon"), m_systray);
 	subSysLay->addWidget(m_showIconInSystray);
-	connect(m_showIconInSystray, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
+	connect(m_showIconInSystray, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
 
 	TQGridLayout *gs = new TQGridLayout(0, /*nRows=*/2, /*nCols=*/3);
 	subSysLay->addLayout(gs);
@@ -431,8 +434,8 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	m_timeToHideOnMouseOut->setSuffix(i18n(" tenths of seconds"));
 	gs->addWidget(m_hideOnMouseOut,       0, 0);
 	gs->addWidget(m_timeToHideOnMouseOut, 0, 1);
-	connect(m_hideOnMouseOut, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-	connect(m_timeToHideOnMouseOut, TQT_SIGNAL(valueChanged (int)), this, TQT_SLOT(changed()));
+	connect(m_hideOnMouseOut, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+	connect(m_timeToHideOnMouseOut, TQ_SIGNAL(valueChanged (int)), this, TQ_SLOT(changed()));
 //	subSysLay->addWidget(
 
 	// Show Main Window when Mouse Hovers over the System Tray Icon for Some Time:
@@ -442,13 +445,13 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	m_timeToShowOnMouseIn->setSuffix(i18n(" tenths of seconds"));
 	gs->addWidget(m_showOnMouseIn,       1, 0);
 	gs->addWidget(m_timeToShowOnMouseIn, 1, 1);
-	connect(m_showOnMouseIn, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-	connect(m_timeToShowOnMouseIn, TQT_SIGNAL(valueChanged (int)), this, TQT_SLOT(changed()));
+	connect(m_showOnMouseIn, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+	connect(m_timeToShowOnMouseIn, TQ_SIGNAL(valueChanged (int)), this, TQ_SLOT(changed()));
 
-	connect( m_hideOnMouseOut, TQT_SIGNAL(toggled(bool)), m_timeToHideOnMouseOut, TQT_SLOT(setEnabled(bool)) );
-	connect( m_showOnMouseIn,  TQT_SIGNAL(toggled(bool)), m_timeToShowOnMouseIn,  TQT_SLOT(setEnabled(bool)) );
+	connect( m_hideOnMouseOut, TQ_SIGNAL(toggled(bool)), m_timeToHideOnMouseOut, TQ_SLOT(setEnabled(bool)) );
+	connect( m_showOnMouseIn,  TQ_SIGNAL(toggled(bool)), m_timeToShowOnMouseIn,  TQ_SLOT(setEnabled(bool)) );
 
-	connect( m_useSystray,     TQT_SIGNAL(toggled(bool)), m_systray,              TQT_SLOT(setEnabled(bool)) );
+	connect( m_useSystray,     TQ_SIGNAL(toggled(bool)), m_systray,              TQ_SLOT(setEnabled(bool)) );
 
 	layout->insertStretch(-1);
 	load();
@@ -508,33 +511,33 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 
 	// Appearance:
 
-	TQGroupBox *appearanceBox = new TQGroupBox(3, Qt::Vertical, i18n("Appearance"), this);
+	TQGroupBox *appearanceBox = new TQGroupBox(3, TQt::Vertical, i18n("Appearance"), this);
 	layout->addWidget(appearanceBox);
 
 	m_playAnimations = new TQCheckBox(i18n("Ani&mate changes in baskets"), appearanceBox);
-	connect( m_playAnimations, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_playAnimations, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	m_showNotesToolTip = new TQCheckBox(i18n("&Show tooltips in baskets"), appearanceBox);
-	connect( m_showNotesToolTip, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_showNotesToolTip, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	m_bigNotes = new TQCheckBox(i18n("&Big notes"), appearanceBox);
-	connect( m_bigNotes, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_bigNotes, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	// Behavior:
 
-	TQGroupBox *behaviorBox = new TQGroupBox(5, Qt::Vertical, i18n("Behavior"), this);
+	TQGroupBox *behaviorBox = new TQGroupBox(5, TQt::Vertical, i18n("Behavior"), this);
 	layout->addWidget(behaviorBox);
 
 	m_autoBullet = new TQCheckBox(i18n("&Transform lines starting with * or - to lists in text editors"), behaviorBox);
-	connect( m_autoBullet, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_autoBullet, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	m_confirmNoteDeletion = new TQCheckBox(i18n("Ask confirmation before &deleting notes"), behaviorBox);
-	connect( m_confirmNoteDeletion, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_confirmNoteDeletion, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	TQWidget *widget = new TQWidget(behaviorBox);
 	hLay = new TQHBoxLayout(widget, /*margin=*/0, KDialogBase::spacingHint());
 	m_exportTextTags = new TQCheckBox(i18n("&Export tags in texts"), widget);
-	connect( m_exportTextTags, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_exportTextTags, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	TQPixmap pixmapHelp(TDEGlobal::dirs()->findResource("data", "basket/images/tag_export_help.png"));
 	TQMimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", pixmapHelp);
@@ -567,7 +570,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	hLayV->addWidget(helpV);
 	hLayV->insertStretch(-1);
 	layout->addWidget(m_groupOnInsertionLineWidget);
-	connect(m_groupOnInsertionLine, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
+	connect(m_groupOnInsertionLine, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
 
 	widget = new TQWidget(behaviorBox);
 	TQGridLayout *ga = new TQGridLayout(widget, /*nRows=*/3, /*nCols=*/4, /*margin=*/0, KDialogBase::spacingHint());
@@ -589,11 +592,11 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	ga->addWidget(labelM,                                          0, 0);
 	ga->addWidget(m_middleAction,                                  0, 1);
 	ga->addWidget(new TQLabel(i18n("at cursor position"), widget),  0, 2);
-	connect( m_middleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()) );
+	connect( m_middleAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()) );
 
 	// Protection:
 
-	TQGroupBox *protectionBox = new TQGroupBox(3, Qt::Vertical, i18n("Password Protection"), this);
+	TQGroupBox *protectionBox = new TQGroupBox(3, TQt::Vertical, i18n("Password Protection"), this);
 	layout->addWidget(protectionBox);
 	widget = new TQWidget(protectionBox);
 
@@ -609,14 +612,14 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	//hLay->addWidget(label);
 	hLay->addStretch();
 //	layout->addLayout(hLay);
-	connect( m_enableReLockTimeoutMinutes, TQT_SIGNAL(stateChanged(int)), this,                   TQT_SLOT(changed())        );
-	connect( m_reLockTimeoutMinutes,       TQT_SIGNAL(valueChanged(int)), this,                   TQT_SLOT(changed())        );
-	connect( m_enableReLockTimeoutMinutes, TQT_SIGNAL(toggled(bool)),     m_reLockTimeoutMinutes, TQT_SLOT(setEnabled(bool)) );
+	connect( m_enableReLockTimeoutMinutes, TQ_SIGNAL(stateChanged(int)), this,                   TQ_SLOT(changed())        );
+	connect( m_reLockTimeoutMinutes,       TQ_SIGNAL(valueChanged(int)), this,                   TQ_SLOT(changed())        );
+	connect( m_enableReLockTimeoutMinutes, TQ_SIGNAL(toggled(bool)),     m_reLockTimeoutMinutes, TQ_SLOT(setEnabled(bool)) );
 
 #ifdef HAVE_LIBGPGME
 	m_useGnuPGAgent = new TQCheckBox(i18n("Use GnuPG agent for &private/public key protected baskets"), protectionBox);
 //	hLay->addWidget(m_useGnuPGAgent);
-	connect( m_useGnuPGAgent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_useGnuPGAgent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 #endif
 
 	layout->insertStretch(-1);
@@ -700,7 +703,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	//layout->addLayout(hLay);
 	label->hide();
 	m_newNotesPlace->hide();
-	connect( m_newNotesPlace, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()) );
+	connect( m_newNotesPlace, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()) );
 
 	// New Images Size:
 
@@ -709,7 +712,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	m_imgSizeX->setMinValue(1);
 	m_imgSizeX->setMaxValue(4096);
 	m_imgSizeX->setReferencePoint(100);
-	connect( m_imgSizeX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_imgSizeX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()) );
 	label = new TQLabel(m_imgSizeX, i18n("&New images size:"), this);
 	hLay->addWidget(label);
 	hLay->addWidget(m_imgSizeX);
@@ -717,7 +720,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	m_imgSizeY->setMinValue(1);
 	m_imgSizeY->setMaxValue(4096);
 	m_imgSizeY->setReferencePoint(100);
-	connect( m_imgSizeY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_imgSizeY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()) );
 	label = new TQLabel(m_imgSizeY, i18n("&by"), this);
 	hLay->addWidget(label);
 	hLay->addWidget(m_imgSizeY);
@@ -727,7 +730,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	hLay->addWidget(m_pushVisualize);
 	hLay->addStretch();
 	layout->addLayout(hLay);
-	connect( m_pushVisualize, TQT_SIGNAL(clicked()), this, TQT_SLOT(visualize()) );
+	connect( m_pushVisualize, TQ_SIGNAL(clicked()), this, TQ_SLOT(visualize()) );
 
 	// View File Content:
 
@@ -737,10 +740,10 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	m_viewImageFileContent = new TQCheckBox( i18n("&Image or animation"), buttonGroup );
 	m_viewSoundFileContent = new TQCheckBox( i18n("&Sound"),              buttonGroup );
 	layout->addWidget(buttonGroup);
-	connect( m_viewTextFileContent,  TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
-	connect( m_viewHtmlFileContent,  TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
-	connect( m_viewImageFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
-	connect( m_viewSoundFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
+	connect( m_viewTextFileContent,  TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
+	connect( m_viewHtmlFileContent,  TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
+	connect( m_viewImageFileContent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
+	connect( m_viewSoundFileContent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
 
 	layout->insertStretch(-1);
 	load();
@@ -798,7 +801,7 @@ NotesAppearancePage::NotesAppearancePage(TQWidget * parent, const char * name)
 	m_fileLook        = new LinkLookEditWidget(this, i18n("Annual report"),                                   "text-x-generic",    tabs);
 	m_localLinkLook   = new LinkLookEditWidget(this, i18n("Home folder"),                                     "folder_home", tabs);
 	m_networkLinkLook = new LinkLookEditWidget(this, "www.kde.org",             KMimeType::iconForURL("http://www.kde.org"), tabs);
-	m_launcherLook    = new LinkLookEditWidget(this, i18n("Launch %1").arg(kapp->aboutData()->programName()), "basket",      tabs);
+	m_launcherLook    = new LinkLookEditWidget(this, i18n("Launch %1").arg(tdeApp->aboutData()->programName()), "basket",      tabs);
 	tabs->addTab(m_soundLook,       i18n("&Sounds")       );
 	tabs->addTab(m_fileLook,        i18n("&Files")        );
 	tabs->addTab(m_localLinkLook,   i18n("&Local Links")  );
@@ -845,32 +848,32 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
 	TQHBoxLayout *hLayH = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint());
 	hLayH->insertSpacing(-1, 20);
 	hLayH->addWidget(m_htmlProg);
-	connect(m_htmlUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-	connect(m_htmlProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+	connect(m_htmlUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+	connect(m_htmlProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
 
 	m_imageUseProg = new TQCheckBox(i18n("Open &image notes with a custom application:"), this);
 	m_imageProg    = new RunCommandRequester("", i18n("Open image notes with:"), this);
 	TQHBoxLayout *hLayI = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint());
 	hLayI->insertSpacing(-1, 20);
 	hLayI->addWidget(m_imageProg);
-	connect(m_imageUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-	connect(m_imageProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+	connect(m_imageUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+	connect(m_imageProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
 
 	m_animationUseProg = new TQCheckBox(i18n("Open a&nimation notes with a custom application:"), this);
 	m_animationProg    = new RunCommandRequester("", i18n("Open animation notes with:"), this);
 	TQHBoxLayout *hLayA = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint());
 	hLayA->insertSpacing(-1, 20);
 	hLayA->addWidget(m_animationProg);
-	connect(m_animationUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-	connect(m_animationProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+	connect(m_animationUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+	connect(m_animationProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
 
 	m_soundUseProg = new TQCheckBox(i18n("Open so&und notes with a custom application:"), this);
 	m_soundProg    = new RunCommandRequester("", i18n("Open sound notes with:"), this);
 	TQHBoxLayout *hLayS = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint());
 	hLayS->insertSpacing(-1, 20);
 	hLayS->addWidget(m_soundProg);
-	connect(m_soundUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-	connect(m_soundProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+	connect(m_soundUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+	connect(m_soundProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
 
 	TQString whatsthis = i18n(
 		"<p>If checked, the application defined below will be used when opening that type of note.</p>"
@@ -940,10 +943,10 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
 	hLay->addStretch();
 	layout->addLayout(hLay);
 
-	connect( m_htmlUseProg,      TQT_SIGNAL(toggled(bool)), m_htmlProg,      TQT_SLOT(setEnabled(bool)) );
-	connect( m_imageUseProg,     TQT_SIGNAL(toggled(bool)), m_imageProg,     TQT_SLOT(setEnabled(bool)) );
-	connect( m_animationUseProg, TQT_SIGNAL(toggled(bool)), m_animationProg, TQT_SLOT(setEnabled(bool)) );
-	connect( m_soundUseProg,     TQT_SIGNAL(toggled(bool)), m_soundProg,     TQT_SLOT(setEnabled(bool)) );
+	connect( m_htmlUseProg,      TQ_SIGNAL(toggled(bool)), m_htmlProg,      TQ_SLOT(setEnabled(bool)) );
+	connect( m_imageUseProg,     TQ_SIGNAL(toggled(bool)), m_imageProg,     TQ_SLOT(setEnabled(bool)) );
+	connect( m_animationUseProg, TQ_SIGNAL(toggled(bool)), m_animationProg, TQ_SLOT(setEnabled(bool)) );
+	connect( m_soundUseProg,     TQ_SIGNAL(toggled(bool)), m_soundProg,     TQ_SLOT(setEnabled(bool)) );
 
 	layout->insertStretch(-1);
 	load();

src/settings.h

@@ -53,9 +53,9 @@ class LinkLookEditWidget;
 class RunCommandRequester;
 class IconSizeCombo;
 
-class GeneralPage : public TDECModule
+class TDE_EXPORT GeneralPage : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	GeneralPage(TQWidget * parent=0, const char * name=0);
@@ -82,9 +82,9 @@ class GeneralPage : public TDECModule
 	KIntNumInput        *m_timeToShowOnMouseIn;
 };
 
-class BasketsPage : public TDECModule
+class TDE_EXPORT BasketsPage : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	BasketsPage(TQWidget * parent=0, const char * name=0);
@@ -114,9 +114,9 @@ class BasketsPage : public TDECModule
 	KIntNumInput        *m_reLockTimeoutMinutes;
 };
 
-class NewNotesPage : public TDECModule
+class TDE_EXPORT NewNotesPage : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	NewNotesPage(TQWidget * parent=0, const char * name=0);
@@ -143,9 +143,9 @@ class NewNotesPage : public TDECModule
 	TQCheckBox           *m_viewSoundFileContent;
 };
 
-class NotesAppearancePage : public TDECModule
+class TDE_EXPORT NotesAppearancePage : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	NotesAppearancePage(TQWidget * parent=0, const char * name=0);
@@ -164,9 +164,9 @@ class NotesAppearancePage : public TDECModule
 	LinkLookEditWidget  *m_launcherLook;
 };
 
-class ApplicationsPage : public TDECModule
+class TDE_EXPORT ApplicationsPage : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	ApplicationsPage(TQWidget * parent=0, const char * name=0);
@@ -191,7 +191,7 @@ class ApplicationsPage : public TDECModule
 /** Handle all global variables (to avoid lot of extern declarations)
   * @author S<EFBFBD>astien Laot
   */
-class Settings // FIXME: Distaptch new config events ?
+class TDE_EXPORT Settings // FIXME: Distaptch new config events ?
 {
   protected:
 	/** Main window */

src/softwareimporters.cpp

@@ -18,9 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqstring.h>
 #include <tqdir.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tqptrstack.h>
@@ -90,13 +94,13 @@ TextFileImportDialog::TextFileImportDialog(TQWidget *parent)
 	m_customSeparator = new TQTextEdit(indentedTextEdit);
 	m_customSeparator->setTextFormat(TQt::PlainText);
 	hLayout->addWidget(m_customSeparator);
-	m_choices->insertChild(TQT_TQOBJECT(indentedTextEdit));
+	m_choices->insertChild(indentedTextEdit);
 
 	new TQRadioButton(i18n("&All in one note"),                  m_choices);
 	m_choices->setButton(0);
 	topLayout->addWidget(m_choices);
 
-	connect( m_customSeparator, TQT_SIGNAL(textChanged()), this, TQT_SLOT(customSeparatorChanged()) );
+	connect( m_customSeparator, TQ_SIGNAL(textChanged()), this, TQ_SLOT(customSeparatorChanged()) );
 
 	setMainWidget(page);
 }

src/softwareimporters.h

@@ -37,7 +37,7 @@ class Note;
   */
 class TreeImportDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	TreeImportDialog(TQWidget *parent = 0);
@@ -52,7 +52,7 @@ class TreeImportDialog : public KDialogBase
   */
 class TextFileImportDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	TextFileImportDialog(TQWidget *parent = 0);

src/systemtray.cpp

@@ -20,6 +20,10 @@
 
 /** KSystemTray2 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 // To draw the systray screenshot image:
 #include <tqdockwindow.h>
 #include <tqmovie.h>
@@ -84,8 +88,8 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
 
 	// Some values we need:
 	TQPoint g = mapToGlobal(pos());
-	int desktopWidth  = kapp->desktop()->width();
-	int desktopHeight = kapp->desktop()->height();
+	int desktopWidth  = tdeApp->desktop()->width();
+	int desktopHeight = tdeApp->desktop()->height();
 	int tw = width();
 	int th = height();
 
@@ -117,24 +121,24 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
 /*	if (useSystray) {
 		// We are testing if one of the corners is hidden, and if yes, we would enter
 		// a time consuming process (raise kicker and wait some time):
-//		if (kapp->widgetAt(g) != this ||
-//		    kapp->widgetAt(g + TQPoint(tw-1, 0)) != this ||
-//		    kapp->widgetAt(g + TQPoint(0, th-1)) != this ||
-//		    kapp->widgetAt(g + TQPoint(tw-1, th-1)) != this) {
+//		if (tdeApp->widgetAt(g) != this ||
+//		    tdeApp->widgetAt(g + TQPoint(tw-1, 0)) != this ||
+//		    tdeApp->widgetAt(g + TQPoint(0, th-1)) != this ||
+//		    tdeApp->widgetAt(g + TQPoint(tw-1, th-1)) != this) {
 			int systrayManagerWinId = topLevelWidget()->winId();
 			KWin::forceActiveWindow(systrayManagerWinId);
-			kapp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed
+			tdeApp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed
 //			KWin::activateWindow(systrayManagerWinId);
-//			kapp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed
+//			tdeApp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed
 //				KWin::raiseWindow(systrayManagerWinId);
-//			kapp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed
+//			tdeApp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed
 			sleep(1);
 			// TODO: Re-verify that at least one corner is now visible
 //		}
 	}*/
 
 //	KMessageBox::information(this, TQString::number(g.x()) + ":" + TQString::number(g.y()) + ":" +
-//	                         TQString::number((int)(kapp->widgetAt(g+TQPoint(1,1)))));
+//	                         TQString::number((int)(tdeApp->widgetAt(g+TQPoint(1,1)))));
 
 	TQString message = i18n(
 		"<p>Closing the main window will keep %1 running in the system tray. "
@@ -181,12 +185,12 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
 
 		// Associate source to image and show the dialog:
 		TQMimeSourceFactory::defaultFactory()->setPixmap("systray_shot", finalShot);
-		KMessageBox::information(TQT_TQWIDGET(kapp->activeWindow()),
+		KMessageBox::information(tdeApp->activeWindow(),
 			message + "<p><center><img source=\"systray_shot\"></center></p>",
 			i18n("Docking in System Tray"), "hideOnCloseInfo");
 		TQMimeSourceFactory::defaultFactory()->setData("systray_shot", 0L);
 	} else {
-		KMessageBox::information(TQT_TQWIDGET(kapp->activeWindow()),
+		KMessageBox::information(tdeApp->activeWindow(),
 			message,
 			i18n("Docking in System Tray"), "hideOnCloseInfo");
 	}
@@ -200,10 +204,10 @@ SystemTray::SystemTray(TQWidget *parent, const char *name)
 	setAcceptDrops(true);
 
 	m_showTimer = new TQTimer(this);
-	connect( m_showTimer, TQT_SIGNAL(timeout()), Global::bnpView, TQT_SLOT(setActive()) );
+	connect( m_showTimer, TQ_SIGNAL(timeout()), Global::bnpView, TQ_SLOT(setActive()) );
 
 	m_autoShowTimer = new TQTimer(this);
-	connect( m_autoShowTimer, TQT_SIGNAL(timeout()), Global::bnpView, TQT_SLOT(setActive()) );
+	connect( m_autoShowTimer, TQ_SIGNAL(timeout()), Global::bnpView, TQ_SLOT(setActive()) );
 
 	// Create pixmaps for the icon:
 	m_iconPixmap              = loadIcon("basket");
@@ -225,20 +229,20 @@ SystemTray::~SystemTray()
 
 void SystemTray::mousePressEvent(TQMouseEvent *event)
 {
-	if (event->button() & Qt::LeftButton) {          // Prepare drag
+	if (event->button() & TQt::LeftButton) {          // Prepare drag
 		m_pressPos = event->globalPos();
 		m_canDrag  = true;
 		event->accept();
-	} else if (event->button() & Qt::MidButton) {    // Paste
+	} else if (event->button() & TQt::MidButton) {    // Paste
 		Global::bnpView->currentBasket()->setInsertPopupMenu();
 		Global::bnpView->currentBasket()->pasteNote(TQClipboard::Selection);
 		Global::bnpView->currentBasket()->cancelInsertPopupMenu();
 		if (Settings::usePassivePopup())
 			Global::bnpView->showPassiveDropped(i18n("Pasted selection to basket <i>%1</i>"));
 		event->accept();
-	} else if (event->button() & Qt::RightButton) { // Popup menu
+	} else if (event->button() & TQt::RightButton) { // Popup menu
 		TDEPopupMenu menu(this);
-		menu.insertTitle( SmallIcon("basket"), kapp->aboutData()->programName() );
+		menu.insertTitle( SmallIcon("basket"), tdeApp->aboutData()->programName() );
 
 		Global::bnpView->actNewBasket->plug(&menu);
 		Global::bnpView->actNewSubBasket->plug(&menu);
@@ -281,7 +285,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *event)
 		}
 
 		Global::bnpView->currentBasket()->setInsertPopupMenu();
-		connect( &menu, TQT_SIGNAL(aboutToHide()), Global::bnpView->currentBasket(), TQT_SLOT(delayedCancelInsertPopupMenu()) );
+		connect( &menu, TQ_SIGNAL(aboutToHide()), Global::bnpView->currentBasket(), TQ_SLOT(delayedCancelInsertPopupMenu()) );
 		menu.exec(event->globalPos());
 		event->accept();
 	} else
@@ -296,8 +300,8 @@ void SystemTray::mouseMoveEvent(TQMouseEvent *event)
 void SystemTray::mouseReleaseEvent(TQMouseEvent *event)
 {
 	m_canDrag = false;
-	if (event->button() == Qt::LeftButton)         // Show / hide main window
-		if ( TQT_TQRECT_OBJECT(rect()).contains(event->pos()) ) {     // Accept only if released in systemTray
+	if (event->button() == TQt::LeftButton)         // Show / hide main window
+		if ( rect().contains(event->pos()) ) {     // Accept only if released in systemTray
 			toggleActive();
 			emit showPart();
 			event->accept();
@@ -422,7 +426,7 @@ void SystemTray::updateToolTip()
 		setPixmap(bgPix);
 	}
 
-	//TQTimer::singleShot( Container::c_delayTooltipTime, this, TQT_SLOT(updateToolTipDelayed()) );
+	//TQTimer::singleShot( Container::c_delayTooltipTime, this, TQ_SLOT(updateToolTipDelayed()) );
 	// No need to delay: it's be called when notes are changed:
 	updateToolTipDelayed();
 }
@@ -431,8 +435,8 @@ void SystemTray::updateToolTipDelayed()
 {
 	Basket *basket = Global::bnpView->currentBasket();
 
-	TQString tip = "<p><nobr>" + ( basket->isLocked() ? kapp->makeStdCaption(i18n("%1 (Locked)"))
-	                                                 : kapp->makeStdCaption(     "%1")          )
+	TQString tip = "<p><nobr>" + ( basket->isLocked() ? tdeApp->makeStdCaption(i18n("%1 (Locked)"))
+	                                                 : tdeApp->makeStdCaption(     "%1")          )
 	                            .arg(Tools::textToHTMLWithoutP(basket->basketName()));
 
 	TQToolTip::add(this, tip);

src/systemtray.h

@@ -29,9 +29,9 @@ class MainWindow;
   * hopefuly integrated in KDE 3.4
   * @author S<EFBFBD>astien Laot
   */
-class KSystemTray2 : public KSystemTray
+class TDE_EXPORT KSystemTray2 : public KSystemTray
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	KSystemTray2(TQWidget *parent = 0, const char *name = 0);
@@ -53,7 +53,7 @@ class KSystemTray2 : public KSystemTray
   */
 class SystemTray : public KSystemTray2
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	SystemTray(TQWidget *parent = 0, const char *name = 0);

src/tag.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tdeapplication.h>
 #include <tdestyle.h>
 #include <kiconloader.h>
@@ -223,7 +227,7 @@ Tag::Tag()
 	static int tagNumber = 0;
 	++tagNumber;
 	TQString sAction = "tag_shortcut_number_" + TQString::number(tagNumber);
-	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(Global::bnpView), TQT_SLOT(activatedTagShortcut()), Global::bnpView->actionCollection(), sAction);
+	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), Global::bnpView, TQ_SLOT(activatedTagShortcut()), Global::bnpView->actionCollection(), sAction.utf8());
 	m_action->setShortcutConfigurable(false); // We do it in the tag properties dialog
 
 	m_inheritedBySiblings = false;
@@ -736,14 +740,14 @@ void IndentedMenuItem::paint(TQPainter *painter, const TQColorGroup &cg, bool ac
 	 */
 	bool drawingEtchedText = !enabled && !active && painter->pen().color() != cg.mid()/*== cg.foreground()*/;
 	if (drawingEtchedText) {
-		TQString styleName = kapp->style().name();
+		TQString styleName = tdeApp->style().name();
 		if (styleName == "plastik" || styleName == "lipstik")
 			painter->setPen(cg.light());
 		drawingEtchedText = !enabled && !active && painter->pen().color() != cg.foreground();
 	} else
 		drawingEtchedText = !enabled && !active && painter->pen().color() == cg.light();
 	if (!m_icon.isEmpty() && !drawingEtchedText) {
-		TQPixmap icon = kapp->iconLoader()->loadIcon(m_icon, TDEIcon::Small, iconSize,
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon(m_icon, TDEIcon::Small, iconSize,
 		                                            (enabled ? (active ? TDEIcon::ActiveState : TDEIcon::DefaultState) : TDEIcon::DisabledState),
 		                                            /*path_store=*/0L, /*canReturnNull=*/true);
 		painter->drawPixmap(x, y + (h-iconSize)/2, icon);
@@ -806,14 +810,14 @@ void StateMenuItem::paint(TQPainter *painter, const TQColorGroup &cg, bool activ
 	 */
 	bool drawingEtchedText = !enabled && !active && painter->pen().color() != cg.mid()/*== cg.foreground()*/;
 	if (drawingEtchedText) {
-		TQString styleName = kapp->style().name();
+		TQString styleName = tdeApp->style().name();
 		if (styleName == "plastik" || styleName == "lipstik")
 			painter->setPen(cg.light());
 		drawingEtchedText = !enabled && !active && painter->pen().color() != cg.foreground();
 	} else
 		drawingEtchedText = !enabled && !active && painter->pen().color() == cg.light();
 	if (!m_state->emblem().isEmpty() && !drawingEtchedText) {
-		TQPixmap icon = kapp->iconLoader()->loadIcon(m_state->emblem(), TDEIcon::Small, iconSize,
+		TQPixmap icon = tdeApp->iconLoader()->loadIcon(m_state->emblem(), TDEIcon::Small, iconSize,
 		                                            (enabled ? (active ? TDEIcon::ActiveState : TDEIcon::DefaultState) : TDEIcon::DisabledState),
 		                                            /*path_store=*/0L, /*canReturnNull=*/true);
 		painter->drawPixmap(x, y + (h-iconSize)/2, icon);
@@ -851,11 +855,11 @@ TQSize StateMenuItem::sizeHint()
 
 TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg)
 {
-	int width  = kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth,  0);
-	int height = kapp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
+	int width  = tdeApp->style().pixelMetric(TQStyle::PM_IndicatorWidth,  0);
+	int height = tdeApp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
 	TQRect rect(0, 0, width, height);
 
-	TQColor menuBackgroundColor = (dynamic_cast<TDEStyle*>(&(kapp->style())) == NULL ? TQColor(cg.background()) : cg.background().light(103));
+	TQColor menuBackgroundColor = (dynamic_cast<TDEStyle*>(&(tdeApp->style())) == NULL ? TQColor(cg.background()) : cg.background().light(103));
 
 	// Enabled, Not hovering
 	TQPixmap  pixmap(width, height);
@@ -863,7 +867,7 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg)
 	TQPainter painter(&pixmap);
 	int style = TQStyle::Style_Enabled | TQStyle::Style_Active | (checked ? TQStyle::Style_On : TQStyle::Style_Off);
 	TQColor background = cg.color(TQColorGroup::Background);
-	kapp->style().tqdrawPrimitive(TQStyle::PE_Indicator, &painter, rect, cg, style);
+	tdeApp->style().drawPrimitive(TQStyle::PE_Indicator, &painter, rect, cg, style);
 	painter.end();
 
 	// Enabled, Hovering
@@ -872,7 +876,7 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg)
 	painter.begin(&pixmapHover);
 	style |= TQStyle::Style_MouseOver;
 	cg.setColor(TQColorGroup::Background, TDEGlobalSettings::highlightColor());
-	kapp->style().tqdrawPrimitive(TQStyle::PE_Indicator, &painter, rect, cg, style);
+	tdeApp->style().drawPrimitive(TQStyle::PE_Indicator, &painter, rect, cg, style);
 	painter.end();
 
 	// Disabled
@@ -881,7 +885,7 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg)
 	painter.begin(&pixmapDisabled);
 	style = /*TQStyle::Style_Enabled | */TQStyle::Style_Active | (checked ? TQStyle::Style_On : TQStyle::Style_Off);
 	cg.setColor(TQColorGroup::Background, background);
-	kapp->style().tqdrawPrimitive(TQStyle::PE_Indicator, &painter, rect, cg, style);
+	tdeApp->style().drawPrimitive(TQStyle::PE_Indicator, &painter, rect, cg, style);
 	painter.end();
 
 	TQIconSet iconSet(pixmap);
@@ -892,8 +896,8 @@ TQIconSet StateMenuItem::checkBoxIconSet(bool checked, TQColorGroup cg)
 
 TQIconSet StateMenuItem::radioButtonIconSet(bool checked, TQColorGroup cg)
 {
-	int width  = kapp->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth,  0);
-	int height = kapp->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorHeight, 0);
+	int width  = tdeApp->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth,  0);
+	int height = tdeApp->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorHeight, 0);
 	TQRect rect(0, 0, width, height);
 
 	int style = TQStyle::Style_Default | TQStyle::Style_Enabled | (checked ? TQStyle::Style_On : TQStyle::Style_Off);
@@ -902,13 +906,13 @@ TQIconSet StateMenuItem::radioButtonIconSet(bool checked, TQColorGroup cg)
 	pixmap.fill(TQt::red);
 	TQPainter painter(&pixmap);
 	/* We can't use that line of code (like for checkboxes):
-	 * //kapp->style().tqdrawPrimitive(TQStyle::PE_ExclusiveIndicator, &painter, rect, cg, style);
+	 * //tdeApp->style().drawPrimitive(TQStyle::PE_ExclusiveIndicator, &painter, rect, cg, style);
 	 * because Plastik (and derived styles) don't care of the TQStyle::Style_On flag and will ALWAYS draw an unchecked radiobutton.
 	 * So, we use another method:
 	 */
 	TQRadioButton rb(0);
 	rb.setChecked(checked);
-	kapp->style().drawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style);
+	tdeApp->style().drawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style);
 	painter.end();
 	/* Some styles like Plastik (and derived ones) have TQStyle::PE_ExclusiveIndicator drawing a radiobutton disc, as wanted,
 	 * and leave pixels ouside it untouched, BUT TQStyle::PE_ExclusiveIndicatorMask is a fully black square.
@@ -921,10 +925,10 @@ TQIconSet StateMenuItem::radioButtonIconSet(bool checked, TQColorGroup cg)
 	TQPixmap pixmapHover(width, height);
 	pixmapHover.fill(TQt::red);
 	painter.begin(&pixmapHover);
-	//kapp->style().tqdrawPrimitive(TQStyle::PE_ExclusiveIndicator, &painter, rect, cg, style);
+	//tdeApp->style().drawPrimitive(TQStyle::PE_ExclusiveIndicator, &painter, rect, cg, style);
 	style |= TQStyle::Style_MouseOver;
 	cg.setColor(TQColorGroup::Background, TDEGlobalSettings::highlightColor());
-	kapp->style().drawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style);
+	tdeApp->style().drawControl(TQStyle::CE_RadioButton, &painter, &rb, rect, cg, style);
 	painter.end();
 	pixmapHover.setMask(pixmapHover.createHeuristicMask());
 

src/tagsedit.cpp

@@ -18,6 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <tqtooltip.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -34,7 +38,7 @@
 #include <tqheader.h>
 #include <tqvaluelist.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kseparator.h>
 #include <kstringhandler.h>
 #include <tqpainter.h>
@@ -231,7 +235,7 @@ void TagListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*colorG
 	TQFontMetrics fontMetrics(font);
 	TQRect textRect = fontMetrics.boundingRect(0, 0, /*width=*/1, 500000, TQt::AlignAuto | TQt::AlignTop, text);
 
-	TQPixmap emblem = (withIcon ? kapp->iconLoader()->loadIcon(state->emblem(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true) : TQPixmap());
+	TQPixmap emblem = (withIcon ? tdeApp->iconLoader()->loadIcon(state->emblem(), TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, /*canReturnNull=*/true) : TQPixmap());
 
 	TQColor backgroundColor = (isSelected() ? TDEGlobalSettings::highlightColor()
 	                                       : (withIcon && state->backgroundColor().isValid() ? state->backgroundColor()
@@ -333,8 +337,8 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	TQPushButton *newTag     = new TQPushButton(i18n("Ne&w Tag"),   plainPage());
 	TQPushButton *newState   = new TQPushButton(i18n("New St&ate"), plainPage());
 
-	connect( newTag,   TQT_SIGNAL(clicked()), this, TQT_SLOT(newTag())   );
-	connect( newState, TQT_SIGNAL(clicked()), this, TQT_SLOT(newState()) );
+	connect( newTag,   TQ_SIGNAL(clicked()), this, TQ_SLOT(newTag())   );
+	connect( newState, TQ_SIGNAL(clicked()), this, TQ_SLOT(newState()) );
 
 	m_tags = new TagListView(plainPage());
 	m_tags->header()->hide();
@@ -351,9 +355,9 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	TQToolTip::add( m_moveDown,  i18n("Move Down (Ctrl+Shift+Down)") );
 	TQToolTip::add( m_deleteTag, i18n("Delete")                      );
 
-	connect( m_moveUp,    TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp())    );
-	connect( m_moveDown,  TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown())  );
-	connect( m_deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteTag()) );
+	connect( m_moveUp,    TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp())    );
+	connect( m_moveDown,  TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown())  );
+	connect( m_deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteTag()) );
 
 	TQHBoxLayout *topLeftLayout = new TQHBoxLayout(0, /*margin=*/0, spacingHint());
 	topLeftLayout->addWidget(m_moveUp);
@@ -372,7 +376,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 
 	TQWidget *rightWidget = new TQWidget(plainPage());
 
-	m_tagBox             = new TQGroupBox(1, Qt::Horizontal, i18n("Tag"), rightWidget);
+	m_tagBox             = new TQGroupBox(1, TQt::Horizontal, i18n("Tag"), rightWidget);
 	TQWidget   *tagWidget = new TQWidget(m_tagBox);
 
 	m_tagName = new TQLineEdit(tagWidget);
@@ -381,8 +385,8 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	m_shortcut = new KKeyButton(tagWidget);
 	m_removeShortcut = new TQPushButton(i18n("Remove tag shortcut", "&Remove"), tagWidget);
 	TQLabel *shortcutLabel = new TQLabel(m_shortcut, i18n("S&hortcut:"), tagWidget);
-	connect( m_shortcut,       TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(capturedShortcut(const TDEShortcut&)) );
-	connect( m_removeShortcut, TQT_SIGNAL(clicked()),                          this, TQT_SLOT(removeShortcut())                   );
+	connect( m_shortcut,       TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQ_SLOT(capturedShortcut(const TDEShortcut&)) );
+	connect( m_removeShortcut, TQ_SIGNAL(clicked()),                          this, TQ_SLOT(removeShortcut())                   );
 
 	m_inherit = new TQCheckBox(i18n("&Inherited by new sibling notes"), tagWidget);
 
@@ -395,7 +399,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	tagGrid->addMultiCellWidget(m_inherit, /*fromRow=*/2, /*toRow=*/2, /*fromCol=*/0, /*toCol=*/3);
 	tagGrid->setColStretch(/*col=*/3, /*stretch=*/255);
 
-	m_stateBox           = new TQGroupBox(1, Qt::Horizontal, i18n("State"), rightWidget);
+	m_stateBox           = new TQGroupBox(1, TQt::Horizontal, i18n("State"), rightWidget);
 	TQWidget *stateWidget = new TQWidget(m_stateBox);
 
 	m_stateName = new TQLineEdit(stateWidget);
@@ -408,7 +412,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	m_emblem->setIcon("edit-delete");
 	m_removeEmblem = new TQPushButton(i18n("Remove tag emblem", "Remo&ve"), emblemWidget);
 	TQLabel *emblemLabel = new TQLabel(m_emblem, i18n("&Emblem:"), stateWidget);
-	connect( m_removeEmblem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot!
+	connect( m_removeEmblem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot!
 
 	// Make the icon button and the remove button the same height:
 	int height = TQMAX(m_emblem->sizeHint().width(), m_emblem->sizeHint().height());
@@ -429,26 +433,26 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	backgroundColorLayout->addWidget(m_backgroundColor);
 	backgroundColorLayout->addStretch();
 
-	TQIconSet boldIconSet = kapp->iconLoader()->loadIconSet("format-text-bold", TDEIcon::Small);
+	TQIconSet boldIconSet = tdeApp->iconLoader()->loadIconSet("format-text-bold", TDEIcon::Small);
 	m_bold = new TQPushButton(boldIconSet, "", stateWidget);
 	m_bold->setToggleButton(true);
 	int size = TQMAX(m_bold->sizeHint().width(), m_bold->sizeHint().height());
 	m_bold->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_bold, i18n("Bold"));
 
-	TQIconSet underlineIconSet = kapp->iconLoader()->loadIconSet("format-text-underline", TDEIcon::Small);
+	TQIconSet underlineIconSet = tdeApp->iconLoader()->loadIconSet("format-text-underline", TDEIcon::Small);
 	m_underline = new TQPushButton(underlineIconSet, "", stateWidget);
 	m_underline->setToggleButton(true);
 	m_underline->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_underline, i18n("Underline"));
 
-	TQIconSet italicIconSet = kapp->iconLoader()->loadIconSet("format-text-italic", TDEIcon::Small);
+	TQIconSet italicIconSet = tdeApp->iconLoader()->loadIconSet("format-text-italic", TDEIcon::Small);
 	m_italic = new TQPushButton(italicIconSet, "", stateWidget);
 	m_italic->setToggleButton(true);
 	m_italic->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_italic, i18n("Italic"));
 
-	TQIconSet strikeIconSet = kapp->iconLoader()->loadIconSet("format-text-strikethrough", TDEIcon::Small);
+	TQIconSet strikeIconSet = tdeApp->iconLoader()->loadIconSet("format-text-strikethrough", TDEIcon::Small);
 	m_strike = new TQPushButton(strikeIconSet, "", stateWidget);
 	m_strike->setToggleButton(true);
 	m_strike->setFixedSize(size, size); // Make it square!
@@ -515,7 +519,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	textEquivalentGrid->addLayout(onEveryLinesHelpLayout,   1, 2);
 	textEquivalentGrid->setColStretch(/*col=*/3, /*stretch=*/255);
 
-	KSeparator *separator = new KSeparator(Qt::Horizontal, stateWidget);
+	KSeparator *separator = new KSeparator(TQt::Horizontal, stateWidget);
 
 	TQGridLayout *stateGrid = new TQGridLayout(stateWidget, /*rows=*/6, /*cols=*/7, /*border=*/0, /*spacing=*/spacingHint());
 	stateGrid->addWidget(m_stateNameLabel,     0, 0);
@@ -588,25 +592,25 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	}
 
 	// Connect Signals:
-	connect( m_tagName,         TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
-	connect( m_shortcut,        TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(modified()) );
-	connect( m_inherit,         TQT_SIGNAL(stateChanged(int)),                  this, TQT_SLOT(modified()) );
-	connect( m_stateName,       TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
-	connect( m_emblem,          TQT_SIGNAL(iconChanged(TQString)),               this, TQT_SLOT(modified()) );
-	connect( m_backgroundColor, TQT_SIGNAL(changed(const TQColor&)),             this, TQT_SLOT(modified()) );
-	connect( m_bold,            TQT_SIGNAL(toggled(bool)),                      this, TQT_SLOT(modified()) );
-	connect( m_underline,       TQT_SIGNAL(toggled(bool)),                      this, TQT_SLOT(modified()) );
-	connect( m_italic,          TQT_SIGNAL(toggled(bool)),                      this, TQT_SLOT(modified()) );
-	connect( m_strike,          TQT_SIGNAL(toggled(bool)),                      this, TQT_SLOT(modified()) );
-	connect( m_textColor,       TQT_SIGNAL(changed(const TQColor&)),             this, TQT_SLOT(modified()) );
-	connect( m_font,            TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
-	connect( m_fontSize,        TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
-	connect( m_textEquivalent,  TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
-	connect( m_onEveryLines,    TQT_SIGNAL(stateChanged(int)),                  this, TQT_SLOT(modified()) );
-
-	connect( m_tags,            TQT_SIGNAL(currentChanged(TQListViewItem*)),     this, TQT_SLOT(currentItemChanged(TQListViewItem*)) );
-	connect( m_tags,            TQT_SIGNAL(deletePressed()),                    this, TQT_SLOT(deleteTag())                        );
-	connect( m_tags,            TQT_SIGNAL(doubleClickedItem()),                this, TQT_SLOT(renameIt())                         );
+	connect( m_tagName,         TQ_SIGNAL(textChanged(const TQString&)),        this, TQ_SLOT(modified()) );
+	connect( m_shortcut,        TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQ_SLOT(modified()) );
+	connect( m_inherit,         TQ_SIGNAL(stateChanged(int)),                  this, TQ_SLOT(modified()) );
+	connect( m_stateName,       TQ_SIGNAL(textChanged(const TQString&)),        this, TQ_SLOT(modified()) );
+	connect( m_emblem,          TQ_SIGNAL(iconChanged(TQString)),               this, TQ_SLOT(modified()) );
+	connect( m_backgroundColor, TQ_SIGNAL(changed(const TQColor&)),             this, TQ_SLOT(modified()) );
+	connect( m_bold,            TQ_SIGNAL(toggled(bool)),                      this, TQ_SLOT(modified()) );
+	connect( m_underline,       TQ_SIGNAL(toggled(bool)),                      this, TQ_SLOT(modified()) );
+	connect( m_italic,          TQ_SIGNAL(toggled(bool)),                      this, TQ_SLOT(modified()) );
+	connect( m_strike,          TQ_SIGNAL(toggled(bool)),                      this, TQ_SLOT(modified()) );
+	connect( m_textColor,       TQ_SIGNAL(changed(const TQColor&)),             this, TQ_SLOT(modified()) );
+	connect( m_font,            TQ_SIGNAL(textChanged(const TQString&)),        this, TQ_SLOT(modified()) );
+	connect( m_fontSize,        TQ_SIGNAL(textChanged(const TQString&)),        this, TQ_SLOT(modified()) );
+	connect( m_textEquivalent,  TQ_SIGNAL(textChanged(const TQString&)),        this, TQ_SLOT(modified()) );
+	connect( m_onEveryLines,    TQ_SIGNAL(stateChanged(int)),                  this, TQ_SLOT(modified()) );
+
+	connect( m_tags,            TQ_SIGNAL(currentChanged(TQListViewItem*)),     this, TQ_SLOT(currentItemChanged(TQListViewItem*)) );
+	connect( m_tags,            TQ_SIGNAL(deletePressed()),                    this, TQ_SLOT(deleteTag())                        );
+	connect( m_tags,            TQ_SIGNAL(doubleClickedItem()),                this, TQ_SLOT(renameIt())                         );
 
 	TQListViewItem *firstItem = m_tags->firstChild();
 	if (stateToEdit != 0) {
@@ -637,31 +641,31 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	// Some keyboard shortcuts:       // Ctrl+arrows instead of Alt+arrows (same as Go menu in the main window) because Alt+Down is for combo boxes
 	TQAction *selectAbove = new TQAction(this);
 	selectAbove->setAccel(TQString("Ctrl+Up"));
-	connect( selectAbove, TQT_SIGNAL(activated()), this, TQT_SLOT(selectUp()) );
+	connect( selectAbove, TQ_SIGNAL(activated()), this, TQ_SLOT(selectUp()) );
 
 	TQAction *selectBelow = new TQAction(this);
 	selectBelow->setAccel(TQString("Ctrl+Down"));
-	connect( selectBelow, TQT_SIGNAL(activated()), this, TQT_SLOT(selectDown()) );
+	connect( selectBelow, TQ_SIGNAL(activated()), this, TQ_SLOT(selectDown()) );
 
 	TQAction *selectLeft = new TQAction(this);
 	selectLeft->setAccel(TQString("Ctrl+Left"));
-	connect( selectLeft, TQT_SIGNAL(activated()), this, TQT_SLOT(selectLeft()) );
+	connect( selectLeft, TQ_SIGNAL(activated()), this, TQ_SLOT(selectLeft()) );
 
 	TQAction *selectRight = new TQAction(this);
 	selectRight->setAccel(TQString("Ctrl+Right"));
-	connect( selectRight, TQT_SIGNAL(activated()), this, TQT_SLOT(selectRight()) );
+	connect( selectRight, TQ_SIGNAL(activated()), this, TQ_SLOT(selectRight()) );
 
 	TQAction *moveAbove = new TQAction(this);
 	moveAbove->setAccel(TQString("Ctrl+Shift+Up"));
-	connect( moveAbove, TQT_SIGNAL(activated()), this, TQT_SLOT(moveUp()) );
+	connect( moveAbove, TQ_SIGNAL(activated()), this, TQ_SLOT(moveUp()) );
 
 	TQAction *moveBelow = new TQAction(this);
 	moveBelow->setAccel(TQString("Ctrl+Shift+Down"));
-	connect( moveBelow, TQT_SIGNAL(activated()), this, TQT_SLOT(moveDown()) );
+	connect( moveBelow, TQ_SIGNAL(activated()), this, TQ_SLOT(moveDown()) );
 
 	TQAction *rename = new TQAction(this);
 	rename->setAccel(TQString("F2"));
-	connect( rename, TQT_SIGNAL(activated()), this, TQT_SLOT(renameIt()) );
+	connect( rename, TQ_SIGNAL(activated()), this, TQ_SLOT(renameIt()) );
 
 	m_tags->setMinimumSize(
 		m_tags->sizeHint().width() * 2,
@@ -669,10 +673,10 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	);
 
 	if (addNewTag)
-		TQTimer::singleShot(0, this, TQT_SLOT(newTag()) );
+		TQTimer::singleShot(0, this, TQ_SLOT(newTag()) );
 	else
 		// Once the window initial size is computed and the window show, allow the user to resize it down:
-		TQTimer::singleShot(0, this, TQT_SLOT(resetTreeSizeHint()) );
+		TQTimer::singleShot(0, this, TQ_SLOT(resetTreeSizeHint()) );
 }
 
 TagsEditDialog::~TagsEditDialog()

src/tagsedit.h

@@ -96,7 +96,7 @@ class TagListViewItem : public TQListViewItem
 
 class TagListView : public TQListView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	TagListView(TQWidget *parent = 0, const char *name = 0, WFlags flags = 0);
@@ -118,7 +118,7 @@ class TagListView : public TQListView
   */
 class TagsEditDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	TagsEditDialog(TQWidget *parent = 0, State *stateToEdit = 0, bool addNewTag = false);

src/variouswidgets.cpp

@@ -51,7 +51,7 @@ RunCommandRequester::RunCommandRequester(const TQString &runCommand, const TQStr
 	layout->addWidget(m_runCommand);
 	layout->addWidget(pb);
 
-	connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelCommand()) );
+	connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelCommand()) );
 }
 
 RunCommandRequester::~RunCommandRequester()
@@ -154,7 +154,7 @@ HelpLabel::HelpLabel(const TQString &text, const TQString &message, TQWidget *pa
  : KURLLabel(parent), m_message(message)
 {
 	setText(text);
-	connect( this, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(showMessage()) );
+	connect( this, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(showMessage()) );
 }
 
 HelpLabel::~HelpLabel()
@@ -216,9 +216,9 @@ IconSizeDialog::IconSizeDialog(const TQString &caption, const TQString &message,
 		case 128: iconView->setSelected(m_size128, true); m_iconSize = 128; break;
 	}
 
-	connect( iconView, TQT_SIGNAL(executed(TQIconViewItem*)),      this, TQT_SLOT(choose(TQIconViewItem*)) );
-	connect( iconView, TQT_SIGNAL(returnPressed(TQIconViewItem*)), this, TQT_SLOT(choose(TQIconViewItem*)) );
-	connect( iconView, TQT_SIGNAL(selectionChanged()),            this, TQT_SLOT(slotSelectionChanged()) );
+	connect( iconView, TQ_SIGNAL(executed(TQIconViewItem*)),      this, TQ_SLOT(choose(TQIconViewItem*)) );
+	connect( iconView, TQ_SIGNAL(returnPressed(TQIconViewItem*)), this, TQ_SLOT(choose(TQIconViewItem*)) );
+	connect( iconView, TQ_SIGNAL(selectionChanged()),            this, TQ_SLOT(slotSelectionChanged()) );
 
 	setMainWidget(page);
 }
@@ -273,8 +273,8 @@ FontSizeCombo::FontSizeCombo(bool rw, bool withDefault, TQWidget *parent, const
 	for (TQValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it)
 		insertItem(TQString::number(*it));
 
-//	connect( this, TQT_SIGNAL(acivated(const TQString&)), this, TQT_SLOT(textChangedInCombo(const TQString&)) );
-	connect( this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChangedInCombo(const TQString&)) );
+//	connect( this, TQ_SIGNAL(acivated(const TQString&)), this, TQ_SLOT(textChangedInCombo(const TQString&)) );
+	connect( this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChangedInCombo(const TQString&)) );
 
 	// TODO: 01617 void TDEFontSizeAction::setFontSize( int size )
 }

src/variouswidgets.h

@@ -40,7 +40,7 @@ class Basket;
   */
 class RunCommandRequester : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	RunCommandRequester(const TQString &runCommand, const TQString &message, TQWidget *parent = 0, const char *name = 0);
@@ -60,7 +60,7 @@ class RunCommandRequester : public TQWidget
   */
 class IconSizeCombo : public TQComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	IconSizeCombo(bool rw, TQWidget *parent = 0, const char *name = 0);
@@ -75,7 +75,7 @@ class IconSizeCombo : public TQComboBox
   */
 class ViewSizeDialog : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	ViewSizeDialog(TQWidget *parent, int w, int h);
@@ -90,7 +90,7 @@ class ViewSizeDialog : public TQDialog
   */
 class HelpLabel : public KURLLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	HelpLabel(const TQString &text, const TQString &message, TQWidget *parent);
@@ -110,7 +110,7 @@ class HelpLabel : public KURLLabel
   */
 class IconSizeDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	IconSizeDialog(const TQString &caption, const TQString &message, const TQString &icon, int iconSize, TQWidget *parent);
@@ -135,7 +135,7 @@ class IconSizeDialog : public KDialogBase
  */
 class FontSizeCombo : public KComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
 	FontSizeCombo(bool rw, bool withDefault, TQWidget *parent = 0, const char *name = 0);

subdirs

@@ -1,10 +0,0 @@
-backgrounds
-backgrounds-previews
-doc
-file-integration
-images
-kontact_plugin
-po
-src
-tags
-welcome

tags/CMakeLists.txt

@@ -0,0 +1,3 @@
+tde_install_icons()
+
+#tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons )

tags/Makefile.am

@@ -1,3 +0,0 @@
-tagsdir = $(kde_datadir)/basket/icons
-tags_ICON = AUTO
-KDE_ICON = AUTO

translations/desktop_files/basket-desktops.pot

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr ""

translations/desktop_files/br.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: br\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "Perzhbasket"

translations/desktop_files/ca.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "Part per a basket"

translations/desktop_files/de.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Korbarchiv und Korbvorlagen"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Korbarchiv"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Korbvorlage"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Körbe"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Plugin Basket Notizblätter für Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Basket Notizblätter"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Bewahren Sie Ihre Ideen."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Anwendungen"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Allgemein"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Neue Notizen"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Erscheinungsbild"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr ""

translations/desktop_files/el.po

@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2020-12-30 17:15+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/basket-desktop-files/el/>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.4\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Συλλογές και πρότυπα καλαθιών"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Συλλογή καλαθιών"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Πρότυπο καλαθιού"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Καλάθια"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Ένθετο Σημειωματαρίου Basket για το Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Σημειωματάριο Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Σημειωματάριο"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Φροντίζοντας τις ιδέες σας για σάς."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Εφαρμογές"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Γενικά"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Νέες σημειώσεις"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Εξωτερική εμφάνιση σημειώσεων"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basketPart"

translations/desktop_files/es.po

@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Juan M Ayala <linux.zero@yahoo.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2025-01-21 09:12+0000\n"
+"Last-Translator: Juan M Ayala <linux.zero@yahoo.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/basket-desktop-files/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Archivo de cestas y plantillas"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Archivo de cestas"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Plantilla de cesta"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Cestas"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Complemento de los blocs de notas Basket para Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Blocs de notas Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Gestor de Notas"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Cuidando de sus ideas."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "General"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Notas nuevas"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Apariencia de las notas"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "Componente de Basket"

translations/desktop_files/es_AR.po

@@ -0,0 +1,100 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2024-11-23 16:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/applications/basket-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+#, fuzzy
+msgid "Basket Archives & Templates"
+msgstr "Archivo de cestas y plantillas"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+#, fuzzy
+msgid "Basket Archive"
+msgstr "Archivo de cestas"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+#, fuzzy
+msgid "Basket Template"
+msgstr "Plantilla de cesta"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Baskets"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+#, fuzzy
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Complemento de los blocs de notas Basket para Kontact"
+
+#. Name
+#: src/basket.desktop:2
+#, fuzzy
+msgid "Basket Note Pads"
+msgstr "Blocs de notas Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Administrador de notas"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Cuidando de tus ideas."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Programas"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+#, fuzzy
+msgid "General"
+msgstr "General"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+#, fuzzy
+msgid "New Notes"
+msgstr "Notas nuevas"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+#, fuzzy
+msgid "Notes Appearance"
+msgstr "Apariencia de las notas"
+
+#. Name
+#: src/basket_part.desktop:2
+#, fuzzy
+msgid "basketPart"
+msgstr "Componente de Basket"

translations/desktop_files/et.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basket komponent"

translations/desktop_files/fr.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Archive de paniers et modèles"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Archive de paniers"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Modèle de panier"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Paniers"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Module Blocs notes Basket pour Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Blocs notes Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Prendre soin de vos idées."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Applications"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Général"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Nouvelles notes"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Apparence des notes"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr ""

translations/desktop_files/it.po

@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2021-08-06 03:14+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/basket-desktop-files/it/>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.7.2\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Archivi e modelli di canestri"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Archivio di canestri"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Modello di canestri"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Canestri"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Plugin Blocco appunti Basket per Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Blocco appunti Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Gestore delle note"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Ci prendiamo cura delle tue idee."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Applicazioni"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Generale"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Nuove note"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Aspetto delle note"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "Componente basket"

translations/desktop_files/ja.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "バスケットアーカイブとテンプレート"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "バスケットアーカイブ"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "バスケットテンプレート"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "バスケット"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Basket メモパッドの Kontact 統合プラグイン"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Basket メモパッド"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "あなたのアイデアのお世話をします。"
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "アプリケーション"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "全般"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "新しいメモ"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "メモの外観"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basket パート"

translations/desktop_files/ka.po

@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2024-11-08 03:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/basket-desktop-files/ka/>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Basket-ის არქივები და ნიმუშები"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Basket-ის არქივი"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Basket-ის ნიმუში"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "კალათები"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Basket-ის შენიშვნების დამატება Kontact-სთვის"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Basket-ის შენიშვნები"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "შენიშვნების მმართველი"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "ზრუნვა თქვენ იდეებზე."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "პროგრამები"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "ზოგადი"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "ახალი შენიშვნები"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "შენიშვნის გარეგნობა"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basketPart"

translations/desktop_files/nb.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Kurvarkiv og kurvmaler"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Kurvarkiv"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Kurvmal"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Kurver"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Kurvnotat-tillegg for Kontakt"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Kurvnotat"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Ta vare på tankene dine."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Programmer"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Generelt"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Nye notat"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Notatutseende"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "kurvDel"

translations/desktop_files/nl.po

@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2025-04-01 10:03+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"applications/basket-desktop-files/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Basket-archieven en -sjablonen"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Basket-archief"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Basket-sjabloon"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Baskets"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Basket-plug-in voor Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Notitiebeheerder"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Draagt zorg voor uw ideeën."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Programma's"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Algemeen"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Nieuwe notities"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Notitievormgeving"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basketPart"

translations/desktop_files/nn.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: nn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Korgarkiv og korgmalar"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Korgarkiv"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Korgmal"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Korger"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Korgnotat-tillegg for Kontakt"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Korgnotat"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Ta vare på tankane dine."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Program"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Generelt"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Nye notat"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Notatutsjånad"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "korgDel"

translations/desktop_files/pt.po

@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2021-04-09 14:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/basket-desktop-files/pt/>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.5.3\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Arquivos e modelos de cestos"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Ficheiro de cestos"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Modelo de cesto"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Cestos"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Plugin do Bloco de Notas Basket para o Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Bloco de Notas Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Gestor de Notas"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Cuidando das suas ideias."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Aplicações"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Geral"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Anotações novas"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Aparência do Notas"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basketPart"

translations/desktop_files/pt_BR.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "Parte basket"

translations/desktop_files/ru.po

@@ -0,0 +1,92 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2020.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: 2024-04-21 17:51+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/basket-desktop-files/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Шаблоны и контейнеры Basket"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Контейнер Basket"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Шаблон корзины"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Корзины"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Модуль Альбом заметок Basket для Kontact"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Альбом заметок Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr "Управление заметками"
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Заботимся о ваших идеях."
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Приложения"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Общие"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Новые заметки"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Вид"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "Модуль basket"

translations/desktop_files/sv.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basket-del"

translations/desktop_files/ta.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ta\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr ""
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr ""
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr ""
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr ""
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr ""
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr ""
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr ""
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basketபாகம்"

translations/desktop_files/tr.po

@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: file-integration/basketthumbcreator.desktop:2
+msgid "Basket Archives & Templates"
+msgstr "Basket Arşivleri & Şablonları"
+
+#. Comment
+#: file-integration/x-basket-archive.desktop:2
+msgid "Basket Archive"
+msgstr "Basket Arşivi"
+
+#. Comment
+#: file-integration/x-basket-template.desktop:2
+msgid "Basket Template"
+msgstr "Basket Şabolonu"
+
+#. Name
+#. Comment
+#: kontact_plugin/basket.desktop:2 src/basket_config_baskets.desktop:2
+#: src/basket_config_baskets.desktop:4
+msgid "Baskets"
+msgstr "Sepetler"
+
+#. Comment
+#: kontact_plugin/basket.desktop:4
+msgid "Basket Note Pads plugin for Kontact"
+msgstr "Kontact için Basket Not Tutucu Eklentisi"
+
+#. Name
+#: src/basket.desktop:2
+msgid "Basket Note Pads"
+msgstr "Basket"
+
+#. GenericName
+#: src/basket.desktop:4
+msgid "Note Manager"
+msgstr ""
+
+#. Comment
+#: src/basket.desktop:6
+msgid "Taking care of your ideas."
+msgstr "Not Tutma Aracı"
+
+#. Name
+#. Comment
+#: src/basket_config_apps.desktop:2 src/basket_config_apps.desktop:4
+msgid "Applications"
+msgstr "Uygulamalar"
+
+#. Name
+#. Comment
+#: src/basket_config_general.desktop:2 src/basket_config_general.desktop:4
+msgid "General"
+msgstr "Genel"
+
+#. Name
+#. Comment
+#: src/basket_config_new_notes.desktop:2 src/basket_config_new_notes.desktop:4
+msgid "New Notes"
+msgstr "Yeni Notlar"
+
+#. Name
+#. Comment
+#: src/basket_config_notes_appearance.desktop:2
+#: src/basket_config_notes_appearance.desktop:4
+msgid "Notes Appearance"
+msgstr "Not Görünümleri"
+
+#. Name
+#: src/basket_part.desktop:2
+msgid "basketPart"
+msgstr "basket Bileşeni"

welcome/CMakeLists.txt

@@ -0,0 +1,6 @@
+file( GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.baskets )
+
+install(
+    FILES ${_files}
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/welcome
+)

welcome/Makefile.am

@@ -1,10 +0,0 @@
-welcomedir = $(kde_datadir)/basket/welcome
-welcome_DATA = \
-	Welcome_de.baskets \
-	Welcome_en_US.baskets \
-	Welcome_fr.baskets \
-	Welcome_it.baskets \
-	Welcome_ja.baskets \
-	Welcome_nn.baskets \
-	Welcome_pt.baskets \
-	Welcome_ru.baskets