Update translation template.

Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
178 changed files with 15456 additions and 6982 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "admin"]
+	path = admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@ -9,23 +9,15 @@
 #
 #################################################

-
-##### set project version ########################
-
-include( TDEVersion )
-cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+cmake_minimum_required( VERSION 2.8 )


 ##### include our cmake modules #################

+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEL10n )


 ##### create translation templates ##############

-tde_l10n_create_template( "messages/smb4k" )
-
-tde_l10n_create_template(
-    CATALOG "desktop_files/smb4k-desktops"
-    SOURCES *.desktop
-)
+tde_l10n_create_template( "smb4k" )
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,89 +0,0 @@
-############################################
-#
-#  (C) 2023 Michele Calgaro
-#  Michele (DOT) Calgaro (AT) yahoo.it
-#
-#  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} )
-tde_set_project_version( )
-
-
-##### general package setup
-
-project( smb4k )
-
-
-##### include essential cmake modules
-
-include( FindPkgConfig          )
-include( CheckSymbolExists      )
-include( CheckIncludeFile       )
-include( CheckLibraryExists     )
-include( CheckCSourceCompiles   )
-include( CheckCXXSourceCompiles )
-include( CheckTypeSize          )
-
-
-##### include our cmake modules
-
-include( TDEMacros )
-
-
-##### setup install paths
-
-include( TDESetupPaths )
-tde_setup_paths( )
-
-
-##### optional stuff
-
-option( WITH_ALL_OPTIONS "Enable all optional support"         OFF )
-
-option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-
-
-##### user requested modules
-
-option( BUILD_ALL          "Build all"           ON           )
-option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )
-option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )
-
-
-
-##### configure checks
-
-include( ConfigureChecks.cmake )
-
-
-##### global compiler settings
-
-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( smb4k )
-add_subdirectory( plugin )
-add_subdirectory( utilities )
-
-
-##### 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 )
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@ -1,26 +0,0 @@
-###########################################
-#                                         #
-#  Improvements and feedback 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 )
--- a/283
+++ b/283
@ -0,0 +1,283 @@
+# Doxyfile 1.5.1-KDevelop
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = smb4k
+PROJECT_NUMBER         = CVS_HEAD
+OUTPUT_DIRECTORY       = 
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = /home/alex/
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+BUILTIN_STL_SUPPORT    = NO
+DISTRIBUTE_GROUP_DOC   = 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       = NO
+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/alex/Entwicklung/smb4k_09
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.C \
+                         *.CC \
+                         *.C++ \
+                         *.II \
+                         *.I++ \
+                         *.H \
+                         *.HH \
+                         *.H++ \
+                         *.CS \
+                         *.PHP \
+                         *.PHP3 \
+                         *.M \
+                         *.MM \
+                         *.PY \
+                         *.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
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS              = NO
+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       = smb4k.tag
+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
+CALLER_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
--- a/14
+++ b/14
@ -77,27 +77,27 @@ A:  If you want to be able to uninstall Smb4K easily, you might want to use
    $ ./configure --prefix=`tde-config --prefix` && make && su -c "checkinstall"


-Q:  The configure script fails and tells me, it can't find my TQt
+Q:  The configure script fails and tells me, it can't find my Qt
    installation.

 A:  There are two things you should check:
-    1. It may be that the TQt header files are not installed. If this is true,
+    1. It may be that the Qt header files are not installed. If this is true,
       install them and run the configure script again.
-    2. The TQTDIR environment variable might not be set properly or at all.
+    2. The QTDIR environment variable might not be set properly or at all.
       Check for the following line in your ~/.bashrc file

-       export TQTDIR=PREFIX
+       export QTDIR=PREFIX

       and add it, if it is not present. Replace PREFIX with the prefix of your
-       TQt installation. Run
+       Qt installation. Run

       $ source ~/.bashrc

       from the shell. Now, you're set for a second configuration attempt.

-     If the header files are installed and the TQTDIR variable is set, but you
+     If the header files are installed and the QTDIR variable is set, but you
     still get the same error, you might want to try to pass the
-     '--with-tqt-includes=/path/to/header/files' option to the configure script.
+     '--with-qt-includes=/path/to/header/files' option to the configure script.


 Q:  The configure script fails and tells me, it can't find my KDE
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,21 @@
+if compile_konqplugin
+  PLUGINDIR=plugin
+endif
+
+EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO smb4k.lsm BUGS FAQ
+
+AUTOMAKE_OPTIONS = foreign 1.5
+
+MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
+
+package-messages:
+	$(MAKE) -f admin/Makefile.common package-messages
+	$(MAKE) -C po merge
+
+#include admin/deps.am
+
+SUBDIRS = smb4k $(PLUGINDIR) utilities po doc
+
+messages: rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/smb4k.pot
--- a/Makefile.cvs
+++ b/Makefile.cvs
@ -0,0 +1,14 @@
+all: 
+	@echo "This Makefile is only for the CVS repository"
+	@echo "This will be deleted before making the distribution"
+	@echo ""
+	@if test ! -d admin; then \
+	   echo "Please recheckout this module!" ;\
+	   echo "for cvs: use checkout once and after that update again" ;\
+	   echo "for cvsup: checkout kde-common from cvsup and" ;\
+	   echo "   link kde-common/admin to ./admin" ;\
+	   exit 1 ;\
+	fi
+	$(MAKE) -f admin/Makefile.common cvs
+
+.SILENT:
--- a/6
+++ b/6
@ -45,15 +45,15 @@ Requirements:
 -------------
 This version of Smb4K depends on the development files of the following
 libraries:
- TDE Libs & Base (>= 3.3.0): The powerful Open Source graphical desktop
+- KDE Libs & Base (>= 3.3.0): The powerful Open Source graphical desktop
  environment for Unix workstations [http://www.kde.org]
- TQt (>= 3.3.0): A multiplatform C++ application development framework.
+- Qt (>= 3.3.0): A multiplatform C++ application development framework.
  [http://www.trolltech.no]
 - X.org or XFree86 - Freely redistributable implementations of the X Window
  System [http://www.x.org or http://www.xfree86.org]
 - An implementation of the C library

-Make sure that you also have installed all header files of the libraries TQt
+Make sure that you also have installed all header files of the libraries Qt
 and KDE are depending on. Recent versions of automake and autoconf are also
 needed.

--- a/4
+++ b/4
@ -9,11 +9,11 @@ for 0.10.x:
  snippet:

     char cu[L_cuserid];
-     user = TQString::fromLocal8Bit( cuserid( cu ), -1 );
+     user = QString::fromLocal8Bit( cuserid( cu ), -1 );

     or

-     user = TQString::fromLocal8Bit( cuserid( NULL ), -1 ); // returning static pointer
+     user = QString::fromLocal8Bit( cuserid( NULL ), -1 ); // returning static pointer

 - Move smb4k/core subdirectory to the root directory of the source.
 - Rename libsmb4kcore to libsmb4k?
--- a/acinclude.m4
+++ b/acinclude.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@ -0,0 +1,881 @@
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 3
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 13
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([acinclude.m4])
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8f
--- a/config.h.cmake
+++ b/config.h.cmake
@ -1,8 +0,0 @@
-#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@
--- a/config.h.in
+++ b/config.h.in
@ -0,0 +1,240 @@
+/* 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 the Konqueror plugin is compiled */
+#undef HAVE_KONQPLUGIN
+
+/* 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
+
+/* 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
+
+/*
+ * 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
+
+
+
+#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
+
+
+
+/*
+ * 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
--- a/configure.files
+++ b/configure.files
@ -0,0 +1,2 @@
+./admin/configure.in.min
+configure.in.in
--- a/configure.in
+++ b/configure.in
@ -0,0 +1,161 @@
+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(smb4k, 0.9.4) 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.3.0)
+AC_PATH_KDE
+dnl =======================================================
+dnl FILE: configure.in.in
+dnl =======================================================
+
+#MIN_CONFIG(3.3.0)
+#AM_KDE_MIN_VERSION(3.3.0)
+
+dnl PACKAGE set before
+
+
+dnl=========================================================================dnl
+dnl  Konqueror plugin                                                       dnl
+dnl=========================================================================dnl
+
+AC_ARG_WITH(
+	[konqplugin],
+    	[AS_HELP_STRING([--with-konqplugin=ARG],
+        	[build with Konqueror plugin (default ARG=yes)])],
+	[],
+	[with_konqplugin=yes])
+
+if test x$with_konqplugin = xyes; then
+	KDE_CHECK_HEADER(
+		[konqsidebarplugin.h],
+		[AC_DEFINE(HAVE_KONQPLUGIN,1,
+			[define if the Konqueror plugin is compiled])],
+		[AC_MSG_ERROR([
+***
+*** Cannot build Konqueror plugin. Install the development files for KDE base 
+*** or pass the '--with-konqplugin=no' option to the configure script.
+***])],
+		[]
+	)
+else
+	DO_NOT_COMPILE="$DO_NOT_COMPILE plugin"
+fi
+
+AM_CONDITIONAL([compile_konqplugin], [test x$with_konqplugin = xyes])
+KDE_CREATE_SUBDIRSLIST
+AC_CONFIG_FILES([ Makefile ])
+AC_CONFIG_FILES([ doc/Makefile ])
+AC_CONFIG_FILES([ doc/en/Makefile ])
+AC_CONFIG_FILES([ plugin/Makefile ])
+AC_CONFIG_FILES([ po/Makefile ])
+AC_CONFIG_FILES([ smb4k/Makefile ])
+AC_CONFIG_FILES([ smb4k/browser/Makefile ])
+AC_CONFIG_FILES([ smb4k/configdlg/Makefile ])
+AC_CONFIG_FILES([ smb4k/core/Makefile ])
+AC_CONFIG_FILES([ smb4k/dialogs/Makefile ])
+AC_CONFIG_FILES([ smb4k/icons/Makefile ])
+AC_CONFIG_FILES([ smb4k/iconview/Makefile ])
+AC_CONFIG_FILES([ smb4k/listview/Makefile ])
+AC_CONFIG_FILES([ smb4k/searchdlg/Makefile ])
+AC_CONFIG_FILES([ utilities/Makefile ])
+AC_OUTPUT
+# 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
--- a/configure.in.in
+++ b/configure.in.in
@ -0,0 +1,36 @@
+#MIN_CONFIG(3.3.0)
+#AM_KDE_MIN_VERSION(3.3.0)
+
+KDE_ENABLE_HIDDEN_VISIBILITY
+
+AM_INIT_AUTOMAKE(smb4k,0.9.4)
+
+
+dnl=========================================================================dnl
+dnl  Konqueror plugin                                                       dnl
+dnl=========================================================================dnl
+
+AC_ARG_WITH(
+	[konqplugin],
+    	[AS_HELP_STRING([--with-konqplugin=ARG],
+        	[build with Konqueror plugin (default ARG=yes)])],
+	[],
+	[with_konqplugin=yes])
+
+if test x$with_konqplugin = xyes; then
+	KDE_CHECK_HEADER(
+		[konqsidebarplugin.h],
+		[AC_DEFINE(HAVE_KONQPLUGIN,1,
+			[define if the Konqueror plugin is compiled])],
+		[AC_MSG_ERROR([
+***
+*** Cannot build Konqueror plugin. Install the development files for KDE base 
+*** or pass the '--with-konqplugin=no' option to the configure script.
+***])],
+		[]
+	)
+else
+	DO_NOT_COMPILE="$DO_NOT_COMPILE plugin"
+fi
+
+AM_CONDITIONAL([compile_konqplugin], [test x$with_konqplugin = xyes])
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -0,0 +1,2 @@
+SUBDIRS = en 
+KDE_DOCS = AUTO
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = smb4k
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@ -4924,18 +4924,18 @@ in the meantime.</para>
 </listitem>

 <listitem id="trouble_shooting_no_qt">
-<para><emphasis role="bold">Problem:</emphasis> The configure script fails and complains about a missing TQt installation.</para>
+<para><emphasis role="bold">Problem:</emphasis> The configure script fails and complains about a missing Qt installation.</para>
 <para><emphasis role="bold">Solution:</emphasis> There are two things that should check:</para>
 <itemizedlist>
-<listitem><para>Maybe the TQt header files are not installed. If this is the case, install them and run the configure script again.</para></listitem>
-<listitem><para>The <envar>TQTDIR</envar> environment variable might not be set properly or at all. Make sure you export it in your shell's configuration file.</para>
+<listitem><para>Maybe the Qt header files are not installed. If this is the case, install them and run the configure script again.</para></listitem>
+<listitem><para>The <envar>QTDIR</envar> environment variable might not be set properly or at all. Make sure you export it in your shell's configuration file.</para>
 <para>If you are using the bash, check for the following line in your <filename>~/.bashrc</filename> file</para>
-<screen>export TQTDIR=PREFIX</screen>
-<para>and add it, if it is not present. Replace PREFIX with the prefix of your TQt installation. Run</para>
+<screen>export QTDIR=PREFIX</screen>
+<para>and add it, if it is not present. Replace PREFIX with the prefix of your Qt installation. Run</para>
 <screen><prompt>$</prompt> <userinput><command>source</command> ~/.bashrc</userinput></screen>
 <para>from the shell. Now, you're set for a second configuration attempt.</para></listitem>
 </itemizedlist>
-<para>If the header files are installed and the <envar>TQTDIR</envar> variable is set, but you still get the same error, you might want to try to pass the <option>--with-tqt-includes=/path/to/header/files</option> option to the configure script.</para>
+<para>If the header files are installed and the <envar>QTDIR</envar> variable is set, but you still get the same error, you might want to try to pass the <option>--with-qt-includes=/path/to/header/files</option> option to the configure script.</para>
 </listitem>

 <listitem id="trouble_shooting_no_kde">
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@ -1,30 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### pluginloader
-
-tde_import( konqueror )
-tde_add_kpart( konqsidebar_smb4k  AUTOMOC
-  SOURCES smb4k_konqplugin.cpp
-  LINK tdecore-shared tdeui-shared tdeio-shared tdeparts-shared konqsidebarplugin-shared smb4kcore-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-
-##### other files
-
-tde_create_translated_desktop(
-  SOURCE smb4k_add.desktop
-  DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add
-)
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@ -0,0 +1,13 @@
+INCLUDES = $(all_includes) 
+METASOURCES = AUTO
+kde_module_LTLIBRARIES = konqsidebar_smb4k.la
+konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp
+konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \
+	-L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin
+konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) \
+	$(LIB_TDEUI)
+
+globaladddir   = $(kde_datadir)/konqsidebartng/add
+globaladd_DATA = smb4k_add.desktop
+noinst_HEADERS = smb4k_konqplugin.h
--- a/plugin/smb4k_add.desktop
+++ b/plugin/smb4k_add.desktop
@ -1,13 +1,73 @@
 [Desktop Entry]
-Type=Application
-
 Name=Samba Browser
-
+Icon=smb4k
+Type=Application
 GenericName=The SMB/CIFS Share Browser
-
+GenericName[bg]=Самба ресурсен четец
+GenericName[ca]=El navegador de compartits SMB/CIFS
+GenericName[cs]=Prohližeč SMB/CIFS sdílení
+GenericName[de]=Der Browser für SMB/CIFS-Freigaben
+GenericName[es]=El explorador de recursos compartidos SMB/CIFS
+GenericName[fr]=L'explorateur de partages SMB / CIFS
+GenericName[hu]=Az SMB/CIFS böngésző
+GenericName[it]=Browser di condivisioni SMB/CIFS
+GenericName[ja]=SMB/CIFS 共有(シェア)・ブラウザー
+GenericName[nl]=De SMB/CIFS Share Browser
+GenericName[no]=SMB/CIFS ressurs utforsker
+GenericName[no_NY]=SMB/CIFS ressurs surfar
+GenericName[pl]=Przeglądarka Zasobów SMB/CIFS
+GenericName[pt_BR]=O navegador de compartilhamentos SMB/CIFS
+GenericName[ru]=The SMB/CIFS Share Browser
+GenericName[sk]=Prehliadač SMB/CIFS zdieľaní
+GenericName[sv]=SMB Katalog programmed
+GenericName[tr]=SMB/CIFS Paylaşım Tarayıcısı
+GenericName[uk]=Навігатор спільних ресурсів SMB/CIFS
+GenericName[zh_CN]=SMB 共享浏览器"
+#
+# The following lines seem to be necessary for SuSE.
+#
+Name[bg]=Samba Browser
+Name[ca]=Samba Browser
+Name[cs]=Samba Browser
+Name[de]=Samba Browser
+Name[es]=Samba Browser
+Name[fr]=Samba Browser
+Name[hu]=Samba Browser
+Name[it]=Samba Browser
+Name[ja]=Samba Browser
+Name[nl]=Samba Browser
+Name[no]=Samba Browser
+Name[no_NY]=Samba Browser
+Name[pl]=Samba Browser
+Name[pt_BR]=Samba Browser
+Name[ru]=Samba Browser
+Name[sk]=Samba Browser
+Name[sv]=Samba Browser
+Name[tr]=Samba Tarayıcısı
+Name[uk]=Samba Browser
+Name[zh_CN]=Samba Browser
 Comment=The SMB/CIFS Share Browser
+Comment[bg]=Самба ресурсен четец
+Comment[ca]=El navegador de compartits SMB/CIFS
+Comment[cs]=Prohližeč SMB/CIFS sdílení
+Comment[de]=Der Browser für SMB/CIFS-Freigaben
+Comment[es]=El explorador de recursos compartidos SMB/CIFS
+Comment[fr]=L'explorateur de partages SMB / CIFS
+Comment[hu]=Az SMB/CIFS böngésző
+Comment[it]=Browser di condivisioni SMB/CIFS
+Comment[ja]=SMB/CIFS 共有(シェア)・ブラウザー
+Comment[nl]=De SMB/CIFS Share Browser
+Comment[no]=SMB/CIFS ressurs utforsker
+Comment[no_NY]=SMB/CIFS ressurs surfar
+Comment[pl]=Przeglądarka Zasobów SMB/CIFS
+Comment[pt_BR]=O navegador de compartilhamentos SMB/CIFS
+Comment[ru]=The SMB/CIFS Share Browser
+Comment[sk]=Prehliadač SMB/CIFS zdieľaní
+Comment[sv]=SMB Katalog programmed
+Comment[tr]=SMB/CIFS Paylaşım Tarayıcısı
+Comment[uk]=Навігатор спільних ресурсів SMB/CIFS
+Comment[zh_CN]=SMB 共享浏览器"

-Icon=smb4k
 X-Open=false
 X-TDE-KonqSidebarAddModule=konqsidebar_smb4k
 X-TDE-KonqSidebarUniversal=true
--- a/plugin/smb4k_konqplugin.cpp
+++ b/plugin/smb4k_konqplugin.cpp
@ -67,9 +67,9 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget

  TDEToolBar  *topBar = new TDEToolBar( widget, "Topbar" );
  topBar->setIconSize(16);
-  topBar->insertButton( "reload",    0, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRescan() ) , true, i18n( "Scan Network" ) );
-  topBar->insertButton( "edit-find",      1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSearch() ) , true,  i18n( "Search" ) );
-  topBar->insertButton( "configure", 2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSmb4KOptionsDlg() ) , true,  i18n( "Configure" ) );
+  topBar->insertButton( "reload",    0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRescan() ) , TRUE, i18n( "Scan Network" ) );
+  topBar->insertButton( "edit-find",      1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSearch() ) , TRUE,  i18n( "Search" ) );
+  topBar->insertButton( "configure", 2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSmb4KOptionsDlg() ) , TRUE,  i18n( "Configure" ) );

  //
  // Browser widget:
@ -78,7 +78,7 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget

  if ( browser_factory )
  {
-    m_browser_part = static_cast<KParts::Part *>( browser_factory->create( widget, "BrowserPart", "KParts::Part", TQStringList( "konqplugin=\"true\"" ) ) );
+    m_browser_part = static_cast<KParts::Part *>( browser_factory->create( TQT_TQOBJECT(widget), "BrowserPart", "KParts::Part", TQStringList( "konqplugin=\"true\"" ) ) );

    // Do nothing here. The network scan (and the mounting of recently used
    // shares) will be done by Smb4KCore::init() below.
@ -90,8 +90,8 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget
    return;
  }

-  connect( Smb4KCore::mounter(), TQ_SIGNAL( mountedShare( const TQString &) ), this, TQ_SLOT( slotMountedShare( const TQString & ) ) );
-  connect( Smb4KCore::mounter(), TQ_SIGNAL( aboutToUnmount( const TQString& ) ), this, TQ_SLOT( slotPrepareUnmount( const TQString& ) ) );
+  connect( Smb4KCore::mounter(), TQT_SIGNAL( mountedShare( const TQString &) ), this, TQT_SLOT( slotMountedShare( const TQString & ) ) );
+  connect( Smb4KCore::mounter(), TQT_SIGNAL( aboutToUnmount( const TQString& ) ), this, TQT_SLOT( slotPrepareUnmount( const TQString& ) ) );

  // Scan the network and remount recently used shares:
  Smb4KCore::self()->init();
@ -151,7 +151,7 @@ void KonqSidebar_Smb4K::slotSearch()

    TQFrame *frame = searchDialog->plainPage();

-    m_search_part = static_cast<KParts::Part *>( search_factory->create( frame, "SearchDialogPart", "KParts::Part" ) );
+    m_search_part = static_cast<KParts::Part *>( search_factory->create( TQT_TQOBJECT(frame), "SearchDialogPart", "KParts::Part" ) );

    if ( m_search_part )
    {
@ -164,7 +164,7 @@ void KonqSidebar_Smb4K::slotSearch()
      // Instead we want that a search is started:
      searchDialog->actionButton( KDialogBase::Close )->setAutoDefault( false );

-      //connect( m_search_dialog, TQ_SIGNAL( searchResult( Smb4KHostItem * ) ), this, TQ_SLOT( slotInsertItem( Smb4KHostItem * ) ) );
+      //connect( m_search_dialog, TQT_SIGNAL( searchResult( Smb4KHostItem * ) ), this, TQT_SLOT( slotInsertItem( Smb4KHostItem * ) ) );

      searchDialog->show();
    }
@ -188,11 +188,11 @@ void KonqSidebar_Smb4K::slotSmb4KOptionsDlg()

  if ( config_factory )
  {
-    TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( config_factory->create( widget, "ConfigDialog", "TDEConfigDialog" ) );
+    TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(widget), "ConfigDialog", "TDEConfigDialog" )) );

    if ( dlg )
    {
-      connect( dlg,  TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) );
+      connect( dlg,  TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) );

      dlg->show();
    }
--- a/plugin/smb4k_konqplugin.h
+++ b/plugin/smb4k_konqplugin.h
@ -42,7 +42,7 @@

 class smb4kWidget : public TQVBox
 {
-TQ_OBJECT
+Q_OBJECT
  
 public:
    smb4kWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
@ -53,7 +53,7 @@ private:

 class KonqSidebar_Smb4K : public KonqSidebarPlugin
 {
-    TQ_OBJECT
+    Q_OBJECT
  
 public:
    /**
--- a/po/Makefile.am
+++ b/po/Makefile.am
@ -0,0 +1,4 @@
+POFILES = AUTO
+
+EXTRA_DIST=smb4k.pot
+
--- a/translations/messages/de.po
+++ b/translations/messages/de.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:27+0000\n"
+"POT-Creation-Date: 2020-05-11 04:29+0200\n"
 "PO-Revision-Date: 2019-12-26 00:37+0000\n"
 "Last-Translator: Chris <xchrisx@uber.space>\n"
 "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
--- a/translations/messages/es.po
+++ b/translations/messages/es.po
@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:27+0000\n"
+"POT-Creation-Date: 2020-05-11 04:29+0200\n"
 "PO-Revision-Date: 2008-04-25 01:39-0300\n"
 "Last-Translator: Martín Carr <tincarr@gmail.com>\n"
 "Language-Team: Español\n"
--- a/translations/messages/it.po
+++ b/translations/messages/it.po
--- a/translations/messages/ja.po
+++ b/translations/messages/ja.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:27+0000\n"
+"POT-Creation-Date: 2020-05-11 04:29+0200\n"
 "PO-Revision-Date: 2007-12-15 15:05+0900\n"
 "Last-Translator: Toyohiro Asukai <toyohiro@ksmplus.com>\n"
 "Language-Team:  <ja@li.org>\n"
--- a/translations/messages/smb4k.pot
+++ b/translations/messages/smb4k.pot
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-07-07 18:27+0000\n"
+"POT-Creation-Date: 2021-07-07 22: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"
--- a/translations/messages/sv.po
+++ b/translations/messages/sv.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:27+0000\n"
+"POT-Creation-Date: 2020-05-11 04:29+0200\n"
 "PO-Revision-Date: 2005-12-26 15:58+0100\n"
 "Last-Translator: Marc Hansen <marcgie@berlios.de>\n"
 "Language-Team: svenska <de@li.org>\n"
--- a/translations/messages/uk.po
+++ b/translations/messages/uk.po
@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:27+0000\n"
+"POT-Creation-Date: 2020-05-11 04:29+0200\n"
 "PO-Revision-Date: 2007-08-27 23:18-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
--- a/smb4k.kdevses
+++ b/smb4k.kdevses
@ -0,0 +1,46 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE KDevPrjSession>
+<KDevPrjSession>
+ <DocsAndViews NumberOfDocuments="7" >
+  <Doc0 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/ChangeLog" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc0>
+  <Doc1 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4tdefileio.cpp" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/configdlg/smb4tdeconfigdialog.cpp" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/configdlg/smb4ksuperuseroptions.cpp" >
+   <View0 Encoding="" line="0" Type="Source" />
+  </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4kscanner.cpp" >
+   <View0 Encoding="" line="399" Type="Source" />
+  </Doc4>
+  <Doc5 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4kauthinfo.h" >
+   <View0 Encoding="" line="64" Type="Source" />
+  </Doc5>
+  <Doc6 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_09/smb4k/core/smb4tdeglobal.h" >
+   <View0 Encoding="" line="82" Type="Source" />
+  </Doc6>
+ </DocsAndViews>
+ <pluginList>
+  <kdevdebugger>
+   <breakpointList/>
+   <showInternalCommands value="0" />
+  </kdevdebugger>
+  <kdevastyle>
+   <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
+   <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
+  </kdevastyle>
+  <kdevbookmarks>
+   <bookmarks/>
+  </kdevbookmarks>
+  <kdevvalgrind>
+   <executable path="" params="" />
+   <valgrind path="" params="" />
+   <calltree path="" params="" />
+   <tdecachegrind path="" />
+  </kdevvalgrind>
+ </pluginList>
+</KDevPrjSession>
--- a/smb4k.tdevelop
+++ b/smb4k.tdevelop
@ -0,0 +1,274 @@
+<!DOCTYPE tdevelop>
+<tdevelop>
+  <general>
+    <author>Alexander Reinholdt</author>
+    <email>dustpuppy@users.berlios.de</email>
+    <projectmanagement>KDevKDEAutoProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>KDE</keyword>
+      <keyword>Qt</keyword>
+    </keywords>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <version>CVS_HEAD</version>
+    <description/>
+    <ignoreparts/>
+    <secondaryLanguages/>
+    <versioncontrol>kdevcvsservice</versioncontrol>
+    <projectname>smb4k</projectname>
+    <defaultencoding/>
+  </general>
+  <kdevautoproject>
+    <general>
+      <mainprogram>smb4k</mainprogram>
+      <useconfiguration>default</useconfiguration>
+      <activetarget>smb4k/widgets/print/libprint.a</activetarget>
+    </general>
+    <configure>
+      <configargs/>
+    </configure>
+    <make>
+      <abortonerror>false</abortonerror>
+      <numberofjobs>1</numberofjobs>
+      <dontact>false</dontact>
+      <makebin/>
+      <envvars>
+        <envvar value="1" name="WANT_AUTOCONF_2_5" />
+        <envvar value="1" name="WANT_AUTOMAKE_1_8" />
+      </envvars>
+      <prio>0</prio>
+    </make>
+    <compiler>
+      <cflags/>
+      <cxxflags>\s-O0 -g3 -Wall</cxxflags>
+    </compiler>
+    <run>
+      <directoryradio>executable</directoryradio>
+      <customdirectory>/</customdirectory>
+      <mainprogram>smb4k/smb4k</mainprogram>
+      <programargs/>
+      <terminal>false</terminal>
+      <autocompile>true</autocompile>
+      <envvars/>
+      <runarguments>
+        <smb4k_kill/>
+        <smb4k_umount/>
+        <smb4k_mount/>
+        <smb4k/>
+      </runarguments>
+      <debugarguments>
+        <smb4k/>
+      </debugarguments>
+      <cwd>
+        <smb4k>/home/alex/Entwicklung/smb4k_head/./</smb4k>
+      </cwd>
+    </run>
+    <configurations>
+      <default>
+        <configargs>--enable-debug=full</configargs>
+        <builddir/>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cflags/>
+        <cxxflags/>
+        <f77flags/>
+        <envvars/>
+      </default>
+    </configurations>
+  </kdevautoproject>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.h;*.hh;*.hxx;*.hpp;*.H" name="Header" />
+      <group pattern="*.cpp;*.c;*.cc;*.C;*.cxx;*.ec;*.ecpp;*.lxx;*.l++;*.ll;*.l" name="Quellen" />
+      <group pattern="*.kdevdlg;*.ui;*.rc;*.dlg" name="Benutzerschnittstelle" />
+      <group pattern="*.po" name="Übersetzungen" />
+      <group pattern="AUTHORS;COPYING;ChangeLog;INSTALL;README;TODO;NEWS" name="GNU" />
+      <group pattern="*" name="Andere" />
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
+    <tree>
+      <hidepatterns></hidepatterns>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
+    </tree>
+  </kdevfileview>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>gtk</toc>
+      <toc>gnustep</toc>
+      <toc>python</toc>
+      <toc>php</toc>
+      <toc>perl</toc>
+    </ignoretocs>
+    <projectdoc>
+      <userdocDir>api-docs/html/</userdocDir>
+      <apidocDir>api-docs/html/</apidocDir>
+    </projectdoc>
+    <ignoreqt_xml/>
+    <ignoredoxygen/>
+    <ignorekdocs/>
+    <ignoredevhelp/>
+  </kdevdoctreeview>
+  <kdevdebugger>
+    <general>
+      <dbgshell>libtool</dbgshell>
+      <programargs/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+      <raiseGDBOnStart>false</raiseGDBOnStart>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <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/>
+    <codecompletion>
+      <includeGlobalFunctions>true</includeGlobalFunctions>
+      <includeTypes>true</includeTypes>
+      <includeEnums>true</includeEnums>
+      <includeTypedefs>false</includeTypedefs>
+      <automaticCodeCompletion>true</automaticCodeCompletion>
+      <automaticArgumentsHint>true</automaticArgumentsHint>
+      <automaticHeaderCompletion>true</automaticHeaderCompletion>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</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>false</processFunctionArguments>
+      <preProcessAllHeaders>false</preProcessAllHeaders>
+      <parseMissingHeaders>false</parseMissingHeaders>
+      <resolveIncludePaths>true</resolveIncludePaths>
+      <alwaysParseInBackground>true</alwaysParseInBackground>
+      <usePermanentCaching>true</usePermanentCaching>
+      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+      <includePaths>.;</includePaths>
+      <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
+      <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
+    </codecompletion>
+    <creategettersetter>
+      <prefixGet/>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
+    <qt>
+      <used>false</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</designer>
+      <designerpluginpaths/>
+    </qt>
+    <splitheadersource>
+      <enabled>false</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Vertical</orientation>
+    </splitheadersource>
+  </kdevcppsupport>
+  <kdevfilecreate>
+    <filetypes>
+      <type icon="text-x-hsrc" ext="h" create="template" name="C/C++ header" >
+        <descr>A new empty header file for C or C++.</descr>
+      </type>
+      <type icon="text-x-c++src" ext="cpp" create="template" name="C++ source" >
+        <descr>A new empty C++ file.</descr>
+      </type>
+    </filetypes>
+    <useglobaltypes/>
+  </kdevfilecreate>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <dist>
+    <custom>true</custom>
+    <bzip>false</bzip>
+    <archname/>
+    <appname>smb4k</appname>
+    <version>0.4.0cvs</version>
+    <release/>
+    <vendor/>
+    <licence/>
+    <summary/>
+    <group/>
+    <packager/>
+    <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>
+  <kdevcvsservice>
+    <recursivewhenupdate>true</recursivewhenupdate>
+    <prunedirswhenupdate>true</prunedirswhenupdate>
+    <createdirswhenupdate>true</createdirswhenupdate>
+    <recursivewhencommitremove>true</recursivewhencommitremove>
+    <revertoptions>-C</revertoptions>
+  </kdevcvsservice>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl>/home/alex/Entwicklung/smb4k_head/smb4k-api</usermanualurl>
+    </projectdoc>
+  </kdevdocumentation>
+  <ctagspart>
+    <customArguments/>
+    <customTagfilePath/>
+  </ctagspart>
+  <kdevvisualadvance>
+    <emulator>VisualBoyAdvance</emulator>
+    <binary/>
+    <addOptions/>
+    <terminal>false</terminal>
+    <fullscreen>false</fullscreen>
+    <graphicFilter>-f0</graphicFilter>
+    <scaling>-1</scaling>
+  </kdevvisualadvance>
+</tdevelop>
--- a/smb4k.tdevelop.pcs
+++ b/smb4k.tdevelop.pcs
--- a/smb4k/CMakeLists.txt
+++ b/smb4k/CMakeLists.txt
@ -1,46 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### subfolders
-
-add_subdirectory( core )
-add_subdirectory( dialogs )
-add_subdirectory( browser )
-add_subdirectory( configdlg )
-add_subdirectory( icons )
-add_subdirectory( iconview )
-add_subdirectory( listview )
-add_subdirectory( searchdlg )
-
-
-##### smb4k (executable)
-
-tde_add_executable( smb4k AUTOMOC
-  SOURCES main.cpp smb4k.cpp smb4ksystemtray.cpp
-  LINK
-    tdecore-shared tdeui-shared tdeio-shared tdeparts-shared smb4kcore-shared smb4kdialogs-shared
-  DESTINATION ${BIN_INSTALL_DIR}
-)
-
-
-##### other files
-
-tde_create_translated_desktop(
-  SOURCE smb4k.desktop
-  DESTINATION ${XDG_APPS_INSTALL_DIR}
-)
-
-install(
-  FILES smb4k_shell.rc
-  DESTINATION ${DATA_INSTALL_DIR}/smb4k
-)
--- a/smb4k/Makefile.am
+++ b/smb4k/Makefile.am
@ -0,0 +1,22 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+SUBDIRS = icons core configdlg dialogs browser iconview listview searchdlg
+
+# Main program
+bin_PROGRAMS = smb4k
+
+smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp
+smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT)
+smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+
+
+KDE_ICON = smb4k
+
+xdg_apps_DATA = smb4k.desktop
+
+rcdir = $(kde_datadir)/smb4k
+rc_DATA = smb4k_shell.rc
+
+noinst_HEADERS = smb4ksystemtray.h
--- a/smb4k/browser/CMakeLists.txt
+++ b/smb4k/browser/CMakeLists.txt
@ -1,31 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4knetworkbrowser (shared)
-
-tde_add_kpart( libsmb4knetworkbrowser AUTOMOC
-  SOURCES
-    smb4knetworkbrowser_part.cpp smb4knetworkbrowser.cpp
-    smb4knetworkbrowseritem.cpp smb4knetworkbrowsertooltip.cpp
-  LINK tdecore-shared tdeui-shared tdeparts-shared smb4kcore-shared smb4kdialogs-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-
-##### other files
-
-install(
-  FILES smb4knetworkbrowser_part.rc
-  DESTINATION ${DATA_INSTALL_DIR}/smb4knetworkbrowserpart
-)
--- a/smb4k/browser/Makefile.am
+++ b/smb4k/browser/Makefile.am
@ -0,0 +1,15 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+kde_module_LTLIBRARIES = libsmb4knetworkbrowser.la
+noinst_HEADERS = smb4knetworkbrowser_part.h smb4knetworkbrowser.h \
+		smb4knetworkbrowseritem.h smb4knetworkbrowsertooltip.h
+libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \
+		smb4knetworkbrowser.cpp smb4knetworkbrowseritem.cpp \
+		smb4knetworkbrowsertooltip.cpp
+libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \
+	$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
+libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries)
+
+partrcdir = $(kde_datadir)/smb4knetworkbrowserpart
+partrc_DATA = smb4knetworkbrowser_part.rc
--- a/smb4k/browser/smb4knetworkbrowser.cpp
+++ b/smb4k/browser/smb4knetworkbrowser.cpp
@ -53,14 +53,14 @@ Smb4KNetworkBrowser::Smb4KNetworkBrowser( TQWidget *parent, const char *name )
  addColumn( i18n( "Comment" ), -1 );

  // Add some connections:
-  connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ),
-           this, TQ_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) );
+  connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
+           this, TQT_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) );

-  connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ),
-           this, TQ_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) );
+  connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
+           this, TQT_SLOT( slotItemExpandedCollapsed( TQListViewItem * ) ) );

-  connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ),
-           this, TQ_SLOT( slotItemExecuted( TQListViewItem * ) ) );
+  connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ),
+           this, TQT_SLOT( slotItemExecuted( TQListViewItem * ) ) );
 }


@ -114,7 +114,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e )
          {
            m_tooltip = new Smb4KNetworkBrowserToolTip( item );

-            TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) );
+            TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) );
          }
          else
          {
@ -133,7 +133,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e )
        {
          m_tooltip = new Smb4KNetworkBrowserToolTip( item );

-          TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) );
+          TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) );
        }
        else
        {
@ -161,7 +161,7 @@ void Smb4KNetworkBrowser::contentsMouseMoveEvent( TQMouseEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KNetworkBrowser::slotItemExpandedCollapsed( TQListViewItem *item )
--- a/smb4k/browser/smb4knetworkbrowser.h
+++ b/smb4k/browser/smb4knetworkbrowser.h
@ -39,7 +39,7 @@ class Smb4KNetworkBrowserToolTip;

 class Smb4KNetworkBrowser : public TDEListView
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -80,11 +80,11 @@ class Smb4KNetworkBrowser : public TDEListView
    Smb4KNetworkBrowserToolTip *tooltip() { return m_tooltip; }

    /**
-     * Block the showing of tool tips. If @p block is set to true, the
+     * Block the showing of tool tips. If @p block is set to TRUE, the
     * current tool tip gets deleted (if there is one) and no tool tip
-     * will be shown until @p block is reset to false.
+     * will be shown until @p block is reset to FALSE.
     *
-     * @param block         Set this parameter to true to block the showing
+     * @param block         Set this parameter to TRUE to block the showing
     *                      of tool tips.
     */
    void blockToolTips( bool block );
--- a/smb4k/browser/smb4knetworkbrowser_part.cpp
+++ b/smb4k/browser/smb4knetworkbrowser_part.cpp
@ -84,50 +84,50 @@ Smb4KNetworkBrowserPart::Smb4KNetworkBrowserPart( TQWidget *parentWidget, const
  loadSettings();

  // Add some connections:
-  connect( m_widget,             TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int ) ),
-           this,                 TQ_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) );
+  connect( m_widget,             TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int ) ),
+           this,                 TQT_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) );

