82 files changed, 743 insertions, 495 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..ebb510b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,80 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8.12 )
+
+
+#### general package setup
+
+project( kdbg )
+set( VERSION R14.0.10 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_TRACE_OUTPUT   "Generate lots of trace output" OFF )
+option( WITH_GDB_TRANSCRIPT "Provide file log"              OFF )
+
+
+##### user requested modules
+
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )
+option( BUILD_TESTPROGS    "Build testprogs executables" OFF  )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST -UQT_NO_COMPAT )
+
+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( ${PROJECT_NAME} )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) 
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..aaecdcd
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,60 @@
+###########################################
+#                                         #
+#  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 )
+
+
+##### Trace outputs
+
+if( WITH_TRACE_OUTPUT )
+  set( WANT_TRACE_OUTPUT 1 )
+endif( WITH_TRACE_OUTPUT )
+
+
+##### gdb-transcript
+
+if( WITH_GDB_TRANSCRIPT )
+  set( GDB_TRANSCRIPT "./gdb-transcript" CACHE STRING "user specified file")
+endif( WITH_GDB_TRANSCRIPT )
+
+
+##### check for headers
+
+check_include_file( "fcntl.h"     HAVE_FCNTL_H     )
+check_include_file( "unistd.h"    HAVE_UNISTD_H    )
+check_include_file( "sys/ioctl.h" HAVE_SYS_IOCTL_H )
+check_include_file( "sys/stat.h"  HAVE_SYS_STAT_H  )
+check_include_file( "pty.h"       HAVE_PTY_H       )
+check_include_file( "libutil.h"   HAVE_LIBUTIL_H   )
+check_include_file( "util.h"      HAVE_UTIL_H      )
+
+
+##### search for 'ps' command
+
+find_program( PS_COMMAND "ps" DOC "Path for the ps command" )
+
+
+##### check for mkfifo function
+
+check_function_exists( mkfifo HAVE_MKFIFO )
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..c7e5688
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,45 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+
+/* Defined if you build with trace outputs */
+#cmakedefine WANT_TRACE_OUTPUT @WANT_TRACE_OUTPUT@
+
+/* Define the GDB_TRANCRIPT log file */
+#cmakedefine GDB_TRANSCRIPT "@GDB_TRANSCRIPT@"
+
+
+/* Defined if you have the <fcntl.h> header */
+#cmakedefine HAVE_FCNTL_H 1
+
+/* Defined if you have the <unistd.h> header */
+#cmakedefine HAVE_UNISTD_H 1
+
+/* Defined if you have the <sys/ioctl.h> header */
+#cmakedefine HAVE_SYS_IOCTL_H 1
+
+/* Defined if you have the <sys/stat.h> header */
+#cmakedefine HAVE_SYS_STAT_H 1
+
+/* Defined if you have the <pty.h> header */
+#cmakedefine HAVE_PTY_H 1
+
+/* Defined if you have the <libutil.h> header */
+#cmakedefine HAVE_LIBUTIL_H 1
+
+/* Defined if you have the <util.h> header */
+#cmakedefine HAVE_UTIL_H 1
+
+
+/* Define the ps command with its defaults arguments */
+#cmakedefine PS_COMMAND "@PS_COMMAND@", "-eo", "pid,ppid,uid,vsz,etime,time,args"
+
+
+/* Defined if you have the "mkfifo" function */ 
+#cmakedefine HAVE_MKFIFO 1
diff --git a/kdbg/CMakeLists.txt b/kdbg/CMakeLists.txt
new file mode 100644
index 0000000..01aa14f
--- /dev/null
+++ b/kdbg/CMakeLists.txt
@@ -0,0 +1,71 @@
+tde_conditional_add_subdirectory( BUILD_DOC doc )
+tde_conditional_add_subdirectory( BUILD_TESTPROGS testprogs )
+ 
+add_subdirectory( typetables )
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kdbg (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+  SOURCES
+        pgmargsbase.ui
+        procattachbase.ui
+        pgmargs.cpp
+        procattach.cpp
+        debugger.cpp
+        programconfig.cpp
+        dbgdriver.cpp
+        gdbdriver.cpp
+        xsldbgdriver.cpp
+        brkpt.cpp
+        exprwnd.cpp
+        regwnd.cpp
+        memwindow.cpp
+        threadlist.cpp
+        sourcewnd.cpp
+        winstack.cpp
+        ttywnd.cpp
+        typetable.cpp
+        prefdebugger.cpp
+        prefmisc.cpp
+        pgmsettings.cpp
+        mainwndbase.cpp
+        dbgmainwnd.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kdbgui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
+
+install(
+    FILES kdbgrc
+    DESTINATION ${CONFIG_INSTALL_DIR}
+)
diff --git a/kdbg/brkpt.cpp b/kdbg/brkpt.cpp
index 67a1ee8..54e1548 100644
--- a/kdbg/brkpt.cpp
+++ b/kdbg/brkpt.cpp
@@ -8,11 +8,11 @@
 #include <tdelocale.h>			/* i18n */
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
-#include <ntqdialog.h>
-#include <ntqkeycode.h>
-#include <ntqpainter.h>
-#include <ntqlabel.h>
-#include <ntqbitmap.h>
+#include <tqdialog.h>
+#include <tqkeycode.h>
+#include <tqpainter.h>
+#include <tqlabel.h>
+#include <tqbitmap.h>
 #include "debugger.h"
 #include "brkpt.h"
 #include "dbgdriver.h"
diff --git a/kdbg/brkpt.h b/kdbg/brkpt.h
index f529248..d501a1c 100644
--- a/kdbg/brkpt.h
+++ b/kdbg/brkpt.h
@@ -7,11 +7,11 @@
 #ifndef BRKPT_H
 #define BRKPT_H
 
-#include <ntqlistview.h>
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqvaluevector.h>
+#include <tqlistview.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqvaluevector.h>
 
 class KDebugger;
 class BreakpointItem;
diff --git a/kdbg/dbgdriver.cpp b/kdbg/dbgdriver.cpp
index 8ac7cd7..95bd843 100644
--- a/kdbg/dbgdriver.cpp
+++ b/kdbg/dbgdriver.cpp
@@ -6,7 +6,7 @@
 
 #include "dbgdriver.h"
 #include "exprwnd.h"
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ctype.h>
 #include <stdlib.h>			/* strtol, atoi */
 #include <algorithm>
diff --git a/kdbg/dbgdriver.h b/kdbg/dbgdriver.h
index 0d33300..73786f4 100644
--- a/kdbg/dbgdriver.h
+++ b/kdbg/dbgdriver.h
@@ -7,9 +7,9 @@
 #ifndef DBGDRIVER_H
 #define DBGDRIVER_H
 
-#include <ntqfile.h>
-#include <ntqregexp.h>
-#include <ntqcstring.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqcstring.h>
 #include <kprocess.h>
 #include <queue>
 #include <list>
diff --git a/kdbg/dbgmainwnd.h b/kdbg/dbgmainwnd.h
index b4e7697..6717390 100644
--- a/kdbg/dbgmainwnd.h
+++ b/kdbg/dbgmainwnd.h
@@ -7,7 +7,7 @@
 #ifndef DBGMAINWND_H
 #define DBGMAINWND_H
 
-#include <ntqtimer.h>
+#include <tqtimer.h>
 #include <kdockwidget.h>
 #include "mainwndbase.h"
 #include "regwnd.h"
diff --git a/kdbg/debugger.h b/kdbg/debugger.h
index f48c62e..f934127 100644
--- a/kdbg/debugger.h
+++ b/kdbg/debugger.h
@@ -7,9 +7,9 @@
 #ifndef DEBUGGER_H
 #define DEBUGGER_H
 
-#include <ntqtimer.h>
-#include <ntqdict.h>
-#include <ntqstringlist.h>
+#include <tqtimer.h>
+#include <tqdict.h>
+#include <tqstringlist.h>
 #include "envvar.h"
 #include "exprwnd.h"			/* some compilers require this */
 
diff --git a/kdbg/doc/CMakeLists.txt b/kdbg/doc/CMakeLists.txt
new file mode 100644
index 0000000..6d0aa9f
--- /dev/null
+++ b/kdbg/doc/CMakeLists.txt
@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )
diff --git a/kdbg/doc/de/CMakeLists.txt b/kdbg/doc/de/CMakeLists.txt
new file mode 100644
index 0000000..b77b646
--- /dev/null
+++ b/kdbg/doc/de/CMakeLists.txt
@@ -0,0 +1,8 @@
+file( GLOB _htmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
+
+install(
+    FILES ${_htmls}
+    DESTINATION ${HTML_INSTALL_DIR}/de/${PROJECT_NAME}
+)
+
+ 
diff --git a/kdbg/doc/en/CMakeLists.txt b/kdbg/doc/en/CMakeLists.txt
new file mode 100644
index 0000000..378feb9
--- /dev/null
+++ b/kdbg/doc/en/CMakeLists.txt
@@ -0,0 +1,8 @@
+file( GLOB _htmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
+
+install(
+    FILES ${_htmls}
+    DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}
+)
+
+ 
diff --git a/kdbg/doc/man/CMakeLists.txt b/kdbg/doc/man/CMakeLists.txt
new file mode 100644
index 0000000..8512250
--- /dev/null
+++ b/kdbg/doc/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES ${PROJECT_NAME}.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/kdbg/doc/man/kdbg.1 b/kdbg/doc/man/kdbg.1
new file mode 100644
index 0000000..588ef94
--- /dev/null
+++ b/kdbg/doc/man/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/kdbg/doc/ru/CMakeLists.txt b/kdbg/doc/ru/CMakeLists.txt
new file mode 100644
index 0000000..e983b81
--- /dev/null
+++ b/kdbg/doc/ru/CMakeLists.txt
@@ -0,0 +1,8 @@
+file( GLOB _htmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
+
+install(
+    FILES ${_htmls}
+    DESTINATION ${HTML_INSTALL_DIR}/ru/${PROJECT_NAME}
+)
+
+ 
diff --git a/kdbg/exprwnd.cpp b/kdbg/exprwnd.cpp
index f95457c..efbbd3c 100644
--- a/kdbg/exprwnd.cpp
+++ b/kdbg/exprwnd.cpp
@@ -7,9 +7,9 @@
 #include "exprwnd.h"
 #include "exprwnd.moc"
 #include "typetable.h"
-#include <ntqstringlist.h>
-#include <ntqpainter.h>
-#include <ntqscrollbar.h>
+#include <tqstringlist.h>
+#include <tqpainter.h>
+#include <tqscrollbar.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>		/* icons */
 #include <tdelocale.h>			/* i18n */
diff --git a/kdbg/exprwnd.h b/kdbg/exprwnd.h
index 0c18b8f..74cd7e3 100644
--- a/kdbg/exprwnd.h
+++ b/kdbg/exprwnd.h
@@ -7,9 +7,9 @@
 #ifndef EXPRWND_H
 #define EXPRWND_H
 
-#include "ntqlistview.h"
-#include <ntqlineedit.h>
-#include <ntqpixmap.h>
+#include "tqlistview.h"
+#include <tqlineedit.h>
+#include <tqpixmap.h>
 #include <list>
 
 class ProgramTypeTable;
diff --git a/kdbg/mainwndbase.cpp b/kdbg/mainwndbase.cpp
index bed938e..ef137a3 100644
--- a/kdbg/mainwndbase.cpp
+++ b/kdbg/mainwndbase.cpp
@@ -10,9 +10,9 @@
 #include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
-#include <ntqtabdialog.h>
-#include <ntqfile.h>
-#include <ntqdragobject.h>
+#include <tqtabdialog.h>
+#include <tqfile.h>
+#include <tqdragobject.h>
 #include "mainwndbase.h"
 #include "debugger.h"
 #include "gdbdriver.h"
diff --git a/kdbg/mainwndbase.h b/kdbg/mainwndbase.h
index 8dc919b..ca6071d 100644
--- a/kdbg/mainwndbase.h
+++ b/kdbg/mainwndbase.h
@@ -7,10 +7,10 @@
 #ifndef MAINWNDBASE_H
 #define MAINWNDBASE_H
 
-#include <ntqlineedit.h>
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqcstring.h>
+#include <tqlineedit.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqcstring.h>
 #include "exprwnd.h"
 #include "sys/types.h"			/* pid_t */
 
diff --git a/kdbg/memwindow.cpp b/kdbg/memwindow.cpp
index 532a4da..06a4384 100644
--- a/kdbg/memwindow.cpp
+++ b/kdbg/memwindow.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "memwindow.h"
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tdelocale.h>
 #include <tdeconfigbase.h>
 #include "debugger.h"
diff --git a/kdbg/memwindow.h b/kdbg/memwindow.h
index 807b28b..fc56379 100644
--- a/kdbg/memwindow.h
+++ b/kdbg/memwindow.h
@@ -7,11 +7,11 @@
 #ifndef MEMWINDOW_H
 #define MEMWINDOW_H
 
-#include <ntqpopupmenu.h>
-#include <ntqlistview.h>
-#include <ntqcombobox.h>
-#include <ntqlayout.h>
-#include <ntqmap.h>
+#include <tqpopupmenu.h>
+#include <tqlistview.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqmap.h>
 #include "dbgdriver.h"
 
 class KDebugger;
diff --git a/kdbg/pgmargs.h b/kdbg/pgmargs.h
index 72f81d0..a5a3de2 100644
--- a/kdbg/pgmargs.h
+++ b/kdbg/pgmargs.h
@@ -8,8 +8,8 @@
 #define PgmArgs_included
 
 #include "pgmargsbase.h"
-#include <ntqlineedit.h>
-#include <ntqdict.h>
+#include <tqlineedit.h>
+#include <tqdict.h>
 #include "envvar.h"
 
 class TQStringList;
diff --git a/kdbg/pgmargsbase.cpp b/kdbg/pgmargsbase.cpp
deleted file mode 100644
index fe2a71d..0000000
--- a/kdbg/pgmargsbase.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-#include <kdialog.h>
-#include <tdelocale.h>
-/****************************************************************************
-** Form implementation generated from reading ui file '../../exper/kdbg/pgmargsbase.ui'
-**
-** Created: Sun Jun 6 14:57:15 2010
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "pgmargsbase.h"
-
-#include <ntqvariant.h>
-#include <ntqpushbutton.h>
-#include <ntqtabwidget.h>
-#include <ntqwidget.h>
-#include <ntqlabel.h>
-#include <ntqlineedit.h>
-#include <ntqheader.h>
-#include <ntqlistview.h>
-#include <ntqlistbox.h>
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-
-/*
- *  Constructs a PgmArgsBase as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- *
- *  The dialog will by default be modeless, unless you set 'modal' to
- *  TRUE to construct a modal dialog.
- */
-PgmArgsBase::PgmArgsBase( TQWidget* parent, const char* name, bool modal, WFlags fl )
-    : TQDialog( parent, name, modal, fl )
-{
-    if ( !name )
-	setName( "PgmArgsBase" );
-    setSizeGripEnabled( TRUE );
-    PgmArgsBaseLayout = new TQHBoxLayout( this, 11, 6, "PgmArgsBaseLayout"); 
-
-    layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); 
-
-    tabWidget = new TQTabWidget( this, "tabWidget" );
-
-    argsPage = new TQWidget( tabWidget, "argsPage" );
-    argsPageLayout = new TQHBoxLayout( argsPage, 11, 6, "argsPageLayout"); 
-
-    layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); 
-
-    labelArgs = new TQLabel( argsPage, "labelArgs" );
-    layout2->addWidget( labelArgs );
-
-    programArgs = new TQLineEdit( argsPage, "programArgs" );
-    layout2->addWidget( programArgs );
-
-    layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); 
-
-    insertFile = new TQPushButton( argsPage, "insertFile" );
-    layout3->addWidget( insertFile );
-
-    insertDir = new TQPushButton( argsPage, "insertDir" );
-    layout3->addWidget( insertDir );
-    spacer1 = new TQSpacerItem( 61, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout3->addItem( spacer1 );
-    layout2->addLayout( layout3 );
-    spacer2 = new TQSpacerItem( 81, 180, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout2->addItem( spacer2 );
-    argsPageLayout->addLayout( layout2 );
-    tabWidget->insertTab( argsPage, TQString::fromLatin1("") );
-
-    wdPage = new TQWidget( tabWidget, "wdPage" );
-    wdPageLayout = new TQHBoxLayout( wdPage, 11, 6, "wdPageLayout"); 
-
-    layout6 = new TQVBoxLayout( 0, 0, 6, "layout6"); 
-
-    wdEdit = new TQLineEdit( wdPage, "wdEdit" );
-    layout6->addWidget( wdEdit );
-
-    layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); 
-
-    wdBrowse = new TQPushButton( wdPage, "wdBrowse" );
-    layout5->addWidget( wdBrowse );
-    spacer4 = new TQSpacerItem( 321, 31, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout5->addItem( spacer4 );
-    layout6->addLayout( layout5 );
-    spacer5 = new TQSpacerItem( 111, 161, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout6->addItem( spacer5 );
-    wdPageLayout->addLayout( layout6 );
-    tabWidget->insertTab( wdPage, TQString::fromLatin1("") );
-
-    envPage = new TQWidget( tabWidget, "envPage" );
-    envPageLayout = new TQHBoxLayout( envPage, 11, 6, "envPageLayout"); 
-
-    layout9 = new TQHBoxLayout( 0, 0, 6, "layout9"); 
-
-    layout7 = new TQVBoxLayout( 0, 0, 6, "layout7"); 
-
-    envLabel = new TQLabel( envPage, "envLabel" );
-    layout7->addWidget( envLabel );
-
-    envVar = new TQLineEdit( envPage, "envVar" );
-    layout7->addWidget( envVar );
-
-    envList = new TQListView( envPage, "envList" );
-    envList->addColumn( tr2i18n( "Name" ) );
-    envList->header()->setClickEnabled( FALSE, envList->header()->count() - 1 );
-    envList->addColumn( tr2i18n( "Value" ) );
-    envList->header()->setClickEnabled( FALSE, envList->header()->count() - 1 );
-    envList->setSelectionMode( TQListView::Single );
-    layout7->addWidget( envList );
-    layout9->addLayout( layout7 );
-
-    layout8 = new TQVBoxLayout( 0, 0, 6, "layout8"); 
-
-    buttonModify = new TQPushButton( envPage, "buttonModify" );
-    layout8->addWidget( buttonModify );
-
-    buttonDelete = new TQPushButton( envPage, "buttonDelete" );
-    layout8->addWidget( buttonDelete );
-    spacer6 = new TQSpacerItem( 51, 141, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout8->addItem( spacer6 );
-    layout9->addLayout( layout8 );
-    envPageLayout->addLayout( layout9 );
-    tabWidget->insertTab( envPage, TQString::fromLatin1("") );
-
-    xsldbgOptionsPage = new TQWidget( tabWidget, "xsldbgOptionsPage" );
-    xsldbgOptionsPageLayout = new TQHBoxLayout( xsldbgOptionsPage, 11, 6, "xsldbgOptionsPageLayout"); 
-
-    xsldbgOptions = new TQListBox( xsldbgOptionsPage, "xsldbgOptions" );
-    xsldbgOptions->setSelectionMode( TQListBox::Multi );
-    xsldbgOptionsPageLayout->addWidget( xsldbgOptions );
-    tabWidget->insertTab( xsldbgOptionsPage, TQString::fromLatin1("") );
-    layout1->addWidget( tabWidget );
-
-    layout4 = new TQHBoxLayout( 0, 0, 6, "layout4"); 
-
-    buttonHelp = new TQPushButton( this, "buttonHelp" );
-    buttonHelp->setAutoDefault( TRUE );
-    layout4->addWidget( buttonHelp );
-    spacer3 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout4->addItem( spacer3 );
-
-    buttonOk = new TQPushButton( this, "buttonOk" );
-    buttonOk->setAutoDefault( TRUE );
-    buttonOk->setDefault( TRUE );
-    layout4->addWidget( buttonOk );
-
-    buttonCancel = new TQPushButton( this, "buttonCancel" );
-    buttonCancel->setAutoDefault( TRUE );
-    layout4->addWidget( buttonCancel );
-    layout1->addLayout( layout4 );
-    PgmArgsBaseLayout->addLayout( layout1 );
-    languageChange();
-    resize( TQSize(528, 410).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-
-    // signals and slots connections
-    connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
-    connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
-    connect( insertFile, SIGNAL( clicked() ), this, SLOT( browseArgFile() ) );
-    connect( wdBrowse, SIGNAL( clicked() ), this, SLOT( browseWd() ) );
-    connect( buttonModify, SIGNAL( clicked() ), this, SLOT( modifyVar() ) );
-    connect( buttonDelete, SIGNAL( clicked() ), this, SLOT( deleteVar() ) );
-    connect( envList, SIGNAL( selectionChanged() ), this, SLOT( envListCurrentChanged() ) );
-    connect( buttonHelp, SIGNAL( clicked() ), this, SLOT( invokeHelp() ) );
-    connect( insertDir, SIGNAL( clicked() ), this, SLOT( browseArgDir() ) );
-
-    // tab order
-    setTabOrder( envVar, envList );
-    setTabOrder( envList, buttonModify );
-    setTabOrder( buttonModify, buttonDelete );
-    setTabOrder( buttonDelete, programArgs );
-    setTabOrder( programArgs, insertFile );
-    setTabOrder( insertFile, insertDir );
-    setTabOrder( insertDir, buttonHelp );
-    setTabOrder( buttonHelp, buttonOk );
-    setTabOrder( buttonOk, buttonCancel );
-    setTabOrder( buttonCancel, tabWidget );
-    setTabOrder( tabWidget, wdEdit );
-    setTabOrder( wdEdit, wdBrowse );
-
-    // buddies
-    labelArgs->setBuddy( programArgs );
-    envLabel->setBuddy( envVar );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-PgmArgsBase::~PgmArgsBase()
-{
-    // no need to delete child widgets, TQt does it all for us
-}
-
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void PgmArgsBase::languageChange()
-{
-    setCaption( tr2i18n( "Program Arguments" ) );
-    labelArgs->setText( tr2i18n( "Run <i>%1</i> with these arguments:" ) );
-    TQWhatsThis::add( programArgs, tr2i18n( "Specify the arguments with which the program shall be invoked for this debugging session. You specify the arguments just as you would on the command line, that is, you can even use quotes and environment variables, for example:<p><tt>--message 'start in: ' $HOME</tt>" ) );
-    insertFile->setText( tr2i18n( "Insert &file name..." ) );
-    insertFile->setAccel( TQKeySequence( tr2i18n( "Alt+F" ) ) );
-    TQWhatsThis::add( insertFile, tr2i18n( "Browse for a file; the full path name will be inserted at the current cursor location in the edit box above." ) );
-    insertDir->setText( tr2i18n( "Insert &directory name..." ) );
-    insertDir->setAccel( TQKeySequence( tr2i18n( "Alt+D" ) ) );
-    TQWhatsThis::add( insertDir, tr2i18n( "Browse for a directory; the full path name will be inserted at the current cursor location in the edit box above." ) );
-    tabWidget->changeTab( argsPage, tr2i18n( "&Arguments" ) );
-    TQWhatsThis::add( wdEdit, tr2i18n( "Specify here the initial working directory where the program is run." ) );
-    wdBrowse->setText( tr2i18n( "&Browse..." ) );
-    wdBrowse->setAccel( TQKeySequence( tr2i18n( "Alt+B" ) ) );
-    TQWhatsThis::add( wdBrowse, tr2i18n( "Browse for the initial working directory where the program is run." ) );
-    tabWidget->changeTab( wdPage, tr2i18n( "&Working Directory" ) );
-    envLabel->setText( tr2i18n( "Environment variables (<tt>NAME=value</tt>):" ) );
-    TQWhatsThis::add( envVar, tr2i18n( "To add a new environment variable or to modify one, specify it here in the form <tt>NAME=value</tt> and click <b>Modify</b>." ) );
-    envList->header()->setLabel( 0, tr2i18n( "Name" ) );
-    envList->header()->setLabel( 1, tr2i18n( "Value" ) );
-    TQWhatsThis::add( envList, tr2i18n( "Environment variables that are set <i>in addition</i> to those that are inherited are listed in this table. To add new environment variables, specify them as <tt>NAME=value</tt> in the edit box above and click <b>Modify</b>. To modify a value, select it in this list and click <b>Modify</b>. To delete an environment variable, select it in this list and click <b>Delete</b>." ) );
-    buttonModify->setText( tr2i18n( "&Modify" ) );
-    buttonModify->setAccel( TQKeySequence( tr2i18n( "Alt+M" ) ) );
-    TQWhatsThis::add( buttonModify, tr2i18n( "Enters the environment variable that is currently specified in the edit box into the list. If the named variable is already in the list, it receives a new value; otherwise, a new entry is created." ) );
-    buttonDelete->setText( tr2i18n( "&Delete" ) );
-    buttonDelete->setAccel( TQKeySequence( tr2i18n( "Alt+D" ) ) );
-    TQWhatsThis::add( buttonDelete, tr2i18n( "Deletes the selected environment variable from the list. This cannot be used to delete environment variables that are inherited." ) );
-    tabWidget->changeTab( envPage, tr2i18n( "&Environment" ) );
-    tabWidget->changeTab( xsldbgOptionsPage, tr2i18n( "&xsldbg Options" ) );
-    buttonHelp->setText( tr2i18n( "&Help" ) );
-    buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) );
-    buttonOk->setText( tr2i18n( "&OK" ) );
-    buttonOk->setAccel( TQKeySequence( TQString::null ) );
-    buttonCancel->setText( tr2i18n( "&Cancel" ) );
-    buttonCancel->setAccel( TQKeySequence( TQString::null ) );
-}
-
-#include "pgmargsbase.moc"
diff --git a/kdbg/pgmsettings.cpp b/kdbg/pgmsettings.cpp
index 6b328cd..92bc08d 100644
--- a/kdbg/pgmsettings.cpp
+++ b/kdbg/pgmsettings.cpp
@@ -7,12 +7,12 @@
 #include "pgmsettings.h"
 #include <tdelocale.h>			/* i18n */
 #include <tdeapplication.h>
-#include <ntqfileinfo.h>
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqlabel.h>
-#include <ntqradiobutton.h>
-#include <ntqbuttongroup.h>
+#include <tqfileinfo.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
 #include "config.h"
 #include "mydebug.h"
 
diff --git a/kdbg/pgmsettings.h b/kdbg/pgmsettings.h
index 082ca97..581455d 100644
--- a/kdbg/pgmsettings.h
+++ b/kdbg/pgmsettings.h
@@ -7,7 +7,7 @@
 #ifndef PGMSETTINGS_H
 #define PGMSETTINGS_H
 
-#include <ntqtabdialog.h>
+#include <tqtabdialog.h>
 
 class TQButtonGroup;
 class TQLineEdit;
diff --git a/kdbg/pics/CMakeLists.txt b/kdbg/pics/CMakeLists.txt
new file mode 100644
index 0000000..c1847ed
--- /dev/null
+++ b/kdbg/pics/CMakeLists.txt
@@ -0,0 +1,20 @@
+##### app icons
+
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### pixmap icons
+
+file( GLOB xpm_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xpm )
+
+install(
+    FILES ${xpm_files}
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
+
+
+##### action icons
+
+tde_install_icons( "action-*"
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons
+)
diff --git a/kdbg/pics/Makefile.am b/kdbg/pics/Makefile.am
index d5d7163..378b0f0 100644
--- a/kdbg/pics/Makefile.am
+++ b/kdbg/pics/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = mng
+
 # toolbar icons
 
 kdbgiconsdir = $(kde_datadir)/kdbg/icons
@@ -34,23 +36,3 @@ picsdir = $(kde_datadir)/kdbg/pics
 
 # application icon
 KDE_ICON = kdbg
-
-animation = $(shell cd "$(srcdir)" && echo hi22-action-pulse0000*.png)
-
-# this requires ImageMagick
-hi22-action-pulse.png: hi22-action-pulse.pngseq
-	list="$(animation)" ; \
-	montage +frame +shadow +label -background black \
-		-geometry 22x22 \
-		-tile 1x`echo $$list | wc -w` \
-		$$list hi22-action-pulse.png
-
-hi22-action-pulse.pngseq: hi22-action-pulse.xml
-	@echo "Using cinelerra render $< into a PNG sequence $@"
-	@echo "If you do not have cinelerra, just touch $@"
-	exit 1
-
-# This file can be rendered by cinelerra into a "PNG sequence".
-# This produces the PNG sequence $(animation), which is pasted together
-# by `make hi22-action-pulse.png'.
-EXTRA_DIST = hi22-action-pulse.xml $(animation)
diff --git a/kdbg/pics/kdbg.xpm b/kdbg/pics/kdbg.xpm
new file mode 100644
index 0000000..8df7ac5
--- /dev/null
+++ b/kdbg/pics/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/kdbg/pics/mng/Makefile.am b/kdbg/pics/mng/Makefile.am
new file mode 100644
index 0000000..e195008
--- /dev/null
+++ b/kdbg/pics/mng/Makefile.am
@@ -0,0 +1,19 @@
+animation = $(shell cd "$(srcdir)" && echo hi22-action-pulse0000*.png)
+
+# this requires ImageMagick
+hi22-action-pulse.png: hi22-action-pulse.pngseq
+	list="$(animation)" ; \
+	montage +frame +shadow +label -background black \
+		-geometry 22x22 \
+		-tile 1x`echo $$list | wc -w` \
+		$$list hi22-action-pulse.png
+
+hi22-action-pulse.pngseq: hi22-action-pulse.xml
+	@echo "Using cinelerra render $< into a PNG sequence $@"
+	@echo "If you do not have cinelerra, just touch $@"
+	exit 1
+
+# This file can be rendered by cinelerra into a "PNG sequence".
+# This produces the PNG sequence $(animation), which is pasted together
+# by `make hi22-action-pulse.png'.
+EXTRA_DIST = hi22-action-pulse.xml $(animation)
diff --git a/kdbg/pics/genanim.sh b/kdbg/pics/mng/genanim.sh
index ab213c6..ab213c6 100755
--- a/kdbg/pics/genanim.sh
+++ b/kdbg/pics/mng/genanim.sh
diff --git a/kdbg/pics/hi22-action-pulse.xml b/kdbg/pics/mng/hi22-action-pulse.xml
index 1284915..1284915 100644
--- a/kdbg/pics/hi22-action-pulse.xml
+++ b/kdbg/pics/mng/hi22-action-pulse.xml
diff --git a/kdbg/pics/hi22-action-pulse000000.png b/kdbg/pics/mng/hi22-action-pulse000000.png
index be9c2e5..be9c2e5 100644
--- a/kdbg/pics/hi22-action-pulse000000.png
+++ b/kdbg/pics/mng/hi22-action-pulse000000.png
diff --git a/kdbg/pics/hi22-action-pulse000001.png b/kdbg/pics/mng/hi22-action-pulse000001.png
index 981d07f..981d07f 100644
--- a/kdbg/pics/hi22-action-pulse000001.png
+++ b/kdbg/pics/mng/hi22-action-pulse000001.png
diff --git a/kdbg/pics/hi22-action-pulse000002.png b/kdbg/pics/mng/hi22-action-pulse000002.png
index f52d27e..f52d27e 100644
--- a/kdbg/pics/hi22-action-pulse000002.png
+++ b/kdbg/pics/mng/hi22-action-pulse000002.png
diff --git a/kdbg/pics/hi22-action-pulse000003.png b/kdbg/pics/mng/hi22-action-pulse000003.png
index 636c82e..636c82e 100644
--- a/kdbg/pics/hi22-action-pulse000003.png
+++ b/kdbg/pics/mng/hi22-action-pulse000003.png
diff --git a/kdbg/pics/hi22-action-pulse000004.png b/kdbg/pics/mng/hi22-action-pulse000004.png
index 041e6a7..041e6a7 100644
--- a/kdbg/pics/hi22-action-pulse000004.png
+++ b/kdbg/pics/mng/hi22-action-pulse000004.png
diff --git a/kdbg/pics/hi22-action-pulse000005.png b/kdbg/pics/mng/hi22-action-pulse000005.png
index 6720f04..6720f04 100644
--- a/kdbg/pics/hi22-action-pulse000005.png
+++ b/kdbg/pics/mng/hi22-action-pulse000005.png
diff --git a/kdbg/pics/hi22-action-pulse000006.png b/kdbg/pics/mng/hi22-action-pulse000006.png
index 2cd2e0f..2cd2e0f 100644
--- a/kdbg/pics/hi22-action-pulse000006.png
+++ b/kdbg/pics/mng/hi22-action-pulse000006.png
diff --git a/kdbg/pics/hi22-action-pulse000007.png b/kdbg/pics/mng/hi22-action-pulse000007.png
index 8361920..8361920 100644
--- a/kdbg/pics/hi22-action-pulse000007.png
+++ b/kdbg/pics/mng/hi22-action-pulse000007.png
diff --git a/kdbg/pics/hi22-action-pulse000008.png b/kdbg/pics/mng/hi22-action-pulse000008.png
index 3e63beb..3e63beb 100644
--- a/kdbg/pics/hi22-action-pulse000008.png
+++ b/kdbg/pics/mng/hi22-action-pulse000008.png
diff --git a/kdbg/pics/hi22-action-pulse000009.png b/kdbg/pics/mng/hi22-action-pulse000009.png
index 125a370..125a370 100644
--- a/kdbg/pics/hi22-action-pulse000009.png
+++ b/kdbg/pics/mng/hi22-action-pulse000009.png
diff --git a/kdbg/pics/hi22-action-pulse000010.png b/kdbg/pics/mng/hi22-action-pulse000010.png
index c206a83..c206a83 100644
--- a/kdbg/pics/hi22-action-pulse000010.png
+++ b/kdbg/pics/mng/hi22-action-pulse000010.png
diff --git a/kdbg/pics/hi22-action-pulse000011.png b/kdbg/pics/mng/hi22-action-pulse000011.png
index d789323..d789323 100644
--- a/kdbg/pics/hi22-action-pulse000011.png
+++ b/kdbg/pics/mng/hi22-action-pulse000011.png
diff --git a/kdbg/pics/hi22-action-pulse000012.png b/kdbg/pics/mng/hi22-action-pulse000012.png
index 3f1ddea..3f1ddea 100644
--- a/kdbg/pics/hi22-action-pulse000012.png
+++ b/kdbg/pics/mng/hi22-action-pulse000012.png
diff --git a/kdbg/pics/hi22-action-pulse000013.png b/kdbg/pics/mng/hi22-action-pulse000013.png
index ab69ad1..ab69ad1 100644
--- a/kdbg/pics/hi22-action-pulse000013.png
+++ b/kdbg/pics/mng/hi22-action-pulse000013.png
diff --git a/kdbg/pics/hi22-action-pulse000014.png b/kdbg/pics/mng/hi22-action-pulse000014.png
index fbbfc74..fbbfc74 100644
--- a/kdbg/pics/hi22-action-pulse000014.png
+++ b/kdbg/pics/mng/hi22-action-pulse000014.png
diff --git a/kdbg/pics/hi22-action-pulse000015.png b/kdbg/pics/mng/hi22-action-pulse000015.png
index 5222a57..5222a57 100644
--- a/kdbg/pics/hi22-action-pulse000015.png
+++ b/kdbg/pics/mng/hi22-action-pulse000015.png
diff --git a/kdbg/pics/hi22-action-pulse000016.png b/kdbg/pics/mng/hi22-action-pulse000016.png
index 5f95d67..5f95d67 100644
--- a/kdbg/pics/hi22-action-pulse000016.png
+++ b/kdbg/pics/mng/hi22-action-pulse000016.png
diff --git a/kdbg/pics/hi22-action-pulse000017.png b/kdbg/pics/mng/hi22-action-pulse000017.png
index 009dc6a..009dc6a 100644
--- a/kdbg/pics/hi22-action-pulse000017.png
+++ b/kdbg/pics/mng/hi22-action-pulse000017.png
diff --git a/kdbg/pics/hi22-action-pulse000018.png b/kdbg/pics/mng/hi22-action-pulse000018.png
index eb40ff0..eb40ff0 100644
--- a/kdbg/pics/hi22-action-pulse000018.png
+++ b/kdbg/pics/mng/hi22-action-pulse000018.png
diff --git a/kdbg/pics/hi22-action-pulse000019.png b/kdbg/pics/mng/hi22-action-pulse000019.png
index 8e75fd2..8e75fd2 100644
--- a/kdbg/pics/hi22-action-pulse000019.png
+++ b/kdbg/pics/mng/hi22-action-pulse000019.png
diff --git a/kdbg/pics/hi22-action-pulse000020.png b/kdbg/pics/mng/hi22-action-pulse000020.png
index c1c16da..c1c16da 100644
--- a/kdbg/pics/hi22-action-pulse000020.png
+++ b/kdbg/pics/mng/hi22-action-pulse000020.png
diff --git a/kdbg/pics/hi22-action-pulse000021.png b/kdbg/pics/mng/hi22-action-pulse000021.png
index 3d91a80..3d91a80 100644
--- a/kdbg/pics/hi22-action-pulse000021.png
+++ b/kdbg/pics/mng/hi22-action-pulse000021.png
diff --git a/kdbg/pics/hi22-action-pulse000022.png b/kdbg/pics/mng/hi22-action-pulse000022.png
index 349fe2c..349fe2c 100644
--- a/kdbg/pics/hi22-action-pulse000022.png
+++ b/kdbg/pics/mng/hi22-action-pulse000022.png
diff --git a/kdbg/pics/hi22-action-pulse000023.png b/kdbg/pics/mng/hi22-action-pulse000023.png
index 5f4607a..5f4607a 100644
--- a/kdbg/pics/hi22-action-pulse000023.png
+++ b/kdbg/pics/mng/hi22-action-pulse000023.png
diff --git a/kdbg/pics/hi22-action-pulse000024.png b/kdbg/pics/mng/hi22-action-pulse000024.png
index 23f43a5..23f43a5 100644
--- a/kdbg/pics/hi22-action-pulse000024.png
+++ b/kdbg/pics/mng/hi22-action-pulse000024.png
diff --git a/kdbg/pics/hi22-action-pulse000025.png b/kdbg/pics/mng/hi22-action-pulse000025.png
index d50ad0e..d50ad0e 100644
--- a/kdbg/pics/hi22-action-pulse000025.png
+++ b/kdbg/pics/mng/hi22-action-pulse000025.png
diff --git a/kdbg/pics/hi22-action-pulse000026.png b/kdbg/pics/mng/hi22-action-pulse000026.png
index 6635ea9..6635ea9 100644
--- a/kdbg/pics/hi22-action-pulse000026.png
+++ b/kdbg/pics/mng/hi22-action-pulse000026.png
diff --git a/kdbg/pics/hi22-action-pulse000027.png b/kdbg/pics/mng/hi22-action-pulse000027.png
index 9375e44..9375e44 100644
--- a/kdbg/pics/hi22-action-pulse000027.png
+++ b/kdbg/pics/mng/hi22-action-pulse000027.png
diff --git a/kdbg/pics/hi22-action-pulse000028.png b/kdbg/pics/mng/hi22-action-pulse000028.png
index f87cf37..f87cf37 100644
--- a/kdbg/pics/hi22-action-pulse000028.png
+++ b/kdbg/pics/mng/hi22-action-pulse000028.png
diff --git a/kdbg/prefdebugger.cpp b/kdbg/prefdebugger.cpp
index f741e98..5c90398 100644
--- a/kdbg/prefdebugger.cpp
+++ b/kdbg/prefdebugger.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <tdelocale.h>			/* i18n */
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include "prefdebugger.h"
 
 PrefDebugger::PrefDebugger(TQWidget* parent) :
diff --git a/kdbg/prefdebugger.h b/kdbg/prefdebugger.h
index 35ecf2f..8fc3225 100644
--- a/kdbg/prefdebugger.h
+++ b/kdbg/prefdebugger.h
@@ -7,9 +7,9 @@
 #ifndef PREFDEBUGGER_H
 #define PREFDEBUGGER_H
 
-#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
 
 class PrefDebugger : public TQWidget
 {
diff --git a/kdbg/prefmisc.h b/kdbg/prefmisc.h
index 3e5f57a..1ddbb08 100644
--- a/kdbg/prefmisc.h
+++ b/kdbg/prefmisc.h
@@ -7,10 +7,10 @@
 #ifndef PREFMISC_H
 #define PREFMISC_H
 
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqlineedit.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
 
 class PrefMisc : public TQWidget
 {
diff --git a/kdbg/procattach.cpp b/kdbg/procattach.cpp
index a0979bb..5ea278f 100644
--- a/kdbg/procattach.cpp
+++ b/kdbg/procattach.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "procattach.h"
-#include <ntqlistview.h>
-#include <ntqtoolbutton.h>
-#include <ntqlineedit.h>
+#include <tqlistview.h>
+#include <tqtoolbutton.h>
+#include <tqlineedit.h>
 #include <kprocess.h>
 #include <ctype.h>
 #include <tdeapplication.h>
diff --git a/kdbg/procattach.h b/kdbg/procattach.h
index 068478b..e1fea6b 100644
--- a/kdbg/procattach.h
+++ b/kdbg/procattach.h
@@ -8,12 +8,12 @@
 #define ProcAttach_included
 
 #include "procattachbase.h"
-#include <ntqvaluevector.h>
-#include <ntqdialog.h>
-#include <ntqlabel.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqvaluevector.h>
+#include <tqdialog.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
 
 
 class TDEProcess;
diff --git a/kdbg/procattachbase.cpp b/kdbg/procattachbase.cpp
deleted file mode 100644
index 7f45969..0000000
--- a/kdbg/procattachbase.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <kdialog.h>
-#include <tdelocale.h>
-/****************************************************************************
-** Form implementation generated from reading ui file '../../exper/kdbg/procattachbase.ui'
-**
-** Created: Sun Jun 6 14:57:15 2010
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "procattachbase.h"
-
-#include <ntqvariant.h>
-#include <ntqpushbutton.h>
-#include <ntqlabel.h>
-#include <ntqlineedit.h>
-#include <ntqtoolbutton.h>
-#include <ntqheader.h>
-#include <ntqlistview.h>
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
-#include <ntqwhatsthis.h>
-
-/*
- *  Constructs a ProcAttachBase as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- *
- *  The dialog will by default be modeless, unless you set 'modal' to
- *  TRUE to construct a modal dialog.
- */
-ProcAttachBase::ProcAttachBase( TQWidget* parent, const char* name, bool modal, WFlags fl )
-    : TQDialog( parent, name, modal, fl )
-{
-    if ( !name )
-	setName( "ProcAttachBase" );
-    setSizeGripEnabled( TRUE );
-    ProcAttachBaseLayout = new TQHBoxLayout( this, 10, 6, "ProcAttachBaseLayout"); 
-
-    layout7 = new TQVBoxLayout( 0, 0, 6, "layout7"); 
-
-    layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); 
-
-    filterLabel = new TQLabel( this, "filterLabel" );
-    layout6->addWidget( filterLabel );
-
-    filterEdit = new TQLineEdit( this, "filterEdit" );
-    filterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, filterEdit->sizePolicy().hasHeightForWidth() ) );
-    filterEdit->setMaxLength( 20 );
-    layout6->addWidget( filterEdit );
-
-    filterClear = new TQToolButton( this, "filterClear" );
-    layout6->addWidget( filterClear );
-    layout7->addLayout( layout6 );
-
-    processList = new TQListView( this, "processList" );
-    processList->addColumn( tr2i18n( "Command" ) );
-    processList->addColumn( tr2i18n( "PID" ) );
-    processList->addColumn( tr2i18n( "PPID" ) );
-    processList->setMinimumSize( TQSize( 300, 200 ) );
-    processList->setAllColumnsShowFocus( TRUE );
-    layout7->addWidget( processList );
-
-    layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); 
-
-    buttonRefresh = new TQPushButton( this, "buttonRefresh" );
-    buttonRefresh->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, buttonRefresh->sizePolicy().hasHeightForWidth() ) );
-    layout3->addWidget( buttonRefresh );
-    spacingBtns = new TQSpacerItem( 242, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout3->addItem( spacingBtns );
-
-    buttonOk = new TQPushButton( this, "buttonOk" );
-    buttonOk->setEnabled( FALSE );
-    buttonOk->setAutoDefault( TRUE );
-    buttonOk->setDefault( TRUE );
-    layout3->addWidget( buttonOk );
-
-    buttonCancel = new TQPushButton( this, "buttonCancel" );
-    buttonCancel->setAutoDefault( TRUE );
-    layout3->addWidget( buttonCancel );
-    layout7->addLayout( layout3 );
-    ProcAttachBaseLayout->addLayout( layout7 );
-    languageChange();
-    resize( TQSize(560, 416).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-
-    // signals and slots connections
-    connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
-    connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
-    connect( buttonRefresh, SIGNAL( clicked() ), this, SLOT( refresh() ) );
-    connect( filterEdit, SIGNAL( textChanged(const TQString&) ), this, SLOT( filterEdited(const TQString&) ) );
-    connect( filterClear, SIGNAL( clicked() ), filterEdit, SLOT( clear() ) );
-    connect( processList, SIGNAL( selectionChanged() ), this, SLOT( selectedChanged() ) );
-
-    // tab order
-    setTabOrder( filterEdit, processList );
-    setTabOrder( processList, buttonRefresh );
-    setTabOrder( buttonRefresh, buttonOk );
-    setTabOrder( buttonOk, buttonCancel );
-
-    // buddies
-    filterLabel->setBuddy( filterEdit );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-ProcAttachBase::~ProcAttachBase()
-{
-    // no need to delete child widgets, TQt does it all for us
-}
-
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void ProcAttachBase::languageChange()
-{
-    setCaption( tr2i18n( "Attach to Process" ) );
-    filterLabel->setText( tr2i18n( "&Filter or PID:" ) );
-    TQWhatsThis::add( filterEdit, tr2i18n( "Type the name of the process or its process ID (PID) here to reduce the number of entries in the list." ) );
-    filterClear->setText( tr2i18n( "..." ) );
-    TQToolTip::add( filterClear, tr2i18n( "Clear filter" ) );
-    TQWhatsThis::add( filterClear, tr2i18n( "Use this button to clear the filter text so that all processes are displayed." ) );
-    processList->header()->setLabel( 0, tr2i18n( "Command" ) );
-    processList->header()->setLabel( 1, tr2i18n( "PID" ) );
-    processList->header()->setLabel( 2, tr2i18n( "PPID" ) );
-    TQWhatsThis::add( processList, tr2i18n( "<p>This list displays all processes that are currently running. You must select the process that you want KDbg to attach to. Use the <b>Filter or PID</b> edit box to reduce the number of entries in this list.<p>The text in the <i>Command</i> column is usually, but not always, the command that was used to start the process. The <i>PID</i> column shows the process ID. The <i>PPID</i> column shows the process ID of the parent process. Additional columns show more information about the processes that is also available via the system's <i>ps</i> command.</p><p>The list is not updated automatically. Use the <b>Refresh</b> button to update it.</p>" ) );
-    buttonRefresh->setText( tr2i18n( "&Refresh" ) );
-    TQWhatsThis::add( buttonRefresh, tr2i18n( "This button updates the list of processes." ) );
-    buttonOk->setText( tr2i18n( "&OK" ) );
-    buttonOk->setAccel( TQKeySequence( TQString::null ) );
-    TQWhatsThis::add( buttonOk, tr2i18n( "You must select a process from the list. Then click the <b>OK</b> button to attach to that process." ) );
-    buttonCancel->setText( tr2i18n( "&Cancel" ) );
-    buttonCancel->setAccel( TQKeySequence( TQString::null ) );
-}
-
-#include "procattachbase.moc"
diff --git a/kdbg/programconfig.cpp b/kdbg/programconfig.cpp
index 192f747..617f796 100644
--- a/kdbg/programconfig.cpp
+++ b/kdbg/programconfig.cpp
@@ -6,7 +6,7 @@
 
 #include "programconfig.h"
 #include <tdeconfigbackend.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/kdbg/regwnd.cpp b/kdbg/regwnd.cpp
index 1ced083..20c698b 100644
--- a/kdbg/regwnd.cpp
+++ b/kdbg/regwnd.cpp
@@ -4,15 +4,15 @@
  * See the file COPYING in the toplevel directory of the source directory.
  */
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>			/* i18n */
 #include <kiconloader.h>
-#include <ntqfontdialog.h>
-#include <ntqmessagebox.h>
-#include <ntqpopupmenu.h>
-#include <ntqregexp.h>
-#include <ntqstringlist.h>
+#include <tqfontdialog.h>
+#include <tqmessagebox.h>
+#include <tqpopupmenu.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 #include <stdlib.h>			/* strtoul */
 #include "regwnd.h"
 #include "dbgdriver.h"
diff --git a/kdbg/regwnd.h b/kdbg/regwnd.h
index 80644c0..71fd9b1 100644
--- a/kdbg/regwnd.h
+++ b/kdbg/regwnd.h
@@ -7,7 +7,7 @@
 #ifndef REGWND_H
 #define REGWND_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <list>
 #include <map>
 
diff --git a/kdbg/sourcewnd.cpp b/kdbg/sourcewnd.cpp
index 6fd1a29..5490666 100644
--- a/kdbg/sourcewnd.cpp
+++ b/kdbg/sourcewnd.cpp
@@ -6,13 +6,13 @@
 
 #include "debugger.h"
 #include "sourcewnd.h"
-#include <ntqtextstream.h>
-#include <ntqpainter.h>
-#include <ntqbrush.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
-#include <ntqkeycode.h>
-#include <ntqpopupmenu.h>
+#include <tqtextstream.h>
+#include <tqpainter.h>
+#include <tqbrush.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqkeycode.h>
+#include <tqpopupmenu.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdeglobalsettings.h>
diff --git a/kdbg/sourcewnd.h b/kdbg/sourcewnd.h
index 17822e5..db0d4d1 100644
--- a/kdbg/sourcewnd.h
+++ b/kdbg/sourcewnd.h
@@ -7,9 +7,9 @@
 #ifndef SOURCEWND_H
 #define SOURCEWND_H
 
-#include <ntqpixmap.h>
-#include <ntqtextedit.h>
-#include <ntqsyntaxhighlighter.h>
+#include <tqpixmap.h>
+#include <tqtextedit.h>
+#include <tqsyntaxhighlighter.h>
 #include <vector>
 #include "dbgdriver.h"
 
diff --git a/kdbg/testprogs/CMakeLists.txt b/kdbg/testprogs/CMakeLists.txt
new file mode 100644
index 0000000..7b74dcb
--- /dev/null
+++ b/kdbg/testprogs/CMakeLists.txt
@@ -0,0 +1,81 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### (executables)
+
+tde_add_executable( anonstruct
+
+  SOURCES
+        anonstruct.cpp
+)
+
+tde_add_executable( locals
+
+  SOURCES
+        locals.cpp
+)
+
+tde_add_executable( maths
+
+  SOURCES
+        maths.cpp
+)
+
+tde_add_executable( nestedclass
+
+  SOURCES
+        nestedclass.cpp
+)
+
+tde_add_executable( qt
+
+  SOURCES
+        qt.cpp
+  LINK
+     tdecore-shared
+)
+
+tde_add_executable( repeats
+
+  SOURCES
+        repeats.cpp
+  LINK
+     tdecore-shared
+)
+
+tde_add_executable( std
+
+  SOURCES
+        std.cpp
+)
+
+tde_add_executable( templates
+
+  SOURCES
+        templates.cpp
+)
+
+tde_add_executable( testfile
+
+  SOURCES
+        testfile.cpp
+  LINK
+     tdecore-shared
+)
+
+tde_add_executable( widechar
+
+  SOURCES
+        widechar.cpp
+)
diff --git a/kdbg/threadlist.cpp b/kdbg/threadlist.cpp
index 5d03213..0c8cfd7 100644
--- a/kdbg/threadlist.cpp
+++ b/kdbg/threadlist.cpp
@@ -8,8 +8,8 @@
 #include "dbgdriver.h"
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <ntqbitmap.h>
-#include <ntqpainter.h>
+#include <tqbitmap.h>
+#include <tqpainter.h>
 
 
 class ThreadEntry : public TQListViewItem, public ThreadInfo
diff --git a/kdbg/threadlist.h b/kdbg/threadlist.h
index 77ed2a4..8a8e094 100644
--- a/kdbg/threadlist.h
+++ b/kdbg/threadlist.h
@@ -7,8 +7,8 @@
 #ifndef THREADLIST_H
 #define THREADLIST_H
 
-#include <ntqlistview.h>
-#include <ntqpixmap.h>
+#include <tqlistview.h>
+#include <tqpixmap.h>
 #include <list>
 
 class ThreadInfo;
diff --git a/kdbg/ttywnd.cpp b/kdbg/ttywnd.cpp
index 48e39d2..4d489f6 100644
--- a/kdbg/ttywnd.cpp
+++ b/kdbg/ttywnd.cpp
@@ -4,8 +4,8 @@
  * See the file COPYING in the toplevel directory of the source directory.
  */
 
-#include <ntqsocketnotifier.h>
-#include <ntqpopupmenu.h>
+#include <tqsocketnotifier.h>
+#include <tqpopupmenu.h>
 #include "ttywnd.h"
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
diff --git a/kdbg/ttywnd.h b/kdbg/ttywnd.h
index 51be8e9..1ed3e92 100644
--- a/kdbg/ttywnd.h
+++ b/kdbg/ttywnd.h
@@ -7,7 +7,7 @@
 #ifndef TTYWND_H
 #define TTYWND_H
 
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 
 class TQSocketNotifier;
 class TQPopupMenu;
diff --git a/kdbg/typetable.h b/kdbg/typetable.h
index fc691e3..4c41395 100644
--- a/kdbg/typetable.h
+++ b/kdbg/typetable.h
@@ -4,10 +4,10 @@
  * See the file COPYING in the toplevel directory of the source directory.
  */
 
-#include <ntqdict.h>
-#include <ntqstring.h>
-#include <ntqregexp.h>
-#include <ntqstringlist.h>
+#include <tqdict.h>
+#include <tqstring.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 #include <map>
 
 class TDEConfigBase;
diff --git a/kdbg/typetables/CMakeLists.txt b/kdbg/typetables/CMakeLists.txt
new file mode 100644
index 0000000..70c46da
--- /dev/null
+++ b/kdbg/typetables/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _types RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kdbgtt )
+
+install(
+    FILES ${_types}
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/types
+)
diff --git a/kdbg/winstack.cpp b/kdbg/winstack.cpp
index 1d2d687..eaa463f 100644
--- a/kdbg/winstack.cpp
+++ b/kdbg/winstack.cpp
@@ -6,9 +6,9 @@
 
 #include "winstack.h"
 #include "sourcewnd.h"
-#include <ntqbrush.h>
-#include <ntqfileinfo.h>
-#include <ntqpopupmenu.h>
+#include <tqbrush.h>
+#include <tqfileinfo.h>
+#include <tqpopupmenu.h>
 #include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdelocale.h>			/* i18n */
diff --git a/kdbg/winstack.h b/kdbg/winstack.h
index 8f450af..3a56431 100644
--- a/kdbg/winstack.h
+++ b/kdbg/winstack.h
@@ -7,12 +7,12 @@
 #ifndef WINSTACK_H
 #define WINSTACK_H
 
-#include <ntqdialog.h>
-#include <ntqlineedit.h>
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
-#include <ntqpushbutton.h>
-#include <ntqtooltip.h>
+#include <tqdialog.h>
+#include <tqlineedit.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
 #include <ktabwidget.h>
 #include <list>
 
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 0000000..75c89f8
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,14 @@
+file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
+
+foreach( _po ${po_files} )
+  get_filename_component( _lang ${_po} NAME_WE )
+  if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
+    if( "${_po}" MATCHES "^([^/]*)/.*" )
+      string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" )
+    else( )
+      set( _component "${PROJECT_NAME}" )
+    endif( )
+    tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} )
+  endif( )
+endforeach( )