-  connect( m_widget,             TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           this,                 TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+  connect( m_widget,             TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           this,                 TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );

-  connect( m_widget,             TQ_SIGNAL( pressed( TQListViewItem * ) ),
-           this,                 TQ_SLOT( slotPressed( TQListViewItem * ) ) );
+  connect( m_widget,             TQT_SIGNAL( pressed( TQListViewItem * ) ),
+           this,                 TQT_SLOT( slotPressed( TQListViewItem * ) ) );

-  connect( m_widget,             TQ_SIGNAL( expanded( TQListViewItem * ) ),
-           this,                 TQ_SLOT( slotItemExpanded( TQListViewItem * ) ) );
+  connect( m_widget,             TQT_SIGNAL( expanded( TQListViewItem * ) ),
+           this,                 TQT_SLOT( slotItemExpanded( TQListViewItem * ) ) );

-  connect( m_widget,             TQ_SIGNAL( collapsed( TQListViewItem * ) ),
-           this,                 TQ_SLOT( slotItemCollapsed( TQListViewItem * ) ) );
+  connect( m_widget,             TQT_SIGNAL( collapsed( TQListViewItem * ) ),
+           this,                 TQT_SLOT( slotItemCollapsed( TQListViewItem * ) ) );

-  connect( m_widget,             TQ_SIGNAL( executed( TQListViewItem * ) ),
-           this,                 TQ_SLOT( slotItemExecuted( TQListViewItem * ) ) );
+  connect( m_widget,             TQT_SIGNAL( executed( TQListViewItem * ) ),
+           this,                 TQT_SLOT( slotItemExecuted( TQListViewItem * ) ) );

-  connect( m_widget,             TQ_SIGNAL( aboutToShowToolTip( Smb4KNetworkBrowserItem * ) ),
-           this,                 TQ_SLOT( slotAboutToShowToolTip( Smb4KNetworkBrowserItem * ) ) );
+  connect( m_widget,             TQT_SIGNAL( aboutToShowToolTip( Smb4KNetworkBrowserItem * ) ),
+           this,                 TQT_SLOT( slotAboutToShowToolTip( Smb4KNetworkBrowserItem * ) ) );

-  connect( Smb4KCore::scanner(), TQ_SIGNAL( workgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ),
-           this,                 TQ_SLOT( slotWorkgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ) );
+  connect( Smb4KCore::scanner(), TQT_SIGNAL( workgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ),
+           this,                 TQT_SLOT( slotWorkgroups( const TQValueList<Smb4KWorkgroupItem *> & ) ) );

-  connect( Smb4KCore::scanner(), TQ_SIGNAL( members( const TQString &, const TQValueList<Smb4KHostItem *> & ) ),
-           this,                 TQ_SLOT( slotWorkgroupMembers( const TQString &, const TQValueList<Smb4KHostItem *> & ) ) );
+  connect( Smb4KCore::scanner(), TQT_SIGNAL( members( const TQString &, const TQValueList<Smb4KHostItem *> & ) ),
+           this,                 TQT_SLOT( slotWorkgroupMembers( const TQString &, const TQValueList<Smb4KHostItem *> & ) ) );

-  connect( Smb4KCore::scanner(), TQ_SIGNAL( shares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ),
-           this,                 TQ_SLOT( slotShares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ) );
+  connect( Smb4KCore::scanner(), TQT_SIGNAL( shares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ),
+           this,                 TQT_SLOT( slotShares( const TQString &, const TQValueList<Smb4KShareItem *> & ) ) );

-  connect( Smb4KCore::scanner(), TQ_SIGNAL( ipAddress( Smb4KHostItem * ) ),
-           this,                 TQ_SLOT( slotAddIPAddress( Smb4KHostItem * ) ) );
+  connect( Smb4KCore::scanner(), TQT_SIGNAL( ipAddress( Smb4KHostItem * ) ),
+           this,                 TQT_SLOT( slotAddIPAddress( Smb4KHostItem * ) ) );

-  connect( Smb4KCore::scanner(), TQ_SIGNAL( info( Smb4KHostItem * ) ),
-           this,                 TQ_SLOT( slotAddInformation( Smb4KHostItem * ) ) );
+  connect( Smb4KCore::scanner(), TQT_SIGNAL( info( Smb4KHostItem * ) ),
+           this,                 TQT_SLOT( slotAddInformation( Smb4KHostItem * ) ) );

-  connect( Smb4KCore::scanner(), TQ_SIGNAL( hostAdded( Smb4KHostItem * ) ),
-           this,                 TQ_SLOT( slotInsertHost( Smb4KHostItem * ) ) );
+  connect( Smb4KCore::scanner(), TQT_SIGNAL( hostAdded( Smb4KHostItem * ) ),
+           this,                 TQT_SLOT( slotInsertHost( Smb4KHostItem * ) ) );

-  connect( Smb4KCore::mounter(), TQ_SIGNAL( updated() ),
-           this,                 TQ_SLOT( slotMarkMountedShares() ) );
+  connect( Smb4KCore::mounter(), TQT_SIGNAL( updated() ),
+           this,                 TQT_SLOT( slotMarkMountedShares() ) );

-  connect( Smb4KCore::self(),    TQ_SIGNAL( runStateChanged() ),
-           this,                 TQ_SLOT( slotRunStateChanged() ) );
+  connect( Smb4KCore::self(),    TQT_SIGNAL( runStateChanged() ),
+           this,                 TQT_SLOT( slotRunStateChanged() ) );
 }


@ -139,35 +139,35 @@ Smb4KNetworkBrowserPart::~Smb4KNetworkBrowserPart()
 void Smb4KNetworkBrowserPart::setupActions()
 {
  TDEAction *rescan =        new TDEAction( i18n( "Scan Netwo&rk" ), "reload", TDEShortcut( CTRL+Key_R ),
-                                        this, TQ_SLOT( slotRescan() ),
+                                        this, TQT_SLOT( slotRescan() ),
                                        actionCollection(), "rescan_action" );
  TDEAction *abort =         new TDEAction( i18n( "&Abort" ) , "process-stop", TDEShortcut( CTRL+Key_A ),
-                                        this, TQ_SLOT( slotAbort() ),
+                                        this, TQT_SLOT( slotAbort() ),
                                        actionCollection(), "abort_action" );
  TDEActionSeparator *sep1 = new TDEActionSeparator( actionCollection(),
                                        "separator_1" );
  TDEAction *manual_mount  = new TDEAction( i18n( "M&ount Manually" ), "connect_creating", TDEShortcut( CTRL+Key_O ),
-                                        this, TQ_SLOT( slotMountManually() ),
+                                        this, TQT_SLOT( slotMountManually() ),
                                        actionCollection(), "mount_manually_action" );
  TDEActionSeparator *sep2 = new TDEActionSeparator( actionCollection(),
                                        "separator_2" );
  TDEAction *auth =          new TDEAction( i18n( "Au&thentication" ), "identity", TDEShortcut( CTRL+Key_T ),
-                                        this, TQ_SLOT( slotAuthentication() ),
+                                        this, TQT_SLOT( slotAuthentication() ),
                                        actionCollection(), "askpass_action" );
  TDEAction *custom =        new TDEAction( i18n( "&Custom Options" ), "samba", TDEShortcut( CTRL+Key_C ),
-                                        this, TQ_SLOT( slotCustomOptions() ),
+                                        this, TQT_SLOT( slotCustomOptions() ),
                                        actionCollection(), "custom_action" );
  TDEAction *bookmark =      new TDEAction( i18n( "Add &Bookmark" ), "bookmark_add", TDEShortcut( CTRL+Key_B ),
-                                        this, TQ_SLOT( slotBookmark() ),
+                                        this, TQT_SLOT( slotBookmark() ),
                                        actionCollection(), "bookmark_action" );
  TDEAction *preview =       new TDEAction( i18n( "Pre&view" ), "view_icon", TDEShortcut( CTRL+Key_V ),
-                                        this, TQ_SLOT( slotPreview() ),
+                                        this, TQT_SLOT( slotPreview() ),
                                        actionCollection(), "preview_action" );
  TDEAction *print =         new TDEAction( i18n( "&Print File" ), "printer", TDEShortcut( CTRL+Key_P ),
-                                        this, TQ_SLOT( slotPrint() ),
+                                        this, TQT_SLOT( slotPrint() ),
                                        actionCollection(), "print_action" );
  TDEAction *mount =         new TDEAction( i18n( "&Mount" ), "drive-harddisk-mounted", TDEShortcut( CTRL+Key_M ),
-                                        this, TQ_SLOT( slotMount() ),
+                                        this, TQT_SLOT( slotMount() ),
                                        actionCollection(), "mount_action" );

  // Enable/disable the actions:
@ -200,8 +200,8 @@ void Smb4KNetworkBrowserPart::setupActions()
  // is also needed:
  if ( m_mode == KonqPlugin )
  {
-    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ),
-                                        this, TQ_SLOT( slotUnmount() ),
+    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
+                                        this, TQT_SLOT( slotUnmount() ),
                                        actionCollection(), "konq_umount_action" );

    unmount->setEnabled( false );
@ -306,7 +306,7 @@ void Smb4KNetworkBrowserPart::customEvent( TQCustomEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS (Smb4KNetworkBrowserPart)
+// TQT_SLOT IMPLEMENTATIONS (Smb4KNetworkBrowserPart)
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KNetworkBrowserPart::slotContextMenuRequested( TQListViewItem *item, const TQPoint &pos,
@ -1477,7 +1477,7 @@ void Smb4KNetworkBrowserPart::slotAbort()

 void Smb4KNetworkBrowserPart::slotMountManually()
 {
-  Smb4KMountDialog *dlg = static_cast<Smb4KMountDialog *>( m_widget->child( "MountDialog", "Smb4KMountDialog", true ) );
+  Smb4KMountDialog *dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(m_widget->child( "MountDialog", "Smb4KMountDialog", true )) );

  if ( !dlg )
  {
@ -1534,7 +1534,7 @@ void Smb4KNetworkBrowserPart::slotAuthentication()
 void Smb4KNetworkBrowserPart::slotCustomOptions()
 {
  Smb4KCustomOptionsDialog *dlg = static_cast<Smb4KCustomOptionsDialog *>(
-                                  m_widget->child( "CustomOptionsDialog", "Smb4KCustomOptionsDialog", true ) );
+                                  TQT_TQWIDGET(m_widget->child( "CustomOptionsDialog", "Smb4KCustomOptionsDialog", true )) );
  Smb4KNetworkBrowserItem *item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->currentItem() );

  if ( !dlg && item )
@ -1618,7 +1618,7 @@ void Smb4KNetworkBrowserPart::slotPreview()

 void Smb4KNetworkBrowserPart::slotPrint()
 {
-  Smb4KPrintDialog *dlg = static_cast<Smb4KPrintDialog *>( m_widget->child( "PrintDialog", "Smb4KPrintDialog", true ) );
+  Smb4KPrintDialog *dlg = static_cast<Smb4KPrintDialog *>( TQT_TQWIDGET(m_widget->child( "PrintDialog", "Smb4KPrintDialog", true )) );
  Smb4KNetworkBrowserItem *item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->currentItem() );

  if ( !dlg && item )
@ -1918,7 +1918,7 @@ TDEInstance *Smb4KNetworkBrowserPartFactory::instance()

 extern "C"
 {
-  TDE_EXPORT void *init_libsmb4knetworkbrowser()
+  void *init_libsmb4knetworkbrowser()
  {
    TDEGlobal::locale()->insertCatalogue( "smb4k" );
    return new Smb4KNetworkBrowserPartFactory;
--- a/smb4k/browser/smb4knetworkbrowser_part.h
+++ b/smb4k/browser/smb4knetworkbrowser_part.h
@ -55,7 +55,7 @@ class Smb4KShareItem;

 class Smb4KNetworkBrowserPart : public KParts::Part
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -322,7 +322,7 @@ class TDEAboutData;

 class Smb4KNetworkBrowserPartFactory : public KParts::Factory
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/browser/smb4knetworkbrowseritem.h
+++ b/smb4k/browser/smb4knetworkbrowseritem.h
@ -139,10 +139,10 @@ class Smb4KNetworkBrowserItem : public TDEListViewItem
    void update( Smb4KShareItem *item );

    /**
-     * This is a convenience function. It returns true if the item is a
-     * printer share and false otherwise.
+     * This is a convenience function. It returns TRUE if the item is a
+     * printer share and FALSE otherwise.
     *
-     * @returns true if the item is a printer share and false otherwise.
+     * @returns TRUE if the item is a printer share and FALSE otherwise.
     */
    bool isPrinter();

@ -151,15 +151,15 @@ class Smb4KNetworkBrowserItem : public TDEListViewItem
     * changed by this function and the item text will be set to italic by
     * Smb4KNetworkBrowserItem::paintCell().
     *
-     * @param mounted       true if the share is mounted and false otherwise
+     * @param mounted       TRUE if the share is mounted and FALSE otherwise
     */
    void setMounted( bool mounted = true );

    /**
     * Tells whether the respective share is shown as mounted or not. For non-share
-     * items this function will always return false.
+     * items this function will always return FALSE.
     *
-     * @returns true if the share is mounted and false otherwise.
+     * @returns TRUE if the share is mounted and FALSE otherwise.
     */
    bool isMounted();

--- a/smb4k/browser/smb4knetworkbrowsertooltip.cpp
+++ b/smb4k/browser/smb4knetworkbrowsertooltip.cpp
@ -96,7 +96,7 @@ void Smb4KNetworkBrowserToolTip::showTip( const TQPoint &pos )
  setGeometry( p.x(), p.y(), width(), height() );
  polish();
  show();
-  TQTimer::singleShot( 10000, this, TQ_SLOT( slotHideToolTip() ) );
+  TQTimer::singleShot( 10000, this, TQT_SLOT( slotHideToolTip() ) );
 }


@ -267,7 +267,7 @@ void Smb4KNetworkBrowserToolTip::update()
  {
    case Smb4KNetworkBrowserItem::Workgroup:
    {
-      TQLabel *master_label = static_cast<TQLabel *>( child( "MasterBrowser", "TQLabel", true ) );
+      TQLabel *master_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "MasterBrowser", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( master_label )
      {
@ -282,9 +282,9 @@ void Smb4KNetworkBrowserToolTip::update()
    }
    case Smb4KNetworkBrowserItem::Host:
    {
-      TQLabel *os_label =     static_cast<TQLabel *>( child( "OSString", "TQLabel", true ) );
-      TQLabel *server_label = static_cast<TQLabel *>( child( "ServerString", "TQLabel", true ) );
-      TQLabel *ip_label =     static_cast<TQLabel *>( child( "IPAddress", "TQLabel", true ) );
+      TQLabel *os_label =     static_cast<TQLabel *>( TQT_TQWIDGET(child( "OSString", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *server_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "ServerString", TQLABEL_OBJECT_NAME_STRING, true )) );
+      TQLabel *ip_label =     static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( os_label )
      {
@ -317,7 +317,7 @@ void Smb4KNetworkBrowserToolTip::update()
    }
    case Smb4KNetworkBrowserItem::Share:
    {
-      TQLabel *ip_label = static_cast<TQLabel *>( child( "IPAddress", "TQLabel", true ) );
+      TQLabel *ip_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "IPAddress", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( ip_label )
      {
@ -363,7 +363,7 @@ void Smb4KNetworkBrowserToolTip::leaveEvent( TQEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KNetworkBrowserToolTip::slotHideToolTip()
--- a/smb4k/browser/smb4knetworkbrowsertooltip.h
+++ b/smb4k/browser/smb4knetworkbrowsertooltip.h
@ -47,7 +47,7 @@ class Smb4KNetworkBrowserItem;

 class Smb4KNetworkBrowserToolTip : public TQLabel
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/CMakeLists.txt
+++ b/smb4k/configdlg/CMakeLists.txt
@ -1,23 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4tdeconfigdialog (shared)
-
-tde_add_kpart( libsmb4tdeconfigdialog AUTOMOC
-  SOURCES
-    smb4kauthoptions.cpp smb4tdeconfigdialog.cpp smb4knetworkoptions.cpp smb4tdersyncoptions.cpp
-    smb4ksambaoptions.cpp smb4kshareoptions.cpp smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp
-  LINK tdecore-shared tdeui-shared tdeio-shared smb4kcore-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
--- a/smb4k/configdlg/Makefile.am
+++ b/smb4k/configdlg/Makefile.am
@ -0,0 +1,12 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+kde_module_LTLIBRARIES = libsmb4tdeconfigdialog.la
+noinst_HEADERS = smb4kauthoptions.h smb4tdeconfigdialog.h smb4knetworkoptions.h \
+	smb4tdersyncoptions.h smb4ksambaoptions.h smb4kshareoptions.h smb4ksuperuseroptions.h \
+	smb4kuserinterfaceoptions.h
+libsmb4tdeconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4tdeconfigdialog.cpp \
+	smb4knetworkoptions.cpp smb4tdersyncoptions.cpp smb4ksambaoptions.cpp smb4kshareoptions.cpp \
+	smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp
+libsmb4tdeconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT)
+libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_TDEFILE)
--- a/smb4k/configdlg/smb4kauthoptions.cpp
+++ b/smb4k/configdlg/smb4kauthoptions.cpp
@ -48,14 +48,14 @@ Smb4KAuthOptions::Smb4KAuthOptions( TQWidget *parent, const char *name )
  TQGridLayout *grid = new TQGridLayout( this );
  grid->setSpacing( 10 );

-  TQButtonGroup *password_group = new TQButtonGroup( 1, TQt::Horizontal,
+  TQButtonGroup *password_group = new TQButtonGroup( 1, Qt::Horizontal,
                                 i18n( "Password Storage" ), this );
  TQCheckBox *use_wallet =        new TQCheckBox( i18n( "Save the authentication data in a wallet" ),
                                 password_group, "kcfg_UseWallet" );
  (void) new TQCheckBox( i18n( "If no wallet is used, remember authentication data during run time" ),
                                 password_group, "kcfg_RememberPasswords" );

-  TQGroupBox *login_box =         new TQGroupBox( 1, TQt::Horizontal, i18n( "Default Login" ),
+  TQGroupBox *login_box =         new TQGroupBox( 1, Qt::Horizontal, i18n( "Default Login" ),
                                 this, "DefaultLoginBox" );
 //   login_box->setInsideMargin( 10 );

@ -87,10 +87,10 @@ Smb4KAuthOptions::Smb4KAuthOptions( TQWidget *parent, const char *name )
  grid->addWidget( login_box, 1, 0, 0 );
  grid->addItem( spacer2, 2, 0 );

-  connect( use_wallet,  TQ_SIGNAL( stateChanged( int ) ),
-           this,          TQ_SLOT( slotTDEWalletButtonState( int ) ) );
-  connect( default_auth, TQ_SIGNAL( stateChanged( int ) ),
-           this,          TQ_SLOT( slotDefaultAuthButtonState( int ) ) );
+  connect( use_wallet,  TQT_SIGNAL( stateChanged( int ) ),
+           this,          TQT_SLOT( slotTDEWalletButtonState( int ) ) );
+  connect( default_auth, TQT_SIGNAL( stateChanged( int ) ),
+           this,          TQT_SLOT( slotDefaultAuthButtonState( int ) ) );

  slotTDEWalletButtonState( use_wallet->state() );
  slotDefaultAuthButtonState( default_auth->state() );
@ -102,18 +102,18 @@ Smb4KAuthOptions::~Smb4KAuthOptions()
 }

 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KAuthOptions::slotTDEWalletButtonState( int state )
 {
  if ( state == TQCheckBox::On )
  {
-    static_cast<TQCheckBox *>( child( "DefaultLoginBox", "TQGroupBox", true ) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", TQGROUPBOX_OBJECT_NAME_STRING, true )) )->setEnabled( true );
  }
  else if ( state == TQCheckBox::Off )
  {
-    static_cast<TQCheckBox *>( child( "DefaultLoginBox", "TQGroupBox", true ) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultLoginBox", TQGROUPBOX_OBJECT_NAME_STRING, true )) )->setEnabled( false );
  }
 }

@ -122,11 +122,11 @@ void Smb4KAuthOptions::slotDefaultAuthButtonState( int state )
 {
  if ( state == TQCheckBox::On )
  {
-    static_cast<TQCheckBox *>( child( "DefaultAuthWidget", "TQWidget", true ) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", TQWIDGET_OBJECT_NAME_STRING, true )) )->setEnabled( true );
  }
  else if ( state == TQCheckBox::Off )
  {
-    static_cast<TQCheckBox *>( child( "DefaultAuthWidget", "TQWidget", true ) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "DefaultAuthWidget", TQWIDGET_OBJECT_NAME_STRING, true )) )->setEnabled( false );
  }
 }

--- a/smb4k/configdlg/smb4kauthoptions.h
+++ b/smb4k/configdlg/smb4kauthoptions.h
@ -45,7 +45,7 @@

 class Smb4KAuthOptions : public TQWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/smb4knetworkoptions.cpp
+++ b/smb4k/configdlg/smb4knetworkoptions.cpp
@ -47,7 +47,7 @@ Smb4KNetworkOptions::Smb4KNetworkOptions( TQWidget *parent, const char *name ) :
  //
  // The browse list group box.
  //
-  TQButtonGroup *browse_box =       new TQButtonGroup( 1, TQt::Horizontal, i18n( "Browse List" ),
+  TQButtonGroup *browse_box =       new TQButtonGroup( 1, Qt::Horizontal, i18n( "Browse List" ),
                                   this, "kcfg_BrowseList" );

  browse_box->insert( new TQRadioButton( i18n( "Scan the network neighborhood for available workgroups and domains" ),
@ -77,7 +77,7 @@ Smb4KNetworkOptions::Smb4KNetworkOptions( TQWidget *parent, const char *name ) :
  //
  // The search group box
  //
-  TQButtonGroup *search_box =       new TQButtonGroup( 1, TQt::Horizontal, i18n( "Network Search" ),
+  TQButtonGroup *search_box =       new TQButtonGroup( 1, Qt::Horizontal, i18n( "Network Search" ),
                                   this, "kcfg_SearchMethod" );
  search_box->setInsideSpacing( 5 );

--- a/smb4k/configdlg/smb4knetworkoptions.h
+++ b/smb4k/configdlg/smb4knetworkoptions.h
@ -43,7 +43,7 @@

 class Smb4KNetworkOptions : public TQWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/smb4ksambaoptions.cpp
+++ b/smb4k/configdlg/smb4ksambaoptions.cpp
@ -66,7 +66,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  TQGridLayout *general_layout = new TQGridLayout( general_tab );
  general_layout->setSpacing( 10 );

-  TQGroupBox *general_options =  new TQGroupBox( 2, TQt::Horizontal,
+  TQGroupBox *general_options =  new TQGroupBox( 2, Qt::Horizontal,
                                i18n( "General Options" ), general_tab );
  general_options->setInsideSpacing( 5 );

@ -85,7 +85,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  (void) new TQLabel( i18n( "Remote SMB port:" ), general_options );
  (void) new KIntNumInput( general_options, "kcfg_RemotePort" );

-  TQGroupBox *authentication =   new TQGroupBox( 1, TQt::Horizontal,
+  TQGroupBox *authentication =   new TQGroupBox( 1, Qt::Horizontal,
                                i18n( "Authentication" ), general_tab );

  (void) new TQCheckBox( i18n( "Try to authenticate with Kerberos" ), authentication, "kcfg_UseKerberos" );
@ -106,7 +106,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  TQGridLayout *mount_layout =   new TQGridLayout( mount_tab );
  mount_layout->setSpacing( 10 );

-  TQGroupBox *filesystem_box =   new TQGroupBox( 1, TQt::Horizontal,
+  TQGroupBox *filesystem_box =   new TQGroupBox( 1, Qt::Horizontal,
                                i18n( "File System" ), mount_tab );

 #ifndef __FreeBSD__
@ -120,7 +120,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  TQLabel *note =                new TQLabel( i18n( "NOTE: You might need to enable support for either \"super\" or \"sudo\" in the Super User page." ), filesystem_box );
  note->setTextFormat( TQt::RichText );

-  TQGroupBox *user_group_box =   new TQGroupBox( 2, TQt::Horizontal,
+  TQGroupBox *user_group_box =   new TQGroupBox( 2, Qt::Horizontal,
                                i18n( "User and Group" ), mount_tab );
  user_group_box->setInsideSpacing( 5 );

@ -132,7 +132,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  KLineEdit *group_id =         new KLineEdit( user_group_box, "kcfg_GroupID" );
  group_id->setAlignment( TQt::AlignRight );

-  TQGroupBox *charset_box =      new TQGroupBox( 2, TQt::Horizontal,
+  TQGroupBox *charset_box =      new TQGroupBox( 2, Qt::Horizontal,
                                i18n( "Charset and Codepage" ), mount_tab );
  charset_box->setInsideSpacing( 5 );

@ -198,7 +198,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  codepage->insertItem( "cp1258", Smb4KSettings::EnumServerCodepage::cp1258 );
  codepage->insertItem( "unicode", Smb4KSettings::EnumServerCodepage::unicode );

-  TQGroupBox *perms_box =        new TQGroupBox( 2, TQt::Horizontal,
+  TQGroupBox *perms_box =        new TQGroupBox( 2, Qt::Horizontal,
                                i18n( "Permissions" ), mount_tab );
  perms_box->setInsideSpacing( 5 );

@ -216,7 +216,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  read_mode->insertItem( i18n( "read-only" ), Smb4KSettings::EnumWriteAccess::ReadOnly );

 #ifndef __FreeBSD__
-  TQGroupBox *advanced_cifs =    new TQGroupBox( 1, TQt::Horizontal,
+  TQGroupBox *advanced_cifs =    new TQGroupBox( 1, Qt::Horizontal,
                                i18n( "Advanced CIFS Options" ), mount_tab, "AdvancedCIFSOptions" );
  advanced_cifs->setInsideSpacing( 5 );

@ -244,7 +244,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  c_extra_layout->addWidget( new TQLabel( i18n( "Additional options:" ), c_extra_widget ), 0, 0, 0 );
  c_extra_layout->addWidget( new KLineEdit( c_extra_widget, "kcfg_CustomCIFSOptions" ), 0, 1, 0 );

-  TQGroupBox *advanced_smbfs =   new TQGroupBox( 1, TQt::Horizontal,
+  TQGroupBox *advanced_smbfs =   new TQGroupBox( 1, Qt::Horizontal,
                                i18n( "Advanced SMBFS Options" ), mount_tab, "AdvancedSMBFSOptions" );
  advanced_smbfs->setInsideSpacing( 5 );

@ -285,7 +285,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  TQGridLayout *net_layout =     new TQGridLayout( net_tab );
  net_layout->setSpacing( 10 );

-  TQButtonGroup *protocol_hint = new TQButtonGroup( 1, TQt::Horizontal,
+  TQButtonGroup *protocol_hint = new TQButtonGroup( 1, Qt::Horizontal,
                                i18n( "Protocol Hint" ), net_tab, "kcfg_ProtocolHint" );

  protocol_hint->insert( new TQRadioButton( i18n( "Automatic detection" ), protocol_hint ),
@ -311,7 +311,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  TQGridLayout *smbclient_layout = new TQGridLayout( smbclient_tab );
  smbclient_layout->setSpacing( 10 );

-  TQGroupBox *smbclient_misc =   new TQGroupBox( 2, TQt::Horizontal, i18n( "Miscellaneous" ),
+  TQGroupBox *smbclient_misc =   new TQGroupBox( 2, Qt::Horizontal, i18n( "Miscellaneous" ),
                                smbclient_tab, "SmbclientMiscellaneous" );
  smbclient_misc->setInsideSpacing( 5 );

@ -343,7 +343,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  TQGridLayout *nmblookup_layout = new TQGridLayout( nmblookup_tab );
  nmblookup_layout->setSpacing( 10 );

-  TQGroupBox *nmblookup_misc =   new TQGroupBox( 1, TQt::Horizontal,
+  TQGroupBox *nmblookup_misc =   new TQGroupBox( 1, Qt::Horizontal,
                                i18n( "Miscellaneous" ), nmblookup_tab );
  nmblookup_misc->setInsideSpacing( 5 );

@ -496,41 +496,41 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
  // Connections
  //
 #ifndef __FreeBSD__
-  connect( filesystem,      TQ_SIGNAL( activated( int ) ),
-           this,            TQ_SLOT( slotSambaFileSystem( int ) ) );
+  connect( filesystem,      TQT_SIGNAL( activated( int ) ),
+           this,            TQT_SLOT( slotSambaFileSystem( int ) ) );
 #endif

-  connect( remove_custom,   TQ_SIGNAL( clicked() ),
-           this,            TQ_SLOT( slotRemoveCustomOption() ) );
+  connect( remove_custom,   TQT_SIGNAL( clicked() ),
+           this,            TQT_SLOT( slotRemoveCustomOption() ) );

-  connect( rm_all_custom,   TQ_SIGNAL( clicked() ),
-           this,            TQ_SLOT( slotRemoveAllCustomOptions() ) );
+  connect( rm_all_custom,   TQT_SIGNAL( clicked() ),
+           this,            TQT_SLOT( slotRemoveAllCustomOptions() ) );

-  connect( custom_options,  TQ_SIGNAL( clicked( TQListViewItem * ) ),
-           this,            TQ_SLOT( slotCustomItemClicked( TQListViewItem * ) ) );
+  connect( custom_options,  TQT_SIGNAL( clicked( TQListViewItem * ) ),
+           this,            TQT_SLOT( slotCustomItemClicked( TQListViewItem * ) ) );

-  connect( custom_protocol, TQ_SIGNAL( activated( int ) ),
-           this,            TQ_SLOT( slotCustomProtocolChanged( int ) ) );
+  connect( custom_protocol, TQT_SIGNAL( activated( int ) ),
+           this,            TQT_SLOT( slotCustomProtocolChanged( int ) ) );

 #ifndef __FreeBSD__
-  connect( custom_fs,       TQ_SIGNAL( activated( int ) ),
-           this,            TQ_SLOT( slotCustomFileSystemChanged( int ) ) );
+  connect( custom_fs,       TQT_SIGNAL( activated( int ) ),
+           this,            TQT_SLOT( slotCustomFileSystemChanged( int ) ) );

-  connect( custom_rw,       TQ_SIGNAL( activated( int ) ),
-           this,            TQ_SLOT( slotCustomWriteAccessChanged( int ) ) );
+  connect( custom_rw,       TQT_SIGNAL( activated( int ) ),
+           this,            TQT_SLOT( slotCustomWriteAccessChanged( int ) ) );
 #endif

-  connect( custom_krb,      TQ_SIGNAL( activated( int ) ),
-           this,            TQ_SLOT( slotCustomKerberosChanged( int ) ) );
+  connect( custom_krb,      TQT_SIGNAL( activated( int ) ),
+           this,            TQT_SLOT( slotCustomKerberosChanged( int ) ) );

-  connect( custom_uid,      TQ_SIGNAL( textChanged( const TQString & ) ),
-           this,            TQ_SLOT( slotCustomUIDChanged( const TQString & ) ) );
+  connect( custom_uid,      TQT_SIGNAL( textChanged( const TQString & ) ),
+           this,            TQT_SLOT( slotCustomUIDChanged( const TQString & ) ) );

-  connect( custom_gid,      TQ_SIGNAL( textChanged( const TQString & ) ),
-           this,            TQ_SLOT( slotCustomGIDChanged( const TQString & ) ) );
+  connect( custom_gid,      TQT_SIGNAL( textChanged( const TQString & ) ),
+           this,            TQT_SLOT( slotCustomGIDChanged( const TQString & ) ) );

-  connect( custom_port,     TQ_SIGNAL( valueChanged( int ) ),
-           this,            TQ_SLOT( slotCustomPortChanged( int ) ) );
+  connect( custom_port,     TQT_SIGNAL( valueChanged( int ) ),
+           this,            TQT_SLOT( slotCustomPortChanged( int ) ) );

  //
  // Do last things before we are ready to go
@ -554,7 +554,7 @@ void Smb4KSambaOptions::resetCustomTab()


 /////////////////////////////////////////////////////////////////////////////
-//  SLOT IMPLEMENTATIONS
+//  TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 #ifndef __FreeBSD__
@ -564,28 +564,28 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index )
  {
    case Smb4KSettings::EnumFilesystem::CIFS:
    {
-      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( child( "AdvancedCIFSOptions", "TQGroupBox", true ) );
+      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );

      if ( adv_cifs )
      {
        adv_cifs->setEnabled( true );
      }

-      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( child( "AdvancedSMBFSOptions", "TQGroupBox", true ) );
+      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );

      if ( adv_smbfs )
      {
        adv_smbfs->setEnabled( false );
      }

-      TQLabel *codepage = static_cast<TQLabel *>( child( "CodepageLabel", "TQLabel", true ) );
+      TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( codepage )
      {
        codepage->setEnabled( false );
      }

-      KComboBox *srv_codepage = static_cast<KComboBox *>( child( "kcfg_ServerCodepage", "KComboBox", true ) );
+      KComboBox *srv_codepage = static_cast<KComboBox *>( TQT_TQWIDGET(child( "kcfg_ServerCodepage", "KComboBox", true )) );

      if ( srv_codepage )
      {
@ -596,28 +596,28 @@ void Smb4KSambaOptions::slotSambaFileSystem( int item_index )
    }
    case Smb4KSettings::EnumFilesystem::SMBFS:
    {
-      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( child( "AdvancedCIFSOptions", "TQGroupBox", true ) );
+      TQGroupBox *adv_cifs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedCIFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );

      if ( adv_cifs )
      {
        adv_cifs->setEnabled( false );
      }

-      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( child( "AdvancedSMBFSOptions", "TQGroupBox", true ) );
+      TQGroupBox *adv_smbfs = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "AdvancedSMBFSOptions", TQGROUPBOX_OBJECT_NAME_STRING, true )) );

      if ( adv_smbfs )
      {
        adv_smbfs->setEnabled( true );
      }

-      TQLabel *codepage = static_cast<TQLabel *>( child( "CodepageLabel", "TQLabel", true ) );
+      TQLabel *codepage = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CodepageLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( codepage )
      {
        codepage->setEnabled( true );
      }

-      KComboBox *srv_codepage = static_cast<KComboBox *>( child( "kcfg_ServerCodepage", "KComboBox", true ) );
+      KComboBox *srv_codepage = static_cast<KComboBox *>( TQT_TQWIDGET(child( "kcfg_ServerCodepage", "KComboBox", true )) );

      if ( srv_codepage )
      {
@ -643,7 +643,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
  if ( item )
  {
    // Enable the input widget:
-    TQWidget *input = static_cast<TQGroupBox *>( child( "CustomInputWidget", "TQGroupBox", true ) );
+    TQWidget *input = static_cast<TQGroupBox *>( TQT_TQWIDGET(child( "CustomInputWidget", TQGROUPBOX_OBJECT_NAME_STRING, true )) );

    if ( input )
    {
@ -651,7 +651,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
    }

    // Enable/disable the labels, combo boxes, buttons, etc:
-    TQLabel *protocol_label = static_cast<TQLabel *>( child( "CustomProtocolLabel", "TQLabel", true ) );
+    TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( protocol_label )
    {
@ -665,7 +665,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KComboBox *protocol = static_cast<KComboBox *>( child( "CustomProtocol", "KComboBox", true ) );
+    KComboBox *protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) );

    if ( protocol )
    {
@ -683,7 +683,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )

 #ifndef __FreeBSD__

-    TQLabel *fs_label = static_cast<TQLabel *>( child( "CustomFileSystemLabel", "TQLabel", true ) );
+    TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( fs_label )
    {
@ -697,7 +697,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KComboBox *filesystem = static_cast<KComboBox *>( child( "CustomFileSystem", "KComboBox", true ) );
+    KComboBox *filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) );

    if ( filesystem )
    {
@ -713,7 +713,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      filesystem->setCurrentText( item->text( FileSystem ) );
    }

-    TQLabel *write_access_label = static_cast<TQLabel *>( child( "CustomWriteAccessLabel", "TQLabel", true ) );
+    TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( write_access_label )
    {
@ -727,7 +727,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KComboBox *write_access = static_cast<KComboBox *>( child( "CustomWriteAccess", "KComboBox", true ) );
+    KComboBox *write_access = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) );

    if ( write_access )
    {
@ -745,7 +745,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )

 #endif

-    TQLabel *krb_label = static_cast<TQLabel *>( child( "CustomKerberosLabel", "TQLabel", true ) );
+    TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( krb_label )
    {
@ -759,7 +759,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KComboBox *kerberos = static_cast<KComboBox *>( child( "CustomKerberos", "KComboBox", true ) );
+    KComboBox *kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomKerberos", "KComboBox", true )) );

    if ( kerberos )
    {
@ -775,7 +775,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      kerberos->setCurrentText( item->text( Kerberos ) );
    }

-    TQLabel *uid_label = static_cast<TQLabel *>( child( "CustomUIDLabel", "TQLabel", true ) );
+    TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( uid_label )
    {
@ -789,7 +789,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KLineEdit *uid = static_cast<KLineEdit *>( child( "CustomUID", "KLineEdit", true ) );
+    KLineEdit *uid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomUID", "KLineEdit", true )) );

    if ( uid )
    {
@ -805,7 +805,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      uid->setText( item->text( UID ) );
    }

-    TQLabel *gid_label = static_cast<TQLabel *>( child( "CustomGIDLabel", "TQLabel", true ) );
+    TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( gid_label )
    {
@ -819,7 +819,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KLineEdit *gid = static_cast<KLineEdit *>( child( "CustomGID", "KLineEdit", true ) );
+    KLineEdit *gid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomGID", "KLineEdit", true )) );

    if ( gid )
    {
@ -835,7 +835,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      gid->setText( item->text( GID ) );
    }

-    TQLabel *port_label = static_cast<TQLabel *>( child( "CustomPortLabel", "TQLabel", true ) );
+    TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

    if ( port_label )
    {
@ -849,7 +849,7 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      }
    }

-    KIntNumInput *port = static_cast<KIntNumInput *>( child( "CustomPort", "KIntNumInput", true ) );
+    KIntNumInput *port = static_cast<KIntNumInput *>( TQT_TQWIDGET(child( "CustomPort", "KIntNumInput", true )) );

    if ( port )
    {
@ -865,14 +865,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
      port->setValue( item->text( Port ).toInt() );
    }

-    KPushButton *remove = static_cast<KPushButton *>( child( "CustomRemoveItem", "KPushButton", true ) );
+    KPushButton *remove = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveItem", "KPushButton", true )) );

    if ( remove )
    {
      remove->setEnabled( true );
    }

-    KPushButton *remove_all = static_cast<KPushButton *>( child( "CustomRemoveAllItems", "KPushButton", true ) );
+    KPushButton *remove_all = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveAllItems", "KPushButton", true )) );

    if ( remove_all )
    {
@ -882,18 +882,18 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
  else
  {
    // Get the list view:
-    TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+    TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

    if ( view )
    {
-      TQLabel *protocol_label = static_cast<TQLabel *>( child( "CustomProtocolLabel", "TQLabel", true ) );
+      TQLabel *protocol_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomProtocolLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( protocol_label )
      {
        protocol_label->setEnabled( false );
      }

-      KComboBox *protocol = static_cast<KComboBox *>( child( "CustomProtocol", "KComboBox", true ) );
+      KComboBox *protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) );

      if ( protocol )
      {
@ -903,14 +903,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )

 #ifndef __FreeBSD__

-      TQLabel *fs_label = static_cast<TQLabel *>( child( "CustomFileSystemLabel", "TQLabel", true ) );
+      TQLabel *fs_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomFileSystemLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( fs_label )
      {
        fs_label->setEnabled( false );
      }

-      KComboBox *filesystem = static_cast<KComboBox *>( child( "CustomFileSystem", "KComboBox", true ) );
+      KComboBox *filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) );

      if ( filesystem )
      {
@ -918,14 +918,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
        filesystem->setEnabled( false );
      }

-      TQLabel *write_access_label = static_cast<TQLabel *>( child( "CustomWriteAccessLabel", "TQLabel", true ) );
+      TQLabel *write_access_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomWriteAccessLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( write_access_label )
      {
        write_access_label->setEnabled( false );
      }

-      KComboBox *write_access = static_cast<KComboBox *>( child( "CustomWriteAccess", "KComboBox", true ) );
+      KComboBox *write_access = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) );

      if ( write_access )
      {
@ -935,14 +935,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )

 #endif

-      TQLabel *krb_label = static_cast<TQLabel *>( child( "CustomKerberosLabel", "TQLabel", true ) );
+      TQLabel *krb_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomKerberosLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( krb_label )
      {
        krb_label->setEnabled( false );
      }

-      KComboBox *kerberos = static_cast<KComboBox *>( child( "CustomKerberos", "KComboBox", true ) );
+      KComboBox *kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomKerberos", "KComboBox", true )) );

      if ( kerberos )
      {
@ -950,14 +950,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
        kerberos->setEnabled( false );
      }

-      TQLabel *uid_label = static_cast<TQLabel *>( child( "CustomUIDLabel", "TQLabel", true ) );
+      TQLabel *uid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomUIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( uid_label )
      {
        uid_label->setEnabled( false );
      }

-      KLineEdit *uid = static_cast<KLineEdit *>( child( "CustomUID", "KLineEdit", true ) );
+      KLineEdit *uid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomUID", "KLineEdit", true )) );

      if ( uid )
      {
@ -965,14 +965,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
        uid->setEnabled( false );
      }

-      TQLabel *gid_label = static_cast<TQLabel *>( child( "CustomGIDLabel", "TQLabel", true ) );
+      TQLabel *gid_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomGIDLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( gid_label )
      {
        gid_label->setEnabled( false );
      }

-      KLineEdit *gid = static_cast<KLineEdit *>( child( "CustomGID", "KLineEdit", true ) );
+      KLineEdit *gid = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "CustomGID", "KLineEdit", true )) );

      if ( gid )
      {
@ -980,14 +980,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
        gid->setEnabled( false );
      }

-      TQLabel *port_label = static_cast<TQLabel *>( child( "CustomPortLabel", "TQLabel", true ) );
+      TQLabel *port_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "CustomPortLabel", TQLABEL_OBJECT_NAME_STRING, true )) );

      if ( port_label )
      {
        port_label->setEnabled( false );
      }

-      KIntNumInput *port = static_cast<KIntNumInput *>( child( "CustomPort", "KIntNumInput", true ) );
+      KIntNumInput *port = static_cast<KIntNumInput *>( TQT_TQWIDGET(child( "CustomPort", "KIntNumInput", true )) );

      if ( port )
      {
@ -995,14 +995,14 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )
        port->setEnabled( false );
      }

-      KPushButton *remove = static_cast<KPushButton *>( child( "CustomRemoveItem", "KPushButton", true ) );
+      KPushButton *remove = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveItem", "KPushButton", true )) );

      if ( remove )
      {
        remove->setEnabled( false );
      }

-      KPushButton *remove_all = static_cast<KPushButton *>( child( "CustomRemoveAllItems", "KPushButton", true ) );
+      KPushButton *remove_all = static_cast<KPushButton *>( TQT_TQWIDGET(child( "CustomRemoveAllItems", "KPushButton", true )) );

      if ( remove_all )
      {
@ -1015,8 +1015,8 @@ void Smb4KSambaOptions::slotCustomItemClicked( TQListViewItem *item )

 void Smb4KSambaOptions::slotCustomProtocolChanged( int index )
 {
-  TDEListView *view =            static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
-  KComboBox *custom_protocol = static_cast<KComboBox *>( child( "CustomProtocol", "KComboBox", true ) );
+  TDEListView *view =            static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
+  KComboBox *custom_protocol = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomProtocol", "KComboBox", true )) );

  if ( view && view->selectedItem() && custom_protocol )
  {
@ -1043,8 +1043,8 @@ void Smb4KSambaOptions::slotCustomProtocolChanged( int index )
 #ifndef __FreeBSD__
 void Smb4KSambaOptions::slotCustomFileSystemChanged( int index )
 {
-  TDEListView *view =              static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
-  KComboBox *custom_filesystem = static_cast<KComboBox *>( child( "CustomFileSystem", "KComboBox", true ) );
+  TDEListView *view =              static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
+  KComboBox *custom_filesystem = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomFileSystem", "KComboBox", true )) );

  if ( view && view->selectedItem() && custom_filesystem )
  {
@ -1075,8 +1075,8 @@ void Smb4KSambaOptions::slotCustomFileSystemChanged( int )
 #ifndef __FreeBSD__
 void Smb4KSambaOptions::slotCustomWriteAccessChanged( int index )
 {
-  TDEListView *view =      static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
-  KComboBox *custom_rw = static_cast<KComboBox *>( child( "CustomWriteAccess", "KComboBox", true ) );
+  TDEListView *view =      static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
+  KComboBox *custom_rw = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) );

  if ( view && view->selectedItem() && custom_rw )
  {
@ -1109,8 +1109,8 @@ void Smb4KSambaOptions::slotCustomKerberosChanged( int index )
  // FIXME: Do we need to adjust something here with respect to
  // FreeBSD? It does not know Kerberos for mounting!

-  TDEListView *view =            static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
-  KComboBox *custom_kerberos = static_cast<KComboBox *>( child( "CustomWriteAccess", "KComboBox", true ) );
+  TDEListView *view =            static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );
+  KComboBox *custom_kerberos = static_cast<KComboBox *>( TQT_TQWIDGET(child( "CustomWriteAccess", "KComboBox", true )) );

  if ( view && view->selectedItem() && custom_kerberos )
  {
@ -1136,7 +1136,7 @@ void Smb4KSambaOptions::slotCustomKerberosChanged( int index )

 void Smb4KSambaOptions::slotCustomUIDChanged( const TQString &uid )
 {
-  TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( view && view->selectedItem() )
  {
@ -1154,7 +1154,7 @@ void Smb4KSambaOptions::slotCustomUIDChanged( const TQString &uid )

 void Smb4KSambaOptions::slotCustomGIDChanged( const TQString &gid )
 {
-  TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( view && view->selectedItem() )
  {
@ -1172,7 +1172,7 @@ void Smb4KSambaOptions::slotCustomGIDChanged( const TQString &gid )

 void Smb4KSambaOptions::slotCustomPortChanged( int port )
 {
-  TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( view && view->selectedItem() )
  {
@ -1189,7 +1189,7 @@ void Smb4KSambaOptions::slotCustomPortChanged( int port )

 void Smb4KSambaOptions::slotRemoveCustomOption()
 {
-  TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( view && view->selectedItem() )
  {
@ -1208,7 +1208,7 @@ void Smb4KSambaOptions::slotRemoveCustomOption()

 void Smb4KSambaOptions::slotRemoveAllCustomOptions()
 {
-  TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( view )
  {
--- a/smb4k/configdlg/smb4ksambaoptions.h
+++ b/smb4k/configdlg/smb4ksambaoptions.h
@ -46,7 +46,7 @@

 class Smb4KSambaOptions : public TQTabWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/smb4kshareoptions.cpp
+++ b/smb4k/configdlg/smb4kshareoptions.cpp
@ -51,7 +51,7 @@ Smb4KShareOptions::Smb4KShareOptions( TQWidget *parent, const char *name ) : TQW
  TQGridLayout *grid = new TQGridLayout( this );
  grid->setSpacing( 10 );

-  TQGroupBox *dir_box = new TQGroupBox( 1, TQt::Horizontal, i18n( "Directories" ), this );
+  TQGroupBox *dir_box = new TQGroupBox( 1, Qt::Horizontal, i18n( "Directories" ), this );

  TQWidget *prefix_container =   new TQWidget( dir_box );
  TQGridLayout *prefix_layout =  new TQGridLayout( prefix_container );
@ -67,7 +67,7 @@ Smb4KShareOptions::Smb4KShareOptions( TQWidget *parent, const char *name ) : TQW
  (void) new TQCheckBox( i18n( "Force generated subdirectories to be lower case" ),
                        dir_box, "kcfg_ForceLowerCaseSubdirs" );

-  TQButtonGroup *mount_box = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Mounting and Unmounting" ), this );
+  TQButtonGroup *mount_box = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Mounting and Unmounting" ), this );
  (void) new TQCheckBox( i18n( "Unmount all shares of user %1 on exit" ).arg( getpwuid( getuid() )->pw_name ),
                       mount_box, "kcfg_UnmountSharesOnExit" );
  (void) new TQCheckBox( i18n( "Remount recently used shares on program start" ),
@ -75,7 +75,7 @@ Smb4KShareOptions::Smb4KShareOptions( TQWidget *parent, const char *name ) : TQW
  (void) new TQCheckBox( i18n( "Allow the unmounting of shares that are owned by other users" ),
                        mount_box, "kcfg_UnmountForeignShares" );

-  TQGroupBox *checks_box = new TQGroupBox( 2, TQt::Horizontal, i18n( "Checks" ), this );
+  TQGroupBox *checks_box = new TQGroupBox( 2, Qt::Horizontal, i18n( "Checks" ), this );

  (void) new TQLabel( i18n( "Interval between checks:" ), checks_box );
  KIntNumInput *check_interval = new KIntNumInput( 2500, checks_box, 10,
--- a/smb4k/configdlg/smb4kshareoptions.h
+++ b/smb4k/configdlg/smb4kshareoptions.h
@ -43,7 +43,7 @@

 class Smb4KShareOptions : public TQWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/smb4ksuperuseroptions.cpp
+++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp
@ -48,7 +48,7 @@ Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *parent, const char *name
  TQGridLayout *grid =           new TQGridLayout( this );
  grid->setSpacing( 10 );

-  TQButtonGroup *suid_progs =    new TQButtonGroup( 1, TQt::Horizontal,
+  TQButtonGroup *suid_progs =    new TQButtonGroup( 1, Qt::Horizontal,
                                i18n( "Programs" ), this, "kcfg_SuperUserProgram" );
  suid_progs->setInsideSpacing( 5 );

@ -56,7 +56,7 @@ Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *parent, const char *name
  suid_progs->insert( new TQRadioButton( "sudo", suid_progs, "SudoButton" ), Smb4KSettings::EnumSuperUserProgram::Sudo );
  suid_progs->insert( new TQRadioButton( "super", suid_progs, "SuperButton" ), Smb4KSettings::EnumSuperUserProgram::Super );

-  TQButtonGroup *suid_actions =  new TQButtonGroup( 1, TQt::Horizontal, i18n( "Actions" ), this, "SUIDActions" );
+  TQButtonGroup *suid_actions =  new TQButtonGroup( 1, Qt::Horizontal, i18n( "Actions" ), this, "SUIDActions" );
  suid_actions->setInsideSpacing( 5 );
 #ifdef __linux__
  (void) new TQCheckBox( i18n( "Use super user privileges to force the unmounting of (inaccessible) shares" ), suid_actions, "kcfg_UseForceUnmount" );
@ -77,8 +77,8 @@ Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *parent, const char *name
  grid->addWidget( remove, 2, 3, 0 );
  grid->addMultiCell( spacer2, 3, 3, 0, 3, 0 );

-  connect( remove, TQ_SIGNAL( clicked() ),
-           this,   TQ_SLOT( slotRemoveClicked() ) );
+  connect( remove, TQT_SIGNAL( clicked() ),
+           this,   TQT_SLOT( slotRemoveClicked() ) );
 }


@ -88,7 +88,7 @@ Smb4KSuperUserOptions::~Smb4KSuperUserOptions()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSuperUserOptions::slotRemoveClicked()
--- a/smb4k/configdlg/smb4ksuperuseroptions.h
+++ b/smb4k/configdlg/smb4ksuperuseroptions.h
@ -44,7 +44,7 @@

 class Smb4KSuperUserOptions : public TQWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
+++ b/smb4k/configdlg/smb4kuserinterfaceoptions.cpp
@ -49,19 +49,19 @@ Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const ch
  TQGridLayout *main_wd_layout = new TQGridLayout( main_wd_widget );
  main_wd_layout->setSpacing( 10 );

-  TQButtonGroup *shares_view   = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Shares View" ),
+  TQButtonGroup *shares_view   = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Shares View" ),
                                main_wd_widget, "kcfg_SharesView" );

  shares_view->insert( new TQRadioButton( i18n( "Show mounted shares in an icon view" ), shares_view ), Smb4KSettings::EnumSharesView::IconView );

  shares_view->insert( new TQRadioButton( i18n( "Show mounted shares in a list view" ), shares_view ), Smb4KSettings::EnumSharesView::ListView );

-  TQButtonGroup *bookmarks_grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Bookmarks" ),
+  TQButtonGroup *bookmarks_grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Bookmarks" ),
                                main_wd_widget, "BookmarksBox" );

  (void) new TQCheckBox( i18n( "Show custom bookmark label if available" ), bookmarks_grp, "kcfg_ShowCustomBookmarkLabel" );

-  TQButtonGroup *tray_group    = new TQButtonGroup( 1, TQt::Horizontal, i18n( "System Tray" ),
+  TQButtonGroup *tray_group    = new TQButtonGroup( 1, Qt::Horizontal, i18n( "System Tray" ),
                                main_wd_widget, "SystemTrayBox" );

  (void) new TQCheckBox( i18n( "Embed application into the system tray" ), tray_group, "kcfg_EmbedIntoSystemTray" );
@ -80,20 +80,20 @@ Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const ch
  TQGridLayout *browser_layout = new TQGridLayout( browser_widget );
  browser_layout->setSpacing( 10 );

-  TQButtonGroup *remoteGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Remote Shares" ),
+  TQButtonGroup *remoteGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Remote Shares" ),
                              browser_widget, "BrowserRemoteSharesBox" );
  (void) new TQCheckBox( i18n( "Show printer shares" ), remoteGroup, "kcfg_ShowPrinterShares" );
  TQCheckBox *hidden = new TQCheckBox( i18n( "Show hidden shares" ), remoteGroup, "kcfg_ShowHiddenShares" );
  (void) new TQCheckBox( i18n( "Show IPC$ shares" ), remoteGroup, "kcfg_ShowHiddenIPCShares" );
  (void) new TQCheckBox( i18n( "Show ADMIN$ shares" ), remoteGroup, "kcfg_ShowHiddenADMINShares" );

-  TQButtonGroup *columnsGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Columns" ),
+  TQButtonGroup *columnsGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Columns" ),
                               browser_widget, "BrowserColumnsBox" );
  (void) new TQCheckBox( i18n( "Show type" ), columnsGroup, "kcfg_ShowType" );
  (void) new TQCheckBox( i18n( "Show IP address" ), columnsGroup, "kcfg_ShowIPAddress" );
  (void) new TQCheckBox( i18n( "Show comment" ), columnsGroup, "kcfg_ShowComment" );

-  TQButtonGroup *netTooltipsGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Tooltips" ),
+  TQButtonGroup *netTooltipsGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Tooltips" ),
                                   browser_widget, "BrowserTooltipsBox" );
  (void) new TQCheckBox( i18n( "Show tooltip with information about a network item" ), netTooltipsGroup, "kcfg_ShowNetworkItemToolTip" );

@ -111,21 +111,21 @@ Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const ch
  TQGridLayout *shares_layout = new TQGridLayout( shares_widget );
  shares_layout->setSpacing( 10 );

-  TQButtonGroup *shares_group = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Mounted Shares" ),
+  TQButtonGroup *shares_group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Mounted Shares" ),
                              shares_widget, "SharesIconGroupBox" );
  (void) new TQCheckBox( i18n( "Show mount point instead of share name" ), shares_group, "kcfg_ShowMountPoint" );
  (void) new TQCheckBox( i18n( "Show all shares that are mounted on the system" ), shares_group, "kcfg_ShowAllShares" );

-  TQButtonGroup *dnd_group = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Drag and Drop" ),
+  TQButtonGroup *dnd_group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Drag and Drop" ),
                            shares_widget, "DragnDropBox" );
  (void) new TQCheckBox( i18n( "Allow dropping of files and directories onto shares" ), dnd_group, "kcfg_EnableDropSupport" );
  (void) new TQCheckBox( i18n( "Allow dragging of shares" ), dnd_group, "kcfg_EnableDragSupport" );

-  TQButtonGroup *sharesTooltipGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Tooltips" ),
+  TQButtonGroup *sharesTooltipGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Tooltips" ),
                                     shares_widget, "SharesTooltipsBox" );
  (void) new TQCheckBox( i18n( "Show tooltip with information about a share" ), sharesTooltipGroup, "kcfg_ShowShareToolTip" );

-  TQButtonGroup *list_view_group = new TQButtonGroup( 2, TQt::Horizontal, i18n( "List View" ),
+  TQButtonGroup *list_view_group = new TQButtonGroup( 2, Qt::Horizontal, i18n( "List View" ),
                                  shares_widget, "SharesListViewBox" );

 #ifndef __FreeBSD__
@ -155,7 +155,7 @@ Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const ch
  TQGridLayout *preview_layout = new TQGridLayout( preview_widget );
  preview_layout->setSpacing( 10 );

-  TQButtonGroup *previewFilesGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Hidden Files and Directories" ), preview_widget, "HiddenFilesBox" );
+  TQButtonGroup *previewFilesGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Hidden Files and Directories" ), preview_widget, "HiddenFilesBox" );
  (void) new TQCheckBox( i18n( "Preview hidden files and directories" ), previewFilesGroup, "kcfg_PreviewHiddenItems" );

  TQSpacerItem *spacer4 = new TQSpacerItem( 0, 0, TQSizePolicy::Preferred, TQSizePolicy::Expanding );
@ -172,8 +172,8 @@ Smb4KUserInterfaceOptions::Smb4KUserInterfaceOptions( TQWidget *parent, const ch
  addTab( preview_widget, i18n( "Preview Dialog" ) );

  // Add connections:
-  connect( hidden, TQ_SIGNAL( stateChanged( int ) ),
-           this,   TQ_SLOT( slotShowHiddenShares( int ) ) );
+  connect( hidden, TQT_SIGNAL( stateChanged( int ) ),
+           this,   TQT_SLOT( slotShowHiddenShares( int ) ) );

  // Do last adjustments:
  slotShowHiddenShares( hidden->state() );
@ -186,7 +186,7 @@ Smb4KUserInterfaceOptions::~Smb4KUserInterfaceOptions()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////


@ -194,13 +194,13 @@ void Smb4KUserInterfaceOptions::slotShowHiddenShares( int state )
 {
  if ( state == TQCheckBox::On )
  {
-    static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" ) )->setEnabled( true );
-    static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" ) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( true );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( true );
  }
  else if ( state == TQCheckBox::Off )
  {
-    static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenIPCShares", "TQCheckBox" ) )->setEnabled( false );
-    static_cast<TQCheckBox *>( child( "kcfg_ShowHiddenADMINShares", "TQCheckBox" ) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenIPCShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( false );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ShowHiddenADMINShares", TQCHECKBOX_OBJECT_NAME_STRING )) )->setEnabled( false );
  }
 }

--- a/smb4k/configdlg/smb4kuserinterfaceoptions.h
+++ b/smb4k/configdlg/smb4kuserinterfaceoptions.h
@ -43,7 +43,7 @@

 class Smb4KUserInterfaceOptions : public TQTabWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/configdlg/smb4tdeconfigdialog.cpp
+++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp
@ -108,7 +108,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
    // done by the core. We only need to disable widgets here.
    if ( Smb4KSettings::sudo().isEmpty() )
    {
-      TQRadioButton *sudo = static_cast<TQRadioButton *>( super_user_options->child( "SudoButton", "TQRadioButton", true ) );
+      TQRadioButton *sudo = static_cast<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SudoButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );

      if ( sudo )
      {
@ -117,7 +117,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
    }
    else if ( Smb4KSettings::super().isEmpty() )
    {
-      TQRadioButton *super = static_cast<TQRadioButton *>( super_user_options->child( "SuperButton", "TQRadioButton", true ) );
+      TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(super_user_options->child( "SuperButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );

      if ( super )
      {
@ -174,17 +174,17 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
  setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "ConfigDialog" ) );

  // Connections
-  connect( samba_options,       TQ_SIGNAL( customSettingsChanged() ),
-           this,                TQ_SLOT( slotCustomSambaSettingsChanged() ) );
+  connect( samba_options,       TQT_SIGNAL( customSettingsChanged() ),
+           this,                TQT_SLOT( slotCustomSambaSettingsChanged() ) );

-  connect( super_user_options,  TQ_SIGNAL( removeEntries() ),
-           this,                TQ_SLOT( slotRemoveSuperUserEntries() ) );
+  connect( super_user_options,  TQT_SIGNAL( removeEntries() ),
+           this,                TQT_SLOT( slotRemoveSuperUserEntries() ) );

-  connect( Smb4KCore::fileIO(), TQ_SIGNAL( failed() ),
-           this,                TQ_SLOT( slotReceivedFileIOFailed() ) );
+  connect( Smb4KCore::fileIO(), TQT_SIGNAL( failed() ),
+           this,                TQT_SLOT( slotReceivedFileIOFailed() ) );

-  connect( Smb4KCore::fileIO(), TQ_SIGNAL( finished() ),
-           this,                TQ_SLOT( slotReceivedFileIOFinished() ) );
+  connect( Smb4KCore::fileIO(), TQT_SIGNAL( finished() ),
+           this,                TQT_SLOT( slotReceivedFileIOFinished() ) );
 }


@ -196,7 +196,7 @@ Smb4TDEConfigDialog::~Smb4TDEConfigDialog()
 void Smb4TDEConfigDialog::loadCustomSambaOptions()
 {
  // Get the list view:
-  TDEListView *custom_list = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *custom_list = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( !custom_list )
  {
@ -380,7 +380,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions()
    }
  }

-  Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( child( "SambaOptions", "Smb4KSambaOptions", true ) );
+  Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) );

  if ( samba_options )
  {
@ -392,7 +392,7 @@ void Smb4TDEConfigDialog::loadCustomSambaOptions()
 void Smb4TDEConfigDialog::saveCustomSambaOptions()
 {
  // Get the list view:
-  TDEListView *custom_list = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *custom_list = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( !custom_list )
  {
@ -517,14 +517,14 @@ void Smb4TDEConfigDialog::loadAuthenticationData()

  (void) passwordHandler()->readDefaultAuth( &auth );

-  KLineEdit *default_user = static_cast<KLineEdit *>( child( "DefaultUserName", "KLineEdit", true ) );
+  KLineEdit *default_user = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultUserName", "KLineEdit", true )) );

  if ( default_user )
  {
    default_user->setText( auth.user() );
  }

-  KLineEdit *default_pass = static_cast<KLineEdit *>( child( "DefaultPassword", "KLineEdit", true ) );
+  KLineEdit *default_pass = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultPassword", "KLineEdit", true )) );

  if ( default_pass )
  {
@ -543,14 +543,14 @@ void Smb4TDEConfigDialog::saveAuthenticationData()
  {
    Smb4KAuthInfo auth( TQString::null, TQString::null, TQString::null );

-    KLineEdit *default_user = static_cast<KLineEdit *>( child( "DefaultUserName", "KLineEdit", true ) );
+    KLineEdit *default_user = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultUserName", "KLineEdit", true )) );

    if ( default_user )
    {
      auth.setUser( default_user->text() );
    }

-    KLineEdit *default_pass = static_cast<KLineEdit *>( child( "DefaultPassword", "KLineEdit", true ) );
+    KLineEdit *default_pass = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "DefaultPassword", "KLineEdit", true )) );

    if ( default_pass )
    {
@ -568,12 +568,12 @@ void Smb4TDEConfigDialog::saveAuthenticationData()

 bool Smb4TDEConfigDialog::writeSuperUserEntries()
 {
-  TQRadioButton *sudo =  static_cast<TQRadioButton *>( child( "SudoButton", "TQRadioButton", true ) );
-  TQRadioButton *super = static_cast<TQRadioButton *>( child( "SuperButton", "TQRadioButton", true ) );
+  TQRadioButton *sudo =  static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
 #ifdef __linux__
-  TQCheckBox *force =    static_cast<TQCheckBox *>( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) );
+  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
 #endif
-  TQCheckBox *full_use = static_cast<TQCheckBox *>( child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true ) );
+  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", TQCHECKBOX_OBJECT_NAME_STRING, true )) );

  // Check if we need to write anything at all:
  Smb4KFileIO::Operation op = Smb4KFileIO::NoOperation;
@ -640,12 +640,12 @@ bool Smb4TDEConfigDialog::writeSuperUserEntries()

 void Smb4TDEConfigDialog::removeSuperUserEntries()
 {
-  TQRadioButton *sudo =  static_cast<TQRadioButton *>( child( "SudoButton", "TQRadioButton", true ) );
-  TQRadioButton *super = static_cast<TQRadioButton *>( child( "SuperButton", "TQRadioButton", true ) );
+  TQRadioButton *sudo =  static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SudoButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  TQRadioButton *super = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "SuperButton", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
 #ifdef __linux__
-  TQCheckBox *force =    static_cast<TQCheckBox *>( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) );
+  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
 #endif
-  TQCheckBox *full_use = static_cast<TQCheckBox *>( child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true ) );
+  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", TQCHECKBOX_OBJECT_NAME_STRING, true )) );

 #ifdef __linux__
  if ( sudo && super && force && full_use )
@ -694,8 +694,8 @@ bool Smb4TDEConfigDialog::checkSettings()

  // If the user chose "Query custom master browser" in the
  // "Network" tab, there must be a master browser present:
-  TQRadioButton *query_custom_master = static_cast<TQRadioButton *>( child( "CustomMasterBrowserLabel", "TQRadioButton", true ) );
-  KLineEdit *custom_master_input    = static_cast<KLineEdit *>( child( "kcfg_CustomMasterBrowser", "KLineEdit", true ) );
+  TQRadioButton *query_custom_master = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "CustomMasterBrowserLabel", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  KLineEdit *custom_master_input    = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_CustomMasterBrowser", "KLineEdit", true )) );

  if ( query_custom_master && custom_master_input &&
       query_custom_master->isChecked() &&
@ -709,8 +709,8 @@ bool Smb4TDEConfigDialog::checkSettings()

  // If the user chose "Scan broadcast areas" in the
  // "Network" tab, there must broadcast areas present:
-  TQRadioButton *scan_bcast_areas    = static_cast<TQRadioButton *>( child( "BroadcastAreasLabel", "TQRadioButton", true ) );
-  KLineEdit *bcast_areas_input      = static_cast<KLineEdit *>( child( "kcfg_BroadcastAreas", "KLineEdit", true ) );
+  TQRadioButton *scan_bcast_areas    = static_cast<TQRadioButton *>( TQT_TQWIDGET(child( "BroadcastAreasLabel", TQRADIOBUTTON_OBJECT_NAME_STRING, true )) );
+  KLineEdit *bcast_areas_input      = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BroadcastAreas", "KLineEdit", true )) );

  if ( scan_bcast_areas && bcast_areas_input &&
       scan_bcast_areas->isChecked() &&
@ -723,7 +723,7 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The mount prefix must not be empty:
-  KURLRequester *mount_prefix       = static_cast<KURLRequester *>( child( "kcfg_MountPrefix", "KURLRequester", true ) );
+  KURLRequester *mount_prefix       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_MountPrefix", "KURLRequester", true )) );

  if ( mount_prefix && mount_prefix->url().stripWhiteSpace().isEmpty() )
  {
@ -735,8 +735,8 @@ bool Smb4TDEConfigDialog::checkSettings()

  // If the user wants to use a default login, the user
  // name must not be empty.
-  TQCheckBox *use_default_login      = static_cast<TQCheckBox *>( child( "kcfg_UseDefaultLogin", "TQCheckBox", true ) );
-  KLineEdit *default_user_name      = static_cast<KLineEdit *>( child( "kcfg_DefaultUserName", "KLineEdit", true ) );
+  TQCheckBox *use_default_login      = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseDefaultLogin", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  KLineEdit *default_user_name      = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_DefaultUserName", "KLineEdit", true )) );

  if ( use_default_login && default_user_name &&
       use_default_login->isChecked() &&
@ -749,7 +749,7 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The file mask must not be empty.
-  KLineEdit *file_mask              = static_cast<KLineEdit *>( child( "kcfg_FileMask", "KLineEdit", true ) );
+  KLineEdit *file_mask              = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_FileMask", "KLineEdit", true )) );

  if ( file_mask && file_mask->text().stripWhiteSpace().isEmpty() )
  {
@ -760,7 +760,7 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The directory mask must not be empty.
-  KLineEdit *directory_mask         = static_cast<KLineEdit *>( child( "kcfg_DirectoryMask", "KLineEdit", true ) );
+  KLineEdit *directory_mask         = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_DirectoryMask", "KLineEdit", true )) );

  if ( directory_mask && directory_mask->text().stripWhiteSpace().isEmpty() )
  {
@ -771,7 +771,7 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The UID must not be empty.
-  KLineEdit *user_id                = static_cast<KLineEdit *>( child( "kcfg_UserID", "KLineEdit", true ) );
+  KLineEdit *user_id                = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_UserID", "KLineEdit", true )) );

  if ( user_id && user_id->text().stripWhiteSpace().isEmpty() )
  {
@ -782,7 +782,7 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The GID must not be empty.
-  KLineEdit *group_id               = static_cast<KLineEdit *>( child( "kcfg_GroupID", "KLineEdit", true ) );
+  KLineEdit *group_id               = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_GroupID", "KLineEdit", true )) );

  if ( group_id && group_id->text().stripWhiteSpace().isEmpty() )
  {
@ -793,7 +793,7 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The rsync prefix must not be empty.
-  KURLRequester *rsync_prefix       = static_cast<KURLRequester *>( child( "kcfg_RsyncPrefix", "KURLRequester", true ) );
+  KURLRequester *rsync_prefix       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_RsyncPrefix", "KURLRequester", true )) );

  if ( rsync_prefix && rsync_prefix->url().stripWhiteSpace().isEmpty() )
  {
@ -804,8 +804,8 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The path where to store partial files must not be empty.
-  TQCheckBox *use_partical_directory = static_cast<TQCheckBox *>( child( "kcfg_UsePartialDirectory", "TQCheckBox", true ) );
-  KURLRequester *partial_directory  = static_cast<KURLRequester *>( child( "kcfg_PartialDirectory", "KURLRequester", true ) );
+  TQCheckBox *use_partical_directory = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UsePartialDirectory", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  KURLRequester *partial_directory  = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_PartialDirectory", "KURLRequester", true )) );

  if ( use_partical_directory && use_partical_directory->isChecked() &&
       partial_directory && partial_directory->url().stripWhiteSpace().isEmpty() )
@ -817,8 +817,8 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The the exclude patterns must not be empty.
-  TQCheckBox *use_exclude_pattern    = static_cast<TQCheckBox *>( child( "kcfg_UseExcludePattern", "TQCheckBox", true ) );
-  KLineEdit *exclude_pattern        = static_cast<KLineEdit *>( child( "kcfg_ExcludePattern", "KLineEdit", true ) );
+  TQCheckBox *use_exclude_pattern    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludePattern", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  KLineEdit *exclude_pattern        = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_ExcludePattern", "KLineEdit", true )) );

  if ( use_exclude_pattern && use_exclude_pattern->isChecked() &&
       exclude_pattern && exclude_pattern->text().stripWhiteSpace().isEmpty() )
@ -830,8 +830,8 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The the path of the exclude file must not be empty.
-  TQCheckBox *use_exclude_file       = static_cast<TQCheckBox *>( child( "kcfg_UseExcludeFrom", "TQCheckBox", true ) );
-  KURLRequester *exclude_file       = static_cast<KURLRequester *>( child( "kcfg_ExcludeFrom", "KURLRequester", true ) );
+  TQCheckBox *use_exclude_file       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseExcludeFrom", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  KURLRequester *exclude_file       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_ExcludeFrom", "KURLRequester", true )) );

  if ( use_exclude_file && use_exclude_file->isChecked() &&
       exclude_file && exclude_file->url().stripWhiteSpace().isEmpty() )
@ -843,8 +843,8 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The the include patterns must not be empty.
-  TQCheckBox *use_include_pattern    = static_cast<TQCheckBox *>( child( "kcfg_UseIncludePattern", "TQCheckBox", true ) );
-  KLineEdit *include_pattern        = static_cast<KLineEdit *>( child( "kcfg_IncludePattern", "KLineEdit", true ) );
+  TQCheckBox *use_include_pattern    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludePattern", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  KLineEdit *include_pattern        = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_IncludePattern", "KLineEdit", true )) );

  if ( use_include_pattern && use_include_pattern->isChecked() &&
       include_pattern && include_pattern->text().stripWhiteSpace().isEmpty() )
@ -856,8 +856,8 @@ bool Smb4TDEConfigDialog::checkSettings()
  }

  // The the path of the exclude file must not be empty.
-  TQCheckBox *use_include_file       = static_cast<TQCheckBox *>( child( "kcfg_UseIncludeFrom", "TQCheckBox", true ) );
-  KURLRequester *include_file       = static_cast<KURLRequester *>( child( "kcfg_IncludeFrom", "KURLRequester", true ) );
+  TQCheckBox *use_include_file       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseIncludeFrom", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+  KURLRequester *include_file       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_IncludeFrom", "KURLRequester", true )) );

  if ( use_include_file && use_include_file->isChecked() &&
       include_file && include_file->url().stripWhiteSpace().isEmpty() )
@ -870,13 +870,13 @@ bool Smb4TDEConfigDialog::checkSettings()

  // If you make backups, check that the suffix and that the
  // backup directory is not empty.
-  TQCheckBox *make_backups           = static_cast<TQCheckBox *>( child( "kcfg_MakeBackups", "TQCheckBox", true ) );
+  TQCheckBox *make_backups           = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_MakeBackups", TQCHECKBOX_OBJECT_NAME_STRING, true )) );

  if ( make_backups && make_backups->isChecked() )
  {
    // The backup suffix must not be empty.
-    TQCheckBox *use_backup_suffix    = static_cast<TQCheckBox *>( child( "kcfg_UseBackupSuffix", "TQCheckBox", true ) );
-    KLineEdit *backup_suffix        = static_cast<KLineEdit *>( child( "kcfg_BackupSuffix", "KLineEdit", true ) );
+    TQCheckBox *use_backup_suffix    = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+    KLineEdit *backup_suffix        = static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) );

    if ( use_backup_suffix && use_backup_suffix->isChecked() &&
         backup_suffix && backup_suffix->text().stripWhiteSpace().isEmpty() )
@ -888,8 +888,8 @@ bool Smb4TDEConfigDialog::checkSettings()
    }

    // The the path for backups must not be empty.
-    TQCheckBox *use_backup_dir       = static_cast<TQCheckBox *>( child( "kcfg_UseBackupDirectory", "TQCheckBox", true ) );
-    KURLRequester *backup_dir       = static_cast<KURLRequester *>( child( "kcfg_BackupDirectory", "KURLRequester", true ) );
+    TQCheckBox *use_backup_dir       = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
+    KURLRequester *backup_dir       = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) );

    if ( use_backup_dir && use_backup_dir->isChecked() &&
         backup_dir && backup_dir->url().stripWhiteSpace().isEmpty() )
@ -930,7 +930,7 @@ void Smb4TDEConfigDialog::showEvent( TQShowEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4TDEConfigDialog::slotApply()
@ -996,7 +996,7 @@ void Smb4TDEConfigDialog::slotOk()
 void Smb4TDEConfigDialog::slotCancel()
 {
  // Reset the custom Samba options tab:
-  Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( child( "SambaOptions", "Smb4KSambaOptions", true ) );
+  Smb4KSambaOptions *samba_options = static_cast<Smb4KSambaOptions *>( TQT_TQWIDGET(child( "SambaOptions", "Smb4KSambaOptions", true )) );

  if ( samba_options )
  {
@ -1010,7 +1010,7 @@ void Smb4TDEConfigDialog::slotCancel()
 void Smb4TDEConfigDialog::slotCustomSambaSettingsChanged()
 {
  // Get the list view and all other input widgets:
-  TDEListView *view = static_cast<TDEListView *>( child( "CustomOptionsList", "TDEListView", true ) );
+  TDEListView *view = static_cast<TDEListView *>( TQT_TQWIDGET(child( "CustomOptionsList", "TDEListView", true )) );

  if ( !view )
  {
@ -1136,9 +1136,9 @@ void Smb4TDEConfigDialog::slotRemoveSuperUserEntries()
 void Smb4TDEConfigDialog::slotReceivedFileIOFailed()
 {
 #ifdef __linux__
-  TQCheckBox *force =    static_cast<TQCheckBox *>( child( "kcfg_UseForceUnmount", "TQCheckBox", true ) );
+  TQCheckBox *force =    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseForceUnmount", TQCHECKBOX_OBJECT_NAME_STRING, true )) );
 #endif
-  TQCheckBox *full_use = static_cast<TQCheckBox *>( child( "kcfg_AlwaysUseSuperUser", "TQCheckBox", true ) );
+  TQCheckBox *full_use = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_AlwaysUseSuperUser", TQCHECKBOX_OBJECT_NAME_STRING, true )) );

 #ifdef __linux__
  if ( force && full_use )
@ -1201,7 +1201,7 @@ TDEInstance *Smb4TDEConfigDialogFactory::instance()
 TQObject *Smb4TDEConfigDialogFactory::createObject( TQObject *parent, const char *name, const char *,
 const TQStringList & )
 {
-  return  new Smb4TDEConfigDialog( Smb4KSettings::self(), static_cast<TQWidget*>( parent ), name ) ;
+  return TQT_TQOBJECT( new Smb4TDEConfigDialog( Smb4KSettings::self(), TQT_TQWIDGET( parent ), name ) );
 }


@ -1212,7 +1212,7 @@ const TQStringList & )

 extern "C"
 {
-  TDE_EXPORT void *init_libsmb4tdeconfigdialog()
+  void *init_libsmb4tdeconfigdialog()
  {
    TDEGlobal::locale()->insertCatalogue( "smb4k" );
    return new Smb4TDEConfigDialogFactory;
--- a/smb4k/configdlg/smb4tdeconfigdialog.h
+++ b/smb4k/configdlg/smb4tdeconfigdialog.h
@ -47,7 +47,7 @@ class Smb4KSettings;

 class Smb4TDEConfigDialog : public TDEConfigDialog
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -145,7 +145,7 @@ class Smb4TDEConfigDialog : public TDEConfigDialog
    /**
     * Write super user configuration entries to configuration file.
     *
-     * @returns true if something needs to be written.
+     * @returns TRUE if something needs to be written.
     */
    bool writeSuperUserEntries();

@ -159,7 +159,7 @@ class Smb4TDEConfigDialog : public TDEConfigDialog
     * need it. This function will report all missing input to the user
     * via a message box.
     *
-     * @returns true if the check passed and false if it failed.
+     * @returns TRUE if the check passed and FALSE if it failed.
     */
    bool checkSettings();
 };
@ -171,7 +171,7 @@ class TDEAboutData;

 class Smb4TDEConfigDialogFactory : KLibFactory
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -192,7 +192,7 @@ class Smb4TDEConfigDialogFactory : KLibFactory

  protected:
    TQObject *createObject( TQObject *parent = 0, const char *name = 0,
-                           const char *classname = "TQObject",
+                           const char *classname = TQOBJECT_OBJECT_NAME_STRING,
                           const TQStringList &args = TQStringList() );

  private:
--- a/smb4k/configdlg/smb4tdersyncoptions.cpp
+++ b/smb4k/configdlg/smb4tdersyncoptions.cpp
@ -52,7 +52,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  TQGridLayout *copying_layout = new TQGridLayout( copying_tab );
  copying_layout->setSpacing( 10 );

-  TQGroupBox *directory_box = new TQGroupBox( 2, TQt::Horizontal, i18n( "Default Destination" ),
+  TQGroupBox *directory_box = new TQGroupBox( 2, Qt::Horizontal, i18n( "Default Destination" ),
                             copying_tab, "RsyncDestinationBox" );
  directory_box->setInsideSpacing( 5 );

@ -60,7 +60,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  KURLRequester *prefix = new KURLRequester( directory_box, "kcfg_RsyncPrefix" );
  prefix->setMode( KFile::Directory | KFile::LocalOnly );

-  TQButtonGroup *general_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "General" ),
+  TQButtonGroup *general_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "General" ),
                              copying_tab, "RsyncModeBox" );
  general_box->setInsideSpacing( 5 );

@ -73,7 +73,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  (void) new TQCheckBox( i18n( "Transfer directories without recursing" ), general_box, "kcfg_TransferDirectories" );
  (void) new TQCheckBox( i18n( "Compress data during transfer" ), general_box, "kcfg_CompressData" );

-  TQButtonGroup *links_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Links" ), copying_tab, "RsyncModeBox" );
+  TQButtonGroup *links_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Links" ), copying_tab, "RsyncModeBox" );
  links_box->setInsideSpacing( 5 );

  TQCheckBox *links = new TQCheckBox( i18n( "Preserve symlinks" ), links_box, "kcfg_PreserveSymlinks" );
@ -83,7 +83,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  (void) new TQCheckBox( i18n( "Preserve hard links" ), links_box, "kcfg_PreserveHardLinks" );
  (void) new TQCheckBox( i18n( "Keep directory symlinks" ), links_box, "kcfg_KeepDirectorySymlinks" );

-  TQButtonGroup *perm_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "File Permissions, etc." ),
+  TQButtonGroup *perm_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "File Permissions, etc." ),
                           copying_tab, "RsyncPreservationBox" );
  perm_box->setInsideSpacing( 5 );

@ -112,7 +112,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  TQGridLayout *deltrans_layout = new TQGridLayout( deltrans_tab );
  deltrans_layout->setSpacing( 10 );

-  TQButtonGroup *delete_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "File Deletion" ), deltrans_tab, "RsyncDeleteBox" );
+  TQButtonGroup *delete_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "File Deletion" ), deltrans_tab, "RsyncDeleteBox" );
  delete_box->setInsideSpacing( 5 );

  (void) new TQCheckBox( i18n( "Remove synchronized source files" ), delete_box, "kcfg_RemoveSourceFiles" );
@ -124,13 +124,13 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  (void) new TQCheckBox( i18n( "Delete even if I/O errors occur" ), delete_box, "kcfg_IgnoreErrors" );
  (void) new TQCheckBox( i18n( "Force deletion of non-void directories" ), delete_box, "kcfg_ForceDirectoryDeletion" );

-  TQButtonGroup *delete_restrictions_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Restrictions" ), deltrans_tab, "RsyncDeleteRestrictionsBox" );
+  TQButtonGroup *delete_restrictions_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Restrictions" ), deltrans_tab, "RsyncDeleteRestrictionsBox" );
  delete_restrictions_box->setInsideSpacing( 5 );

  (void) new TQCheckBox( i18n( "Don't delete more than this many files:" ), delete_restrictions_box, "kcfg_UseMaximumDelete" );
  (void) new KIntNumInput( delete_restrictions_box, "kcfg_MaximumDeleteValue" );

-  TQButtonGroup *transfer_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "File Transfer" ),
+  TQButtonGroup *transfer_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "File Transfer" ),
                               deltrans_tab, "RsyncFileTransferBox" );
  transfer_box->setInsideSpacing( 5 );

@ -163,7 +163,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  TQGridLayout *filter_layout = new TQGridLayout( filter_tab );
  filter_layout->setSpacing( 10 );

-  TQButtonGroup *general_filter_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "General" ),
+  TQButtonGroup *general_filter_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "General" ),
                                     filter_tab, "RsyncGeneralFilterBox" );
  general_filter_box->setInsideSpacing( 5 );

@ -180,7 +180,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  KURLRequester *include_from = new KURLRequester( general_filter_box, "kcfg_IncludeFrom" );
  include_from->setMode( KFile::File | KFile::LocalOnly );

-  TQButtonGroup *filter_rules_box = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Filter Rules" ),
+  TQButtonGroup *filter_rules_box = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Filter Rules" ),
                                   filter_tab, "RsyncFilterRulesBox" );
  filter_rules_box->setInsideSpacing( 5 );
  TQLabel *filter_rules_label = new TQLabel( i18n( "The rules defined below will be added to the \"rsync\" command as they are. Thus, you have to start with the --filter=... argument." ), filter_rules_box );
@ -206,7 +206,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  TQGridLayout *advanced_layout = new TQGridLayout( advanced_tab );
  advanced_layout->setSpacing( 10 );

-  TQButtonGroup *misc_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "General" ),
+  TQButtonGroup *misc_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "General" ),
                           advanced_tab, "RsyncAdvancedMiscBox" );
  misc_box->setInsideSpacing( 5 );

@ -217,7 +217,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  (void) new TQCheckBox( i18n( "Ignore files that already exist" ), misc_box, "kcfg_IgnoreExisting" );
  (void) new TQCheckBox( i18n( "Delay updates until the end of transfer" ), misc_box, "kcfg_DelayUpdates" );

-  TQButtonGroup *backup_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Backup" ), advanced_tab, "RsyncBackupBox" );
+  TQButtonGroup *backup_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Backup" ), advanced_tab, "RsyncBackupBox" );
  backup_box->setInsideSpacing( 5 );

  TQCheckBox *backup = new TQCheckBox( i18n( "Make backups" ), backup_box, "kcfg_MakeBackups" );
@ -228,7 +228,7 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT
  KURLRequester *backup_dir = new KURLRequester( backup_box, "kcfg_BackupDirectory" );
  backup_dir->setMode( KFile::Directory | KFile::LocalOnly );

-  TQButtonGroup *checksum_box = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Checksums" ), advanced_tab, "RsyncChecksumsBox" );
+  TQButtonGroup *checksum_box = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Checksums" ), advanced_tab, "RsyncChecksumsBox" );
  checksum_box->setInsideSpacing( 5 );

  (void) new TQCheckBox( i18n( "Force fixed checksum block size:" ), checksum_box, "kcfg_UseBlockSize" );
@ -247,38 +247,38 @@ Smb4KRsyncOptions::Smb4KRsyncOptions( TQWidget *parent, const char *name ) : TQT

  addTab( advanced_tab, i18n( "Advanced" ) );

-  connect( archive_mode, TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotArchiveToggled( bool ) ) );
+  connect( archive_mode, TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotArchiveToggled( bool ) ) );

-  connect( recursive,    TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( recursive,    TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( links,        TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( links,        TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( perms,        TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( perms,        TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( times,        TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( times,        TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( group,        TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( group,        TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( owner,        TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( owner,        TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( devices,      TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotUncheckArchive( bool ) ) );
+  connect( devices,      TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotUncheckArchive( bool ) ) );

-  connect( backup,       TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotBackupToggled( bool ) ) );
+  connect( backup,       TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotBackupToggled( bool ) ) );

-  connect( f_filter,     TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotFShortcutToggled( bool ) ) );
+  connect( f_filter,     TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotFShortcutToggled( bool ) ) );

-  connect( ff_filter,    TQ_SIGNAL( toggled( bool ) ),
-           this,         TQ_SLOT( slotFFShortcutToggled( bool ) ) );
+  connect( ff_filter,    TQT_SIGNAL( toggled( bool ) ),
+           this,         TQT_SLOT( slotFFShortcutToggled( bool ) ) );

  slotArchiveToggled( true );
  slotBackupToggled( false );
@ -291,20 +291,20 @@ Smb4KRsyncOptions::~Smb4KRsyncOptions()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KRsyncOptions::slotArchiveToggled( bool on )
 {
  if ( on )
  {
-    static_cast<TQCheckBox *>( child( "kcfg_RecurseIntoDirectories", "TQCheckBox", true ) )->setChecked( on );
-    static_cast<TQCheckBox *>( child( "kcfg_PreserveSymlinks", "TQCheckBox", true ) )->setChecked( on );
-    static_cast<TQCheckBox *>( child( "kcfg_PreservePermissions", "TQCheckBox", true ) )->setChecked( on );
-    static_cast<TQCheckBox *>( child( "kcfg_PreserveTimes", "TQCheckBox", true ) )->setChecked( on );
-    static_cast<TQCheckBox *>( child( "kcfg_PreserveGroup", "TQCheckBox", true ) )->setChecked( on );
-    static_cast<TQCheckBox *>( child( "kcfg_PreserveOwner", "TQCheckBox", true ) )->setChecked( on );
-    static_cast<TQCheckBox *>( child( "kcfg_PreserveDevicesAndSpecials", "TQCheckBox", true ) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_RecurseIntoDirectories", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveSymlinks", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreservePermissions", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveTimes", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveGroup", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveOwner", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_PreserveDevicesAndSpecials", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
  }
 }

@ -313,23 +313,23 @@ void Smb4KRsyncOptions::slotUncheckArchive( bool on )
 {
  if ( !on )
  {
-    static_cast<TQCheckBox *>( child( "kcfg_ArchiveMode", "TQCheckBox", true ) )->setChecked( on );
+    static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_ArchiveMode", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setChecked( on );
  }
 }


 void Smb4KRsyncOptions::slotBackupToggled( bool on )
 {
-  static_cast<TQCheckBox *>( child( "kcfg_UseBackupDirectory", "TQCheckBox", true ) )->setEnabled( on );
-  static_cast<KURLRequester *>( child( "kcfg_BackupDirectory", "KURLRequester", true ) )->setEnabled( on );
-  static_cast<TQCheckBox *>( child( "kcfg_UseBackupSuffix", "TQCheckBox", true ) )->setEnabled( on );
-  static_cast<KLineEdit *>( child( "kcfg_BackupSuffix", "KLineEdit", true ) )->setEnabled( on );
+  static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupDirectory", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setEnabled( on );
+  static_cast<KURLRequester *>( TQT_TQWIDGET(child( "kcfg_BackupDirectory", "KURLRequester", true )) )->setEnabled( on );
+  static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseBackupSuffix", TQCHECKBOX_OBJECT_NAME_STRING, true )) )->setEnabled( on );
+  static_cast<KLineEdit *>( TQT_TQWIDGET(child( "kcfg_BackupSuffix", "KLineEdit", true )) )->setEnabled( on );
 }


 void Smb4KRsyncOptions::slotFShortcutToggled( bool on )
 {
-  TQCheckBox *ff_filter = static_cast<TQCheckBox *>( child( "kcfg_UseFFFilterRule", "TQCheckBox", true ) );
+  TQCheckBox *ff_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFFilterRule", TQCHECKBOX_OBJECT_NAME_STRING, true )) );

  if ( on && ff_filter->isChecked() )
  {
@ -340,7 +340,7 @@ void Smb4KRsyncOptions::slotFShortcutToggled( bool on )

 void Smb4KRsyncOptions::slotFFShortcutToggled( bool on )
 {
-  TQCheckBox *f_filter = static_cast<TQCheckBox *>( child( "kcfg_UseFFilterRule", "TQCheckBox", true ) );
+  TQCheckBox *f_filter = static_cast<TQCheckBox *>( TQT_TQWIDGET(child( "kcfg_UseFFilterRule", TQCHECKBOX_OBJECT_NAME_STRING, true )) );

  if ( on && f_filter->isChecked() )
  {
--- a/smb4k/configdlg/smb4tdersyncoptions.h
+++ b/smb4k/configdlg/smb4tdersyncoptions.h
@ -43,7 +43,7 @@

 class Smb4KRsyncOptions : public TQTabWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -66,7 +66,7 @@ class Smb4KRsyncOptions : public TQTabWidget
     * This slot is invoked if the "Archive mode" checkbox has been
     * toggled.
     *
-     * @param on            Is true if the checkbox is checked and false otherwise.
+     * @param on            Is TRUE if the checkbox is checked and FALSE otherwise.
     */
    void slotArchiveToggled( bool on );

@ -74,8 +74,8 @@ class Smb4KRsyncOptions : public TQTabWidget
     * This slot is invoked if the --archive option has to be switched
     * off.
     *
-     * @param on            Is false if one of the connected checkboxes is unchecked
-     *                      and true otherwise.
+     * @param on            Is FALSE if one of the connected checkboxes is unchecked
+     *                      and TRUE otherwise.
     */
    void slotUncheckArchive( bool on );

@ -84,8 +84,8 @@ class Smb4KRsyncOptions : public TQTabWidget
     * It enables/disables all other backup options according to the
     * state the backup button is in.
     *
-     * @param on            Is true if the m_backup check box has been
-     *                      checked and false otherwise.
+     * @param on            Is TRUE if the m_backup check box has been
+     *                      checked and FALSE otherwise.
     */
    void slotBackupToggled( bool on );

@ -93,7 +93,7 @@ class Smb4KRsyncOptions : public TQTabWidget
     * This slot is called if the '-F' shortcut has been toggled.
     * It unchecks the '-F -F' shortcut.
     *
-     * @param on            Is true is m_f_filter is checked and false otherwise.
+     * @param on            Is TRUE is m_f_filter is checked and FALSE otherwise.
     */
    void slotFShortcutToggled( bool on );

@ -101,7 +101,7 @@ class Smb4KRsyncOptions : public TQTabWidget
     * This slot is called if the '-F -F' shortcut has been toggled.
     * It unchecks the '-F' shortcut.
     *
-     * @param on            Is true is m_ff_filter is checked and false otherwise.
+     * @param on            Is TRUE is m_ff_filter is checked and FALSE otherwise.
     */
    void slotFFShortcutToggled( bool on );
 };
--- a/smb4k/core/CMakeLists.txt
+++ b/smb4k/core/CMakeLists.txt
@ -1,49 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4kcore (shared)
-
-tde_add_library( smb4kcore SHARED AUTOMOC
-  SOURCES
-    smb4kauthinfo.cpp smb4kbookmark.cpp smb4kbookmarkhandler.cpp smb4kcore.cpp
-    smb4kerror.cpp smb4tdefileio.cpp smb4tdeglobal.cpp smb4kglobal_p.cpp
-    smb4khomesshareshandler.cpp smb4kmounter.cpp smb4kmounter_p.cpp
-    smb4knetworkitems.cpp smb4kpasswordhandler.cpp smb4kpreviewer.cpp
-    smb4kpreviewitem.cpp smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp
-    smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc
-    smb4kshare.cpp smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
-  LINK tdecore-shared tdeui-shared tdeio-shared tdewalletclient-shared
-  VERSION 2.0.0
-  DESTINATION ${LIB_INSTALL_DIR}
-)
-
-
-##### other files
-
-install(
-  FILES smb4k.kcfg
-  DESTINATION ${SHARE_INSTALL_PREFIX}/config.kcfg
-)
-
-install(
-  FILES
-    smb4kauthinfo.h smb4kbookmark.h smb4kbookmarkhandler.h
-    smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4tdeglobal.h
-    smb4khomesshareshandler.h smb4kmounter.h smb4knetworkitems.h
-    smb4kpasswordhandler.h smb4kpreviewer.h smb4kpreviewitem.h
-    smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h
-    smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h
-    smb4ksynchronizationinfo.h smb4ksynchronizer.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}
-)
--- a/smb4k/core/Makefile.am
+++ b/smb4k/core/Makefile.am
@ -0,0 +1,35 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libsmb4kcore.la
+libsmb4kcore_la_LDFLAGS = -no-undefined $(all_libraries) -ltdewalletclient \
+	-version-info 2:0:0
+include_HEADERS = smb4kauthinfo.h smb4kbookmark.h smb4kbookmarkhandler.h \
+	smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4tdeglobal.h \
+	smb4khomesshareshandler.h smb4kmounter.h smb4knetworkitems.h \
+	smb4kpasswordhandler.h smb4kpreviewer.h smb4kpreviewitem.h \
+	smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h \
+	smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h \
+	smb4ksynchronizationinfo.h smb4ksynchronizer.h
+libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
+	smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4tdefileio.cpp smb4tdeglobal.cpp \
+	smb4kglobal_p.cpp smb4khomesshareshandler.cpp smb4kmounter.cpp smb4kmounter_p.cpp \
+	smb4knetworkitems.cpp smb4kpasswordhandler.cpp smb4kpreviewer.cpp smb4kpreviewitem.cpp \
+	smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
+	smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \
+	smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
+libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT)
+
+kde_kcfg_DATA = smb4k.kcfg
+
+# Build rules
+smb4kcore.lo: smb4ksettings.h
+smb4tdefileio.lo: smb4ksettings.h
+smb4kmounter.lo: smb4ksettings.h
+smb4kpasswordhandler.lo: smb4ksettings.h
+smb4kprint.lo: smb4ksettings.h
+smb4ksambaoptionshandler.lo: smb4ksettings.h
+smb4kscanner.lo: smb4ksettings.h
+smb4ksynchronizer.lo: smb4ksettings.h
+
+noinst_HEADERS = smb4kglobal_p.h smb4kmounter_p.h smb4kscanner_p.h
--- a/smb4k/core/smb4kauthinfo.h
+++ b/smb4k/core/smb4kauthinfo.h
@ -31,8 +31,6 @@
 #include <tqstring.h>
 #include <tqcstring.h>

-#include <tdemacros.h>
-
 /**
 * This class provides a container for the authentication data.
 *
@ -40,7 +38,7 @@
 */


-class TDE_EXPORT Smb4KAuthInfo
+class Smb4KAuthInfo
 {
  public:
    /**
--- a/smb4k/core/smb4kbookmark.h
+++ b/smb4k/core/smb4kbookmark.h
@ -31,8 +31,6 @@
 // TQt includes
 #include <tqstring.h>

-#include <tdemacros.h>
-
 // forward declarations
 class Smb4KShareItem;

@ -40,7 +38,7 @@ class Smb4KShareItem;
 * This class is a container for a set bookmark on a samba share
 */

-class TDE_EXPORT Smb4KBookmark
+class Smb4KBookmark
 {
  public:
    /**
@ -201,12 +199,12 @@ class TDE_EXPORT Smb4KBookmark

    /**
     * This function checks if the IP address is valid, i.e. the
-     * IP address is either IP v4 or IP v6. It returns either true
-     * or false.
+     * IP address is either IP v4 or IP v6. It returns either TRUE
+     * or FALSE.
     *
     * @param ip            The IP address that's going to be checked.
     *
-     * @returns true if the IP address is valid and false otherwise.
+     * @returns TRUE if the IP address is valid and FALSE otherwise.
     */
    bool ipIsValid( const TQString &ip );
 };
--- a/smb4k/core/smb4kbookmarkhandler.cpp
+++ b/smb4k/core/smb4kbookmarkhandler.cpp
@ -28,7 +28,7 @@
 #include <tqfile.h>

 // KDE includes
-#include <tdestandarddirs.h>
+#include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeapplication.h>

@ -96,7 +96,7 @@ void Smb4KBookmarkHandler::addBookmark( Smb4KBookmark *bookmark )

  if ( TQString::compare( bookmark->share(), "homes" ) == 0 )
  {
-    TQString share = specifyUser( bookmark->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
+    TQString share = specifyUser( bookmark->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );

    bookmark->setShareName( share );
  }
--- a/smb4k/core/smb4kbookmarkhandler.h
+++ b/smb4k/core/smb4kbookmarkhandler.h
@ -34,8 +34,6 @@
 #include <tqobject.h>
 #include <tqvaluelist.h>

-#include <tdemacros.h>
-
 // forward declarations
 class Smb4KHostItem;
 class Smb4KBookmark;
@ -48,9 +46,9 @@ class Smb4KBookmark;
 * @author         Alexander Reinholdt <dustpuppy@mail.berlios.de>
 */

-class TDE_EXPORT Smb4KBookmarkHandler : public TQObject
+class Smb4KBookmarkHandler : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/core/smb4kcore.cpp
+++ b/smb4k/core/smb4kcore.cpp
@ -83,23 +83,23 @@ Smb4KCore::Smb4KCore() : TQObject()
  m_previewer_state = PREVIEWER_STOP;

  // Connections:
-  connect( m_scanner,         TQ_SIGNAL( state( int ) ),
-           this,              TQ_SLOT( slotSetScannerState( int ) ) );
+  connect( m_scanner,         TQT_SIGNAL( state( int ) ),
+           this,              TQT_SLOT( slotSetScannerState( int ) ) );

-  connect( m_mounter,         TQ_SIGNAL( state( int ) ),
-           this,              TQ_SLOT( slotSetMounterState( int ) ) );
+  connect( m_mounter,         TQT_SIGNAL( state( int ) ),
+           this,              TQT_SLOT( slotSetMounterState( int ) ) );

-  connect( m_print,           TQ_SIGNAL( state( int ) ),
-           this,              TQ_SLOT( slotSetPrinterHandlerState( int ) ) );
+  connect( m_print,           TQT_SIGNAL( state( int ) ),
+           this,              TQT_SLOT( slotSetPrinterHandlerState( int ) ) );

-  connect( m_synchronizer,    TQ_SIGNAL( state( int ) ),
-           this,              TQ_SLOT( slotSetSynchronizerState( int ) ) );
+  connect( m_synchronizer,    TQT_SIGNAL( state( int ) ),
+           this,              TQT_SLOT( slotSetSynchronizerState( int ) ) );

-  connect( m_previewer,       TQ_SIGNAL( state( int ) ),
-           this,              TQ_SLOT( slotSetSynchronizerState( int ) ) );
+  connect( m_previewer,       TQT_SIGNAL( state( int ) ),
+           this,              TQT_SLOT( slotSetSynchronizerState( int ) ) );

-  connect( tdeApp,              TQ_SIGNAL( shutDown() ),
-           this,              TQ_SLOT( slotShutdown() ) );
+  connect( kapp,              TQT_SIGNAL( shutDown() ),
+           this,              TQT_SLOT( slotShutdown() ) );
 }


@ -904,7 +904,7 @@ void Smb4KCore::setDefaultSettings()


 /////////////////////////////////////////////////////////////////////////////
-//  SLOT IMPLEMENTATIONS
+//  TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KCore::slotSetScannerState( int state )
--- a/smb4k/core/smb4kcore.h
+++ b/smb4k/core/smb4kcore.h
@ -36,8 +36,6 @@
 #include <tqtimer.h>
 #include <tqvaluelist.h>

-#include <tdemacros.h>
-
 // application specific includes
 #include "smb4kscanner.h"
 #include "smb4kmounter.h"
@ -59,9 +57,9 @@ class Smb4KShare;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KCore : public TQObject
+class Smb4KCore : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -89,7 +87,7 @@ class TDE_EXPORT Smb4KCore : public TQObject
    static int scannerState() { return self()->m_scanner_state; }

    /**
-     * Returns true, if the scanner is running, otherwise false.
+     * Returns TRUE, if the scanner is running, otherwise FALSE.
     */
    static bool scannerIsRunning() { return self()->m_scanner->isRunning(); }

@ -99,7 +97,7 @@ class TDE_EXPORT Smb4KCore : public TQObject
    static int mounterState() { return self()->m_mounter_state; }

    /**
-     * Returns true, if the mounter is running, otherwise false.
+     * Returns TRUE, if the mounter is running, otherwise FALSE.
     */
    static bool mounterIsRunning() { return self()->m_mounter->isRunning(); }

@ -109,7 +107,7 @@ class TDE_EXPORT Smb4KCore : public TQObject
    static int printState() { return self()->m_print_state; }

    /**
-     * Returns true, if the print object is running, otherwise false.
+     * Returns TRUE, if the print object is running, otherwise FALSE.
     */
    static bool printIsRunning() { return self()->m_print->isRunning(); }

@ -119,12 +117,12 @@ class TDE_EXPORT Smb4KCore : public TQObject
    static int synchronizerState() { return self()->m_syncer_state; }

    /**
-     * Returns true, if the synchronizer is running, otherwise false.
+     * Returns TRUE, if the synchronizer is running, otherwise FALSE.
     */
    static bool synchronizerIsRunning() { return self()->m_synchronizer->isRunning(); }

    /**
-     * Returns true if one of the core classes is doing something.
+     * Returns TRUE if one of the core classes is doing something.
     */
    static bool isRunning();

--- a/smb4k/core/smb4kglobal_p.cpp
+++ b/smb4k/core/smb4kglobal_p.cpp
@ -102,7 +102,7 @@ const TQString &Smb4TDEGlobalPrivate::tempDir()
    {
      Smb4KError::error( ERROR_CREATING_TEMP_DIR, tmpd_name, strerror( errno ) );

-      return TQString::null;
+      return TQString();
    }

    m_temp_dir = TQString( tmpd_name );
--- a/smb4k/core/smb4khomesshareshandler.cpp
+++ b/smb4k/core/smb4khomesshareshandler.cpp
@ -31,7 +31,7 @@

 // KDE includes
 #include <kdebug.h>
-#include <tdestandarddirs.h>
+#include <kstandarddirs.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
@ -98,10 +98,10 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid
  layout->addMultiCellWidget( userCombo, 1, 1, 1, 4, 0 );
  layout->addItem( spacer1, 0, 2 );

-  connect( userCombo, TQ_SIGNAL( textChanged( const TQString &) ),
-           this,      TQ_SLOT( slotTextChanged( const TQString & ) ) );
-  connect( m_dlg,     TQ_SIGNAL( user1Clicked() ),
-           this,      TQ_SLOT( slotClearClicked() ) );
+  connect( userCombo, TQT_SIGNAL( textChanged( const TQString &) ),
+           this,      TQT_SLOT( slotTextChanged( const TQString & ) ) );
+  connect( m_dlg,     TQT_SIGNAL( user1Clicked() ),
+           this,      TQT_SLOT( slotClearClicked() ) );

  // Read the list of logins, that are already defined
  // for this 'homes' share.
@ -325,7 +325,7 @@ void Smb4KHomesSharesHandler::write_names( const TQString &host, const TQStringL


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KHomesSharesHandler::slotTextChanged( const TQString &text )
--- a/smb4k/core/smb4khomesshareshandler.h
+++ b/smb4k/core/smb4khomesshareshandler.h
@ -47,7 +47,7 @@

 class Smb4KHomesSharesHandler : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/core/smb4kmounter.cpp
+++ b/smb4k/core/smb4kmounter.cpp
@ -37,9 +37,9 @@
 #include <kdebug.h>

 // system includes
-#if !defined(__FreeBSD__) && !defined(__sun)
+#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS)
 #include <sys/statfs.h>
-#elif defined(__sun)
+#elif defined(__solaris__) || defined(USE_SOLARIS)
 #include <sys/statvfs.h>
 #elif defined(__FreeBSD__)
 #include <sys/param.h>
@ -84,17 +84,17 @@ Smb4KMounter::Smb4KMounter( TQObject *parent, const char *name ) : TQObject( par

  m_queue.setAutoDelete( true );

-  connect( m_proc,  TQ_SIGNAL( processExited( TDEProcess * ) ),
-           this,    TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( m_proc,  TQT_SIGNAL( processExited( TDEProcess * ) ),
+           this,    TQT_SLOT( slotProcessExited( TDEProcess * ) ) );

-  connect( m_proc,  TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this,    TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( m_proc,  TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this,    TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );

-  connect( m_proc,  TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           this,    TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( m_proc,  TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this,    TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );

-  connect( tdeApp,    TQ_SIGNAL( shutDown() ),
-           this,    TQ_SLOT( slotShutdown() ) );
+  connect( kapp,    TQT_SIGNAL( shutDown() ),
+           this,    TQT_SLOT( slotShutdown() ) );
 }


@ -369,18 +369,18 @@ void Smb4KMounter::import()

            if ( (!new_share->isBroken() &&
                 (tqstrncmp( new_share->canonicalPath(),
-                            TQDir( Smb4KSettings::mountPrefix() ).canonicalPath().local8Bit(),
-                            TQDir( Smb4KSettings::mountPrefix() ).canonicalPath().local8Bit().length() ) == 0 ||
+                            TQDir( Smb4KSettings::mountPrefix() ).canonicalPath(),
+                            TQDir( Smb4KSettings::mountPrefix() ).canonicalPath().length() ) == 0 ||
                  tqstrncmp( new_share->canonicalPath(),
-                            TQDir::home().canonicalPath().local8Bit(),
-                            TQDir::home().canonicalPath().local8Bit().length() ) == 0)) ||
+                            TQDir::home().canonicalPath(),
+                            TQDir::home().canonicalPath().length() ) == 0)) ||
                 (new_share->isBroken() &&
                 (tqstrncmp( new_share->path(),
-                            TQDir::homeDirPath().local8Bit(),
-                            TQDir::homeDirPath().local8Bit().length() ) == 0 ||
+                            TQDir::homeDirPath(),
+                            TQDir::homeDirPath().length() ) == 0 ||
                  tqstrncmp( new_share->path(),
-                            Smb4KSettings::mountPrefix().local8Bit(),
-                            Smb4KSettings::mountPrefix().local8Bit().length() ) == 0)) )
+                            Smb4KSettings::mountPrefix(),
+                            Smb4KSettings::mountPrefix().length() ) == 0)) )
            {
              foreign = false;
            }
@ -480,7 +480,7 @@ void Smb4KMounter::mountShare( const TQString &workgroup, const TQString &host,

  if ( TQString::compare( share, "homes" ) == 0 )
  {
-    share_name = specifyUser( host, tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
+    share_name = specifyUser( host, kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );
  }
  else
  {
@ -1046,14 +1046,14 @@ void Smb4KMounter::processMount()
      TQString name = TQString( "//%1/%2" ).arg( m_priv->host() ).arg( m_priv->share() );

      // Check file system
-#if !defined(__sun)
+#if !defined(__solaris__)
      struct statfs filesystem;
 #else
      struct statvfs filesystem;
 #endif

-#if !defined(__sun) && !defined(__irix__)
-      if ( statfs( m_priv->path().local8Bit(), &filesystem ) == -1 )
+#if !defined(__solaris__) && !defined(__irix__)
+      if ( statfs( m_priv->path(), &filesystem ) == -1 )
 #elif defined(__irix__)
      if ( statfs( m_priv->path(), &filesystem, sizeof( filesystem ), 0 ) == -1 )
 #else
@ -1079,7 +1079,7 @@ void Smb4KMounter::processMount()
      }
      else
      {
-#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__)
+#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(__irix__)
        if ( (uint)filesystem.f_type == 0xFF534D42 /* CIFS */)
        {
          // The user name will be send if no login was specified.
@ -1095,7 +1095,7 @@ void Smb4KMounter::processMount()
          share =  new Smb4KShare( name, m_priv->path(), "smbfs", (int)getuid(), (int)getgid() );
          m_mounted_shares.append( share );
        }
-#elif defined(__sun)
+#elif defined(__solaris__)
        if ( (uint)filesystem.f_basetype == 0xFF534D42 /* CIFS */)
        {
          // The user name will be send if no login was specified.
@ -1534,7 +1534,7 @@ void Smb4KMounter::timerEvent( TQTimerEvent * )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////


@ -1588,13 +1588,12 @@ void Smb4KMounter::slotShutdown()

      for ( TQValueListIterator<Smb4KShare *> bs = broken_shares.begin(); bs != broken_shares.end(); ++bs )
      {
-				TQString path = Smb4KSettings::mountPrefix()+*it;
        if ( tqstrncmp( (*bs)->path(),
-                       path.local8Bit(),
-                       path.local8Bit().length() ) == 0 ||
+                       Smb4KSettings::mountPrefix()+*it,
+                       (Smb4KSettings::mountPrefix()+*it).length() ) == 0 ||
             tqstrncmp( (*bs)->canonicalPath(),
-                       path.local8Bit(),
-                       path.local8Bit().length() ) == 0 )
+                       Smb4KSettings::mountPrefix()+*it,
+                       (Smb4KSettings::mountPrefix()+*it).length() ) == 0 )
        {
          broken = true;

--- a/smb4k/core/smb4kmounter.h
+++ b/smb4k/core/smb4kmounter.h
@ -37,8 +37,7 @@
 #include <tqfile.h>

 // KDE includes
-#include <tdemacros.h>
-#include <tdeprocess.h>
+#include <kprocess.h>

 // application specific includes
 #include "smb4kdefs.h"
@ -57,9 +56,9 @@ class Smb4KShare;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KMounter : public TQObject
+class Smb4KMounter : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -85,7 +84,7 @@ class TDE_EXPORT Smb4KMounter : public TQObject

    /**
     * Unmounts a share. This can either be done the "normal" way, or you may
-     * force it. If you decide the force the unmounting by setting @p force to true,
+     * force it. If you decide the force the unmounting by setting @p force to TRUE,
     * a lazy unmount will be initiated. With the parameter @p noMessage you can
     * suppress any error messages.
     *
@ -94,7 +93,7 @@ class TDE_EXPORT Smb4KMounter : public TQObject
     * @param force       Force the unmounting of the share.
     *
     * @param noMessage   Determines whether this function should emit an error code in case of an error.
-     *                    The default value is false.
+     *                    The default value is FALSE.
     */
    void unmountShare( Smb4KShare *share, bool force = false, bool noMessage = false );

@ -136,23 +135,23 @@ class TDE_EXPORT Smb4KMounter : public TQObject
    TQValueList<Smb4KShare> findShareByName( const TQString &name );

    /**
-     * This function returns true if a share is mounted and false otherwise.
+     * This function returns TRUE if a share is mounted and FALSE otherwise.
     *
     * @param name        The name of the share. It has to look like this:
     *                    //HOST/SHARE.
     *
     * @param userOnly    Specifies whether this function should only consider
     *                    shares mounted by the user or all shares that are
-     *                    available on the system. The default is true.
+     *                    available on the system. The default is TRUE.
     *
-     * @return true if the share is mounted and false otherwise.
+     * @return TRUE if the share is mounted and FALSE otherwise.
     */
    bool isMounted( const TQString &name, bool userOnly = true );

    /**
     * This function reports if the mounter is running or not.
     *
-     * @returns             true if the scanner is running and false otherwise.
+     * @returns             TRUE if the scanner is running and FALSE otherwise.
     */
    bool isRunning() { return m_working; }

--- a/smb4k/core/smb4knetworkitems.h
+++ b/smb4k/core/smb4knetworkitems.h
@ -35,14 +35,12 @@
 #include <tqobject.h>
 #include <tqstring.h>

-#include <tdemacros.h>
-
 /**
 * This class provides a container for a workgroup/domain found in the network
 * neighborhood.
 */

-class TDE_EXPORT Smb4KWorkgroupItem
+class Smb4KWorkgroupItem
 {
  public:
    /**
@ -95,7 +93,7 @@ class TDE_EXPORT Smb4KWorkgroupItem
    void setPseudoMaster();

    /**
-     * Returns true, if the master is a 'pseudo' master. @see setPseudoMaster()
+     * Returns TRUE, if the master is a 'pseudo' master. @see setPseudoMaster()
     * for further information.
     */
    bool hasPseudoMaster() const { return m_pseudo; }
@ -144,12 +142,12 @@ class TDE_EXPORT Smb4KWorkgroupItem

    /**
     * This function checks if the IP address is valid, i.e. the
-     * IP address is either IP v4 or IP v6. It returns either true
-     * or false.
+     * IP address is either IP v4 or IP v6. It returns either TRUE
+     * or FALSE.
     *
     * @param ip            The IP address that's going to be checked.
     *
-     * @returns true if the IP address is valid and false otherwise.
+     * @returns TRUE if the IP address is valid and FALSE otherwise.
     */
    bool ipIsValid( const TQString &ip );
 };
@ -160,7 +158,7 @@ class TDE_EXPORT Smb4KWorkgroupItem
 * neighborhood.
 */

-class TDE_EXPORT Smb4KHostItem
+class Smb4KHostItem
 {
  public:
    /**
@ -240,14 +238,14 @@ class TDE_EXPORT Smb4KHostItem
     * This functions determines whether this host should be
     * registered as a master browser.
     *
-     * @param master        Set this to true if the host is a master browser.
+     * @param master        Set this to TRUE if the host is a master browser.
     */
    void setMaster( bool master );

    /**
     * This function tells you if the host is a master or not.
     *
-     * @returns             true if the host is a master browser.
+     * @returns             TRUE if the host is a master browser.
     */
    const bool isMaster() const { return m_master; }

@ -269,14 +267,14 @@ class TDE_EXPORT Smb4KHostItem
     * This function is used to tell the host item, if a
     * check for the IP address has already been performed.
     *
-     * @param yes           Should be set to true if a check was performed.
+     * @param yes           Should be set to TRUE if a check was performed.
     */
    void setIPAddressChecked( bool yes );

    /**
     * Tells if a check for the IP address has already been performed.
     *
-     * @returns             true if a check was performed, and false otherwise.
+     * @returns             TRUE if a check was performed, and FALSE otherwise.
     */
    const bool ipAddressChecked() const { return m_ip_checked; }

@ -284,7 +282,7 @@ class TDE_EXPORT Smb4KHostItem
     * This function is used to tell the host item, if a
     * check for the information (OS and Server string ) has already been performed.
     *
-     * @param yes           Should be set to true if a check was performed.
+     * @param yes           Should be set to TRUE if a check was performed.
     */
    void setInfoChecked( bool yes );

@ -292,7 +290,7 @@ class TDE_EXPORT Smb4KHostItem
     * Tells if a check for the information (OS and Server string) has already
     * been performed.
     *
-     * @returns             true is the check was performed previously.
+     * @returns             TRUE is the check was performed previously.
     */
    const bool infoChecked() const { return m_info_checked; }

@ -347,12 +345,12 @@ class TDE_EXPORT Smb4KHostItem

    /**
     * This function checks if the IP address is valid, i.e. the
-     * IP address is either IP v4 or IP v6. It returns either true
-     * or false.
+     * IP address is either IP v4 or IP v6. It returns either TRUE
+     * or FALSE.
     *
     * @param ip            The IP address that's going to be checked.
     *
-     * @returns true if the IP address is valid and false otherwise.
+     * @returns TRUE if the IP address is valid and FALSE otherwise.
     */
    bool ipIsValid( const TQString &ip );
 };
@ -363,7 +361,7 @@ class TDE_EXPORT Smb4KHostItem
 * network neighborhood.
 */

-class TDE_EXPORT Smb4KShareItem
+class Smb4KShareItem
 {
  public:
    /**
@ -431,31 +429,31 @@ class TDE_EXPORT Smb4KShareItem
    /**
     * This function tells if the share is a hidden one.
     *
-     * @returns           true is the share is a hidden one and false otherwise.
+     * @returns           TRUE is the share is a hidden one and FALSE otherwise.
     */
    bool isHidden() const;

    /**
-     * This function is true if the share is a printer and
-     * false otherwise.
+     * This function is TRUE if the share is a printer and
+     * FALSE otherwise.
     *
-     * @returns	          true if the share is a printer
+     * @returns	          TRUE if the share is a printer
     */
    bool isPrinter() const;

    /**
-     * This function returns true if the share is an IPC$
-     * share and false otherwise.
+     * This function returns TRUE if the share is an IPC$
+     * share and FALSE otherwise.
     *
-     * @returns           true if the share is an IPC$ share
+     * @returns           TRUE if the share is an IPC$ share
     */
    bool isIPC() const;

    /**
-     * This function returns true if the share is an ADMIN$
-     * share and false otherwise.
+     * This function returns TRUE if the share is an ADMIN$
+     * share and FALSE otherwise.
     *
-     * @returns           true if the share is an ADMIN$ share
+     * @returns           TRUE if the share is an ADMIN$ share
     */
    bool isADMIN() const;

--- a/smb4k/core/smb4kpasswordhandler.cpp
+++ b/smb4k/core/smb4kpasswordhandler.cpp
@ -36,7 +36,7 @@

 // KDE includes
 #include <tdelocale.h>
-#include <tdestandarddirs.h>
+#include <kstandarddirs.h>
 #include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
@ -109,9 +109,9 @@ void Smb4KPasswordHandler::open_close_wallet()
      // Start the wallet manager before accessing the wallet. We
      // do not care about the return value, because we do not do
      // error handling here.
-      if ( tdeApp )
+      if ( kapp )
      {
-        (void) tdeApp->tdeinitExec( "tdewalletmanager" );
+        (void) kapp->tdeinitExec( "tdewalletmanager" );
      }
      else
      {
@ -323,13 +323,13 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h
  // the edit line for the user to enable/disable the OK button.
  if ( user_edit )
  {
-    connect( user_edit, TQ_SIGNAL( textChanged( const TQString & ) ),
-             this,      TQ_SLOT( slotEnableOKButton( const TQString& ) ) );
+    connect( user_edit, TQT_SIGNAL( textChanged( const TQString & ) ),
+             this,      TQT_SLOT( slotEnableOKButton( const TQString& ) ) );
  }
  else
  {
-    connect( user_combo, TQ_SIGNAL( textChanged( const TQString & ) ),
-             this,       TQ_SLOT( slotEnableOKButton( const TQString& ) ) );
+    connect( user_combo, TQT_SIGNAL( textChanged( const TQString & ) ),
+             this,       TQT_SLOT( slotEnableOKButton( const TQString& ) ) );
  }

  // Process the authentication data:
@ -355,8 +355,8 @@ bool Smb4KPasswordHandler::askpass( const TQString &workgroup, const TQString &h
    user_combo->insertStringList( list );
    user_combo->setCurrentText( TQString() );

-    connect( user_combo, TQ_SIGNAL( activated( const TQString & ) ),
-             this,       TQ_SLOT( slotGetPassword( const TQString & ) ) );
+    connect( user_combo, TQT_SIGNAL( activated( const TQString & ) ),
+             this,       TQT_SLOT( slotGetPassword( const TQString & ) ) );

    user_combo->setFocus();
  }
@ -786,10 +786,10 @@ void Smb4KPasswordHandler::writeToSMBConfFile( Smb4KAuthInfo *authInfo )
  TDEProcess *p = new TDEProcess();
  p->setUseShell( true );

-  connect( p,    TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this, TQ_SLOT( slotReceivePassword( TDEProcess *, char *, int ) ) );
-  connect( p,    TQ_SIGNAL( processExited( TDEProcess * ) ),
-           this, TQ_SLOT( slotWritePassword( TDEProcess * ) ) );
+  connect( p,    TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this, TQT_SLOT( slotReceivePassword( TDEProcess *, char *, int ) ) );
+  connect( p,    TQT_SIGNAL( processExited( TDEProcess * ) ),
+           this, TQT_SLOT( slotWritePassword( TDEProcess * ) ) );

  *p << TQString( "smbutil crypt %1" ).arg( m_nsmbrc_auth.password() );

@ -800,7 +800,7 @@ void Smb4KPasswordHandler::writeToSMBConfFile( Smb4KAuthInfo *authInfo )


 /////////////////////////////////////////////////////////////////////////////
-//  SLOT IMPLEMENTATIONS
+//  TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////


@ -812,7 +812,7 @@ void Smb4KPasswordHandler::slotGetPassword( const TQString &username )
    // of the homes shares:
    Smb4KAuthInfo *auth = readAuth( new Smb4KAuthInfo( m_auth->workgroup().upper(), m_auth->host().upper(), username ) );

-    KLineEdit *lineEdit = static_cast<KLineEdit *>(  m_dlg->child( "AskPassPasswordEdit", "KLineEdit", true ) );
+    KLineEdit *lineEdit = static_cast<KLineEdit *>(  TQT_TQWIDGET(m_dlg->child( "AskPassPasswordEdit", "KLineEdit", true )) );
    lineEdit->setText( auth->password() );

    delete auth;
--- a/smb4k/core/smb4kpasswordhandler.h
+++ b/smb4k/core/smb4kpasswordhandler.h
@ -35,10 +35,9 @@
 #include <tqcheckbox.h>

 // KDE includes
-#include <tdemacros.h>
-#include <kdialogbase.h>
-#include <tdeprocess.h>
 #include <tdewallet.h>
+#include <kdialogbase.h>
+#include <kprocess.h>

 // forward declarations
 #ifndef __FreeBSD__
@ -61,9 +60,9 @@ class Smb4KAuthInfo;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KPasswordHandler : public TQObject
+class Smb4KPasswordHandler : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -127,7 +126,7 @@ class TDE_EXPORT Smb4KPasswordHandler : public TQObject
     *
     * @param name          The name of this dialog.
     *
-     * @returns             true if a new password has been supplied and false otherwise.
+     * @returns             TRUE if a new password has been supplied and FALSE otherwise.
     */
    bool askpass( const TQString &workgroup, const TQString &host, const TQString &share, int desc, TQWidget *parent = 0, const char *name = 0 );

@ -174,18 +173,18 @@ class TDE_EXPORT Smb4KPasswordHandler : public TQObject
    enum Description{ NewData, AccessDenied, BadPassword, PermDenied, AuthError, LogonFailure, None };

    /**
-     * This function returns true if the wallet it open at the moment and false
+     * This function returns TRUE if the wallet it open at the moment and FALSE
     * if it is closed or not used.
     *
-     * @returns true if the wallet is open.
+     * @returns TRUE if the wallet is open.
     */
    bool walletIsOpen() { return (m_wallet && m_wallet->isOpen()); }

    /**
-     * This function returns true if the digital wallet support has been
+     * This function returns TRUE if the digital wallet support has been
     * disabled. This happens when the wallet could not be opened.
     *
-     * @returns true if the digital wallet support has been disabled.
+     * @returns TRUE if the digital wallet support has been disabled.
     */
    bool walletSupportIsDisabled() { return m_wallet_support_disabled; }

--- a/smb4k/core/smb4kpreviewer.cpp
+++ b/smb4k/core/smb4kpreviewer.cpp
@ -55,14 +55,14 @@ Smb4KPreviewer::Smb4KPreviewer( TQObject *parent, const char *name )
  m_proc = new TDEProcess( this, "PreviewProcess" );
  m_proc->setUseShell( true );

-  connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( processExited( TDEProcess* ) ),
-           this,   TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ),
+           this,   TQT_SLOT( slotProcessExited( TDEProcess * ) ) );

-  connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
 }


@ -83,7 +83,7 @@ bool Smb4KPreviewer::preview( Smb4KPreviewItem *item )

  if ( TQString::compare( item->share(), "homes" ) == 0 )
  {
-    TQString share_name = specifyUser( item->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
+    TQString share_name = specifyUser( item->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );

    if ( !share_name.isEmpty() )
    {
@ -177,7 +177,7 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KPreviewer::slotReceivedStdout( TDEProcess *, char *buf, int len )
@ -237,7 +237,7 @@ void Smb4KPreviewer::slotProcessExited( TDEProcess * )

      if ( passwordHandler()->askpass( m_item->workgroup(), m_item->host(),
                                       m_item->share(), state,
-                                       tdeApp->mainWidget() ? tdeApp->mainWidget() : 0,
+                                       kapp->mainWidget() ? kapp->mainWidget() : 0,
                                       "AskPass" ) )
      {
        // Now we have a password. Retry.
--- a/smb4k/core/smb4kpreviewer.h
+++ b/smb4k/core/smb4kpreviewer.h
@ -36,8 +36,7 @@
 #include <tqptrqueue.h>

 // KDE includes
-#include <tdemacros.h>
-#include <tdeprocess.h>
+#include <kprocess.h>

 // forward declarations
 class Smb4KPreviewItem;
@ -49,9 +48,9 @@ class Smb4KPreviewItem;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KPreviewer : public TQObject
+class Smb4KPreviewer : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -79,8 +78,8 @@ class TDE_EXPORT Smb4KPreviewer : public TQObject
     * @param item              The item for which a preview should be
     *                          requested.
     *
-     * @returns true if einter the share name is not 'homes' or if it could
-     * successfully be set to a user name. Otherwise it returns false.
+     * @returns TRUE if einter the share name is not 'homes' or if it could
+     * successfully be set to a user name. Otherwise it returns FALSE.
     */
    bool preview( Smb4KPreviewItem *item );

@ -88,7 +87,7 @@ class TDE_EXPORT Smb4KPreviewer : public TQObject
     * Using this function, you can find out whether the previewer is running
     * at the moment.
     *
-     * @returns true if the previewer is running or false otherwise.
+     * @returns TRUE if the previewer is running or FALSE otherwise.
     */
    bool isRunning() { return m_working; }

--- a/smb4k/core/smb4kpreviewitem.cpp
+++ b/smb4k/core/smb4kpreviewitem.cpp
@ -68,7 +68,7 @@ void Smb4KPreviewItem::setPath( const TQString &path )

 void Smb4KPreviewItem::addContents( const ContentsItem &item )
 {
-  // Do not set the last argument to true, because then
+  // Do not set the last argument to TRUE, because then
  // we would be in overwrite mode.
  m_contents.append( item );
 }
--- a/smb4k/core/smb4kpreviewitem.h
+++ b/smb4k/core/smb4kpreviewitem.h
@ -35,8 +35,6 @@
 #include <tqmap.h>
 #include <tqpair.h>

-#include <tdemacros.h>
-
 // application specific includes
 #include "smb4knetworkitems.h"

@ -49,7 +47,7 @@ typedef TQPair<int, TQString> ContentsItem;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KPreviewItem
+class Smb4KPreviewItem
 {
  public:
    /**
@ -205,12 +203,12 @@ class TDE_EXPORT Smb4KPreviewItem

    /**
     * This function checks if the IP address is valid, i.e. the
-     * IP address is either IP v4 or IP v6. It returns either true
-     * or false.
+     * IP address is either IP v4 or IP v6. It returns either TRUE
+     * or FALSE.
     *
     * @param ip            The IP address that's going to be checked.
     *
-     * @returns true if the IP address is valid and false otherwise.
+     * @returns TRUE if the IP address is valid and FALSE otherwise.
     */
    bool ipIsValid( const TQString &ip );
 };
--- a/smb4k/core/smb4kprint.cpp
+++ b/smb4k/core/smb4kprint.cpp
@ -59,14 +59,14 @@ Smb4KPrint::Smb4KPrint( TQObject *parent, const char *name ) : TQObject( parent,

  m_working = false;

-  connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
-           this,   TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+           this,   TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
 }


@ -289,7 +289,7 @@ void Smb4KPrint::printText()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KPrint::slotReceivedStdout( TDEProcess *, char *buf, int len )
@ -333,7 +333,7 @@ void Smb4KPrint::slotProcessExited( TDEProcess * )
      if ( passwordHandler()->askpass( m_info->workgroup(), m_info->host(), m_info->printer(), state ) )
      {
        retry = true;
-        TQTimer::singleShot( 50, this, TQ_SLOT( slotRetry() ) );
+        TQTimer::singleShot( 50, this, TQT_SLOT( slotRetry() ) );
      }
    }
    else
--- a/smb4k/core/smb4kprint.h
+++ b/smb4k/core/smb4kprint.h
@ -36,9 +36,8 @@
 #include <tqwidget.h>

 // KDE includes
-#include <tdemacros.h>
+#include <kprocess.h>
 #include <kdialogbase.h>
-#include <tdeprocess.h>

 // forward declarations
 class Smb4KPrintInfo;
@ -53,9 +52,9 @@ class Smb4KPrintInfo;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KPrint : public TQObject
+class Smb4KPrint : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -87,10 +86,10 @@ class TDE_EXPORT Smb4KPrint : public TQObject
    void abort();

    /**
-     * This function returns true if the printer handler is running and
-     * false otherwise.
+     * This function returns TRUE if the printer handler is running and
+     * FALSE otherwise.
     *
-     * @returns           true is the printer handler is running and false otherwise.
+     * @returns           TRUE is the printer handler is running and FALSE otherwise.
     */
    bool isRunning() { return m_working; }

@ -138,8 +137,8 @@ class TDE_EXPORT Smb4KPrint : public TQObject
    TQString m_buffer;

    /**
-     * This boolean is true if the printer handler is running and
-     * false otherwise.
+     * This boolean is TRUE if the printer handler is running and
+     * FALSE otherwise.
     */
    bool m_working;

--- a/smb4k/core/smb4kprintinfo.h
+++ b/smb4k/core/smb4kprintinfo.h
@ -33,8 +33,6 @@
 // TQt includes
 #include <tqstring.h>

-#include <tdemacros.h>
-
 // application specific includes
 #include "smb4knetworkitems.h"

@ -43,7 +41,7 @@
 * that is needed to print a file.
 */

-class TDE_EXPORT Smb4KPrintInfo
+class Smb4KPrintInfo
 {
  public:
    /**
@ -135,12 +133,12 @@ class TDE_EXPORT Smb4KPrintInfo

    /**
     * This function checks if the IP address is valid, i.e. the
-     * IP address is either IP v4 or IP v6. It returns either true
-     * or false.
+     * IP address is either IP v4 or IP v6. It returns either TRUE
+     * or FALSE.
     *
     * @param ip            The IP address that's going to be checked.
     *
-     * @returns true if the IP address is valid and false otherwise.
+     * @returns TRUE if the IP address is valid and FALSE otherwise.
     */
    bool ipIsValid( const TQString &ip );
 };
--- a/smb4k/core/smb4ksambaoptionshandler.cpp
+++ b/smb4k/core/smb4ksambaoptionshandler.cpp
@ -29,8 +29,8 @@
 #include <tqdir.h>

 // KDE includes
-#include <tdestandarddirs.h>
-#include <tdeprocess.h>
+#include <kstandarddirs.h>
+#include <kprocess.h>
 #include <kdebug.h>
 #include <tdelocale.h>

--- a/smb4k/core/smb4ksambaoptionshandler.h
+++ b/smb4k/core/smb4ksambaoptionshandler.h
@ -35,7 +35,6 @@
 #include <tqmap.h>

 // KDE includes
-#include <tdemacros.h>
 #include <tdeconfig.h>

 // forward declarations
@ -50,9 +49,9 @@ class Smb4KShare;
 * @author Alexander Reinholdt <dustpuppy@mail.berlios.de>
 */

-class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject
+class Smb4KSambaOptionsHandler : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -80,14 +79,14 @@ class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject
    const TQValueList<Smb4KSambaOptionsInfo *> &customOptionsList();

    /**
-     * This functions sets the remount flag of the share @p share to true or false.
+     * This functions sets the remount flag of the share @p share to TRUE or FALSE.
     * In case the share is not yet in the list of shares that are to be remounted,
-     * it will be added. If you set the remount flag to false on an existing entry,
+     * it will be added. If you set the remount flag to FALSE on an existing entry,
     * it will stay in the list even if no other custom options were defined.
     *
     * @param share             The Smb4KShare object that represents the share
     *
-     * @param yes               true if you want the share to be remounted and false
+     * @param yes               TRUE if you want the share to be remounted and FALSE
     *                          otherwise
     */
    void remount( Smb4KShare *share, bool yes );
@ -170,7 +169,7 @@ class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject
     *
     * Please note that if the host where a share you are probing for
     * is located, a pointer to this *host* item will be returned unless
-     * you set @p exactMatch to true in which case NULL is returned! If
+     * you set @p exactMatch to TRUE in which case NULL is returned! If
     * neither the host nor the share is found, NULL is returned.
     *
     * @param item              The name of the network item to find.
@ -187,7 +186,7 @@ class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject
     *
     * @param info              The Smb4KSambaOptionsInfo object
     *
-     * @param sync              If true, the list is sync'ed with the config file.
+     * @param sync              If TRUE, the list is sync'ed with the config file.
     */
    void addItem( Smb4KSambaOptionsInfo *info, bool sync );

@ -196,7 +195,7 @@ class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject
     *
     * @param name              The name of the item.
     *
-     * @param sync              If true, the list is sync'ed with the config file.
+     * @param sync              If TRUE, the list is sync'ed with the config file.
     */
    void removeItem( const TQString &name, bool sync );

@ -220,7 +219,7 @@ class TDE_EXPORT Smb4KSambaOptionsHandler : public TQObject
     * This function searches a particular network item in the list. If this item is a share
     * and it is not found, @p exactMatch determines if NULL is returned or if the values of
     * the item that matches @p item closest (i.e. the host, or another share that's located
-     * on the host). In most cases you want @p exactMatch to be false.
+     * on the host). In most cases you want @p exactMatch to be FALSE.
     * Please note: Do not delete the pointer that's returned by this function or you will
     * remove an item from the list!
     *
--- a/smb4k/core/smb4ksambaoptionsinfo.h
+++ b/smb4k/core/smb4ksambaoptionsinfo.h
@ -34,8 +34,6 @@
 // TQt includes
 #include <tqstring.h>

-#include <tdemacros.h>
-
 // forward declarations
 class Smb4KShare;

@ -47,7 +45,7 @@ class Smb4KShare;
 * @author  Alexander Reinholdt <dustpuppy@mail.berlios.de>
 */

-class TDE_EXPORT Smb4KSambaOptionsInfo
+class Smb4KSambaOptionsInfo
 {
  public:
    /**
@ -83,15 +81,15 @@ class TDE_EXPORT Smb4KSambaOptionsInfo
    /**
     * Sets the "should be remounted" flag.
     *
-     * @param rm                true if the share is to be remounted and
-     *                          false otherwise.
+     * @param rm                TRUE if the share is to be remounted and
+     *                          FALSE otherwise.
     */
    void setRemount( bool rm );

    /**
-     * Returns true if the share is to be remounted and false otherwise.
+     * Returns TRUE if the share is to be remounted and FALSE otherwise.
     *
-     * @returns                 true if the share is to be remounted and false otherwise
+     * @returns                 TRUE if the share is to be remounted and FALSE otherwise
     */
    bool remount() const { return m_remount; }

@ -145,16 +143,16 @@ class TDE_EXPORT Smb4KSambaOptionsInfo
    /**
     * Set the 'Use Kerberos' flag.
     *
-     * @param krb               true if the user wants to use Kerberos
-     *                          and false otherwise.
+     * @param krb               TRUE if the user wants to use Kerberos
+     *                          and FALSE otherwise.
     */
    void setKerberos( bool krb );

    /**
-     * This functions returns true if the user wants to use Kerberos and
-     * otherwise it returns false.
+     * This functions returns TRUE if the user wants to use Kerberos and
+     * otherwise it returns FALSE.
     *
-     * @returns                 true if Kerberos should be used and false
+     * @returns                 TRUE if Kerberos should be used and FALSE
     *                          otherwise.
     */
    bool kerberos() const { return m_kerberos; }
@ -226,17 +224,17 @@ class TDE_EXPORT Smb4KSambaOptionsInfo
     *
     * Note: This function is not available und FreeBSD.
     *
-     * @param rw                true if read-write and false otherwise.
+     * @param rw                TRUE if read-write and FALSE otherwise.
     */
    void setWriteAccess( bool rw );

    /**
-     * This functions returns true if the user wants to mount a share read-write
-     * otherwise it returns false.
+     * This functions returns TRUE if the user wants to mount a share read-write
+     * otherwise it returns FALSE.
     *
     * Note: This function is not available und FreeBSD.
     *
-     * @returns                 true if read-write and false otherwise.
+     * @returns                 TRUE if read-write and FALSE otherwise.
     */
    bool writeAccess() const { return m_write_access; }
 #endif
--- a/smb4k/core/smb4kscanner.cpp
+++ b/smb4k/core/smb4kscanner.cpp
@ -88,14 +88,14 @@ TQObject *parent, const char *name )

  m_queue.setAutoDelete( true );

-  connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( processExited( TDEProcess* ) ),
-           this,   TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ),
+           this,   TQT_SLOT( slotProcessExited( TDEProcess * ) ) );

-  connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
 }


@ -906,7 +906,7 @@ void Smb4KScanner::processWorkgroupMembers()

        if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(),
             TQString(), Smb4KPasswordHandler::AccessDenied,
-             tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) )
+             kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) )
        {
           m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) );
        }
@ -1088,7 +1088,7 @@ void Smb4KScanner::processWorkgroupMembers()

        if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(),
             TQString(), Smb4KPasswordHandler::AccessDenied,
-             tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) )
+             kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) )
        {
           m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) );
        }
@ -1185,7 +1185,7 @@ void Smb4KScanner::processShares()
    // Authentication failed:
    emit failed();

-    if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) )
+    if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) )
    {
      m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), TQString() ) ) );
    }
@ -1582,7 +1582,7 @@ void Smb4KScanner::timerEvent( TQTimerEvent * )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////


@ -1656,10 +1656,10 @@ void Smb4KScanner::lookupIPAddresses()
    TDEProcess *proc = new TDEProcess( this );
    proc->setUseShell( true );

-    connect( proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-             this, TQ_SLOT( slotReceivedIPAddresses( TDEProcess *, char *, int ) ) );
-    connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
-             this, TQ_SLOT( slotIPAddressProcessExited( TDEProcess * ) ) );
+    connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+             this, TQT_SLOT( slotReceivedIPAddresses( TDEProcess *, char *, int ) ) );
+    connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+             this, TQT_SLOT( slotIPAddressProcessExited( TDEProcess * ) ) );

    *proc << command;
    proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout );
--- a/smb4k/core/smb4kscanner.h
+++ b/smb4k/core/smb4kscanner.h
@ -36,8 +36,7 @@
 #include <tqptrqueue.h>

 // KDE includes
-#include <tdemacros.h>
-#include <tdeprocess.h>
+#include <kprocess.h>

 // application specific includes
 #include "smb4kdefs.h"
@ -56,9 +55,9 @@ class Smb4KShareItem;
 * @author Alexander Reinholdt <dustpuppy@mail.berlios.de>
 */

-class TDE_EXPORT Smb4KScanner : public TQObject
+class Smb4KScanner : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -172,7 +171,7 @@ class TDE_EXPORT Smb4KScanner : public TQObject
    /**
     * This function reports if the scanner is running or not.
     *
-     * @returns             true if the scanner is running and false otherwise.
+     * @returns             TRUE if the scanner is running and FALSE otherwise.
     */
    bool isRunning() { return m_working; }

--- a/smb4k/core/smb4ksettings.kcfgc
+++ b/smb4k/core/smb4ksettings.kcfgc
@ -4,4 +4,3 @@ Singleton=true
 Mutators=true
 ItemAccessors=true
 SetUserTexts=true
-Visibility=TDE_EXPORT
--- a/smb4k/core/smb4kshare.h
+++ b/smb4k/core/smb4kshare.h
@ -38,7 +38,6 @@
 #include <tqcstring.h>

 // KDE includes
-#include <tdemacros.h>
 #include <kuser.h>


@ -51,7 +50,7 @@
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KShare
+class Smb4KShare
 {
  public:
    /**
@ -124,7 +123,7 @@ class TDE_EXPORT Smb4KShare
    /**
     * This function returns the canonical path of the share. In contrast to
     * Smb4KShare::path(), it will return the absolute path without symlinks. However,
-     * should the share be broken (i.e. Smb4KShare::isBroken() returns true),
+     * should the share be broken (i.e. Smb4KShare::isBroken() returns TRUE),
     * only Smb4KShare::path() is returned.
     *
     * @returns           Returns the canonical path of the share.
@ -176,29 +175,29 @@ class TDE_EXPORT Smb4KShare
    const TQString &cifsLogin() const;

    /**
-     * Is true if the share is/seems to be mounted by another
+     * Is TRUE if the share is/seems to be mounted by another
     * user.
     *
-     * @returns           true if another user mounted the share and false otherwise.
+     * @returns           TRUE if another user mounted the share and FALSE otherwise.
     */
    bool isForeign() const;

    /**
     * This function sets the share to be foreign.
     *
-     * @param foreign     true if share is foreign and false otherwise.
+     * @param foreign     TRUE if share is foreign and FALSE otherwise.
     */
    void setForeign( bool foreign );

    /**
-     * Returns true if the share is broken and false otherwise.
+     * Returns TRUE if the share is broken and FALSE otherwise.
     */
    bool isBroken() const;

    /**
     * Sets the share to be broken.
     *
-     * @param broken      true if the share is broken and false otherwise.
+     * @param broken      TRUE if the share is broken and FALSE otherwise.
     */
    void setBroken( bool broken );

@ -243,12 +242,12 @@ class TDE_EXPORT Smb4KShare
    double percentage() const;

    /**
-     * Compare another Smb4KShare object with this one and return true if both
+     * Compare another Smb4KShare object with this one and return TRUE if both
     * carry the same data.
     *
     * @param share       The Smb4KShare object that is compared to this one
     *
-     * @returns           true if the values match.
+     * @returns           TRUE if the values match.
     */
    bool equals( const Smb4KShare &share );

--- a/smb4k/core/smb4ksynchronizer.cpp
+++ b/smb4k/core/smb4ksynchronizer.cpp
@ -63,17 +63,17 @@ Smb4KSynchronizer::Smb4KSynchronizer( TQObject *parent, const char *name )

  m_working = false;

-  connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( processExited( TDEProcess* ) ),
-           this,   TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ),
+           this,   TQT_SLOT( slotProcessExited( TDEProcess * ) ) );

-  connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );

-  connect( tdeApp,   TQ_SIGNAL( shutDown() ),
-           this,   TQ_SLOT( slotShutdown() ) );
+  connect( kapp,   TQT_SIGNAL( shutDown() ),
+           this,   TQT_SLOT( slotShutdown() ) );
 }


@ -356,7 +356,7 @@ const TQString Smb4KSynchronizer::readRsyncOptions()


 /////////////////////////////////////////////////////////////////////////////
-//   SLOT IMPLEMENTATIONS
+//   TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSynchronizer::abort()
--- a/smb4k/core/smb4ksynchronizer.h
+++ b/smb4k/core/smb4ksynchronizer.h
@ -31,9 +31,8 @@
 #endif

 // KDE includes
-#include <tdemacros.h>
+#include <kprocess.h>
 #include <kdialogbase.h>
-#include <tdeprocess.h>

 // TQt includes
 #include <tqobject.h>
@ -52,9 +51,9 @@ class Smb4KSynchronizationInfo;
 */


-class TDE_EXPORT Smb4KSynchronizer : public TQObject
+class Smb4KSynchronizer : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -84,7 +83,7 @@ class TDE_EXPORT Smb4KSynchronizer : public TQObject
    /**
     * This function reports if the synchronizer is running or not.
     *
-     * @returns           true if the synchronizer is running an false otherwise.
+     * @returns           TRUE if the synchronizer is running an FALSE otherwise.
     */
    bool isRunning() { return m_working; }

@ -168,7 +167,7 @@ class TDE_EXPORT Smb4KSynchronizer : public TQObject
    TDEProcess *m_proc;

    /**
-     * This booian is true if the synchronizer is working and false otherwise.
+     * This booian is TRUE if the synchronizer is working and FALSE otherwise.
     */
    bool m_working;

--- a/smb4k/core/smb4tdefileio.cpp
+++ b/smb4k/core/smb4tdefileio.cpp
@ -63,17 +63,17 @@ Smb4KFileIO::Smb4KFileIO( TQObject *parent, const char *name ) : TQObject( paren
  m_proc = new TDEProcess( this, "FileIOProcess" );
  m_proc->setUseShell( true );

-  connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           this,   TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this,   TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );

-  connect( m_proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
-           this,   TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
+           this,   TQT_SLOT( slotProcessExited( TDEProcess * ) ) );

-  connect( tdeApp,   TQ_SIGNAL( shutDown() ),
-           this,   TQ_SLOT( slotShutdown() ) );
+  connect( kapp,   TQT_SIGNAL( shutDown() ),
+           this,   TQT_SLOT( slotShutdown() ) );
 }


@ -1695,7 +1695,7 @@ void Smb4KFileIO::processSuperTab()
 }

 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KFileIO::slotShutdown()
--- a/smb4k/core/smb4tdefileio.h
+++ b/smb4k/core/smb4tdefileio.h
@ -36,8 +36,7 @@
 #include <tqcstring.h>

 // KDE include
-#include <tdemacros.h>
-#include <tdeprocess.h>
+#include <kprocess.h>


 /**
@ -47,9 +46,9 @@
 * @author Alexander Reinholdt <dustpuppy@mail.berlios.de>
 */

-class TDE_EXPORT Smb4KFileIO : public TQObject
+class Smb4KFileIO : public TQObject
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -78,9 +77,9 @@ class TDE_EXPORT Smb4KFileIO : public TQObject
     *
     * @param operation   Defines whether entries should be inserted or if
     *                    they should be removed. With Smb4KFileIO::NoOperation
-     *                    the function exits immediately and returns true.
+     *                    the function exits immediately and returns TRUE.
     *
-     * @returns true if the write process was successfully initiate and false
+     * @returns TRUE if the write process was successfully initiate and FALSE
     * otherwise.
     *
     * @note You need to connect to the finished() and failed() signals to find
@ -94,9 +93,9 @@ class TDE_EXPORT Smb4KFileIO : public TQObject
     *
     * @param operation   Defines whether entries should be inserted or if
     *                    they should be removed. With Smb4KFileIO::NoOperation
-     *                    the function exits immediately and returns true.
+     *                    the function exits immediately and returns TRUE.
     *
-     * @returns true if the write process was successfully initiate and false
+     * @returns TRUE if the write process was successfully initiate and FALSE
     * otherwise.
     *
     * @note You need to connect to the finished() and failed() signals to find
@ -160,14 +159,14 @@ class TDE_EXPORT Smb4KFileIO : public TQObject
     * This function creates a lock file in /tmp if it does not
     * exist already. If the user is not allowed to write to the
     * desired file a the moment, the user will be shown an error
-     * dialog and the function will return false.
+     * dialog and the function will return FALSE.
     *
     * Checks are performed to make sure it is save to write to an
     * existing lock file using the system call lstat().
     *
     * @param filename        The name of the file that is to be modified.
     *
-     * @returns true if the creation was successful and false if
+     * @returns TRUE if the creation was successful and FALSE if
     * something went wrong.
     */
    bool createLockFile( const TQString &filename );
@ -179,11 +178,11 @@ class TDE_EXPORT Smb4KFileIO : public TQObject
     * Checks are performed to make sure it is save to write to an
     * existing lock file using the system call lstat().
     *
-     * @param shutdown        Should be set to false if you do not want to have
+     * @param shutdown        Should be set to FALSE if you do not want to have
     *                        any error message shown. Otherwise you should set it
-     *                        to true.
+     *                        to TRUE.
     *
-     * @returns true if the removal was successful and false if
+     * @returns TRUE if the removal was successful and FALSE if
     * something went wrong.
     */
    bool removeLockFile( const bool error_message = true );
--- a/smb4k/core/smb4tdeglobal.h
+++ b/smb4k/core/smb4tdeglobal.h
@ -29,7 +29,6 @@
 #include <tqstring.h>
 #include <tqtimer.h>

-#include <tdemacros.h>
 #include <tdeconfig.h>

 // forward declarations:
@ -43,7 +42,7 @@ class Smb4KHomesSharesHandler;
 * @author    Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-namespace Smb4TDEGlobal TDE_EXPORT
+namespace Smb4TDEGlobal
 {
  /**
   * This returns the pointer to the global timer for the application.
@ -52,7 +51,7 @@ namespace Smb4TDEGlobal TDE_EXPORT
   *
   * @returns           A pointer to the global timer.
   */
-  TQTimer *timer() TDE_DEPRECATED;
+  TQTimer *timer() KDE_DEPRECATED;

  /**
   * This function returns the interval of the timer.
--- a/smb4k/dialogs/CMakeLists.txt
+++ b/smb4k/dialogs/CMakeLists.txt
@ -1,23 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4kdialogs (shared)
-
-tde_add_library( smb4kdialogs SHARED AUTOMOC
-  SOURCES
-    smb4kbookmarkeditor.cpp smb4kcustomoptionsdialog.cpp smb4kmountdialog.cpp
-    smb4kpreviewdialog.cpp smb4kprintdialog.cpp smb4ksynchronizationdialog.cpp
-  LINK tdecore-shared tdeui-shared smb4kcore-shared
-  DESTINATION ${LIB_INSTALL_DIR}
-)
--- a/smb4k/dialogs/Makefile.am
+++ b/smb4k/dialogs/Makefile.am
@ -0,0 +1,11 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+lib_LTLIBRARIES = libsmb4kdialogs.la
+libsmb4kdialogs_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
+libsmb4kdialogs_la_SOURCES = smb4kbookmarkeditor.cpp \
+	smb4kcustomoptionsdialog.cpp smb4kmountdialog.cpp smb4kpreviewdialog.cpp smb4kprintdialog.cpp \
+	smb4ksynchronizationdialog.cpp
+libsmb4kdialogs_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT)
+noinst_HEADERS = smb4kbookmarkeditor.h smb4kmountdialog.h smb4kpreviewdialog.h \
+	smb4kprintdialog.h smb4ksynchronizationdialog.h
--- a/smb4k/dialogs/smb4kbookmarkeditor.cpp
+++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp
@ -71,9 +71,9 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )

  m_collection = new TDEActionCollection( this, "BookmarkEditor_ActionCollection", TDEGlobal::instance() );

-  (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, this, TQ_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" );
+  (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" );

-  (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, this, TQ_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" );
+  (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" );

  slotLoadBookmarks();

@ -82,20 +82,20 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
  setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "BookmarkEditor" ) );
  setMinimumSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );

-  connect( m_view,                       TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ),
-           this,                         TQ_SLOT( slotRightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) );
+  connect( m_view,                       TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ),
+           this,                         TQT_SLOT( slotRightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) );

-  connect( m_view,                       TQ_SIGNAL( itemRenamed( TQListViewItem * ) ),
-           this,                         TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) );
+  connect( m_view,                       TQT_SIGNAL( itemRenamed( TQListViewItem * ) ),
+           this,                         TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) );

-  connect( this,                         TQ_SIGNAL( okClicked() ),
-           this,                         TQ_SLOT( slotOkClicked() ) );
+  connect( this,                         TQT_SIGNAL( okClicked() ),
+           this,                         TQT_SLOT( slotOkClicked() ) );

-  connect( this,                         TQ_SIGNAL( cancelClicked() ),
-           this,                         TQ_SLOT( slotCancelClicked() ) );
+  connect( this,                         TQT_SIGNAL( cancelClicked() ),
+           this,                         TQT_SLOT( slotCancelClicked() ) );

-  connect( Smb4KCore::bookmarkHandler(), TQ_SIGNAL( bookmarksUpdated() ),
-           this,                         TQ_SLOT( slotLoadBookmarks() ) );
+  connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ),
+           this,                         TQT_SLOT( slotLoadBookmarks() ) );
 }


@ -113,7 +113,7 @@ Smb4KBookmarkEditor::~Smb4KBookmarkEditor()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KBookmarkEditor::slotRightButtonPressed( TQListViewItem *item, const TQPoint &pos, int )
@ -140,7 +140,7 @@ void Smb4KBookmarkEditor::slotRightButtonPressed( TQListViewItem *item, const TQ

  if ( !menu )
  {
-    menu = new TDEActionMenu( this, "BookmarkEditorPopupMenu" );
+    menu = new TDEActionMenu( TQT_TQOBJECT(this), "BookmarkEditorPopupMenu" );
    menu->insert( m_collection->action( "remove_bookmark" ) );
    menu->insert( m_collection->action( "remove_all_bookmarks" ) );
  }
--- a/smb4k/dialogs/smb4kbookmarkeditor.h
+++ b/smb4k/dialogs/smb4kbookmarkeditor.h
@ -31,7 +31,6 @@
 #endif

 // KDE includes
-#include <tdemacros.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
 #include <tdeactioncollection.h>
@ -42,9 +41,9 @@
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KBookmarkEditor : public KDialogBase
+class Smb4KBookmarkEditor : public KDialogBase
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
+++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
@ -111,7 +111,7 @@ Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWid
  }
  else
  {
-    m_homes_user = specifyUser( share->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
+    m_homes_user = specifyUser( share->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );
    m_initialized = m_homes_user.isEmpty() ? false : true;
  }

@ -262,14 +262,14 @@ void Smb4KCustomOptionsDialog::setupDialog()
      }

      // Connections:
-      connect( m_port_input,  TQ_SIGNAL( valueChanged( int ) ),
-               this,          TQ_SLOT( slotPortChanged( int ) ) );
+      connect( m_port_input,  TQT_SIGNAL( valueChanged( int ) ),
+               this,          TQT_SLOT( slotPortChanged( int ) ) );

-      connect( m_kerberos,    TQ_SIGNAL( toggled( bool ) ),
-               this,          TQ_SLOT( slotKerberosToggled( bool ) ) );
+      connect( m_kerberos,    TQT_SIGNAL( toggled( bool ) ),
+               this,          TQT_SLOT( slotKerberosToggled( bool ) ) );

-      connect( m_proto_input, TQ_SIGNAL( activated( const TQString & ) ),
-               this,          TQ_SLOT( slotProtocolChanged( const TQString & ) ) );
+      connect( m_proto_input, TQT_SIGNAL( activated( const TQString & ) ),
+               this,          TQT_SLOT( slotProtocolChanged( const TQString & ) ) );

      break;
    }
@ -448,24 +448,24 @@ void Smb4KCustomOptionsDialog::setupDialog()
 #endif

      // Connections:
-      connect( m_port_input,  TQ_SIGNAL( valueChanged( int ) ),
-               this,          TQ_SLOT( slotPortChanged( int ) ) );
+      connect( m_port_input,  TQT_SIGNAL( valueChanged( int ) ),
+               this,          TQT_SLOT( slotPortChanged( int ) ) );

-      connect( m_uid_input,   TQ_SIGNAL( textChanged( const TQString & ) ),
-               this,          TQ_SLOT( slotUIDChanged( const TQString & ) ) );
+      connect( m_uid_input,   TQT_SIGNAL( textChanged( const TQString & ) ),
+               this,          TQT_SLOT( slotUIDChanged( const TQString & ) ) );

-      connect( m_gid_input,   TQ_SIGNAL( textChanged( const TQString & ) ),
-               this,          TQ_SLOT( slotGIDChanged( const TQString & ) ) );
+      connect( m_gid_input,   TQT_SIGNAL( textChanged( const TQString & ) ),
+               this,          TQT_SLOT( slotGIDChanged( const TQString & ) ) );

 #ifndef __FreeBSD__
-      connect( m_kerberos,    TQ_SIGNAL( toggled( bool ) ),
-               this,          TQ_SLOT( slotKerberosToggled( bool ) ) );
+      connect( m_kerberos,    TQT_SIGNAL( toggled( bool ) ),
+               this,          TQT_SLOT( slotKerberosToggled( bool ) ) );

-      connect( m_rw_input,    TQ_SIGNAL( activated( const TQString & ) ),
-               this,          TQ_SLOT( slotWriteAccessChanged( const TQString & ) ) );
+      connect( m_rw_input,    TQT_SIGNAL( activated( const TQString & ) ),
+               this,          TQT_SLOT( slotWriteAccessChanged( const TQString & ) ) );

-      connect( m_fs_input,    TQ_SIGNAL( activated( const TQString & ) ),
-               this,          TQ_SLOT( slotFilesystemChanged( const TQString & ) ) );
+      connect( m_fs_input,    TQT_SIGNAL( activated( const TQString & ) ),
+               this,          TQT_SLOT( slotFilesystemChanged( const TQString & ) ) );
 #endif

      break;
@ -482,17 +482,17 @@ void Smb4KCustomOptionsDialog::setupDialog()
  enableButton( User1, enable_default_button );

  // Connect the buttons:
-  connect( this,          TQ_SIGNAL( okClicked() ),
-           this,          TQ_SLOT( slotOKButtonClicked() ) );
+  connect( this,          TQT_SIGNAL( okClicked() ),
+           this,          TQT_SLOT( slotOKButtonClicked() ) );

-  connect( this,          TQ_SIGNAL( user1Clicked() ),
-           this,          TQ_SLOT( slotDefaultButtonClicked() ) );
+  connect( this,          TQT_SIGNAL( user1Clicked() ),
+           this,          TQT_SLOT( slotDefaultButtonClicked() ) );

  setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
 }

 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KCustomOptionsDialog::slotPortChanged( int val )
--- a/smb4k/dialogs/smb4kcustomoptionsdialog.h
+++ b/smb4k/dialogs/smb4kcustomoptionsdialog.h
@ -35,7 +35,6 @@
 #include <tqcheckbox.h>

 // KDE includes
-#include <tdemacros.h>
 #include <kdialogbase.h>
 #include <knuminput.h>
 #include <kcombobox.h>
@ -45,9 +44,9 @@
 class Smb4KHostItem;
 class Smb4KShareItem;

-class TDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase
+class Smb4KCustomOptionsDialog : public KDialogBase
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -79,12 +78,12 @@ class TDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase
    ~Smb4KCustomOptionsDialog();

    /**
-     * This function returns true if the dialog has been initialized correctly
-     * and may be shown now. It will always return true if you want to set options
+     * This function returns TRUE if the dialog has been initialized correctly
+     * and may be shown now. It will always return TRUE if you want to set options
     * for a server or for a share, that is not a 'homes' share. Only in the case
-     * of a homes share it may return false, if you didn't choose a user name.
+     * of a homes share it may return FALSE, if you didn't choose a user name.
     *
-     * @returns               true if the dialog has been set up correctly.
+     * @returns               TRUE if the dialog has been set up correctly.
     */
    bool isInitialized() { return m_initialized; }

@ -114,8 +113,8 @@ class TDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase
     * Is invoked when the user clicked the 'Use Kerberos'
     * check box.
     *
-     * @param on              true if the check box was
-     *                        checked and false otherwise
+     * @param on              TRUE if the check box was
+     *                        checked and FALSE otherwise
     */
    void slotKerberosToggled( bool on );

@ -201,7 +200,7 @@ class TDE_EXPORT Smb4KCustomOptionsDialog : public KDialogBase
    KComboBox *m_proto_input;

    /**
-     * Boolean that is true if the dialog has been initialized
+     * Boolean that is TRUE if the dialog has been initialized
     * correctly and my be shown now.
     */
    bool m_initialized;
--- a/smb4k/dialogs/smb4kmountdialog.cpp
+++ b/smb4k/dialogs/smb4kmountdialog.cpp
@ -90,15 +90,15 @@ void Smb4KMountDialog::setupView()
  layout->addWidget( m_workgroup_input, 2, 1, 0 );
  layout->addMultiCellWidget( m_bookmark, 3, 3, 0, 1, 0 );

-  connect( m_share_input, TQ_SIGNAL( textChanged ( const TQString & ) ) ,
-           this,          TQ_SLOT( slotChangeInputValue( const TQString & ) ) );
+  connect( m_share_input, TQT_SIGNAL( textChanged ( const TQString & ) ) ,
+           this,          TQT_SLOT( slotChangeInputValue( const TQString & ) ) );

  slotChangeInputValue( m_share_input->text() );
 }


 /////////////////////////////////////////////////////////////////////////////
-//  SLOT IMPLEMENTATIONS
+//  TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KMountDialog::slotChangeInputValue( const TQString& _test)
@ -133,7 +133,7 @@ void Smb4KMountDialog::slotOk()
        Smb4KCore::bookmarkHandler()->addBookmark( new Smb4KBookmark( host, share, workgroup, ip, TQString() ) );
      }

-      connect( Smb4KCore::mounter(), TQ_SIGNAL( state( int ) ), this, TQ_SLOT( slotMounterStateChanged( int ) ) );
+      connect( Smb4KCore::mounter(), TQT_SIGNAL( state( int ) ), this, TQT_SLOT( slotMounterStateChanged( int ) ) );
    }
    else
    {
--- a/smb4k/dialogs/smb4kmountdialog.h
+++ b/smb4k/dialogs/smb4kmountdialog.h
@ -35,7 +35,6 @@
 #include <tqcheckbox.h>

 // KDE includes
-#include <tdemacros.h>
 #include <kdialogbase.h>
 #include <klineedit.h>

@ -45,9 +44,9 @@
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KMountDialog : public KDialogBase
+class Smb4KMountDialog : public KDialogBase
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/dialogs/smb4kpreviewdialog.cpp
+++ b/smb4k/dialogs/smb4kpreviewdialog.cpp
@ -64,17 +64,17 @@ Smb4KPreviewDialog::Smb4KPreviewDialog( Smb4KShareItem *item, TQWidget *parent,

    setInitialSize( configDialogSize( *(Smb4KSettings::self()->config()), "PreviewDialog" ) );

-    connect( m_view,                 TQ_SIGNAL( executed( TQIconViewItem * ) ),
-            this,                    TQ_SLOT( slotItemExecuted( TQIconViewItem * ) ) );
+    connect( m_view,                 TQT_SIGNAL( executed( TQIconViewItem * ) ),
+            this,                    TQT_SLOT( slotItemExecuted( TQIconViewItem * ) ) );

-    connect( m_toolbar,              TQ_SIGNAL( clicked( int ) ),
-            this,                    TQ_SLOT( slotButtonClicked( int ) ) );
+    connect( m_toolbar,              TQT_SIGNAL( clicked( int ) ),
+            this,                    TQT_SLOT( slotButtonClicked( int ) ) );

-    connect( m_combo,                TQ_SIGNAL( activated( const TQString & ) ),
-            this,                    TQ_SLOT( slotItemActivated( const TQString & ) ) );
+    connect( m_combo,                TQT_SIGNAL( activated( const TQString & ) ),
+            this,                    TQT_SLOT( slotItemActivated( const TQString & ) ) );

-    connect( Smb4KCore::previewer(), TQ_SIGNAL( result( Smb4KPreviewItem * ) ),
-             this,                   TQ_SLOT( slotReceivedData( Smb4KPreviewItem * ) ) );
+    connect( Smb4KCore::previewer(), TQT_SIGNAL( result( Smb4KPreviewItem * ) ),
+             this,                   TQT_SLOT( slotReceivedData( Smb4KPreviewItem * ) ) );

    m_initialized = Smb4KCore::previewer()->preview( m_item );
  }
@ -124,7 +124,7 @@ void Smb4KPreviewDialog::setupView()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
--- a/smb4k/dialogs/smb4kpreviewdialog.h
+++ b/smb4k/dialogs/smb4kpreviewdialog.h
@ -34,7 +34,6 @@
 #include <tqvaluelist.h>

 // KDE includes
-#include <tdemacros.h>
 #include <kdialogbase.h>
 #include <kiconview.h>
 #include <tdetoolbar.h>
@ -53,9 +52,9 @@ class Smb4KShareItem;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KPreviewDialog : public KDialogBase
+class Smb4KPreviewDialog : public KDialogBase
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -76,10 +75,10 @@ class TDE_EXPORT Smb4KPreviewDialog : public KDialogBase
    ~Smb4KPreviewDialog();

    /**
-     * This function returns true if the preview dialog has been
-     * initialized correctly and false otherwise.
+     * This function returns TRUE if the preview dialog has been
+     * initialized correctly and FALSE otherwise.
     *
-     * @returns true if the dialog was initialized correctly.
+     * @returns TRUE if the dialog was initialized correctly.
     */
    bool isInitialized() { return m_initialized; }

@ -161,8 +160,8 @@ class TDE_EXPORT Smb4KPreviewDialog : public KDialogBase
    TQStringList::Iterator m_current_item;

    /**
-     * true if the dialog was successfully initilized and
-     * false otherwise.
+     * TRUE if the dialog was successfully initilized and
+     * FALSE otherwise.
     */
    bool m_initialized;
 };
--- a/smb4k/dialogs/smb4kprintdialog.cpp
+++ b/smb4k/dialogs/smb4kprintdialog.cpp
@ -68,7 +68,7 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
  TQGridLayout *layout = new TQGridLayout( frame );
  layout->setSpacing( 10 );

-  TQGroupBox *p = new TQGroupBox( 2, TQt::Horizontal, i18n( "Printer" ), frame );
+  TQGroupBox *p = new TQGroupBox( 2, Qt::Horizontal, i18n( "Printer" ), frame );
  p->setInsideSpacing( 5 );

  (void) new TQLabel( i18n( "Name:" ), p );
@ -92,14 +92,14 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */
  (void) new TQLabel( i18n( "Workgroup:" ), p );
  (void) new TQLabel( m_item->workgroup(), p );

-  TQGroupBox *f = new TQGroupBox( 2, TQt::Horizontal, i18n( "File" ), frame );
+  TQGroupBox *f = new TQGroupBox( 2, Qt::Horizontal, i18n( "File" ), frame );
  f->setInsideSpacing( 5 );

  (void) new TQLabel( i18n( "File:" ), f );
  KURLRequester *requester = new KURLRequester( TQString(), f, "URL" );
  requester->setMode( KFile::File | KFile::LocalOnly );

-  TQGroupBox *s = new TQGroupBox( 2, TQt::Horizontal, i18n( "Options" ), frame );
+  TQGroupBox *s = new TQGroupBox( 2, Qt::Horizontal, i18n( "Options" ), frame );
  s->setInsideSpacing( 5 );

  setDetailsWidget( s );
@ -115,8 +115,8 @@ m_item( item ), m_ip( TQString() ) /* will collect it in an instant */

  enableButton( User1, false );

-  connect( requester, TQ_SIGNAL( textChanged( const TQString & ) ),
-           this,      TQ_SLOT( slotInputValueChanged( const TQString & ) ) );
+  connect( requester, TQT_SIGNAL( textChanged( const TQString & ) ),
+           this,      TQT_SLOT( slotInputValueChanged( const TQString & ) ) );
 }


@ -127,13 +127,13 @@ Smb4KPrintDialog::~ Smb4KPrintDialog()


 /////////////////////////////////////////////////////////////////////////////
-//  SLOT IMPLEMENTATIONS
+//  TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KPrintDialog::slotUser1()
 {
-  KURLRequester *url = static_cast<KURLRequester *>( child( "URL", "KURLRequester", true ) );
-  KIntNumInput *copies = static_cast<KIntNumInput *>( child( "Copies", "KIntNumInput", true ) );
+  KURLRequester *url = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "URL", "KURLRequester", true )) );
+  KIntNumInput *copies = static_cast<KIntNumInput *>( TQT_TQWIDGET(child( "Copies", "KIntNumInput", true )) );

  if ( url && copies )
  {
@ -143,7 +143,7 @@ void Smb4KPrintDialog::slotUser1()
      {
        enableButton( User1, false );

-        connect( Smb4KCore::print(), TQ_SIGNAL( state( int ) ), this, TQ_SLOT( slotPrintStateChanged( int ) ) );
+        connect( Smb4KCore::print(), TQT_SIGNAL( state( int ) ), this, TQT_SLOT( slotPrintStateChanged( int ) ) );
      }
      else
      {
--- a/smb4k/dialogs/smb4kprintdialog.h
+++ b/smb4k/dialogs/smb4kprintdialog.h
@ -34,7 +34,6 @@
 #include <tqstring.h>

 // KDE includes
-#include <tdemacros.h>
 #include <kdialogbase.h>

 // forward declarations
@ -49,9 +48,9 @@ class Smb4KShareItem;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KPrintDialog : public KDialogBase
+class Smb4KPrintDialog : public KDialogBase
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/dialogs/smb4ksynchronizationdialog.cpp
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.cpp
@ -109,11 +109,11 @@ m_share( share )
  layout->addMultiCellWidget( transfer_widget, 5, 6, 0, 1, 0 );

  // Connections
-  connect( Smb4KCore::synchronizer(), TQ_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ),
-           this,                      TQ_SLOT( slotProgress( const Smb4KSynchronizationInfo & ) ) );
+  connect( Smb4KCore::synchronizer(), TQT_SIGNAL( progress( const Smb4KSynchronizationInfo & ) ),
+           this,                      TQT_SLOT( slotProgress( const Smb4KSynchronizationInfo & ) ) );

-  connect( Smb4KCore::synchronizer(), TQ_SIGNAL( finished() ),
-           this,                      TQ_SLOT( slotSynchronizationFinished() ) );
+  connect( Smb4KCore::synchronizer(), TQT_SIGNAL( finished() ),
+           this,                      TQT_SLOT( slotSynchronizationFinished() ) );


  setFixedSize( (sizeHint().width() > 350 ? sizeHint().width() : 350), sizeHint().height() );
@ -127,7 +127,7 @@ Smb4KSynchronizationDialog::~Smb4KSynchronizationDialog()


 /////////////////////////////////////////////////////////////////////////////
-//   SLOT IMPLEMENTATIONS
+//   TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////


@ -137,23 +137,23 @@ void Smb4KSynchronizationDialog::slotUser1()

  // Disable the URL requesters but in a way, that the information
  // proviced in them is still readable:
-  KURLRequester *source = static_cast<KURLRequester *>( child( "SourceURL", "KURLRequester", true ) );
+  KURLRequester *source = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "SourceURL", "KURLRequester", true )) );
  source->lineEdit()->setReadOnly( true );
  source->button()->setEnabled( false );

-  KURLRequester *destination = static_cast<KURLRequester *>( child( "DestinationURL", "KURLRequester", true ) );
+  KURLRequester *destination = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "DestinationURL", "KURLRequester", true )) );
  destination->lineEdit()->setReadOnly( true );
  destination->button()->setEnabled( false );

-  TQWidget *transfer_widget = static_cast<TQWidget *>( child( "TransferInfoWidget", "TQWidget", true ) );
+  TQWidget *transfer_widget = static_cast<TQWidget *>( TQT_TQWIDGET(child( "TransferInfoWidget", TQWIDGET_OBJECT_NAME_STRING, true )) );
  transfer_widget->setEnabled( true );

  enableButton( User1, false );
  enableButton( User2, false );

  // Enable the progress bars and the information widgets:
-  static_cast<KProgress *>( child( "IndividualProgress", "KProgress", true ) )->setEnabled( true );
-  static_cast<KProgress *>( child( "TotalProgress", "KProgress", true ) )->setEnabled( true );
+  static_cast<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) )->setEnabled( true );
+  static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) )->setEnabled( true );

  Smb4KCore::synchronizer()->synchronize( source->url(), destination->url() );
 }
@ -163,8 +163,8 @@ void Smb4KSynchronizationDialog::slotUser2()
 {
  // Swap URLs.

-  KURLRequester *source = static_cast<KURLRequester *>( child( "SourceURL", "KURLRequester", true ) );
-  KURLRequester *destination = static_cast<KURLRequester *>( child( "DestinationURL", "KURLRequester", true ) );
+  KURLRequester *source = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "SourceURL", "KURLRequester", true )) );
+  KURLRequester *destination = static_cast<KURLRequester *>( TQT_TQWIDGET(child( "DestinationURL", "KURLRequester", true )) );

  TQString sourceURL = source->url();
  TQString destinationURL = destination->url();
@ -184,11 +184,11 @@ void Smb4KSynchronizationDialog::slotCancel()

 void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &info )
 {
-  KLineEdit *progress =   static_cast<KLineEdit *>( child( "ProgressInfo", "KLineEdit", true ) );
-  KProgress *individual = static_cast<KProgress *>( child( "IndividualProgress", "KProgress", true ) );
-  KProgress *total =      static_cast<KProgress *>( child( "TotalProgress", "KProgress", true ) );
-  TQLabel *transferred =   static_cast<TQLabel *>( child( "FilesTransferred", "TQLabel", true ) );
-  TQLabel *rate =          static_cast<TQLabel *>( child( "TransferRate", "TQLabel", true ) );
+  KLineEdit *progress =   static_cast<KLineEdit *>( TQT_TQWIDGET(child( "ProgressInfo", "KLineEdit", true )) );
+  KProgress *individual = static_cast<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) );
+  KProgress *total =      static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) );
+  TQLabel *transferred =   static_cast<TQLabel *>( TQT_TQWIDGET(child( "FilesTransferred", TQLABEL_OBJECT_NAME_STRING, true )) );
+  TQLabel *rate =          static_cast<TQLabel *>( TQT_TQWIDGET(child( "TransferRate", TQLABEL_OBJECT_NAME_STRING, true )) );

  if ( !info.text().isEmpty() )
  {
@ -219,8 +219,8 @@ void Smb4KSynchronizationDialog::slotProgress( const Smb4KSynchronizationInfo &i

 void Smb4KSynchronizationDialog::slotSynchronizationFinished()
 {
-  KProgress *individual = static_cast<KProgress *>( child( "IndividualProgress", "KProgress", true ) );
-  KProgress *total =      static_cast<KProgress *>( child( "TotalProgress", "KProgress", true ) );
+  KProgress *individual = static_cast<KProgress *>( TQT_TQWIDGET(child( "IndividualProgress", "KProgress", true )) );
+  KProgress *total =      static_cast<KProgress *>( TQT_TQWIDGET(child( "TotalProgress", "KProgress", true )) );

  if ( individual && individual->progress() != 100 )
  {
--- a/smb4k/dialogs/smb4ksynchronizationdialog.h
+++ b/smb4k/dialogs/smb4ksynchronizationdialog.h
@ -31,7 +31,6 @@
 #endif

 // KDE includes
-#include <tdemacros.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>

@ -47,9 +46,9 @@ class Smb4KSynchronizationInfo;
 * @author Alexander Reinholdt <dustpuppy@users.berlios.de>
 */

-class TDE_EXPORT Smb4KSynchronizationDialog : public KDialogBase
+class Smb4KSynchronizationDialog : public KDialogBase
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/icons/CMakeLists.txt
+++ b/smb4k/icons/CMakeLists.txt
@ -1 +0,0 @@
-tde_install_icons( ${PROJECT_NAME} )
--- a/smb4k/icons/Makefile.am
+++ b/smb4k/icons/Makefile.am
@ -0,0 +1,22 @@
+####### tdevelop will overwrite this part!!! (begin)##########
+
+
+EXTRA_DIST = cr16-app-smb4k.png cr32-app-smb4k.png cr48-app-smb4k.png cr64-app-smb4k.png 
+
+install-data-local:
+	$(mkinstalldirs) $(kde_icondir)/crystalsvg/16x16/apps/
+	$(INSTALL_DATA) $(srcdir)/cr16-app-smb4k.png $(kde_icondir)/crystalsvg/16x16/apps/smb4k.png
+	$(mkinstalldirs) $(kde_icondir)/crystalsvg/32x32/apps/
+	$(INSTALL_DATA) $(srcdir)/cr32-app-smb4k.png $(kde_icondir)/crystalsvg/32x32/apps/smb4k.png
+	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
+	$(INSTALL_DATA) $(srcdir)/cr48-app-smb4k.png $(kde_icondir)/crystalsvg/48x48/apps/smb4k.png
+	$(mkinstalldirs) $(kde_icondir)/crystalsvg/64x64/apps/
+	$(INSTALL_DATA) $(srcdir)/cr64-app-smb4k.png $(kde_icondir)/crystalsvg/64x64/apps/smb4k.png
+
+uninstall-local:
+	-rm -f $(kde_icondir)/crystalsvg/16x16/apps/smb4k.png
+	-rm -f $(kde_icondir)/crystalsvg/32x32/apps/smb4k.png
+	-rm -f $(kde_icondir)/crystalsvg/48x48/apps/smb4k.png
+	-rm -f $(kde_icondir)/crystalsvg/64x64/apps/smb4k.png
+
+####### tdevelop will overwrite this part!!! (end)############
--- a/smb4k/iconview/CMakeLists.txt
+++ b/smb4k/iconview/CMakeLists.txt
@ -1,31 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4ksharesiconview (shared)
-
-tde_add_kpart( libsmb4ksharesiconview AUTOMOC
-  SOURCES
-    smb4ksharesiconview.cpp smb4ksharesiconview_part.cpp
-    smb4ksharesiconviewitem.cpp smb4ksharesiconviewtooltip.cpp
-  LINK tdecore-shared tdeui-shared tdeio-shared tdeparts-shared smb4kcore-shared smb4kdialogs-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-
-##### other files
-
-install(
-  FILES smb4ksharesiconview_part.rc
-  DESTINATION ${DATA_INSTALL_DIR}/smb4ksharesiconviewpart
-)
--- a/smb4k/iconview/Makefile.am
+++ b/smb4k/iconview/Makefile.am
@ -0,0 +1,16 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = libsmb4ksharesiconview.la
+libsmb4ksharesiconview_la_SOURCES = smb4ksharesiconview.cpp \
+		smb4ksharesiconview_part.cpp smb4ksharesiconviewitem.cpp \
+		smb4ksharesiconviewtooltip.cpp
+libsmb4ksharesiconview_la_LDFLAGS = -module -no-undefined $(all_libraries)
+noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \
+		smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h
+libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
+	$(LIB_QT)
+
+partrcdir = $(kde_datadir)/smb4ksharesiconviewpart
+partrc_DATA = smb4ksharesiconview_part.rc
--- a/smb4k/iconview/smb4ksharesiconview.cpp
+++ b/smb4k/iconview/smb4ksharesiconview.cpp
@ -55,8 +55,8 @@ Smb4KSharesIconView::Smb4KSharesIconView( TQWidget *parent, const char *name )
  m_tooltip = NULL;

  // Connections:
-  connect( this, TQ_SIGNAL( pressed( TQIconViewItem * ) ),
-           this, TQ_SLOT( slotPressed( TQIconViewItem * ) ) );
+  connect( this, TQT_SIGNAL( pressed( TQIconViewItem * ) ),
+           this, TQT_SLOT( slotPressed( TQIconViewItem * ) ) );
 }


@ -150,7 +150,7 @@ void Smb4KSharesIconView::contentsDropEvent( TQDropEvent *e )
  {
    if ( dest.equals( *it, true ) )
    {
-      if ( e->source() == this || e->source()->parent() == this )
+      if ( e->source() == this || TQT_BASE_OBJECT(e->source()->parent()) == TQT_BASE_OBJECT(this) )
      {
        e->ignore();

@ -187,7 +187,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e )
        {
          m_tooltip = new Smb4KSharesIconViewToolTip( item );

-          TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) );
+          TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) );
        }
        else
        {
@ -207,7 +207,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e )
      {
        m_tooltip = new Smb4KSharesIconViewToolTip( item );

-        TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) );
+        TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) );
      }
      else
      {
@ -229,7 +229,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSharesIconView::slotPressed( TQIconViewItem *item )
--- a/smb4k/iconview/smb4ksharesiconview.h
+++ b/smb4k/iconview/smb4ksharesiconview.h
@ -50,7 +50,7 @@ class Smb4KSharesIconViewToolTip;

 class Smb4KSharesIconView : public TDEIconView
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/iconview/smb4ksharesiconview_part.cpp
+++ b/smb4k/iconview/smb4ksharesiconview_part.cpp
@ -77,23 +77,23 @@ Smb4KSharesIconViewPart::Smb4KSharesIconViewPart( TQWidget *parentWidget, const
  loadSettings();

  // Add some connections:
-  connect( Smb4KCore::mounter(),      TQ_SIGNAL( updated() ),
-           this,                      TQ_SLOT( slotMountedShares() ) );
+  connect( Smb4KCore::mounter(),      TQT_SIGNAL( updated() ),
+           this,                      TQT_SLOT( slotMountedShares() ) );

-  connect( Smb4KCore::synchronizer(), TQ_SIGNAL( state( int ) ),
-           this,                      TQ_SLOT( slotSynchronizationState( int ) ) );
+  connect( Smb4KCore::synchronizer(), TQT_SIGNAL( state( int ) ),
+           this,                      TQT_SLOT( slotSynchronizationState( int ) ) );

-  connect( m_widget,                  TQ_SIGNAL( contextMenuRequested( TQIconViewItem *, const TQPoint & ) ),
-           this,                      TQ_SLOT( slotContextMenuRequested( TQIconViewItem *, const TQPoint & ) ) );
+  connect( m_widget,                  TQT_SIGNAL( contextMenuRequested( TQIconViewItem *, const TQPoint & ) ),
+           this,                      TQT_SLOT( slotContextMenuRequested( TQIconViewItem *, const TQPoint & ) ) );

-  connect( m_widget,                  TQ_SIGNAL( selectionChanged( TQIconViewItem * ) ),
-           this,                      TQ_SLOT( slotSelectionChanged( TQIconViewItem * ) ) );
+  connect( m_widget,                  TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ),
+           this,                      TQT_SLOT( slotSelectionChanged( TQIconViewItem * ) ) );

-  connect( m_widget,                  TQ_SIGNAL( pressed( TQIconViewItem * ) ),
-           this,                      TQ_SLOT( slotMouseButtonPressed( TQIconViewItem * ) ) );
+  connect( m_widget,                  TQT_SIGNAL( pressed( TQIconViewItem * ) ),
+           this,                      TQT_SLOT( slotMouseButtonPressed( TQIconViewItem * ) ) );

-  connect( m_widget,                  TQ_SIGNAL( executed( TQIconViewItem * ) ),
-           this,                      TQ_SLOT( slotFilemanager() ) );
+  connect( m_widget,                  TQT_SIGNAL( executed( TQIconViewItem * ) ),
+           this,                      TQT_SLOT( slotFilemanager() ) );
 }


@ -105,25 +105,25 @@ Smb4KSharesIconViewPart::~Smb4KSharesIconViewPart()
 void Smb4KSharesIconViewPart::setupActions()
 {
  // Create the actions:
-  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ),
-                                    this, TQ_SLOT( slotUnmountShare() ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
+                                    this, TQT_SLOT( slotUnmountShare() ),
                                    actionCollection(), "unmount_action" );
 #ifdef __linux__
-  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_F ),
-                                    this, TQ_SLOT( slotForceUnmountShare() ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
+                                    this, TQT_SLOT( slotForceUnmountShare() ),
                                    actionCollection(), "force_unmount_action" );
 #endif
  TDEAction *all =       new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ),
-                                    this, TQ_SLOT( slotUnmountAllShares() ),
+                                    this, TQT_SLOT( slotUnmountAllShares() ),
                                    actionCollection(), "unmount_all_action" );
  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut( CTRL+Key_Y ),
-                                    this, TQ_SLOT( slotSynchronize() ),
+                                    this, TQT_SLOT( slotSynchronize() ),
                                    actionCollection(), "synchronize_action" );
  TDEAction *konsole =   new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ),
-                                    this, TQ_SLOT( slotKonsole() ),
+                                    this, TQT_SLOT( slotKonsole() ),
                                    actionCollection(), "konsole_action" );
  TDEAction *konq =      new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut( CTRL+Key_K ),
-                                    this, TQ_SLOT( slotFilemanager() ),
+                                    this, TQT_SLOT( slotFilemanager() ),
                                    actionCollection(), "filemanager_action" );

  // Disable all actions for now:
@ -217,7 +217,7 @@ void Smb4KSharesIconViewPart::customEvent( TQCustomEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS (Smb4KSharesIconViewPart)
+// TQT_SLOT IMPLEMENTATIONS (Smb4KSharesIconViewPart)
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSharesIconViewPart::slotContextMenuRequested( TQIconViewItem *item, const TQPoint &pos )
@ -444,7 +444,7 @@ void Smb4KSharesIconViewPart::slotUnmountAllShares()
 void Smb4KSharesIconViewPart::slotSynchronize()
 {
  Smb4KSharesIconViewItem *item = static_cast<Smb4KSharesIconViewItem *>( m_widget->currentItem() );
-  Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true ) );
+  Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( TQT_TQWIDGET(m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true )) );

  if ( item && !item->shareObject()->isBroken() && !dlg )
  {
@ -562,7 +562,7 @@ TDEInstance *Smb4KSharesIconViewPartFactory::instance()

 extern "C"
 {
-  TDE_EXPORT void *init_libsmb4ksharesiconview()
+  void *init_libsmb4ksharesiconview()
  {
    TDEGlobal::locale()->insertCatalogue( "smb4k" );
    return new Smb4KSharesIconViewPartFactory;
--- a/smb4k/iconview/smb4ksharesiconview_part.h
+++ b/smb4k/iconview/smb4ksharesiconview_part.h
@ -47,7 +47,7 @@

 class Smb4KSharesIconViewPart : public KParts::Part
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -192,7 +192,7 @@ class TDEAboutData;

 class Smb4KSharesIconViewPartFactory : public KParts::Factory
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/iconview/smb4ksharesiconviewitem.h
+++ b/smb4k/iconview/smb4ksharesiconviewitem.h
@ -60,7 +60,7 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem
     * @param share         The Smb4KShare object that represents the share.
     *
     * @param mountpoint    Tells the item if the mount point instead of the
-     *                      share name should be shown. Default is false.
+     *                      share name should be shown. Default is FALSE.
     *
     * @param parent        The parent widget of this item.
     */
@ -75,11 +75,11 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem

    /**
     * This function compares the encapsulated Smb4KShare object with @p item
-     * and returns true if they contain equal values.
+     * and returns TRUE if they contain equal values.
     *
     * @param item          A Smb4KShare object that should be compared
     *
-     * @returns             true if @p item has the same values stored as the
+     * @returns             TRUE if @p item has the same values stored as the
     *                      encapsulated Smb4KShare object.
     */
    bool sameShareObject( Smb4KShare *share );
@ -112,7 +112,7 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem
     * Reimplemented from TQIconViewItem.
     *
     * This function paints the icon text and uses Smb4KShare::isForeign() to
-     * determine the color (true: gray, false: the default color).
+     * determine the color (TRUE: gray, FALSE: the default color).
     *
     * @param p             The painter
     *
@ -136,7 +136,7 @@ class Smb4KSharesIconViewItem : public TDEIconViewItem
     *
     * @param share         The Smb4KShare object.
     *
-     * @param mountpoint    If true, the mount point will be shown instead of the
+     * @param mountpoint    If TRUE, the mount point will be shown instead of the
     *                      share name.
     */
    void setupItem( const Smb4KShare &share,
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.cpp
@ -106,7 +106,7 @@ void Smb4KSharesIconViewToolTip::showTip( const TQPoint &pos )
  setGeometry( p.x(), p.y(), width(), height() );
  polish();
  show();
-  TQTimer::singleShot( 10000, this, TQ_SLOT( slotHideToolTip() ) );
+  TQTimer::singleShot( 10000, this, TQT_SLOT( slotHideToolTip() ) );
 }


@ -322,7 +322,7 @@ void Smb4KSharesIconViewToolTip::update()
  }
  else
  {
-    TQLabel *free_label = static_cast<TQLabel *>( child( "FreeLabel", "TQLabel" ) );
+    TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( free_label )
    {
@ -337,7 +337,7 @@ void Smb4KSharesIconViewToolTip::update()
      m_free = NULL;
    }

-    TQLabel *used_label = static_cast<TQLabel *>( child( "UsedLabel", "TQLabel" ) );
+    TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( used_label )
    {
@ -352,7 +352,7 @@ void Smb4KSharesIconViewToolTip::update()
      m_used = NULL;
    }

-    TQLabel *total_label = static_cast<TQLabel *>( child( "TotalLabel", "TQLabel" ) );
+    TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( total_label )
    {
@ -367,7 +367,7 @@ void Smb4KSharesIconViewToolTip::update()
      m_total = NULL;
    }

-    TQLabel *usage_label = static_cast<TQLabel *>( child( "UsageLabel", "TQLabel" ) );
+    TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( usage_label )
    {
@ -415,7 +415,7 @@ void Smb4KSharesIconViewToolTip::leaveEvent( TQEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSharesIconViewToolTip::slotHideToolTip()
--- a/smb4k/iconview/smb4ksharesiconviewtooltip.h
+++ b/smb4k/iconview/smb4ksharesiconviewtooltip.h
@ -47,7 +47,7 @@ class Smb4KSharesIconViewItem;

 class Smb4KSharesIconViewToolTip : public TQLabel
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/listview/CMakeLists.txt
+++ b/smb4k/listview/CMakeLists.txt
@ -1,31 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4kdialogs (shared)
-
-tde_add_kpart( libsmb4kshareslistview AUTOMOC
-  SOURCES
-    smb4kshareslistview.cpp smb4kshareslistview_part.cpp
-    smb4kshareslistviewitem.cpp smb4kshareslistviewtooltip.cpp
-  LINK tdecore-shared tdeui-shared tdeio-shared tdeparts-shared smb4kcore-shared smb4kdialogs-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-
-##### other files
-
-install(
-  FILES smb4kshareslistview_part.rc
-  DESTINATION ${DATA_INSTALL_DIR}/smb4kshareslistviewpart
-)
--- a/smb4k/listview/Makefile.am
+++ b/smb4k/listview/Makefile.am
@ -0,0 +1,15 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = libsmb4kshareslistview.la
+libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
+	$(LIB_QT)
+libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries)
+
+partrcdir = $(kde_datadir)/smb4kshareslistviewpart
+partrc_DATA = smb4kshareslistview_part.rc
+libsmb4kshareslistview_la_SOURCES = smb4kshareslistview.cpp \
+	smb4kshareslistview_part.cpp smb4kshareslistviewitem.cpp smb4kshareslistviewtooltip.cpp
+noinst_HEADERS = smb4kshareslistview.h smb4kshareslistview_part.h \
+	smb4kshareslistviewitem.h smb4kshareslistviewtooltip.h
--- a/smb4k/listview/smb4kshareslistview.cpp
+++ b/smb4k/listview/smb4kshareslistview.cpp
@ -68,8 +68,8 @@ Smb4KSharesListView::Smb4KSharesListView( TQWidget *parent, const char *name )
  m_tooltip = NULL;

  // Connections:
-  connect( this, TQ_SIGNAL( pressed( TQListViewItem * ) ),
-           this, TQ_SLOT( slotPressed( TQListViewItem * ) ) );
+  connect( this, TQT_SIGNAL( pressed( TQListViewItem * ) ),
+           this, TQT_SLOT( slotPressed( TQListViewItem * ) ) );
 }


@ -155,7 +155,7 @@ void Smb4KSharesListView::contentsDropEvent( TQDropEvent *e )
  {
    if ( dest.equals( *it, true ) )
    {
-      if ( e->source() == this || e->source()->parent() == this )
+      if ( e->source() == this || TQT_BASE_OBJECT(e->source()->parent()) == TQT_BASE_OBJECT(this) )
      {
        e->ignore();

@ -192,7 +192,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e )
        {
          m_tooltip = new Smb4KSharesListViewToolTip( item );

-          TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) );
+          TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) );
        }
        else
        {
@ -212,7 +212,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e )
      {
        m_tooltip = new Smb4KSharesListViewToolTip( item );

-        TQTimer::singleShot( 2000, this, TQ_SLOT( slotShowToolTip() ) );
+        TQTimer::singleShot( 2000, this, TQT_SLOT( slotShowToolTip() ) );
      }
      else
      {
@ -234,7 +234,7 @@ void Smb4KSharesListView::contentsMouseMoveEvent( TQMouseEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSharesListView::slotPressed( TQListViewItem *item )
--- a/smb4k/listview/smb4kshareslistview.h
+++ b/smb4k/listview/smb4kshareslistview.h
@ -45,7 +45,7 @@ class Smb4KSharesListViewToolTip;

 class Smb4KSharesListView : public TDEListView
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/listview/smb4kshareslistview_part.cpp
+++ b/smb4k/listview/smb4kshareslistview_part.cpp
@ -80,23 +80,23 @@ Smb4KSharesListViewPart::Smb4KSharesListViewPart( TQWidget *parentWidget, const
  loadSettings();

  // Add some connections:
-  connect( Smb4KCore::mounter(),      TQ_SIGNAL( updated() ),
-           this,                      TQ_SLOT( slotMountedShares() ) );
+  connect( Smb4KCore::mounter(),      TQT_SIGNAL( updated() ),
+           this,                      TQT_SLOT( slotMountedShares() ) );

-  connect( Smb4KCore::synchronizer(), TQ_SIGNAL( state( int ) ),
-           this,                      TQ_SLOT( slotSynchronizationState( int ) ) );
+  connect( Smb4KCore::synchronizer(), TQT_SIGNAL( state( int ) ),
+           this,                      TQT_SLOT( slotSynchronizationState( int ) ) );

-  connect( m_widget,                  TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ),
-           this,                      TQ_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) );
+  connect( m_widget,                  TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ),
+           this,                      TQT_SLOT( slotContextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) );

-  connect( m_widget,                  TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           this,                      TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+  connect( m_widget,                  TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           this,                      TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );

-  connect( m_widget,                  TQ_SIGNAL( pressed( TQListViewItem * ) ),
-           this,                      TQ_SLOT( slotMouseButtonPressed( TQListViewItem * ) ) );
+  connect( m_widget,                  TQT_SIGNAL( pressed( TQListViewItem * ) ),
+           this,                      TQT_SLOT( slotMouseButtonPressed( TQListViewItem * ) ) );

-  connect( m_widget,                  TQ_SIGNAL( executed( TQListViewItem * ) ),
-           this,                      TQ_SLOT( slotFilemanager() ) );
+  connect( m_widget,                  TQT_SIGNAL( executed( TQListViewItem * ) ),
+           this,                      TQT_SLOT( slotFilemanager() ) );
 }


@ -108,25 +108,25 @@ Smb4KSharesListViewPart::~Smb4KSharesListViewPart()
 void Smb4KSharesListViewPart::setupActions()
 {
  // Create the actions:
-  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ),
-                                    this, TQ_SLOT( slotUnmountShare() ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
+                                    this, TQT_SLOT( slotUnmountShare() ),
                                    actionCollection(), "unmount_action" );
 #ifdef __linux__
-  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_F ),
-                                    this, TQ_SLOT( slotForceUnmountShare() ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
+                                    this, TQT_SLOT( slotForceUnmountShare() ),
                                    actionCollection(), "force_unmount_action" );
 #endif
  TDEAction *all =       new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut( CTRL+Key_N ),
-                                    this, TQ_SLOT( slotUnmountAllShares() ),
+                                    this, TQT_SLOT( slotUnmountAllShares() ),
                                    actionCollection(), "unmount_all_action" );
  TDEAction *sync =      new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut( CTRL+Key_Y ),
-                                    this, TQ_SLOT( slotSynchronize() ),
+                                    this, TQT_SLOT( slotSynchronize() ),
                                    actionCollection(), "synchronize_action" );
  TDEAction *konsole =   new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut( CTRL+Key_L ),
-                                    this, TQ_SLOT( slotKonsole() ),
+                                    this, TQT_SLOT( slotKonsole() ),
                                    actionCollection(), "konsole_action" );
  TDEAction *konq =      new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut( CTRL+Key_K ),
-                                    this, TQ_SLOT( slotFilemanager() ),
+                                    this, TQT_SLOT( slotFilemanager() ),
                                    actionCollection(), "filemanager_action" );

  // Disable all actions for now:
@ -331,7 +331,7 @@ void Smb4KSharesListViewPart::customEvent( TQCustomEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS (Smb4KSharesListViewPart)
+// TQT_SLOT IMPLEMENTATIONS (Smb4KSharesListViewPart)
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSharesListViewPart::slotContextMenuRequested( TQListViewItem *item, const TQPoint &pos, int /*col*/ )
@ -578,7 +578,7 @@ void Smb4KSharesListViewPart::slotUnmountAllShares()
 void Smb4KSharesListViewPart::slotSynchronize()
 {
  Smb4KSharesListViewItem *item = static_cast<Smb4KSharesListViewItem *>( m_widget->currentItem() );
-  Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true ) );
+  Smb4KSynchronizationDialog *dlg = static_cast<Smb4KSynchronizationDialog *>( TQT_TQWIDGET(m_widget->child( "SynchronizationDialog", "Smb4KSynchronizationDialog", true )) );

  if ( item && !item->shareObject()->isBroken() && !dlg )
  {
@ -689,7 +689,7 @@ TDEInstance *Smb4KSharesListViewPartFactory::instance()

 extern "C"
 {
-  TDE_EXPORT void *init_libsmb4kshareslistview()
+  void *init_libsmb4kshareslistview()
  {
    TDEGlobal::locale()->insertCatalogue( "smb4k" );
    return new Smb4KSharesListViewPartFactory;
--- a/smb4k/listview/smb4kshareslistview_part.h
+++ b/smb4k/listview/smb4kshareslistview_part.h
@ -47,7 +47,7 @@

 class Smb4KSharesListViewPart : public KParts::Part
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -194,7 +194,7 @@ class TDEAboutData;

 class Smb4KSharesListViewPartFactory : public KParts::Factory
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/listview/smb4kshareslistviewitem.h
+++ b/smb4k/listview/smb4kshareslistviewitem.h
@ -60,7 +60,7 @@ class Smb4KSharesListViewItem : public TDEListViewItem
     * @param share         The Smb4KShare object that represents the share.
     *
     * @param mountpoint    Tells the item if the mount point instead of the
-     *                      share name should be shown. Default is false.
+     *                      share name should be shown. Default is FALSE.
     *
     * @param parent        The parent widget of this item.
     */
@ -75,11 +75,11 @@ class Smb4KSharesListViewItem : public TDEListViewItem

    /**
     * This function compares the encapsulated Smb4KShare object with @p item
-     * and returns true if they contain equal values.
+     * and returns TRUE if they contain equal values.
     *
     * @param item          A Smb4KShare object that should be compared
     *
-     * @returns             true if @p item has the same values stored as the
+     * @returns             TRUE if @p item has the same values stored as the
     *                      encapsulated Smb4KShare object.
     */
    bool sameShareObject( Smb4KShare *share );
@ -134,7 +134,7 @@ class Smb4KSharesListViewItem : public TDEListViewItem
     * Reimplemented from TDEListViewItem.
     *
     * This function paints the icon text and the usage. It uses Smb4KShare::isForeign() to
-     * determine the color of the icon text (true: gray, false: the default color).
+     * determine the color of the icon text (TRUE: gray, FALSE: the default color).
     *
     * @param p             The painter
     *
@ -167,7 +167,7 @@ class Smb4KSharesListViewItem : public TDEListViewItem
     *
     * @param share         The Smb4KShare object.
     *
-     * @param mountpoint    If true, the mount point will be shown instead of the
+     * @param mountpoint    If TRUE, the mount point will be shown instead of the
     *                      share name.
     */
    void setupItem( const Smb4KShare &share,
--- a/smb4k/listview/smb4kshareslistviewtooltip.cpp
+++ b/smb4k/listview/smb4kshareslistviewtooltip.cpp
@ -106,7 +106,7 @@ void Smb4KSharesListViewToolTip::showTip( const TQPoint &pos )
  setGeometry( p.x(), p.y(), width(), height() );
  polish();
  show();
-  TQTimer::singleShot( 10000, this, TQ_SLOT( slotHideToolTip() ) );
+  TQTimer::singleShot( 10000, this, TQT_SLOT( slotHideToolTip() ) );
 }


@ -322,7 +322,7 @@ void Smb4KSharesListViewToolTip::update()
  }
  else
  {
-    TQLabel *free_label = static_cast<TQLabel *>( child( "FreeLabel", "TQLabel" ) );
+    TQLabel *free_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "FreeLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( free_label )
    {
@ -337,7 +337,7 @@ void Smb4KSharesListViewToolTip::update()
      m_free = NULL;
    }

-    TQLabel *used_label = static_cast<TQLabel *>( child( "UsedLabel", "TQLabel" ) );
+    TQLabel *used_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsedLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( used_label )
    {
@ -352,7 +352,7 @@ void Smb4KSharesListViewToolTip::update()
      m_used = NULL;
    }

-    TQLabel *total_label = static_cast<TQLabel *>( child( "TotalLabel", "TQLabel" ) );
+    TQLabel *total_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "TotalLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( total_label )
    {
@ -367,7 +367,7 @@ void Smb4KSharesListViewToolTip::update()
      m_total = NULL;
    }

-    TQLabel *usage_label = static_cast<TQLabel *>( child( "UsageLabel", "TQLabel" ) );
+    TQLabel *usage_label = static_cast<TQLabel *>( TQT_TQWIDGET(child( "UsageLabel", TQLABEL_OBJECT_NAME_STRING )) );

    if ( usage_label )
    {
@ -415,7 +415,7 @@ void Smb4KSharesListViewToolTip::leaveEvent( TQEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSharesListViewToolTip::slotHideToolTip()
--- a/smb4k/listview/smb4kshareslistviewtooltip.h
+++ b/smb4k/listview/smb4kshareslistviewtooltip.h
@ -47,7 +47,7 @@ class Smb4KSharesListViewItem;

 class Smb4KSharesListViewToolTip : public TQLabel
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/main.cpp
+++ b/smb4k/main.cpp
@ -34,9 +34,9 @@
 #include <kiconloader.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <tdeuniqueapplication.h>
+#include <kuniqueapplication.h>
 #include <tdemessagebox.h>
-#include <tdestandarddirs.h>
+#include <kstandarddirs.h>

 // system includes
 #include <stdlib.h>
@ -102,17 +102,17 @@ int main( int argc, char *argv[] )
  TDECmdLineArgs::init( argc, argv, &aboutData );
  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.

-  TDEUniqueApplication::addCmdLineOptions();
+  KUniqueApplication::addCmdLineOptions();

-  // This is not needed, because TDEUniqueApplication::start()
+  // This is not needed, because KUniqueApplication::start()
  // is called directly before the application is executed, but
  // we use it anyway. There is no performance impact.
-  if ( !TDEUniqueApplication::start() )
+  if ( !KUniqueApplication::start() )
  {
    exit( 0 );
  }

-  TDEUniqueApplication app;
+  KUniqueApplication app;

  // Check the current config file and remove it if it belongs to
  // a version < 0.9.0.
--- a/smb4k/searchdlg/CMakeLists.txt
+++ b/smb4k/searchdlg/CMakeLists.txt
@ -1,21 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### smb4ksearchdialog (shared)
-
-tde_add_kpart( libsmb4ksearchdialog AUTOMOC
-  SOURCES smb4ksearchdialog.cpp smb4ksearchdialog_part.cpp smb4ksearchdialogitem.cpp
-  LINK tdecore-shared tdeui-shared tdeparts-shared smb4kcore-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
--- a/smb4k/searchdlg/Makefile.am
+++ b/smb4k/searchdlg/Makefile.am
@ -0,0 +1,10 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+kde_module_LTLIBRARIES = libsmb4ksearchdialog.la
+libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
+	$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
+noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \
+	smb4ksearchdialogitem.h
+libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \
+	smb4ksearchdialog_part.cpp smb4ksearchdialogitem.cpp
+libsmb4ksearchdialog_la_LDFLAGS = -module -no-undefined $(all_libraries)
--- a/smb4k/searchdlg/smb4ksearchdialog.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialog.cpp
@ -47,8 +47,8 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
  // Tool bar
  m_tool_bar = new TDEToolBar( this, "SearchDialogToolBar", true, true );

-  m_tool_bar->insertCombo( TQStringList(), Combo, true, TQ_SIGNAL( returnPressed() ),
-                           this, TQ_SLOT( slotReturnPressed() ), true,
+  m_tool_bar->insertCombo( TQStringList(), Combo, true, TQT_SIGNAL( returnPressed() ),
+                           TQT_TQOBJECT(this), TQT_SLOT( slotReturnPressed() ), true,
                           i18n( "Enter the search string here." ), -1, Combo );
  m_tool_bar->setItemAutoSized( Combo, true );

@ -70,17 +70,17 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
  m_search_string = TQString();

  // Connections:
-  connect( m_tool_bar->getCombo( Combo ), TQ_SIGNAL( textChanged( const TQString & ) ),
-           this,                          TQ_SLOT( slotTextChanged( const TQString & ) ) );
+  connect( m_tool_bar->getCombo( Combo ), TQT_SIGNAL( textChanged( const TQString & ) ),
+           this,                          TQT_SLOT( slotTextChanged( const TQString & ) ) );

-  connect( m_tool_bar,                    TQ_SIGNAL( pressed( int ) ),
-           this,                          TQ_SLOT( slotButtonPressed( int ) ) );
+  connect( m_tool_bar,                    TQT_SIGNAL( pressed( int ) ),
+           this,                          TQT_SLOT( slotButtonPressed( int ) ) );

-  connect( m_list_view,                   TQ_SIGNAL( clicked( TQListViewItem * )  ),
-           this,                          TQ_SLOT( slotItemClicked( TQListViewItem * ) ) );
+  connect( m_list_view,                   TQT_SIGNAL( clicked( TQListViewItem * )  ),
+           this,                          TQT_SLOT( slotItemClicked( TQListViewItem * ) ) );

-  connect( m_list_view,                   TQ_SIGNAL( selectionChanged( TQListViewItem * )  ),
-           this,                          TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+  connect( m_list_view,                   TQT_SIGNAL( selectionChanged( TQListViewItem * )  ),
+           this,                          TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
 }


@ -98,7 +98,7 @@ const TQString &Smb4KSearchDialog::searchString()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSearchDialog::slotReturnPressed()
--- a/smb4k/searchdlg/smb4ksearchdialog.h
+++ b/smb4k/searchdlg/smb4ksearchdialog.h
@ -52,7 +52,7 @@ class Smb4KHostItem;

 class Smb4KSearchDialog : public TQWidget
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/searchdlg/smb4ksearchdialog_part.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialog_part.cpp
@ -65,17 +65,17 @@ Smb4KSearchDialogPart::Smb4KSearchDialogPart( TQWidget *parentWidget, const char
  m_serial_number = 0;

  // Connections:
-  connect( m_widget,              TQ_SIGNAL( buttonPressed( int ) ),
-           this,                  TQ_SLOT( slotButtonPressed( int ) ) );
+  connect( m_widget,              TQT_SIGNAL( buttonPressed( int ) ),
+           this,                  TQT_SLOT( slotButtonPressed( int ) ) );

-  connect( m_widget->listView(),  TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           this,                  TQ_SLOT( slotItemDoubleClicked( TQListViewItem * ) ) );
+  connect( m_widget->listView(),  TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           this,                  TQT_SLOT( slotItemDoubleClicked( TQListViewItem * ) ) );

-  connect( Smb4KCore::scanner(),  TQ_SIGNAL( searchResult( Smb4KHostItem * ) ),
-           this,                  TQ_SLOT( slotReceivedSearchResult( Smb4KHostItem * ) ) );
+  connect( Smb4KCore::scanner(),  TQT_SIGNAL( searchResult( Smb4KHostItem * ) ),
+           this,                  TQT_SLOT( slotReceivedSearchResult( Smb4KHostItem * ) ) );

-  connect( Smb4KCore::scanner(),  TQ_SIGNAL( hostListChanged() ),
-           this,                  TQ_SLOT( slotCheckItemIsKnown() ) );
+  connect( Smb4KCore::scanner(),  TQT_SIGNAL( hostListChanged() ),
+           this,                  TQT_SLOT( slotCheckItemIsKnown() ) );
 }


@ -111,7 +111,7 @@ void Smb4KSearchDialogPart::customEvent( TQCustomEvent *e )


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS (Smb4KSearchDialogPart)
+// TQT_SLOT IMPLEMENTATIONS (Smb4KSearchDialogPart)
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSearchDialogPart::slotButtonPressed( int button_id )
@ -267,7 +267,7 @@ TDEInstance *Smb4KSearchDialogPartFactory::instance()

 extern "C"
 {
-  TDE_EXPORT void *init_libsmb4ksearchdialog()
+  void *init_libsmb4ksearchdialog()
  {
    TDEGlobal::locale()->insertCatalogue( "smb4k" );
    return new Smb4KSearchDialogPartFactory;
--- a/smb4k/searchdlg/smb4ksearchdialog_part.h
+++ b/smb4k/searchdlg/smb4ksearchdialog_part.h
@ -51,7 +51,7 @@ class Smb4KHostItem;

 class Smb4KSearchDialogPart : public KParts::Part
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -132,7 +132,7 @@ class TDEAboutData;

 class Smb4KSearchDialogPartFactory : public KParts::Factory
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/searchdlg/smb4ksearchdialogitem.h
+++ b/smb4k/searchdlg/smb4ksearchdialogitem.h
@ -83,11 +83,11 @@ class Smb4KSearchDialogItem : public TDEListViewItem
    Smb4KHostItem *hostItem() { return &m_item; }

    /**
-     * This function returns true, if the item is regular, that means it
+     * This function returns TRUE, if the item is regular, that means it
     * represents a host. If it represents a failed search, it returns
-     * false.
+     * FALSE.
     *
-     * @returns true is the item is a regular one.
+     * @returns TRUE is the item is a regular one.
     */
    bool isRegular() { return m_is_regular; }

@ -96,14 +96,14 @@ class Smb4KSearchDialogItem : public TDEListViewItem
     * known to the application, i.e. it is in the list of hosts. It will set
     * the pixmap accordingly and sets m_is_known.
     *
-     * @param known             Should be true is the host is known.
+     * @param known             Should be TRUE is the host is known.
     */
    void setKnown( bool known );

    /**
-     * This function returns true, if the item is already known by the scanner.
+     * This function returns TRUE, if the item is already known by the scanner.
     *
-     * @returns true is the item is already known.
+     * @returns TRUE is the item is already known.
     */
    bool isKnown() { return m_is_known; }

@ -116,7 +116,7 @@ class Smb4KSearchDialogItem : public TDEListViewItem

    /**
     * Reimplemented from TQListViewItem. It is used for sorting and compares the
-     * serial numbers of this item and @p item. If @p ascending is true and the
+     * serial numbers of this item and @p item. If @p ascending is TRUE and the
     * serial number of this item is greater than that of @p item, it will be inserted
     * before @p item and else it will be inserted after. In this implementation,
     * @p col is *not* used.
@ -126,7 +126,7 @@ class Smb4KSearchDialogItem : public TDEListViewItem
     * @param col               The column that should be used for sorting. It is
     *                          not used in this implementation.
     *
-     * @param ascending         Sort ascending if true or descending if false.
+     * @param ascending         Sort ascending if TRUE or descending if FALSE.
     *
     * @returns 0 if serialNumber() and @p item->serialNumber() are equal and != 0 if
     * they are not. Which value and especially which algebraic sign is returned depends
@ -141,12 +141,12 @@ class Smb4KSearchDialogItem : public TDEListViewItem
    Smb4KHostItem m_item;

    /**
-     * true, if we have a regular item
+     * TRUE, if we have a regular item
     */
    bool m_is_regular;

    /**
-     * true is the item is known
+     * TRUE is the item is known
     */
    bool m_is_known;

--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@ -32,7 +32,7 @@
 #include <kstdaction.h>
 #include <klibloader.h>
 #include <tdemessagebox.h>
-#include <tdeuniqueapplication.h>
+#include <kuniqueapplication.h>
 #include <kiconloader.h>
 #include <tdeactionclasses.h>
 #include <tdelocale.h>
@ -77,7 +77,7 @@ Smb4KApp::Smb4KApp( TQWidget *parent, const char *name )

  // Setup all things that need to be done *after* createGUI()
  // was run:
-  TQPopupMenu *settings = static_cast<TQPopupMenu *>( child( "settings", "TQPopupMenu", true ) );
+  TQPopupMenu *settings = static_cast<TQPopupMenu *>( TQT_TQWIDGET(child( "settings", TQPOPUPMENU_OBJECT_NAME_STRING, true )) );

  if ( settings )
  {
@ -124,17 +124,17 @@ Smb4KApp::Smb4KApp( TQWidget *parent, const char *name )
  }

  // Connections
-  connect( actionCollection(),           TQ_SIGNAL( actionHighlighted( TDEAction * ) ),
-           this,                         TQ_SLOT( slotActionHighlighted( TDEAction * ) ) );
+  connect( actionCollection(),           TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+           this,                         TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );

-  connect( Smb4KCore::self(),            TQ_SIGNAL( runStateChanged() ),
-           this,                         TQ_SLOT( slotRunStateChanged() ) );
+  connect( Smb4KCore::self(),            TQT_SIGNAL( runStateChanged() ),
+           this,                         TQT_SLOT( slotRunStateChanged() ) );

-  connect( Smb4KCore::bookmarkHandler(), TQ_SIGNAL( bookmarksUpdated() ),
-           this,                         TQ_SLOT( slotSetupBookmarksMenu() ) );
+  connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ),
+           this,                         TQT_SLOT( slotSetupBookmarksMenu() ) );

-  connect( Smb4KCore::mounter(),         TQ_SIGNAL( updated() ),
-           this,                         TQ_SLOT( slotShareListUpdated() ) );
+  connect( Smb4KCore::mounter(),         TQT_SIGNAL( updated() ),
+           this,                         TQT_SLOT( slotShareListUpdated() ) );
 }


@ -147,7 +147,7 @@ void Smb4KApp::setupActions()
 {
  actionCollection()->setHighlightingEnabled( true );

-  (void) KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection(), "quit_action" );
+  (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection(), "quit_action" );

  // Set up the "Settings" menu:
  setStandardToolBarMenuEnabled( true );
@ -157,11 +157,11 @@ void Smb4KApp::setupActions()
                             actionCollection(), "view_modes_menu" );

  TDERadioAction *icon_view  = new TDERadioAction( i18n( "&Icon View" ), "view_icon", CTRL+Key_I,
-                             this, TQ_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" );
+                             TQT_TQOBJECT(this), TQT_SLOT( slotChangeSharesView() ), actionCollection(), "icon_view_action" );
  icon_view->setExclusiveGroup( "SharesViewActions" );

  TDERadioAction *list_view  = new TDERadioAction( i18n( "List Vie&w" ), "view_detailed", CTRL+Key_W,
-                             this, TQ_SLOT( slotChangeSharesView() ), actionCollection(), "list_view_action" );
+                             TQT_TQOBJECT(this), TQT_SLOT( slotChangeSharesView() ), actionCollection(), "list_view_action" );
  list_view->setExclusiveGroup( "SharesViewActions" );

  switch ( Smb4KSettings::sharesView() )
@ -187,7 +187,7 @@ void Smb4KApp::setupActions()
  view_modes->insert( icon_view, -1 );
  view_modes->insert( list_view, -1 );

-  (void) KStdAction::preferences( this, TQ_SLOT( slotConfigDialog() ), actionCollection(), "configure_action" );
+  (void) KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotConfigDialog() ), actionCollection(), "configure_action" );

  // Notes:
  // (1) Actions from the parts will be included by setupView().
@ -248,7 +248,7 @@ void Smb4KApp::setupView()

  if ( shares_factory )
  {
-    m_shares_part = static_cast<KParts::Part *>( shares_factory->create( this, "SharesPart", "KParts::Part" ) );
+    m_shares_part = static_cast<KParts::Part *>( shares_factory->create( TQT_TQOBJECT(this), "SharesPart", "KParts::Part" ) );

    if ( m_shares_part )
    {
@ -261,7 +261,7 @@ void Smb4KApp::setupView()

      createGUI( m_shares_part );

-      accel()->insert( i18n( "Jump to shares view" ).utf8().data(), CTRL+Key_3, this, TQ_SLOT( slotJumpToSharesView() ), false, true );
+      accel()->insert( i18n( "Jump to shares view" ), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT( slotJumpToSharesView() ), false, true );
    }
  }
  else
@ -280,7 +280,7 @@ void Smb4KApp::setupView()

  if ( browser_factory )
  {
-    m_browser_part = static_cast<KParts::Part *>( browser_factory->create( this, "BrowserPart", "KParts::Part" ) );
+    m_browser_part = static_cast<KParts::Part *>( browser_factory->create( TQT_TQOBJECT(this), "BrowserPart", "KParts::Part" ) );

    if ( m_browser_part )
    {
@ -290,7 +290,7 @@ void Smb4KApp::setupView()

      factory()->addClient( m_browser_part );

-      accel()->insert( i18n( "Jump to network browser" ).utf8().data(), CTRL+Key_1, this, TQ_SLOT( slotJumpToNetworkBrowser() ), false, true );
+      accel()->insert( i18n( "Jump to network browser" ), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT( slotJumpToNetworkBrowser() ), false, true );
    }
  }
  else
@ -309,7 +309,7 @@ void Smb4KApp::setupView()

  if ( search_factory )
  {
-    m_search_part = static_cast<KParts::Part *>( search_factory->create( this, "SearchDialogPart", "KParts::Part" ) );
+    m_search_part = static_cast<KParts::Part *>( search_factory->create( TQT_TQOBJECT(this), "SearchDialogPart", "KParts::Part" ) );

    if ( m_search_part )
    {
@ -329,7 +329,7 @@ void Smb4KApp::setupView()

      factory()->addClient( m_search_part );

-      accel()->insert( i18n( "Jump to search dialog" ).utf8().data(), CTRL+Key_2, this, TQ_SLOT( slotJumpToSearchDialog() ), false, true );
+      accel()->insert( i18n( "Jump to search dialog" ), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT( slotJumpToSearchDialog() ), false, true );
    }
  }
  else
@ -350,11 +350,11 @@ void Smb4KApp::setupSystemTray()
    m_system_tray = new Smb4KSystemTray( this, "SystemTray" );
  }

-  connect( m_system_tray, TQ_SIGNAL( quitSelected() ),
-           this,          TQ_SLOT( slotQuit() ) );
+  connect( m_system_tray, TQT_SIGNAL( quitSelected() ),
+           this,          TQT_SLOT( slotQuit() ) );

-  connect( m_system_tray, TQ_SIGNAL( settingsChanged() ),
-           this,          TQ_SLOT( slotSettingsChanged() ) );
+  connect( m_system_tray, TQT_SIGNAL( settingsChanged() ),
+           this,          TQT_SLOT( slotSettingsChanged() ) );

  m_system_tray->embed( Smb4KSettings::embedIntoSystemTray() );
 }
@ -403,7 +403,7 @@ void Smb4KApp::changeSharesView()

  if ( shares_factory )
  {
-    m_shares_part = static_cast<KParts::Part *>( shares_factory->create( this, "SharesPart", "KParts::Part" ) );
+    m_shares_part = static_cast<KParts::Part *>( shares_factory->create( TQT_TQOBJECT(this), "SharesPart", "KParts::Part" ) );

    if ( m_shares_part )
    {
@ -455,7 +455,7 @@ bool Smb4KApp::queryExit()

 bool Smb4KApp::queryClose()
 {
-  if ( !tdeApp->sessionSaving() && isVisible() && m_system_tray->isEmbedded() &&
+  if ( !kapp->sessionSaving() && isVisible() && m_system_tray->isEmbedded() &&
       Smb4KSettings::embedIntoSystemTray() )
  {
    // This part has been 'stolen' from JuK application.
@ -478,7 +478,7 @@ bool Smb4KApp::queryClose()

 void Smb4KApp::timerEvent( TQTimerEvent * )
 {
-  KProgress *progress_bar = static_cast<KProgress *>( child( "StatusBarProgressBar", "KProgress", true ) );
+  KProgress *progress_bar = static_cast<KProgress *>( TQT_TQWIDGET(child( "StatusBarProgressBar", "KProgress", true )) );

  if ( progress_bar )
  {
@ -488,7 +488,7 @@ void Smb4KApp::timerEvent( TQTimerEvent * )


 /////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////

 void Smb4KApp::slotQuit()
@ -571,11 +571,11 @@ void Smb4KApp::slotConfigDialog()

  if ( config_factory )
  {
-    TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( config_factory->create( this, "ConfigDialog", "TDEConfigDialog" ) );
+    TDEConfigDialog *dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) );

    if ( dlg )
    {
-      connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) );
+      connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) );

      dlg->show();
    }
@ -618,7 +618,7 @@ void Smb4KApp::slotSettingsChanged()

 void Smb4KApp::slotBookmarkEditor()
 {
-  Smb4KBookmarkEditor *dlg = static_cast<Smb4KBookmarkEditor *>( child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) );
+  Smb4KBookmarkEditor *dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) );

  if ( !dlg )
  {
@ -632,7 +632,7 @@ void Smb4KApp::slotBookmarkEditor()
 void Smb4KApp::slotRunStateChanged()
 {
  // Get the progress bar:
-  KProgress *progress_bar = static_cast<KProgress *>( child( "StatusBarProgressBar", "KProgress", true ) );
+  KProgress *progress_bar = static_cast<KProgress *>( TQT_TQWIDGET(child( "StatusBarProgressBar", "KProgress", true )) );

  // Clear the status bar:
  statusBar()->clear();
@ -817,7 +817,7 @@ void Smb4KApp::slotSetupBookmarksMenu()

    // Create the "Edit Bookmarks" action:
    bookmark_actions.append( new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", CTRL+Key_E,
-                             this, TQ_SLOT( slotBookmarkEditor() ), actionCollection(),
+                             TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkEditor() ), actionCollection(),
                             "edit_bookmarks_action" ) );

    // Get the "Add Bookmark" action from the browser:
@ -886,9 +886,9 @@ void Smb4KApp::slotSetupBookmarksMenu()

    for ( TQStringList::ConstIterator it = display_strings.begin(); it != display_strings.end(); ++it )
    {
-      TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), (*it).utf8() );
+      TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), *it );
      a->setGroup( "Bookmarks" );
-      connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotBookmarkActivated() ) );
+      connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) );
      bookmark_list.append( a );
    }

--- a/smb4k/smb4k.desktop
+++ b/smb4k/smb4k.desktop
@ -1,15 +1,80 @@
 [Desktop Entry]
-Type=Application
-
 Name=Smb4K
-
 GenericName=The SMB/CIFS Share Browser
-
+GenericName[bg]=Самба ресурсен четец
+GenericName[ca]=El navegador de compartits SMB/CIFS
+GenericName[cs]=Prohližeč SMB/CIFS sdílení
+GenericName[da]=SMB/CIFS ressource browseren
+GenericName[de]=Der Browser für SMB/CIFS-Freigaben
+GenericName[es]=El explorador de recursos compartidos SMB/CIFS
+GenericName[fr]=L'explorateur de partages SMB / CIFS
+GenericName[hu]=Az SMB/CIFS böngésző
+GenericName[is]=SMB/CIFS sameignarflakkarinn
+GenericName[it]=Browser di condivisioni SMB/CIFS
+GenericName[ja]=SMB/CIFS 共有(シェア)・ブラウザー
+GenericName[nb]=SMB/CIFS ressursutforsker
+GenericName[nl]=De SMB/CIFS Share Browser
+GenericName[nn]=SMB/CIFS ressurs-surfar
+GenericName[pl]=Przeglądarka Zasobów SMB/CIFS
+GenericName[pt_BR]=O navegador de compartilhamentos SMB/CIFS
+GenericName[ru]=The SMB/CIFS Share Browser
+GenericName[sk]=Prehliadač SMB/CIFS zdieľaní
+GenericName[sv]=SMB Katalog programmed
+GenericName[tr]=The SMB/CIFS Share Browser
+GenericName[uk]=Навігатор спільних ресурсів SMB/CIFS
+GenericName[zh_CN]=SMB 共享浏览器
+#
+# The following lines seem to be necessary for SuSE.
+#
+Name[bg]=Smb4K
+Name[ca]=Smb4K
+Name[cs]=Smb4K
+Name[da]=Smb4K
+Name[de]=Smb4K
+Name[es]=Smb4K
+Name[fr]=Smb4K
+Name[hu]=Smb4K
+Name[is]=Smb4K
+Name[it]=Smb4K
+Name[ja]=Smb4K
+Name[nb]=Smb4K
+Name[nl]=Smb4K
+Name[nn]=Smb4K
+Name[pl]=Smb4K
+Name[pt_BR]=Smb4K
+Name[ru]=Smb4K
+Name[sk]=Smb4K
+Name[sv]=Smb4K
+Name[tr]=Smb4K
+Name[uk]=Smb4K
+Name[zh_CN]=Smb4K
 Comment=The SMB/CIFS Share Browser
-
-Icon=smb4k
+Comment[bg]=Самба ресурсен четец
+Comment[ca]=El navegador de compartits SMB/CIFS
+Comment[cs]=Prohližeč SMB/CIFS sdílení
+Comment[da]=SMB/CIFS ressource browseren
+Comment[de]=Der Browser für SMB/CIFS-Freigaben
+Comment[es]=El explorador de recursos compartidos SMB/CIFS
+Comment[fr]=L'explorateur de partages SMB / CIFS
+Comment[hu]=Az SMB/CIFS böngésző
+Comment[is]=SMB/CIFS sameignarflakkarinn
+Comment[it]=Browser di condivisioni SMB/CIFS
+Comment[ja]=SMB/CIFS 共有(シェア)・ブラウザー
+Comment[nb]=SMB/CIFS ressursutforsker
+Comment[nl]=De SMB/CIFS Share Browser
+Comment[nn]=SMB/CIFS ressurs-surfar
+Comment[pl]=Przeglądarka Zasobów SMB/CIFS
+Comment[pt_BR]=O navegador de compartilhamentos SMB/CIFS
+Comment[ru]=The SMB/CIFS Share Browser
+Comment[sk]=Prehliadač SMB/CIFS zdieľaní
+Comment[sv]=SMB Katalog programmed
+Comment[tr]=The SMB/CIFS Share Browser
+Comment[uk]=Навігатор спільних ресурсів SMB/CIFS
+Comment[zh_CN]=SMB 共享浏览器
 Exec=smb4k
+Icon=smb4k
+X-DocPath=smb4k/index.html
+Type=Application
 Terminal=false
 Categories=Qt;TDE;Network;
-X-DocPath=smb4k/index.html
 X-DCOP-ServiceType=Unique
--- a/smb4k/smb4k.h
+++ b/smb4k/smb4k.h
@ -45,7 +45,7 @@ class Smb4KSystemTray;

 class Smb4KApp : public KParts::DockMainWindow
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
--- a/smb4k/smb4ksystemtray.cpp
+++ b/smb4k/smb4ksystemtray.cpp
@ -68,11 +68,11 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name )
                          actionCollection(), "st_mounted_shares_action_menu" );
  m_bookmarks_menu      = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder",
                          actionCollection(), "st_bookmark_action_menu" );
-  TDEActionSeparator *sep = new TDEActionSeparator( this );
+  TDEActionSeparator *sep = new TDEActionSeparator( TQT_TQOBJECT(this) );
  TDEAction *manual_mount = new TDEAction( i18n( "M&ount Manually" ), "connect_creating",
-                          0, this, TQ_SLOT( slotMountManually() ),
+                          0, TQT_TQOBJECT(this), TQT_SLOT( slotMountManually() ),
                          actionCollection(), "st_mount_manually_action" );
-  TDEAction *configure    = KStdAction::preferences( this, TQ_SLOT( slotConfigDialog() ),
+  TDEAction *configure    = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotConfigDialog() ),
                          actionCollection(), "st_configure_action" );

  m_shares_menu->plug( contextMenu() );
@ -86,17 +86,17 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name )
  slotSetupSharesMenu();

  // Connections:
-  connect( actionCollection(),           TQ_SIGNAL( actionHighlighted( TDEAction * ) ),
-           this,                         TQ_SLOT( slotActionHighlighted( TDEAction * ) ) );
+  connect( actionCollection(),           TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+           this,                         TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );

-  connect( Smb4KCore::bookmarkHandler(), TQ_SIGNAL( bookmarksUpdated() ),
-           this,                         TQ_SLOT( slotSetupBookmarksMenu() ) );
+  connect( Smb4KCore::bookmarkHandler(), TQT_SIGNAL( bookmarksUpdated() ),
+           this,                         TQT_SLOT( slotSetupBookmarksMenu() ) );

-  connect( Smb4KCore::mounter(),         TQ_SIGNAL( updated() ),
-           this,                         TQ_SLOT( slotEnableBookmarks() ) );
+  connect( Smb4KCore::mounter(),         TQT_SIGNAL( updated() ),
+           this,                         TQT_SLOT( slotEnableBookmarks() ) );

-  connect( Smb4KCore::mounter(),         TQ_SIGNAL( updated() ),
-           this,                         TQ_SLOT( slotSetupSharesMenu() ) );
+  connect( Smb4KCore::mounter(),         TQT_SIGNAL( updated() ),
+           this,                         TQT_SLOT( slotSetupSharesMenu() ) );

  // Connection to quitSelected() signal must be done in parent widget.
 }
@ -134,7 +134,7 @@ void Smb4KSystemTray::loadSettings()


 /////////////////////////////////////////////////////////////////////////////
-// SLOT IMPLEMENTATIONS
+// TQT_SLOT IMPLEMENTATIONS
 /////////////////////////////////////////////////////////////////////////////

 void Smb4KSystemTray::slotMountManually()
@ -143,11 +143,11 @@ void Smb4KSystemTray::slotMountManually()

  if ( parentWidget() )
  {
-    dlg = static_cast<Smb4KMountDialog *>( parentWidget()->child( "MountDialog", "Smb4KMountDialog", true ) );
+    dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(parentWidget()->child( "MountDialog", "Smb4KMountDialog", true )) );
  }
  else
  {
-    dlg = static_cast<Smb4KMountDialog *>( child( "MountDialog", "Smb4KMountDialog", true ) );
+    dlg = static_cast<Smb4KMountDialog *>( TQT_TQWIDGET(child( "MountDialog", "Smb4KMountDialog", true )) );
  }

  if ( !dlg )
@ -181,8 +181,8 @@ void Smb4KSystemTray::slotConfigDialog()
    // To make sure we do not connect the config dialog several times
    // to slotSettingsChanged(), we break the connection first and re-
    // establish it afterwards:
-    disconnect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) );
-    connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) );
+    disconnect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) );
+    connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) );

    return;
  }
@ -194,17 +194,17 @@ void Smb4KSystemTray::slotConfigDialog()
  {
    if ( parentWidget() && parentWidget()->isShown() )
    {
-      dlg = static_cast<TDEConfigDialog *>( config_factory->create( parentWidget(), "ConfigDialog", "TDEConfigDialog" ) );
+      dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(parentWidget()), "ConfigDialog", "TDEConfigDialog" )) );
    }
    else
    {
-      dlg = static_cast<TDEConfigDialog *>( config_factory->create( this, "ConfigDialog", "TDEConfigDialog" ) );
+      dlg = static_cast<TDEConfigDialog *>( TQT_TQWIDGET(config_factory->create( TQT_TQOBJECT(this), "ConfigDialog", "TDEConfigDialog" )) );
    }

    // ... and show it.
    if ( dlg )
    {
-      connect( dlg, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) );
+      connect( dlg, TQT_SIGNAL( settingsChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotSettingsChanged() ) );

      dlg->show();
    }
@ -234,7 +234,7 @@ void Smb4KSystemTray::slotSetupBookmarksMenu()
  {
    // OK, build the menu from ground up:
    TDEAction *edit_bookmarks = new TDEAction( i18n( "&Edit Bookmarks" ), "bookmark", 0,
-                              this, TQ_SLOT( slotBookmarkEditor() ), actionCollection(),
+                              TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkEditor() ), actionCollection(),
                              "st_edit_bookmarks_action" );
    edit_bookmarks->setGroup( "BookmarkActions" );
    edit_bookmarks->plug( m_bookmarks_menu->popupMenu() );
@ -289,9 +289,9 @@ void Smb4KSystemTray::slotSetupBookmarksMenu()
  for ( TQStringList::ConstIterator it = display_strings.begin(); it != display_strings.end(); ++it )
  {
    // Create the bookmark action:
-    TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), ("st_"+*it).utf8() );
+    TDEAction *a = new TDEAction( *it, "folder", TDEShortcut::null(), 0, 0, actionCollection(), "st_"+*it );
    a->setGroup( "Bookmarks" );
-    connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotBookmarkActivated() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( slotBookmarkActivated() ) );

    // Let's have a look if the bookmark action has to be enabled or disabled:
    TQString name;
@ -339,11 +339,11 @@ void Smb4KSystemTray::slotBookmarkEditor()

  if ( parentWidget() )
  {
-    dlg = static_cast<Smb4KBookmarkEditor *>( parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) );
+    dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(parentWidget()->child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) );
  }
  else
  {
-    dlg = static_cast<Smb4KBookmarkEditor *>( child( "BookmarkEditor", "Smb4KBookmarkEditor", true ) );
+    dlg = static_cast<Smb4KBookmarkEditor *>( TQT_TQWIDGET(child( "BookmarkEditor", "Smb4KBookmarkEditor", true )) );
  }

  if ( !dlg )
@ -444,7 +444,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
  {
    // OK, build the menu from ground up:
    TDEAction *unmount_all  = new TDEAction( i18n( "U&nmount All" ), "gear", TDEShortcut::null(),
-                            this, TQ_SLOT( slotUnmountAllShares() ), actionCollection(),
+                            TQT_TQOBJECT(this), TQT_SLOT( slotUnmountAllShares() ), actionCollection(),
                            "st_unmount_all_action" );
    unmount_all->setGroup( "ShareActions" );
    unmount_all->plug( m_shares_menu->popupMenu(), 0 );
@ -494,7 +494,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
          {
            // Find the "Force Unmount" action and decide if it needs to be
            // enabled/disabled:
-            TDEAction *force = actionCollection()->action( ("st_[force]_"+canonical_path).utf8() );
+            TDEAction *force = actionCollection()->action( "st_[force]_"+canonical_path );

            if ( force )
            {
@ -512,7 +512,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
            if ( menu )
            {
              // Unmount action
-              action = actionCollection()->action( ("st_[unmount]_"+canonical_path).utf8() );
+              action = actionCollection()->action( "st_[unmount]_"+canonical_path );

              if ( action )
              {
@ -522,7 +522,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()

 #ifdef __linux__
              // Force Unmount action
-              action = actionCollection()->action( ("st_[force]_"+canonical_path).utf8() );
+              action = actionCollection()->action( "st_[force]_"+canonical_path );

              if ( action )
              {
@ -532,7 +532,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 #endif

              // Synchronize action
-              action = actionCollection()->action( ("st_[synchronize]_"+canonical_path).utf8() );
+              action = actionCollection()->action( "st_[synchronize]_"+canonical_path );

              if ( action )
              {
@ -541,7 +541,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
              }

              // Konsole action
-              action = actionCollection()->action( ("st_[konsole]_"+canonical_path).utf8() );
+              action = actionCollection()->action( "st_[konsole]_"+canonical_path );

              if ( action )
              {
@ -550,7 +550,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
              }

              // Konqueror action
-              action = actionCollection()->action( ("st_[filemanager]_"+canonical_path).utf8() );
+              action = actionCollection()->action( "st_[filemanager]_"+canonical_path );

              if ( action )
              {
@ -575,7 +575,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
          if ( menu )
          {
            // Unmount action
-            action = actionCollection()->action( ("st_[unmount]_"+canonical_path).utf8() );
+            action = actionCollection()->action( "st_[unmount]_"+canonical_path );

            if ( action )
            {
@ -585,7 +585,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()

 #ifdef __linux__
            // Force Unmount action
-            action = actionCollection()->action( ("st_[force]_"+canonical_path).utf8() );
+            action = actionCollection()->action( "st_[force]_"+canonical_path );

            if ( action )
            {
@ -595,7 +595,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 #endif

            // Synchronize action
-            action = actionCollection()->action( ("st_[synchronize]_"+canonical_path).utf8() );
+            action = actionCollection()->action( "st_[synchronize]_"+canonical_path );

            if ( action )
            {
@ -604,7 +604,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
            }

            // Konsole action
-            action = actionCollection()->action( ("st_[konsole]_"+canonical_path).utf8() );
+            action = actionCollection()->action( "st_[konsole]_"+canonical_path );

            if ( action )
            {
@ -613,7 +613,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
            }

            // Konqueror action
-            action = actionCollection()->action( ("st_[filemanager]_"+canonical_path).utf8() );
+            action = actionCollection()->action( "st_[filemanager]_"+canonical_path );

            if ( action )
            {
@ -638,7 +638,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
        if ( menu )
        {
          // Unmount action
-          action = actionCollection()->action( ("st_[unmount]_"+canonical_path).utf8() );
+          action = actionCollection()->action( "st_[unmount]_"+canonical_path );

          if ( action )
          {
@ -648,7 +648,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()

 #ifdef __linux__
          // Force Unmount action
-          action = actionCollection()->action( ("st_[force]_"+canonical_path).utf8() );
+          action = actionCollection()->action( "st_[force]_"+canonical_path );

          if ( action )
          {
@ -658,7 +658,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 #endif

          // Synchronize action
-          action = actionCollection()->action( ("st_[synchronize]_"+canonical_path).utf8() );
+          action = actionCollection()->action( "st_[synchronize]_"+canonical_path );

          if ( action )
          {
@ -667,7 +667,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
          }

            // Konsole action
-          action = actionCollection()->action( ("st_[konsole]_"+canonical_path).utf8() );
+          action = actionCollection()->action( "st_[konsole]_"+canonical_path );

          if ( action )
          {
@ -676,7 +676,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
          }

          // Konqueror action
-          action = actionCollection()->action( ("st_[filemanager]_"+canonical_path).utf8() );
+          action = actionCollection()->action( "st_[filemanager]_"+canonical_path );

          if ( action )
          {
@ -787,27 +787,27 @@ void Smb4KSystemTray::slotSetupSharesMenu()

        // Define the actions that can be performed on a share from within
        // the system tray widget:
-        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut::null(), this,
-                                TQ_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
+        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
+                                TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
        umount->setGroup( "ShareActions" );
 #ifdef __linux__
-        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut::null(), this,
-                                TQ_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
+        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
+                                TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
        force_umount->setGroup( "ShareActions" );
        force_umount->setEnabled( Smb4KSettings::useForceUnmount() );
 #endif
-        TDEAction *synchronize =  new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut::null(), this,
-                                TQ_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() );
+        TDEAction *synchronize =  new TDEAction( i18n( "S&ynchronize" ), "go-bottom", TDEShortcut::null(), TQT_TQOBJECT(this),
+                                TQT_SLOT( slotSynchronize() ), actionCollection(), "st_[synchronize]_"+(*it)->canonicalPath() );
        synchronize->setGroup( "ShareActions" );
        synchronize->setEnabled( !Smb4KSettings::rsync().isEmpty() );

-        TDEAction *konsole =      new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut::null(), this,
-                                TQ_SLOT( slotKonsole() ), actionCollection(), "st_[konsole]_"+(*it)->canonicalPath() );
+        TDEAction *konsole =      new TDEAction( i18n( "Open with Konso&le" ), "terminal", TDEShortcut::null(), TQT_TQOBJECT(this),
+                                TQT_SLOT( slotKonsole() ), actionCollection(), "st_[konsole]_"+(*it)->canonicalPath() );
        konsole->setGroup( "ShareActions" );
        konsole->setEnabled( !Smb4KSettings::konsole().isEmpty() );

-        TDEAction *konqueror =    new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut::null(), this,
-                                TQ_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() );
+        TDEAction *konqueror =    new TDEAction( i18n( "Open with &Konqueror" ), "kfm_home", TDEShortcut::null(), TQT_TQOBJECT(this),
+                                TQT_SLOT( slotFilemanager() ), actionCollection(), "st_[filemanager]_"+(*it)->canonicalPath() );
        konqueror->setGroup( "ShareActions" );

        // Set up the action submenu:
@ -866,9 +866,9 @@ void Smb4KSystemTray::slotSetupSharesMenu()

          // Disable actions that should not be performed on an inaccessible
          // share:
-          actionCollection()->action( TQString("st_[synchronize]_"+(*it)->canonicalPath()).utf8() )->setEnabled( false );
-          actionCollection()->action( TQString("st_[konsole]_"+(*it)->canonicalPath()).utf8() )->setEnabled( false );
-          actionCollection()->action( TQString("st_[filemanager]_"+(*it)->canonicalPath()).utf8() )->setEnabled( false );
+          actionCollection()->action( TQString("st_[synchronize]_"+(*it)->canonicalPath()) )->setEnabled( false );
+          actionCollection()->action( TQString("st_[konsole]_"+(*it)->canonicalPath()) )->setEnabled( false );
+          actionCollection()->action( TQString("st_[filemanager]_"+(*it)->canonicalPath()) )->setEnabled( false );
        }

        // Change the text if necessary:
@ -904,7 +904,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
      TDEAction *action = NULL;

      // Unmount action
-      action = actionCollection()->action( ("st_[unmount]_"+canonical_path).utf8() );
+      action = actionCollection()->action( "st_[unmount]_"+canonical_path );

      if ( action )
      {
@ -914,7 +914,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()

 #ifdef __linux__
      // Force Unmount action
-      action = actionCollection()->action( ("st_[force]_"+canonical_path).utf8() );
+      action = actionCollection()->action( "st_[force]_"+canonical_path );

      if ( action )
      {
@ -924,7 +924,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 #endif

      // Synchronize action
-      action = actionCollection()->action( ("st_[synchronize]_"+canonical_path).utf8() );
+      action = actionCollection()->action( "st_[synchronize]_"+canonical_path );

      if ( action )
      {
@ -933,7 +933,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
      }

      // Konsole action
-      action = actionCollection()->action( ("st_[konsole]_"+canonical_path).utf8() );
+      action = actionCollection()->action( "st_[konsole]_"+canonical_path );

      if ( action )
      {
@ -942,7 +942,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
      }

      // Konqueror action
-      action = actionCollection()->action( ("st_[filemanager]_"+canonical_path).utf8() );
+      action = actionCollection()->action( "st_[filemanager]_"+canonical_path );

      if ( action )
      {
--- a/smb4k/smb4ksystemtray.h
+++ b/smb4k/smb4ksystemtray.h
@ -36,7 +36,7 @@

 class Smb4KSystemTray : public KSystemTray
 {
-  TQ_OBJECT
+  Q_OBJECT
  

  public:
@ -56,19 +56,19 @@ class Smb4KSystemTray : public KSystemTray

    /**
     * Embeds the system tray window into the system tray, if @p ebd is
-     * true. Otherwise, it removes it from there. Note, that the system tray
+     * TRUE. Otherwise, it removes it from there. Note, that the system tray
     * icon won't be deleted but only hidden!
     *
-     * @param ebd           If true the system tray icon will be embedded into
+     * @param ebd           If TRUE the system tray icon will be embedded into
     *                      the system tray.
     */
    void embed( bool ebd );

    /**
-     * This function returns true if the system tray window is embedded into
-     * the system tray and false otherwise.
+     * This function returns TRUE if the system tray window is embedded into
+     * the system tray and FALSE otherwise.
     *
-     * @returns true if the system tray window is embedded.
+     * @returns TRUE if the system tray window is embedded.
     */
    bool isEmbedded() { return isShown(); }

--- a/stamp-h.in
+++ b/stamp-h.in
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+doc
+plugin
+po
+smb4k
+utilities
--- a/translations/desktop_files/bg.po
+++ b/translations/desktop_files/bg.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: bg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Самба ресурсен четец"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/ca.po
+++ b/translations/desktop_files/ca.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "El navegador de compartits SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/cs.po
+++ b/translations/desktop_files/cs.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Prohližeč SMB/CIFS sdílení"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/da.po
+++ b/translations/desktop_files/da.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr ""
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS ressource browseren"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/de.po
+++ b/translations/desktop_files/de.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Der Browser für SMB/CIFS-Freigaben"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/es.po
+++ b/translations/desktop_files/es.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "El explorador de recursos compartidos SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/fr.po
+++ b/translations/desktop_files/fr.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "L'explorateur de partages SMB / CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/hu.po
+++ b/translations/desktop_files/hu.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: hu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Az SMB/CIFS böngésző"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/is.po
+++ b/translations/desktop_files/is.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: is\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr ""
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS sameignarflakkarinn"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/it.po
+++ b/translations/desktop_files/it.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Browser di condivisioni SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/ja.po
+++ b/translations/desktop_files/ja.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS 共有(シェア)・ブラウザー"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/ka.po
+++ b/translations/desktop_files/ka.po
@ -1,37 +0,0 @@
-# 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: 2024-05-13 14:47+0200\n"
-"PO-Revision-Date: 2024-11-04 12:10+0000\n"
-"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
-"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
-"projects/applications/smb4k-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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba-ის ბრაუზერი"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS გაზიარებების ბრაუზერი"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/nb.po
+++ b/translations/desktop_files/nb.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS ressursutforsker"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/nl.po
+++ b/translations/desktop_files/nl.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: nl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "De SMB/CIFS Share Browser"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/nn.po
+++ b/translations/desktop_files/nn.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS ressurs surfar"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/pl.po
+++ b/translations/desktop_files/pl.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Przeglądarka Zasobów SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/pt_BR.po
+++ b/translations/desktop_files/pt_BR.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "O navegador de compartilhamentos SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/ru.po
+++ b/translations/desktop_files/ru.po
@ -1,38 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# Andrei Stepanov <adem4ik@gmail.com>, 2025.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-13 14:47+0200\n"
-"PO-Revision-Date: 2025-05-02 10:44+0000\n"
-"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
-"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
-"projects/applications/smb4k-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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Обозреватель общих ресурсов SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/sk.po
+++ b/translations/desktop_files/sk.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: sk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Prehliadač SMB/CIFS zdieľaní"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/smb4k-desktops.pot
+++ b/translations/desktop_files/smb4k-desktops.pot
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr ""
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr ""
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr ""
--- a/translations/desktop_files/sv.po
+++ b/translations/desktop_files/sv.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB Katalog programmed"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/tr.po
+++ b/translations/desktop_files/tr.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Tarayıcısı"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB/CIFS Paylaşım Tarayıcısı"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/uk.po
+++ b/translations/desktop_files/uk.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "Навігатор спільних ресурсів SMB/CIFS"
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/desktop_files/zh_CN.po
+++ b/translations/desktop_files/zh_CN.po
@ -1,36 +0,0 @@
-# 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: 2024-05-13 14:47+0200\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: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Name
-#: plugin/smb4k_add.desktop:4
-msgid "Samba Browser"
-msgstr "Samba Browser"
-
-#. GenericName
-#. Comment
-#. GenericName
-#. Comment
-#: plugin/smb4k_add.desktop:6 plugin/smb4k_add.desktop:8 smb4k/smb4k.desktop:6
-#: smb4k/smb4k.desktop:8
-msgid "The SMB/CIFS Share Browser"
-msgstr "SMB 共享浏览器\""
-
-#. Name
-#: smb4k/smb4k.desktop:4
-msgid "Smb4K"
-msgstr "Smb4K"
--- a/translations/messages/ka.po
+++ b/translations/messages/ka.po
--- a/utilities/CMakeLists.txt
+++ b/utilities/CMakeLists.txt
@ -1,40 +0,0 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${TDE_LIBRARY_DIRS}
-)
-
-
-##### (executable)
-
-tde_add_executable( smb4k_mount AUTOMOC
-  SOURCES smb4k_mount.cpp
-  DESTINATION ${BIN_INSTALL_DIR}
-)
-
-tde_add_executable( smb4k_umount AUTOMOC
-  SOURCES smb4k_umount.cpp
-  DESTINATION ${BIN_INSTALL_DIR}
-)
-
-tde_add_executable( smb4k_kill AUTOMOC
-  SOURCES smb4k_kill.cpp
-  DESTINATION ${BIN_INSTALL_DIR}
-)
-
-tde_add_executable( smb4k_cat  AUTOMOC
-  SOURCES smb4k_cat.cpp
-  DESTINATION ${BIN_INSTALL_DIR}
-)
-
-tde_add_executable( smb4k_mv AUTOMOC
-  SOURCES smb4k_mv.cpp
-  DESTINATION ${BIN_INSTALL_DIR}
-)
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@ -0,0 +1,14 @@
+INCLUDES = 
+METASOURCES = AUTO
+bin_PROGRAMS = smb4k_mount smb4k_umount smb4k_kill smb4k_cat smb4k_mv
+smb4k_mount_LDFLAGS = $(all_libraries)
+
+smb4k_umount_LDFLAGS = $(all_libraries)
+smb4k_kill_LDFLAGS = $(all_libraries)
+smb4k_umount_SOURCES = smb4k_umount.cpp
+smb4k_mount_SOURCES = smb4k_mount.cpp
+smb4k_kill_SOURCES = smb4k_kill.cpp
+smb4k_cat_LDFLAGS = $(all_libraries)
+smb4k_cat_SOURCES = smb4k_cat.cpp
+smb4k_mv_LDFLAGS = $(all_libraries)
+smb4k_mv_SOURCES = smb4k_mv.cpp
--- a/utilities/smb4k_umount.cpp
+++ b/utilities/smb4k_umount.cpp
@ -27,9 +27,9 @@
 #include <config.h>
 #endif

-#if !defined(__FreeBSD__) && !defined(__sun)
+#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS)
 #include <sys/statfs.h>
-#elif defined(__sun)
+#elif defined(__solaris__) || defined(USE_SOLARIS)
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #elif defined(__FreeBSD__)
@ -138,13 +138,13 @@ bool check_filesystem( const char *path, const char *fs )
 {
 	bool ok = false;

-#if !defined(__sun)
+#if !defined(__solaris__) && !defined(USE_SOLARIS)
 	struct statfs filesystem;
 #else
 	struct statvfs filesystem;
 #endif

-#if !defined(__sun) && !defined(__irix__)
+#if !defined(__solaris__) && !defined(USE_SOLARIS) && !defined(__irix__)
 	if ( statfs( path, &filesystem ) == -1 )
 #elif defined(__irix__)
 	if ( statfs( path, &filesystem, sizeof( filesystem ), 0 ) == -1 )
@ -156,19 +156,19 @@ bool check_filesystem( const char *path, const char *fs )

 		if ( err_code != EIO && err_code != EACCES )
 		{
-			// ok is still false
+			// ok is still FALSE
 			cerr << "smb4k_umount: " << strerror( err_code ) << endl;
 		}
 		else
 		{
-			ok = true; // Bypass the check below, because it would yield ok == false
+			ok = true; // Bypass the check below, because it would yield ok == FALSE
 			           // and we want to be able to unmount broken shares as well.
 		}

 		return ok;
 	}

-#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__)
+#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS) && !defined(__irix__)
 	// First entry is for CIFS, the second for SMBFS.
 	if ( (uint)filesystem.f_type == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) )
 	{
@ -183,7 +183,7 @@ bool check_filesystem( const char *path, const char *fs )
 	{
 		ok = true;
 	}
-#elif defined(__sun)
+#elif defined(__solaris__) || defined(USE_SOLARIS)
 	if ( (uint)filesystem.f_basetype == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) )
 	{
 		ok = true;
@ -204,7 +204,7 @@ bool check_filesystem( const char *path, const char *fs )
 #endif
 	else
 	{
-		// ok is still false.
+		// ok is still FALSE.
 		cerr << "smb4k_umount: Wrong file system specified" << endl;
 	}
Author	SHA1	Message	Date
TDE Gitea	46dba89c1d	Update translation template.	4 years ago
Slávek Banko	25adf51d22	Remove cmake submodule since it has now been replaced by cmake-trinity dependency. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>	4 years ago
TDE Gitea	2d346d72ec	Reset submodule main/applications/smb4k/cmake to latest HEAD	4 years ago
TDE Gitea	f3ee1e16a3	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	037279c57b	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	0dc0540fe0	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	5d9ce69ded	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	9c4ded39a2	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	5f488c5d5a	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	68bb5a8863	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	18b0a25baa	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	40c5073efb	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	e897c23326	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	bbfbb1da9b	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	031d2e44b2	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	b454b07d64	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	e54dc7e895	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	068038ca43	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	d4ef8ecc40	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	7e87fad3f9	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	c19dfd669d	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	9ea2a505a0	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	96d92dd4fc	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	07cf0775cb	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	2566b240af	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	9d2484e966	Reset submodule main/applications/smb4k/admin to latest HEAD	5 years ago
TDE Gitea	057417621b	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	5b7160dce0	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	ccbaaf7e59	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
Slávek Banko	98046d4e37	Merge translation files from master branch.	5 years ago
Slávek Banko	8339d80e6a	Update translation template.	5 years ago
TDE Gitea	243f01eda7	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	262d678022	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	c957ed9e26	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	8a5d8ba828	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	79ba0e6145	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
TDE Gitea	1b6886cf1b	Reset submodule main/applications/smb4k/cmake to latest HEAD	5 years ago
Slávek Banko	d248a799d4	Merge translation files from master branch.	6 years ago
Slávek Banko	371235765d	Merge translation files from master branch.	6 years ago
Slávek Banko	a93fbd5f1d	Merge translation files from master branch.	6 years ago
TDE Gitea	0056465558	Reset submodule main/applications/smb4k/cmake to latest HEAD	6 years ago
Slávek Banko	c816f2c921	Switch all submodules to https. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>	6 years ago
Slávek Banko	806ce54af4	Merge translation files from master branch.	6 years ago
Slávek Banko	5c91446a20	Merge translation files from master branch.	6 years ago
Michele Calgaro	9d3f2ed7e5	Removed .lsm files. lsm database is outdated and unmaintained. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	6 years ago
Slávek Banko	2ce0bdf4b7	Merge translation files from master branch.	6 years ago
TDE Gitea	7eddc2c583	Reset submodule main/applications/smb4k/cmake to latest HEAD	6 years ago
TDE Gitea	710b19933b	Reset submodule main/applications/smb4k/cmake to latest HEAD	6 years ago
TDE Gitea	db6e8ed598	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
Michele Calgaro	bc35b35bff	Updated date and version to R14.0.6 in .lsm files. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	7 years ago
TDE Gitea	6927bb16fd	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	7a42348de5	Reset submodule main/applications/smb4k/admin to latest HEAD	7 years ago
TDE Gitea	72762bd357	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	c6aea4bede	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Weblate	e4899a26bc	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/smb4k Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/smb4k/ (cherry picked from commit `7692325151`)	7 years ago
Slávek Banko	2277e367ae	Update translation template. (cherry picked from commit `b67d492db1`)	7 years ago
TDE Gitea	db079948f3	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	166acaae9d	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Weblate	258267f9b9	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/smb4k Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/smb4k/ (cherry picked from commit `958a6c7489`)	7 years ago
Slávek Banko	d26fa9d1e5	Add CMakeL10n rules. Create translation template. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit `9fb5aa2802`)	7 years ago
TDE Gitea	70dd69b995	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	f5831d0601	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	aea4e761d0	Reset submodule main/applications/smb4k/admin to latest HEAD	7 years ago
TDE Gitea	70c0efe2c8	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	efb30b50a3	Reset submodule main/applications/smb4k/cmake to latest HEAD	7 years ago
TDE Gitea	d241a7ab41	Reset submodule main/applications/smb4k/admin to latest HEAD	7 years ago
Slávek Banko	35355d551c	Update version numbers and date for R14.0.5 final release	7 years ago
Slávek Banko	ad2f3925aa	Reset submodule main/applications/smb4k/admin to latest HEAD	7 years ago
Slávek Banko	60d1e91a87	Reset submodule main/applications/smb4k/admin to latest HEAD	7 years ago
Slávek Banko	d7f9aa2a7b	Reset submodule main/applications/smb4k/admin to latest HEAD	7 years ago
Slávek Banko	8fbe4b87bd	Reset submodule main/applications/smb4k/cmake to latest HEAD	8 years ago
Slávek Banko	b446815121	Reset submodule main/applications/smb4k/cmake to latest HEAD	9 years ago
Slávek Banko	5502b0af8c	Reset submodule main/applications/smb4k/cmake to latest HEAD	9 years ago
Slávek Banko	66850e96b4	Reset submodule main/applications/smb4k/cmake to latest HEAD	9 years ago
Slávek Banko	f182fd5074	Reset submodule main/applications/smb4k/admin to latest HEAD	9 years ago
Slávek Banko	49137df6ad	cmake: add tde_add_check_executable macro	9 years ago
Slávek Banko	e261d1e241	Update version number for new target R14.0.5	9 years ago
Slávek Banko	9961958345	Update date in lsm files	9 years ago
Slávek Banko	e759e055ae	Reset submodule main/applications/smb4k/admin to latest HEAD	9 years ago
Timothy Pearson	ea1e7ceecc	Fix invalid headers in PNG files and optimize for size (cherry picked from commit `6ee88c1674`)	9 years ago
Slávek Banko	94b295ad06	Reset submodule main/applications/smb4k/cmake to latest HEAD	9 years ago
Slávek Banko	c549c35d46	Reset submodule main/applications/smb4k/cmake to latest HEAD	10 years ago
Slávek Banko	e579456c0c	Update version number for new target R14.0.4	10 years ago
Slávek Banko	3d1b4019b7	Update date in lsm files	10 years ago
Slávek Banko	d4ebc9a930	Update version number for new target R14.0.3	10 years ago
Slávek Banko	710e936241	Update date in lsm files	10 years ago
Slávek Banko	29bac45e4e	Update version number for new target R14.0.2	10 years ago
Slávek Banko	1dc57d419f	Update date in lsm files	10 years ago
Slávek Banko	ea1abe110f	Update version in lsm files	10 years ago
Slávek Banko	c559972145	Reset submodule main/applications/smb4k/cmake to latest HEAD	10 years ago
Slávek Banko	10f6b9a8bd	Reset submodule main/applications/smb4k/cmake to latest HEAD	10 years ago
Slávek Banko	853ac36d82	Reset submodule main/applications/smb4k/admin to latest HEAD	10 years ago
Timothy Pearson	a2c894a791	Bring printer1 icon into XDG compliance (cherry picked from commit `39fa81fa7d`)	11 years ago
Timothy Pearson	8c7d69faa0	Rename most device icons to comply with XDG standards (cherry picked from commit `75b96c6c24`)	11 years ago
				`@ -0,0 +1 @@`
				`Subproject commit 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8f`