Remove unnecessary backup translations.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c356ea7e9e)

.gitmodules

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

CMakeL10n.txt

@@ -0,0 +1,22 @@
+#################################################
+#
+#  (C) 2019 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

CMakeLists.txt

@@ -0,0 +1,86 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+#### general package setup
+
+project( ktechlab )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckIncludeFileCXX    )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+include( TDEMacros )
+
+
+##### set version number ########################
+
+tde_set_project_version( )
+
+
+##### 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_GPSIM          "Enable gpsim support"                              ${WITH_ALL_OPTIONS} )
+option( WITH_MECHANICS      "Enable mechanics support"                          OFF )
+
+
+##### user requested modules
+
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( src )
+add_subdirectory( icons )
+add_subdirectory( microbe )
+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 )

ConfigureChecks.cmake

@@ -0,0 +1,139 @@
+###########################################
+#                                         #
+#  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 )
+
+
+##### look for gpsim
+
+if( NOT WITH_GPSIM )
+    set( NO_GPSIM 1 )
+ else()
+    find_path( HAVE_GPSIM_INCLUDE "gpsim/cod.h" )
+    find_library( HAVE_GPSIM_LIBRARY gpsim)
+
+    if( (NOT HAVE_GPSIM_INCLUDE) OR (NOT HAVE_GPSIM_LIBRARY) )
+        tde_message_fatal( "gpsim support have been requested but was not found on your system" )
+     else()
+        set( GPSIM_INCLUDE_DIRS ${HAVE_GPSIM_INCLUDE} )
+        set( GPSIM_LIBRARIES gpsim;gpsimcli )
+
+##### glib-1.2 or glib-2.0
+
+        pkg_search_module( GLIB glib-2.0 glib )
+        message( STATUS "glib version: ${GLIB_VERSION}" )
+
+        if( NOT GLIB_FOUND )
+            tde_message_fatal( "glib is required but was not found on your system" )
+        endif()
+
+        tde_save( CMAKE_REQUIRED_INCLUDES )
+        set( CMAKE_REQUIRED_INCLUDES ${GLIB_INCLUDE_DIRS} ${GPSIM_INCLUDE_DIRS})
+
+##### check for gpsim version
+
+        if( EXISTS ${GPSIM_INCLUDE_DIRS}/gpsim/breakpoints.h )
+          file( STRINGS ${GPSIM_INCLUDE_DIRS}/gpsim/breakpoints.h
+                GPSIM_BROKEN_INCLUDE
+                REGEX "^#include \"../config.h" )
+          if( NOT "${GPSIM_BROKEN_INCLUDE}" STREQUAL "" )
+            message( STATUS "Create fake config.h, due to broken gpsim includes" )
+            list( APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_BINARY_DIR}/CMakeFiles" )
+            list( APPEND GPSIM_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/src" )
+            if( NOT EXISTS "${CMAKE_BINARY_DIR}/config.h" )
+              file( WRITE "${CMAKE_BINARY_DIR}/config.h"
+                    "/* fake config.h - due to broken gpsim includes */" )
+            endif()
+          endif()
+        endif()
+
+        check_cxx_source_compiles( "
+        #include <gpsim/interface.h>
+        #include <gpsim/gpsim_interface.h>
+        #include <gpsim/breakpoints.h>
+        #include <gpsim/gpsim_time.h>
+        void func()
+        {
+            (void)cycles;
+            (void)initialize_gpsim_core();
+            (void)load_symbol_file(0,0);
+        }
+        int main()
+        {
+            return 0;
+        } "
+        GPSIM_0_21_4
+        )
+
+        check_cxx_source_compiles( "
+        #include <gpsim/interface.h>
+        #include <gpsim/gpsim_interface.h>
+        #include <gpsim/breakpoints.h>
+        #include <gpsim/gpsim_time.h>
+        #include <gpsim/symbol.h>
+        #include <gpsim/program_files.h>
+        void func()
+        {
+            (void)cycles;
+            (void)initialize_gpsim_core();
+        }
+        int main()
+        {
+            return 0;
+        } "
+        GPSIM_0_21_11
+        )
+   
+        check_cxx_source_compiles( "
+        #include <gpsim/ValueCollections.h>
+        int main()
+        {
+            return 0;
+        } "
+        GPSIM_0_21_12
+        )
+
+        check_cxx_source_compiles( "
+        #include <gpsim/pic-processor.h>
+        void func()
+        {
+            pic_processor *Processor;
+            sizeof(Processor->Wreg);
+        }
+        int main()
+        {
+            return 0;
+        } "
+        GPSIM_0_27_0
+        )
+       tde_restore( CMAKE_REQUIRED_INCLUDES )
+    endif((NOT HAVE_GPSIM_INCLUDE) OR (NOT HAVE_GPSIM_LIBRARY))
+endif( NOT WITH_GPSIM )
+
+
+##### mechanics
+
+if( WITH_MECHANICS )
+    set( MECHANICS 1 )
+endif()

INSTALL

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

Makefile.am

@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = foreign 1.5
-
-include admin/deps.am
-
-SUBDIRS=$(TOPSUBDIRS)

README

@@ -1 +0,0 @@
-

README.md

@@ -0,0 +1,32 @@
+
+KTechlab - circuit simulator for microcontrollers and electronics.
+
+
+KTechlab is a circuit simulator with a nice, clickable and discoverable
+interface. It supports many discrete components, logic circuits as well
+as PIC programming in its own Basic dialect and some form of assembler.
+
+.
+
+Contributing
+--------------
+
+If you wish to contribute to ktechlab, you might do so:
+
+- TDE Gitea Workspace (TGW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/gitea
+
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/weblate
+
+
+Translations status
+---------------------
+
+### messages
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/ktechlab/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/ktechlab/)
+
+### desktop files
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/ktechlab-desktop-files/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/ktechlab-desktop-files/)

admin

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

cmake

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

config.h.cmake

@@ -0,0 +1,26 @@
+#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@
+
+/* build with gpsim-0.21.4 support */
+#cmakedefine GPSIM_0_21_4 1
+
+/* build with gpsim-0.21.11 support */
+#cmakedefine GPSIM_0_21_11 1
+
+/* build with gpsim-0.21.12 support */
+#cmakedefine GPSIM_0_21_12 1
+
+/* build with gpsim-0.27 support */
+#cmakedefine GPSIM_0_27_0 1
+
+/* build without gpsim support */
+#cmakedefine NO_GPSIM 1
+
+/* build with mechanics support */
+#cmakedefine MECHANICS 1

config.h.in

@@ -1,259 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Gpsim 0.21.11 was found */
-#undef GPSIM_0_21_11
-
-/* Gpsim 0.21.12 was found */
-#undef GPSIM_0_21_12
-
-/* Gpsim 0.21.4 was found */
-#undef GPSIM_0_21_4
-
-/* Gpsim 0.27.0 was found */
-#undef GPSIM_0_27_0
-
-/* 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 you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
-
-/* Define if you have res_init */
-#undef HAVE_RES_INIT
-
-/* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Define a safe value for MAXPATHLEN */
-#undef KDEMAXPATHLEN
-
-/* Gpsim was not found */
-#undef NO_GPSIM
-
-/* 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 a `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
-
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of a `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of a `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of a `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Defined if compiling without arts */
-#undef WITHOUT_ARTS
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-
-#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

configure.files

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

configure.in

@@ -1,264 +0,0 @@
-dnl =======================================================
-dnl FILE: ./admin/configure.in.min
-dnl =======================================================
-
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
- 
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
- 
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
- 
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl    Boston, MA 02110-1301, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(ktechlab, 0.3) 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.2.0)
-AC_PATH_KDE
-dnl =======================================================
-dnl FILE: configure.in.in
-dnl =======================================================
-
-#MIN_CONFIG(3.2.0)
-
-dnl PACKAGE set before
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-
-################################
-## BEGIN Check for gpsim 0.21 ##
-################################
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ktechlab_save_CXXFLAGS="$CXXFLAGS"
-
-AC_ARG_WITH(glib12, [  --with-glib12           force using glib 1.2.x [default=no]])
-if test "x$with_glib12" != "xyes" ; then
-	glib_cflags=`pkg-config --cflags glib-2.0`
-else
-	glib_cflags=`glib-config --cflags`
-fi
-AC_SUBST(glib_cflags)
-
-CXXFLAGS="$glib_cflags"
-
-AC_MSG_CHECKING([for gpsim 0.21.4 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/interface.h>
-#include <gpsim/gpsim_interface.h>
-#include <gpsim/breakpoints.h>
-#include <gpsim/gpsim_time.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); }
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_21_4=yes,
-	AC_MSG_RESULT( no )
-)
-
-AC_MSG_CHECKING([for gpsim 0.21.11 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/interface.h>
-#include <gpsim/gpsim_interface.h>
-#include <gpsim/breakpoints.h>
-#include <gpsim/gpsim_time.h>
-#include <gpsim/symbol.h>
-#include <gpsim/program_files.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); }
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_21_11=yes,
-	AC_MSG_RESULT( no )
-)
-
-AC_MSG_CHECKING([for gpsim 0.21.12 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/ValueCollections.h>
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_21_12=yes,
-	AC_MSG_RESULT( no )
-)
-
-AC_MSG_CHECKING([for gpsim 0.27.0 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/pic-processor.h>
-void func() { pic_processor *Processor; sizeof(Processor->Wreg); }
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_27_0=yes,
-	AC_MSG_RESULT( no )
-)
-
-CXXFLAGS="$ktechlab_save_CXXFLAGS"
-AC_LANG_RESTORE
-
-##############################
-## END Check for gpsim 0.21 ##
-##############################
-
-
-
-################################
-## BEGIN DO_NOT_COMPILE CHECK ##
-################################
-
-if test x$have_gpsim_0_21_12 == xyes; then
-	AC_DEFINE([GPSIM_0_21_12],[],[Gpsim 0.21.12 was found])
-	CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS"
-else
-	if test x$have_gpsim_0_21_4 != xyes; then
-		if test x$have_gpsim_0_21_11 != xyes; then
-			AC_DEFINE([NO_GPSIM],[],[Gpsim was not found])
-			LIB_GPSIM=""
-		else
-			AC_DEFINE([GPSIM_0_21_11],[],[Gpsim 0.21.11 was found])
-		fi
-	else
-		AC_DEFINE([GPSIM_0_21_4],[],[Gpsim 0.21.4 was found])
-	fi
-fi
-
-if test x$have_gpsim_0_21_4 == xyes || test x$have_gpsim_0_21_11 == xyes || test x$have_gpsim_0_21_12 == xyes; then
-	wi_cv_lib_readline=no
-	ac_save_LIBS="$LIBS"
-	# Note: $LIBCURSES is permitted to be empty.
-	for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
-	do
-		LIBS="$ac_save_LIBS $LIBREADLINE"
-		LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli -lgpsimgui"
-		AC_TRY_RUN([
-			/* program */
-			#include <stdio.h>
-			#include <stdlib.h>
-		 
-			main(int argc, char **argv)
-			{
-				/* Note:  don't actually call readline, since it may block;
-				 * We just want to see if it (dynamic) linked in okay.
-				 */
-				if (argc == 0)	/* never true */
-					readline(0);
-				exit(0);
-			}
-		],[
-		# action if true
-			wi_cv_lib_readline=yes
-		],[
-			# action if false
-			wi_cv_lib_readline=no
-	],[
-		# action if cross compiling
-		wi_cv_lib_readline=no
-	])
-	
-		if test "$wi_cv_lib_readline" = yes ; then break ; fi
-	done
-
-	LIBS="$ac_save_LIBS"
-fi
-
-if test x$have_gpsim_0_27_0 == xyes; then
-	AC_DEFINE([GPSIM_0_27_0],[],[Gpsim 0.27.0 was found])
-fi
-
-AC_SUBST(LIB_GPSIM)
-
-##############################
-## END DO_NOT_COMPILE CHECK ##
-##############################
-
-KDE_CREATE_SUBDIRSLIST
-AC_CONFIG_FILES([ Makefile ])
-AC_CONFIG_FILES([ doc/Makefile ])
-AC_CONFIG_FILES([ doc/en/Makefile ])
-AC_CONFIG_FILES([ icons/Makefile ])
-AC_CONFIG_FILES([ icons/pics/Makefile ])
-AC_CONFIG_FILES([ microbe/Makefile ])
-AC_CONFIG_FILES([ po/Makefile ])
-AC_CONFIG_FILES([ src/Makefile ])
-AC_CONFIG_FILES([ src/core/Makefile ])
-AC_CONFIG_FILES([ src/drawparts/Makefile ])
-AC_CONFIG_FILES([ src/electronics/Makefile ])
-AC_CONFIG_FILES([ src/electronics/components/Makefile ])
-AC_CONFIG_FILES([ src/electronics/simulation/Makefile ])
-AC_CONFIG_FILES([ src/flowparts/Makefile ])
-AC_CONFIG_FILES([ src/gui/Makefile ])
-AC_CONFIG_FILES([ src/languages/Makefile ])
-AC_CONFIG_FILES([ src/mechanics/Makefile ])
-AC_CONFIG_FILES([ src/micro/Makefile ])
-AC_OUTPUT
-if test x$have_gpsim_0_21_4 != xyes; then
-	if test x$have_gpsim_0_21_11 != xyes; then
-		echo ""
-        echo "################################################################################"
-        echo "# WARNING: gpsim support will not be compiled as gpsim >= 0.21.4 was not found #"
-        echo "################################################################################"
-    fi
-fi
-
-if test "$all_tests" = "bad"; then
-  if test ! "$cache_file" = "/dev/null"; then
-    echo ""    
-    echo "Please remove the file $cache_file after changing your setup"
-    echo "so that configure will find the changes next time."
-    echo ""
-  fi
-else
-  echo ""
-  echo "Good - your configure finished. Start make now"
-  echo ""
-fi

configure.in.in

@@ -1,160 +0,0 @@
-#MIN_CONFIG(3.2.0)
-
-KDE_ENABLE_HIDDEN_VISIBILITY
-
-AM_INIT_AUTOMAKE(ktechlab, 0.3)
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-
-################################
-## BEGIN Check for gpsim 0.21 ##
-################################
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ktechlab_save_CXXFLAGS="$CXXFLAGS"
-
-AC_ARG_WITH(glib12, [  --with-glib12           force using glib 1.2.x [default=no]])
-if test "x$with_glib12" != "xyes" ; then
-	glib_cflags=`pkg-config --cflags glib-2.0`
-else
-	glib_cflags=`glib-config --cflags`
-fi
-AC_SUBST(glib_cflags)
-
-CXXFLAGS="$glib_cflags"
-
-AC_MSG_CHECKING([for gpsim 0.21.4 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/interface.h>
-#include <gpsim/gpsim_interface.h>
-#include <gpsim/breakpoints.h>
-#include <gpsim/gpsim_time.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); }
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_21_4=yes,
-	AC_MSG_RESULT( no )
-)
-
-AC_MSG_CHECKING([for gpsim 0.21.11 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/interface.h>
-#include <gpsim/gpsim_interface.h>
-#include <gpsim/breakpoints.h>
-#include <gpsim/gpsim_time.h>
-#include <gpsim/symbol.h>
-#include <gpsim/program_files.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); }
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_21_11=yes,
-	AC_MSG_RESULT( no )
-)
-
-AC_MSG_CHECKING([for gpsim 0.21.12 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/ValueCollections.h>
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_21_12=yes,
-	AC_MSG_RESULT( no )
-)
-
-AC_MSG_CHECKING([for gpsim 0.27.0 availability])
-AC_TRY_COMPILE(
-	[
-#include <gpsim/pic-processor.h>
-void func() { pic_processor *Processor; sizeof(Processor->Wreg); }
-	],
-	[],
-	AC_MSG_RESULT( yes )
-	have_gpsim_0_27_0=yes,
-	AC_MSG_RESULT( no )
-)
-
-CXXFLAGS="$ktechlab_save_CXXFLAGS"
-AC_LANG_RESTORE
-
-##############################
-## END Check for gpsim 0.21 ##
-##############################
-
-
-
-################################
-## BEGIN DO_NOT_COMPILE CHECK ##
-################################
-
-if test x$have_gpsim_0_21_12 == xyes; then
-	AC_DEFINE([GPSIM_0_21_12],[],[Gpsim 0.21.12 was found])
-	CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS"
-else
-	if test x$have_gpsim_0_21_4 != xyes; then
-		if test x$have_gpsim_0_21_11 != xyes; then
-			AC_DEFINE([NO_GPSIM],[],[Gpsim was not found])
-			LIB_GPSIM=""
-		else
-			AC_DEFINE([GPSIM_0_21_11],[],[Gpsim 0.21.11 was found])
-		fi
-	else
-		AC_DEFINE([GPSIM_0_21_4],[],[Gpsim 0.21.4 was found])
-	fi
-fi
-
-if test x$have_gpsim_0_21_4 == xyes || test x$have_gpsim_0_21_11 == xyes || test x$have_gpsim_0_21_12 == xyes; then
-	wi_cv_lib_readline=no
-	ac_save_LIBS="$LIBS"
-	# Note: $LIBCURSES is permitted to be empty.
-	for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
-	do
-		LIBS="$ac_save_LIBS $LIBREADLINE"
-		LIB_GPSIM="$LIBREADLINE -lgpsim -lgpsim_eXdbm -lgpsimcli -lgpsimgui"
-		AC_TRY_RUN([
-			/* program */
-			#include <stdio.h>
-			#include <stdlib.h>
-		 
-			main(int argc, char **argv)
-			{
-				/* Note:  don't actually call readline, since it may block;
-				 * We just want to see if it (dynamic) linked in okay.
-				 */
-				if (argc == 0)	/* never true */
-					readline(0);
-				exit(0);
-			}
-		],[
-		# action if true
-			wi_cv_lib_readline=yes
-		],[
-			# action if false
-			wi_cv_lib_readline=no
-	],[
-		# action if cross compiling
-		wi_cv_lib_readline=no
-	])
-	
-		if test "$wi_cv_lib_readline" = yes ; then break ; fi
-	done
-
-	LIBS="$ac_save_LIBS"
-fi
-
-if test x$have_gpsim_0_27_0 == xyes; then
-	AC_DEFINE([GPSIM_0_27_0],[],[Gpsim 0.27.0 was found])
-fi
-
-AC_SUBST(LIB_GPSIM)
-
-##############################
-## END DO_NOT_COMPILE CHECK ##
-##############################
-

doc/Makefile.am

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

doc/en/Makefile.am

@@ -1,7 +0,0 @@
-KDE_DOCS = ktechlab
-# KDE_MANS = ktechlab
-KDE_LANG = en
-# KDE_DOCS = AUTO
-
-kde_docs_KDEDOCS = debugging.docbook circuits.docbook flowcode.docbook \
-		quick.docbook faq.docbook picprograms.docbook

doc/en/circuits.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="circuits">
 	<title>Circuits</title>
 	

doc/en/debugging.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="debugging">
 	<title>Debugging</title>
 	

doc/en/faq.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="faq">
 <title>FAQ</title>
 

doc/en/flowcode.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="flowcode">
 	<title>&flowcode;</title>
 	

doc/en/index.docbook

@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- kate: tab-width 2; indent-mode xml; -->
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
 		  <!ENTITY ktechlab "ktechlab">
 			<!ENTITY ktechlab-quick SYSTEM "quick.docbook">

doc/en/microbe.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="microbe">
 <title>&microbe;</title>
 <sect1>

doc/en/picprograms.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="pic_programs">
 	<title>PIC Programs</title>
 	

doc/en/quick.docbook

@@ -1,4 +1,3 @@
-<!-- kate: tab-width 2; indent-mode xml; -->
 <chapter id="quick">
 	<title>Quick Tour</title>
 	

doc/man/ktechlab.1

@@ -0,0 +1,151 @@
+.\" This file was generated by kdemangen.pl
+.TH KTECHLAB 1 "Jan 2006" "Trinity Desktop Environment" "An IDE for microcontrollers and electronics"
+.SH NAME
+ktechlab
+\- An IDE for microcontrollers and electronics
+.SH SYNOPSIS
+ktechlab [Qt\-options] [TDE\-options] [URL] 
+.SH DESCRIPTION
+An IDE for microcontrollers and electronics
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B URL
+Document to open.
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/ktechlab/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/ktechlab/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+David Saxton <david@bluehaze.org>
+.br
+Daniel Clarke <daniel.jc@gmail.com>
+.br
+

doc/man/microbe.1

@@ -0,0 +1,162 @@
+.\" This file was generated by kdemangen.pl
+.TH MICROBE 1 "Jan 2006" "Trinity Desktop Environment" "The Microbe Compiler"
+.SH NAME
+microbe
+\- The Microbe Compiler
+.SH SYNOPSIS
+microbe [Qt\-options] [TDE\-options] [options] [Input URL] [Output URL] 
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B Input
+URL                 Input filename
+.TP
+.B Output
+URL                Output filename
+.SS Options:
+.TP
+.B  \-\-show\-source  
+Show source code lines in assembly output
+.TP
+.B  \-\-nooptimize  
+Do not attempt optimization of generated instructions.
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/microbe/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/microbe/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Daniel Clarke <daniel.jc@gmail.com>
+.br
+David Saxton <david@bluehaze.org>
+.br
+

icons/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_subdirectory( pics )
+
+
+##### icons hicolor
+
+tde_install_icons()

icons/Makefile.am

@@ -1,6 +0,0 @@
-
-METASOURCES = AUTO
-	
-KDE_ICON = AUTO
-
-SUBDIRS = pics

icons/pics/CMakeLists.txt

@@ -0,0 +1,8 @@
+##### icons
+
+file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png )
+
+install(
+    FILES ${_pics}
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons
+)

icons/pics/Makefile.am

@@ -1,19 +0,0 @@
-
-METASOURCES = AUTO
-ktlicon_DATA = and.png cell.png logic_input.png logic_output.png nand.png \
-		nor.png not.png or.png xor.png current_source.png ground.png voltage.png \
-		capacitor.png led.png resistor.png signal_lamp.png seven_segment.png ammeter.png \
-		diode.png npn.png pnp.png voltmeter.png dpdt.png dpst.png ptb.png ptm.png \
-		spdt.png spst.png keypad.png opamp.png xnor.png circuit.png flowcode.png \
-		delay.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
-		repeat.png while.png for.png assignment.png branch.png delay.png embed.png end.png \
-		interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
-		repeat.png start.png sub.png subcall.png unary.png item.png ic1.png \
-		ic2.png ic3.png voltagesignal.png currentsignal.png clockinput.png cccs.png \
-		ccvs.png vcvs.png vccs.png mechanics.png buffer.png external_connection.png \
-		logicprobe.png potentiometer.png resistordip.png bidirled.png project_library.png \
-		project_program.png bus.png floatingprobe.png inductor.png matrixdisplay.png \
-		rotary.png
-ktlicondir = $(kde_datadir)/ktechlab/icons
-	
-

microbe/CMakeLists.txt

@@ -0,0 +1,31 @@
+
+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}
+)
+
+
+##### microbe (executable)
+
+tde_add_executable( microbe AUTOMOC
+
+  SOURCES
+        btreebase.cpp btreenode.cpp main.cpp
+        traverser.cpp expression.cpp pic14.cpp
+        variable.cpp optimizer.cpp instruction.cpp
+        microbe.cpp parser.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)

microbe/Makefile.am

@@ -1,10 +0,0 @@
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-bin_PROGRAMS = microbe
-microbe_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-microbe_SOURCES = btreebase.cpp btreenode.cpp main.cpp traverser.cpp \
-	expression.cpp pic14.cpp variable.cpp optimizer.cpp instruction.cpp microbe.cpp \
-	parser.cpp
-noinst_HEADERS = btreebase.h btreenode.h traverser.h pic14.h variable.h \
-	optimizer.h microbe.h parser.h
-microbe_LDADD = -lpthread $(LIB_TDEFILE)

microbe/instruction.cpp

@@ -517,8 +517,8 @@ bool RegisterState::operator == ( const RegisterState & state ) const
 
 void RegisterState::print()
 {
-	cout << "   known="<<binary(known)<<endl;
-	cout << "   value="<<binary(value)<<endl;
+	cout << "   known=" << binary(known).local8Bit() << endl;
+	cout << "   value=" << binary(value).local8Bit() << endl;
 }
 //END class RegisterState
 
@@ -714,7 +714,7 @@ void ProcessorState::print()
 	RegisterMap::iterator end = m_registers.end();
 	for ( RegisterMap::iterator it = m_registers.begin(); it != end; ++it )
 	{
-		cout << " " << it.key().name() << ":\n";
+		cout << " " << it.key().name().local8Bit() << ":\n";
 		it.data().print();
 	}
 }

microbe/main.cpp

@@ -64,14 +64,14 @@ int main(int argc, char **argv)
 		
 		if ( !errorReport.isEmpty() )
 		{
-			cerr << mb.errorReport();
+			cerr << mb.errorReport().local8Bit();
 			return 1; // If there was an error, don't write the output to file.
 		}
 		
 		else
 		{
 			ofstream out(args->arg(1));
-			out << s;
+			out << s.local8Bit();
 			return 0;
 		}
 	}

microbe/pic14.cpp

@@ -135,7 +135,7 @@ PIC14::Type PIC14::toType( const TQString & _text )
 	if ( text == "16F628" )
 		return P16F628;
 	
-	cerr << TQString("%1 is not a known PIC identifier\n").arg(_text);
+	cerr << TQString("%1 is not a known PIC identifier\n").arg(_text).local8Bit();
 	return unknown;
 }
 

po/Makefile.am

@@ -1 +0,0 @@
-POFILES = AUTO

src/CMakeL10n.txt

@@ -0,0 +1,8 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "messages/ktechlab" )
+
+tde_l10n_create_template(
+    CATALOG desktop_files/ktechlab-desktops
+    SOURCES *.desktop
+)

src/CMakeLists.txt

@@ -0,0 +1,100 @@
+add_subdirectory( core        )
+add_subdirectory( gui         )
+add_subdirectory( flowparts   )
+add_subdirectory( micro       )
+add_subdirectory( mechanics   )
+add_subdirectory( electronics )
+add_subdirectory( languages   )
+add_subdirectory( drawparts   )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src/drawparts
+  ${CMAKE_SOURCE_DIR}/src/electronics
+  ${CMAKE_SOURCE_DIR}/src/electronics/components
+  ${CMAKE_SOURCE_DIR}/src/electronics/simulation
+  ${CMAKE_SOURCE_DIR}/src/flowparts
+  ${CMAKE_SOURCE_DIR}/src/gui
+  ${CMAKE_SOURCE_DIR}/src/languages
+  ${CMAKE_SOURCE_DIR}/src/mechanics
+  ${CMAKE_SOURCE_DIR}/src/micro
+  ${GPSIM_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### ktechlab (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+  SOURCES
+        docmanageriface.skel viewiface.skel documentiface.skel
+        ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp
+        libraryitem.cpp projectmanager.cpp picitem.cpp
+        variant.cpp canvasitemparts.cpp flowcontainer.cpp
+        microsettings.cpp fpnode.cpp cells.cpp
+        asmformatter.cpp conrouter.cpp nodegroup.cpp
+        canvasmanipulator.cpp iteminterface.cpp
+        itemgroup.cpp ciwidgetmgr.cpp filemetainfo.cpp
+        resizeoverlay.cpp document.cpp view.cpp
+        docmanager.cpp cnitem.cpp item.cpp cnitemgroup.cpp
+        itemview.cpp itemdocument.cpp textview.cpp
+        textdocument.cpp circuitdocument.cpp
+        flowcodedocument.cpp icnview.cpp icndocument.cpp
+        viewcontainer.cpp circuitview.cpp flowcodeview.cpp
+        eventinfo.cpp oscilloscopedata.cpp
+        itemdocumentdata.cpp docmanageriface.cpp
+        documentiface.cpp viewiface.cpp simulator.cpp
+        katemdi.cpp debugmanager.cpp recentfilesaction.cpp
+        variablelabel.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeprint-shared
+     tdeparts-shared
+     tdeutils-shared
+     tdetexteditor-shared
+     core-static
+     gui-static
+     micro-static
+     flowparts-static
+     mechanics-static
+     electronics-static
+     components-static
+     languages-static
+     drawparts-static
+     ${GPSIM_LIBRARIES}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES ktechlabui.rc error_messages_en_gb
+          ktechlabcircuitui.rc ktechlabflowcodeui.rc
+          ktechlabitemviewui.rc ktechlabmechanicsui.rc
+          ktechlabtextui.rc ktechlabkateui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+install(
+    FILES microbe.xml
+    DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax
+)
+
+tde_create_translated_desktop(
+    SOURCE x-circuit.desktop x-flowcode.desktop
+           x-ktechlab.desktop x-microbe.desktop
+    DESTINATION ${MIME_INSTALL_DIR}/application
+)
+
+tde_create_translated_desktop( ${PROJECT_NAME}.desktop )

src/Makefile.am

@@ -1,88 +0,0 @@
-## Makefile.am for ktechlab
-
-# this is the program that gets installed.  it's name is used for all
-# of the other Makefile.am variables
-bin_PROGRAMS = ktechlab
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts \
-	-I$(top_srcdir)/src/electronics -I$(top_srcdir)/src/electronics/components \
-	-I$(top_srcdir)/src/electronics/simulation -I$(top_srcdir)/src/flowparts -I$(top_srcdir)/src/gui \
-	-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)
-
-# the library search path. 
-ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP $(LIB_TDEPARTS) $(LIB_GPSIM)
-
-# the libraries to link against.
-ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
-	$(top_builddir)/src/micro/libmicro.la $(top_builddir)/src/flowparts/libflowparts.la \
-	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
-	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
-	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
-	$(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
-
-# which sources should be compiled for ktechlab
-ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
-			libraryitem.cpp projectmanager.cpp picitem.cpp variant.cpp canvasitemparts.cpp \
-			flowcontainer.cpp microsettings.cpp fpnode.cpp cells.cpp asmformatter.cpp conrouter.cpp \
-			nodegroup.cpp canvasmanipulator.cpp iteminterface.cpp itemgroup.cpp ciwidgetmgr.cpp \
-			filemetainfo.cpp resizeoverlay.cpp document.cpp view.cpp docmanager.cpp cnitem.cpp \
-			item.cpp cnitemgroup.cpp itemview.cpp itemdocument.cpp textview.cpp \
-			textdocument.cpp circuitdocument.cpp flowcodedocument.cpp icnview.cpp icndocument.cpp \
-			viewcontainer.cpp circuitview.cpp flowcodeview.cpp eventinfo.cpp oscilloscopedata.cpp \
-			itemdocumentdata.cpp docmanageriface.cpp documentiface.cpp viewiface.cpp \
-			docmanageriface.skel viewiface.skel documentiface.skel simulator.cpp katemdi.cpp \
-			debugmanager.cpp recentfilesaction.cpp variablelabel.cpp
-
-ktechlab_PCH = AUTO
-
-
-# these are the headers for your project
-noinst_HEADERS = ktechlab.h node.h connector.h itemlibrary.h libraryitem.h \
-			projectmanager.h picitem.h canvasitemparts.h microsettings.h fpnode.h cells.h \
-			asmformatter.h conrouter.h nodegroup.h canvasmanipulator.h iteminterface.h itemgroup.h \
-			ciwidgetmgr.h filemetainfo.h resizeoverlay.h document.h view.h docmanager.h cnitem.h \
-			item.h cnitemgroup.h itemview.h itemdocument.h textview.h textdocument.h \
-			circuitdocument.h flowcodedocument.h icnview.h icndocument.h viewcontainer.h \
-			circuitview.h flowcodeview.h eventinfo.h oscilloscopedata.h itemdocumentdata.h \
-			docmanageriface.h documentiface.h viewiface.h simulator.h katemdi.h debugmanager.h \
-		recentfilesaction.h variablelabel.h
-
-
-# client stuff
-
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-
-messages: rc.cpp
-	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` > rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
-	if test -n "$$LIST"; then \
-		$(XGETTEXT) $$LIST -o $(podir)/ktechlab.pot; \
-	fi
-
-#KDE_ICON = ktechlab
-#KDE_ICON = AUTO
-
-# this is where the kdelnk file will go 
-kdelnkdir = $(kde_appsdir)/Development
-kdelnk_DATA = ktechlab.desktop
-
-# this is where the XML-GUI resource file goes
-rcdir = $(kde_datadir)/ktechlab
-rc_DATA = ktechlabui.rc error_messages_en_gb ktechlabcircuitui.rc \
-	ktechlabflowcodeui.rc ktechlabitemviewui.rc ktechlabmechanicsui.rc ktechlabtextui.rc ktechlabkateui.rc
- 
-SUBDIRS = core gui flowparts micro mechanics electronics languages drawparts
-#iconsdir = $(kde_datadir)/ktechlab/icons
-
-
-mimedir = $(kde_mimedir)/application
-mime_DATA = x-circuit.desktop x-flowcode.desktop x-ktechlab.desktop x-microbe.desktop
-EXTRA_DIST = $(mime_DATA)
-
-katesyntaxdir = $(kde_datadir)/katepart/syntax
-katesyntax_DATA = microbe.xml
-

src/circuitview.cpp

@@ -8,9 +8,12 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "circuitdocument.h"
 #include "circuitview.h"
-#include "config.h"
 #include "ktechlab.h"
 #include "simulator.h"
 #include "viewiface.h"

src/core/CMakeLists.txt

@@ -0,0 +1,31 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### core (static)
+
+tde_add_library( core STATIC_PIC AUTOMOC
+
+  SOURCES
+        ktlconfig.kcfgc
+        main.cpp
+)
+
+
+##### other data
+
+install(
+    FILES ktechlab.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)

src/core/Makefile.am

@@ -1,6 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts 	-I$(top_srcdir)/src/electronics -I$(top_srcdir)/src/electronics/components 	-I$(top_srcdir)/src/electronics/simulation -I$(top_srcdir)/src/flowparts -I$(top_srcdir)/src/gui 	-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)
-METASOURCES = AUTO
-libcore_la_LDFLAGS = $(all_libraries)
-noinst_LTLIBRARIES = libcore.la
-kde_kcfg_DATA = ktechlab.kcfg
-libcore_la_SOURCES = ktlconfig.kcfgc main.cpp

src/core/main.cpp

@@ -8,6 +8,10 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ktechlab.h"
 
 #include <dcopclient.h>
@@ -57,8 +61,12 @@ int main(int argc, char **argv)
 	return app.exec();
 }
 
-void exit_gpsim(int ret)
+#ifndef NO_GPSIM
+
+KDE_EXPORT void exit_gpsim(int ret)
 {
 	printf("gpsim attempted to call exit_gpsim(%d), ***IGNORING***\n", ret);
 //	exit(ret);
 }
+
+#endif

src/debugmanager.cpp

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "debugmanager.h"

src/debugmanager.h

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #ifndef DEBUGMANAGER_H

src/documentiface.h

@@ -11,7 +11,9 @@
 #ifndef DOCUMENTIFACE_H
 #define DOCUMENTIFACE_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <dcopobject.h>
 #include <dcopref.h>

src/drawparts/CMakeLists.txt

@@ -0,0 +1,25 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### drawparts (static)
+
+tde_add_library( drawparts STATIC_PIC AUTOMOC
+
+  SOURCES
+        drawpart.cpp
+        dpline.cpp
+        solidshape.cpp
+        dptext.cpp
+)

src/drawparts/Makefile.am

@@ -1,6 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src 	-I$(top_srcdir)/src/electronics -I$(top_srcdir)/src/electronics/components 	-I$(top_srcdir)/src/electronics/simulation -I$(top_srcdir)/src/flowparts -I$(top_srcdir)/src/gui 	-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libdrawparts.la
-libdrawparts_la_SOURCES = drawpart.cpp dpline.cpp solidshape.cpp dptext.cpp
-noinst_HEADERS = drawpart.h dpline.h solidshape.h dptext.h
-

src/electronics/CMakeLists.txt

@@ -0,0 +1,36 @@
+add_subdirectory( simulation )
+add_subdirectory( components )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/electronics/components
+  ${CMAKE_SOURCE_DIR}/src/electronics/simulation
+  ${CMAKE_SOURCE_DIR}/src/gui
+  ${CMAKE_SOURCE_DIR}/src/languages
+  ${CMAKE_SOURCE_DIR}/src/micro
+  ${GLIB_INCLUDE_DIRS}
+  ${GPSIM_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### electronics (static)
+
+
+tde_add_library( electronics STATIC_PIC AUTOMOC
+
+  SOURCES
+        component.cpp subcircuits.cpp gpsimprocessor.cpp
+        switch.cpp pin.cpp wire.cpp ecnode.cpp port.cpp
+  LINK
+        components-static
+)

src/electronics/Makefile.am

@@ -1,18 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/electronics \
-	-I$(top_srcdir)/src/electronics/components -I$(top_srcdir)/src/electronics/simulation \
-	-I$(top_srcdir)/src/flowparts -I$(top_srcdir)/src/gui -I$(top_srcdir)/src/languages \
-	-I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(glib_cflags) $(all_includes)
-
-METASOURCES = AUTO
-
-SUBDIRS = simulation components
-
-noinst_LTLIBRARIES = libelectronics.la
-
-libelectronics_la_SOURCES = component.cpp subcircuits.cpp gpsimprocessor.cpp \
-	switch.cpp pin.cpp wire.cpp ecnode.cpp port.cpp
-
-libelectronics_la_LIBADD = \
-	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la
-
-noinst_HEADERS = gpsimprocessor.h switch.h pin.h wire.h ecnode.h port.h

src/electronics/components/CMakeLists.txt

@@ -0,0 +1,49 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/electronics
+  ${CMAKE_SOURCE_DIR}/src/electronics/components
+  ${CMAKE_SOURCE_DIR}/src/electronics/simulation
+  ${CMAKE_SOURCE_DIR}/src/gui
+  ${CMAKE_SOURCE_DIR}/src/languages
+  ${CMAKE_SOURCE_DIR}/src/micro
+  ${GLIB_INCLUDE_DIRS}
+  ${GPSIM_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### components (static)
+
+tde_add_library( components STATIC_PIC AUTOMOC
+
+  SOURCES
+        ecresistor.cpp ecled.cpp ecdiode.cpp
+        ecsevensegment.cpp eckeypad.cpp
+        eccapacitor.cpp ec555.cpp eccurrentsource.cpp
+        ecfixedvoltage.cpp ecbcdto7segment.cpp
+        ecsignallamp.cpp ecclockinput.cpp
+        ecpotentiometer.cpp ecopamp.cpp ecvoltagesource.cpp
+        eccurrentsignal.cpp ecvoltagesignal.cpp
+        ecground.cpp multiinputgate.cpp fulladder.cpp
+        multiplexer.cpp demultiplexer.cpp externalconnection.cpp
+        ecsubcircuit.cpp meter.cpp probe.cpp resistordip.cpp
+        addac.cpp dependentsource.cpp flipflop.cpp
+        toggleswitch.cpp pushswitch.cpp ram.cpp
+        discretelogic.cpp piccomponent.cpp piccomponentpin.cpp
+        binarycounter.cpp bidirled.cpp matrixdisplay.cpp
+        bussplitter.cpp matrixdisplaydriver.cpp
+        magnitudecomparator.cpp serialportcomponent.cpp
+        parallelportcomponent.cpp inductor.cpp ecbjt.cpp
+        rotoswitch.cpp
+  LINK
+     elements-static
+)

src/electronics/components/Makefile.am

@@ -1,33 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/electronics -I$(top_srcdir)/src/electronics/components \
-	-I$(top_srcdir)/src/electronics/simulation -I$(top_srcdir)/src/gui -I$(top_srcdir)/src/languages \
-	-I$(top_srcdir)/src/micro $(glib_cflags) $(all_includes)
-
-METASOURCES = AUTO
-noinst_HEADERS = ecresistor.h ecled.h ecdiode.h ecsevensegment.h eckeypad.h \
-	eccapacitor.h ec555.h eccurrentsource.h ecfixedvoltage.h ecbcdto7segment.h \
-	ecsignallamp.h ecclockinput.h ecpotentiometer.h ecopamp.h ecvoltagesource.h \
-	eccurrentsignal.h ecvoltagesignal.h ecground.h multiinputgate.h fulladder.h multiplexer.h \
-	demultiplexer.h externalconnection.h ecsubcircuit.h meter.h probe.h resistordip.h \
-	addac.h dependentsource.h flipflop.h toggleswitch.h pushswitch.h ram.h \
-	discretelogic.h piccomponent.h piccomponentpin.h binarycounter.h bidirled.h \
-	matrixdisplay.h bussplitter.h matrixdisplaydriver.h magnitudecomparator.h \
-	serialportcomponent.h parallelportcomponent.h inductor.h ecbjt.h rotoswitch.h
-
-noinst_LTLIBRARIES =  libcomponents.la
-libcomponents_la_SOURCES = ecresistor.cpp ecled.cpp ecdiode.cpp \
-	ecsevensegment.cpp eckeypad.cpp eccapacitor.cpp ec555.cpp eccurrentsource.cpp \
-	ecfixedvoltage.cpp ecbcdto7segment.cpp ecsignallamp.cpp ecclockinput.cpp \
-	ecpotentiometer.cpp ecopamp.cpp ecvoltagesource.cpp eccurrentsignal.cpp ecvoltagesignal.cpp \
-	ecground.cpp multiinputgate.cpp fulladder.cpp multiplexer.cpp demultiplexer.cpp \
-	externalconnection.cpp ecsubcircuit.cpp meter.cpp probe.cpp resistordip.cpp addac.cpp \
-	dependentsource.cpp flipflop.cpp toggleswitch.cpp pushswitch.cpp ram.cpp discretelogic.cpp \
-	piccomponent.cpp piccomponentpin.cpp binarycounter.cpp bidirled.cpp matrixdisplay.cpp \
-	bussplitter.cpp matrixdisplaydriver.cpp magnitudecomparator.cpp serialportcomponent.cpp \
-	parallelportcomponent.cpp inductor.cpp ecbjt.cpp rotoswitch.cpp
-
-libcomponents_la_PCH = AUTO
-
-
-libcomponents_la_LIBADD =\
-	$(top_builddir)/src/electronics/simulation/libelements.la

src/electronics/components/piccomponent.cpp

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "canvasitemparts.h"

src/electronics/components/piccomponent.h

@@ -11,7 +11,9 @@
 #ifndef PICCOMPONENT_H
 #define PICCOMPONENT_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "component.h"

src/electronics/components/piccomponentpin.cpp

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "micropackage.h"

src/electronics/components/piccomponentpin.h

@@ -11,7 +11,9 @@
 #ifndef PICCOMPONENTPIN_H
 #define PICCOMPONENTPIN_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "logic.h"

src/electronics/components/pushswitch.cpp

@@ -93,7 +93,7 @@ void ECPTBSwitch::drawShape( TQPainter &p )
 
 	p.drawLine( _x+width()/4,	_y+dy,						_x+(3*width())/4,	_y+dy ); // Top horizontal line
 	p.drawLine( _x,				_y+(_height/2)-radius+dy,	_x+width(),			_y+(_height/2)-radius+dy ); // Bottom horizontal line
-	p.drawLine( _x+width()/2,	_y+dy,						_x+width()/2,		_y+(_height/2)-radius+dy ); //Qt::Vertical line
+	p.drawLine( _x+width()/2,	_y+dy,						_x+width()/2,		_y+(_height/2)-radius+dy ); // Vertical line
 
 	p.drawEllipse( _x,						_y+(_height/2)-radius, 2*radius, 2*radius ); // Left circle
 	p.drawEllipse( _x+width()-2*radius+1,	_y+(_height/2)-radius, 2*radius, 2*radius ); // Right circle
@@ -186,7 +186,7 @@ void ECPTMSwitch::drawShape( TQPainter &p )
 
 	p.drawLine( _x+width()/4,	_y-dy,						_x+(3*width())/4,	_y-dy ); // Top horizontal line
 	p.drawLine( _x,				_y+(_height/2)-radius-dy,	_x+width(),			_y+(_height/2)-radius-dy ); // Bottom horizontal line
-	p.drawLine( _x+width()/2,	_y-dy,						_x+width()/2,		_y+(_height/2)-radius-dy ); //Qt::Vertical line
+	p.drawLine( _x+width()/2,	_y-dy,						_x+width()/2,		_y+(_height/2)-radius-dy ); // Vertical line
 
 	p.drawEllipse( _x,						_y+(_height/2)-radius, 2*radius, 2*radius ); // Left circle
 	p.drawEllipse( _x+width()-2*radius+1,	_y+(_height/2)-radius, 2*radius, 2*radius ); // Right circle

src/electronics/gpsimprocessor.cpp

@@ -8,7 +8,14 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#if defined(QT_NO_STL)
+# define DISABLE_QT_NO_STL
+# undef QT_NO_STL
+#endif
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "asmparser.h"
@@ -50,8 +57,8 @@ void initialize_ConsoleUI();
 extern void initialize_readline();
 extern void gui_main(void);
 extern void cli_main();
-void gpsim_version() {};
-void quit_gui() {};
+KDE_EXPORT void gpsim_version() {};
+KDE_EXPORT void quit_gui() {};
 
 
 //BEGIN class GpsimProcessor
@@ -788,7 +795,6 @@ void RegisterSet::update()
 //END class RegisterSet
 
 
-
 //BEGIN class RegisterInfo
 RegisterInfo::RegisterInfo( Register * reg )
 {
@@ -815,7 +821,6 @@ RegisterInfo::RegisterInfo( Register * reg )
 			m_type = Invalid;
 			break;
 	}
-		
 	m_name = m_pRegister->baseName();
 }
 
@@ -880,7 +885,11 @@ DebugLine::DebugLine()
 }
 //END class DebugLine
 
-
 #include "gpsimprocessor.moc"
+#endif
 
+// restore QT_NO_STL
+#if defined(DISABLE_QT_NO_STL)
+# undef DISABLE_QT_NO_STL
+# define QT_NO_STL
 #endif

src/electronics/gpsimprocessor.h

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #ifndef GPSIMPROCESSOR_H

src/electronics/port.cpp

@@ -244,13 +244,13 @@ const int IRQ_MODE_BIT = 1 << 20; // Controls if pin 10 (Ack) causes interrupts
 const int INPUT_MODE_BIT = 1 << 21; // Controls if the data pins are input or output
 const int ALWAYS_INPUT_PINS = ParallelPort::STATUS_PINS;
 
-const int IOCTL_REG_READ[3] = {
+const unsigned int IOCTL_REG_READ[3] = {
 	PPRDATA,
 	PPRSTATUS,
 	PPRCONTROL,
 };
 
-const int IOCTL_REG_WRITE[3] = {
+const unsigned int IOCTL_REG_WRITE[3] = {
 	PPWDATA,
 	0,
 	PPWCONTROL,

src/electronics/simulation/CMakeLists.txt

@@ -0,0 +1,31 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/electronics
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### elements (static)
+
+tde_add_library( elements STATIC_PIC AUTOMOC
+
+  SOURCES
+        cccs.cpp ccvs.cpp circuit.cpp currentsource.cpp
+        diode.cpp element.cpp elementset.cpp logic.cpp
+        matrix.cpp vccs.cpp vcvs.cpp voltagesource.cpp
+        capacitance.cpp resistance.cpp currentsignal.cpp
+        voltagepoint.cpp voltagesignal.cpp elementsignal.cpp
+        nonlinear.cpp reactive.cpp vec.cpp bjt.cpp
+        opamp.cpp inductance.cpp
+  DEPENDENCIES
+        core-static
+)

src/electronics/simulation/Makefile.am

@@ -1,11 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/electronics $(all_includes)
-METASOURCES = AUTO
-noinst_LTLIBRARIES =  libelements.la
-libelements_la_SOURCES = cccs.cpp ccvs.cpp circuit.cpp currentsource.cpp \
-			diode.cpp element.cpp elementset.cpp logic.cpp matrix.cpp vccs.cpp vcvs.cpp \
-			voltagesource.cpp capacitance.cpp resistance.cpp currentsignal.cpp voltagepoint.cpp \
-			voltagesignal.cpp elementsignal.cpp nonlinear.cpp reactive.cpp vec.cpp bjt.cpp opamp.cpp \
-	inductance.cpp
-noinst_HEADERS = cccs.h ccvs.h circuit.h currentsource.h diode.h element.h \
-			elementset.h logic.h matrix.h vccs.h vcvs.h voltagesource.h capacitance.h \
-			resistance.h elementsignal.h nonlinear.h reactive.h vec.h bjt.h opamp.h inductance.h

src/flowparts/CMakeLists.txt

@@ -0,0 +1,35 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/electronics
+  ${CMAKE_SOURCE_DIR}/src/electronics/components
+  ${CMAKE_SOURCE_DIR}/src/languages
+  ${CMAKE_SOURCE_DIR}/src/micro
+  
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### flowparts (static)
+
+tde_add_library( flowparts STATIC_PIC AUTOMOC
+
+  SOURCES
+        callsub.cpp delay.cpp end.cpp forloop.cpp
+        readport.cpp setpin.cpp start.cpp
+        testpin.cpp unary.cpp varassignment.cpp
+        varcomparison.cpp writeport.cpp repeat.cpp
+        while.cpp sub.cpp count.cpp embed.cpp
+        interrupt.cpp keypad.cpp pulse.cpp
+        sevenseg.cpp inputbutton.cpp
+        flowpart.cpp pinmapping.cpp
+)

src/flowparts/Makefile.am

@@ -1,15 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/electronics \
-	-I$(top_srcdir)/src/electronics/components -I$(top_srcdir)/src/gui -I$(top_srcdir)/src/languages \
-	-I$(top_srcdir)/src/micro $(all_includes)
-METASOURCES = AUTO
-noinst_LTLIBRARIES =  libflowparts.la
-noinst_HEADERS = callsub.h delay.h end.h forloop.h readport.h setpin.h start.h \
-			testpin.h unary.h varassignment.h varcomparison.h writeport.h repeat.h while.h \
-			sub.h inputbutton.h flowpart.h pinmapping.h
-libflowparts_la_SOURCES = callsub.cpp delay.cpp end.cpp forloop.cpp \
-		readport.cpp 	setpin.cpp start.cpp testpin.cpp unary.cpp varassignment.cpp \
-		varcomparison.cpp 	writeport.cpp repeat.cpp while.cpp sub.cpp count.cpp embed.cpp \
-		interrupt.cpp 	keypad.cpp pulse.cpp sevenseg.cpp inputbutton.cpp flowpart.cpp \
-	pinmapping.cpp
-
-libflowparts_la_PCH = AUTO

src/flowparts/sub.cpp

@@ -57,6 +57,3 @@ void Sub::generateMicrobe( FlowCode *code )
 	code->addCodeBranch( outputPart("int_in") );
 	code->addCode("}");
 }
-
-
-// #include "sub.moc"

src/gui/CMakeLists.txt

@@ -0,0 +1,46 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/electronics
+  ${CMAKE_SOURCE_DIR}/src/electronics/components
+  ${CMAKE_SOURCE_DIR}/src/electronics/simulation
+  ${CMAKE_SOURCE_DIR}/src/flowparts
+  ${CMAKE_SOURCE_DIR}/src/languages
+  ${CMAKE_SOURCE_DIR}/src/mechanics
+  ${CMAKE_SOURCE_DIR}/src/micro
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### gui (static)
+
+tde_add_library( gui STATIC_PIC AUTOMOC
+
+  SOURCES
+        asmformattingwidget.ui gpasmsettingswidget.ui
+        logicwidget.ui newfilewidget.ui newprojectwidget.ui
+        outputmethodwidget.ui microsettingswidget.ui
+        oscilloscopewidget.ui generaloptionswidget.ui
+        createsubprojectwidget.ui processingoptionswidget.ui
+        sdccoptionswidget.ui linkeroptionswidget.ui
+        picprogrammerconfigwidget.ui newpinmappingwidget.ui
+        programmerwidget.ui
+        contexthelp.cpp doublespinbox.cpp itemeditor.cpp
+        itemselector.cpp microsettingsdlg.cpp
+        newfiledlg.cpp orientationwidget.cpp
+        outputmethoddlg.cpp pieditor.cpp plvitem.cpp
+        propertieslistview.cpp settingsdlg.cpp oscilloscope.cpp
+        oscilloscopeview.cpp probepositioner.cpp logview.cpp
+        projectdlgs.cpp microselectwidget.cpp
+        symbolviewer.cpp programmerdlg.cpp colorcombo.cpp
+  DEPENDENCIES
+        core-static
+)

src/gui/Makefile.am

@@ -1,23 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/core \
-	-I$(top_srcdir)/src/electronics -I$(top_srcdir)/src/electronics/components \
-	-I$(top_srcdir)/src/electronics/simulation -I$(top_srcdir)/src/flowparts -I$(top_srcdir)/src/gui \
-	-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro \
-	-I$(top_srcdir)/gpsim-interface $(all_includes)
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libgui.la
-libgui_la_SOURCES = contexthelp.cpp doublespinbox.cpp itemeditor.cpp \
-	itemselector.cpp microsettingsdlg.cpp newfiledlg.cpp orientationwidget.cpp \
-	outputmethoddlg.cpp pieditor.cpp plvitem.cpp propertieslistview.cpp asmformattingwidget.ui \
-	gpasmsettingswidget.ui logicwidget.ui newfilewidget.ui newprojectwidget.ui \
-	outputmethodwidget.ui microsettingswidget.ui settingsdlg.cpp oscilloscope.cpp \
-	oscilloscopewidget.ui oscilloscopeview.cpp probepositioner.cpp generaloptionswidget.ui \
-	logview.cpp createsubprojectwidget.ui processingoptionswidget.ui \
-	sdccoptionswidget.ui projectdlgs.cpp linkeroptionswidget.ui microselectwidget.cpp \
-	symbolviewer.cpp picprogrammerconfigwidget.ui newpinmappingwidget.ui programmerwidget.ui \
-	programmerdlg.cpp colorcombo.cpp
-
-libgui_la_PCH = AUTO
-			 
-noinst_HEADERS = settingsdlg.h oscilloscope.h oscilloscopeview.h \
-				probepositioner.h projectdlgs.h microselectwidget.h symbolviewer.h programmerdlg.h \
-	colorcombo.h

src/gui/asmformattingwidget.ui

@@ -171,9 +171,6 @@
             <property name="text">
                 <string>&amp;Automatically format Microbe output</string>
             </property>
-            <property name="accel">
-                <string>Alt+A</string>
-            </property>
         </widget>
         <spacer>
             <property name="name">
@@ -203,11 +200,7 @@
     <tabstop>kcfg_AutoFormatMBOutput</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>

src/gui/createsubprojectwidget.ui

@@ -91,9 +91,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>

src/gui/generaloptionswidget.ui

@@ -29,9 +29,6 @@
             <property name="text">
                 <string>Reuse the same output view for code generation</string>
             </property>
-            <property name="accel">
-                <string></string>
-            </property>
         </widget>
         <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
@@ -40,9 +37,6 @@
             <property name="text">
                 <string>Show voltage bars &amp;on electronic components</string>
             </property>
-            <property name="accel">
-                <string>Alt+O</string>
-            </property>
         </widget>
         <widget class="KColorButton" row="2" column="1">
             <property name="name">
@@ -62,9 +56,6 @@
             <property name="text">
                 <string>Show &amp;grid:</string>
             </property>
-            <property name="accel">
-                <string>Alt+G</string>
-            </property>
         </widget>
         <widget class="KIntSpinBox" row="3" column="1">
             <property name="name">
@@ -111,9 +102,6 @@
                     <property name="text">
                         <string>Restore opened doc&amp;uments on startup</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+U</string>
-                    </property>
                 </widget>
                 <widget class="TQCheckBox">
                     <property name="name">
@@ -122,9 +110,6 @@
                     <property name="text">
                         <string>Raise the &amp;appropriate item selector on creating a new document</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+A</string>
-                    </property>
                 </widget>
                 <widget class="TQCheckBox">
                     <property name="name">
@@ -133,9 +118,6 @@
                     <property name="text">
                         <string>Raise the &amp;Messages log when compiling</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+M</string>
-                    </property>
                 </widget>
             </vbox>
         </widget>
@@ -262,8 +244,8 @@
     <tabstop>refreshRateSlider</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>

src/gui/gpasmsettingswidget.ui

@@ -56,9 +56,6 @@
             <property name="text">
                 <string>Ign&amp;ore case (-i)</string>
             </property>
-            <property name="accel">
-                <string>Alt+O</string>
-            </property>
             <property name="toolTip" stdset="0">
                 <string>All user defined symbols and macros are case sensitive. This option makes them case insensitive.</string>
             </property>
@@ -70,9 +67,6 @@
             <property name="text">
                 <string>Generate DOS-formated hex file (-&amp;n)</string>
             </property>
-            <property name="accel">
-                <string>Alt+N</string>
-            </property>
             <property name="toolTip" stdset="0">
                 <string>By default, gpasm generates hex files using ISO format. However, some device programmers required a DOS formatted file. This option will cause gpasm to generate a DOS formatted hex file. </string>
             </property>
@@ -279,10 +273,8 @@
     <tabstop>kcfg_DosFormat</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>

src/gui/linkeroptionswidget.ui

@@ -81,9 +81,6 @@
             <property name="text">
                 <string>&amp;Output a map file (-m)</string>
             </property>
-            <property name="accel">
-                <string>Alt+O</string>
-            </property>
         </widget>
         <widget class="TQLabel" row="4" column="0">
             <property name="name">
@@ -168,12 +165,10 @@
     <tabstop>m_pInternalLibraries</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>

src/gui/logicwidget.ui

@@ -263,14 +263,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>

src/gui/microsettingswidget.ui

@@ -167,9 +167,6 @@ Drag it to set the type (input/output).</string>
                     <property name="text">
                         <string>Modif&amp;y</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+Y</string>
-                    </property>
                 </widget>
                 <widget class="KPushButton" row="1" column="3">
                     <property name="name">
@@ -178,20 +175,14 @@ Drag it to set the type (input/output).</string>
                     <property name="text">
                         <string>Rename</string>
                     </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
                 </widget>
             </grid>
         </widget>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>

src/gui/newfiledlg.cpp

@@ -8,7 +8,10 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "document.h"
 #include "microinfo.h"
 #include "newfiledlg.h"

src/gui/newfilewidget.ui

@@ -109,9 +109,6 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
             <property name="text">
                 <string>&amp;Add to project</string>
             </property>
-            <property name="accel">
-                <string>Alt+A</string>
-            </property>
             <property name="checked">
                 <bool>true</bool>
             </property>
@@ -188,8 +185,8 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
     <tabstop>addToProjectCheck</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kiconview.h</includehint>
-    <includehint>microselectwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kiconview.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>

src/gui/newpinmappingwidget.ui

@@ -124,7 +124,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>

src/gui/newprojectwidget.ui

@@ -101,10 +101,9 @@
     <tabstop>projectLocationURL</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>

src/gui/oscilloscopewidget.ui

@@ -200,9 +200,6 @@
                     <property name="text">
                         <string>Reset</string>
                     </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
                 </widget>
             </vbox>
         </widget>
@@ -282,8 +279,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>oscilloscopeview.h</includehint>
-    <includehint>probepositioner.h</includehint>
-</includehints>
+<includes>
+    <include location="local" impldecl="in implementation">oscilloscopeview.h</include>
+    <include location="local" impldecl="in implementation">probepositioner.h</include>
+</includes>
 </UI>

src/gui/outputmethodwidget.ui

@@ -173,10 +173,10 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>microselectwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>

src/gui/picprogrammerconfigwidget.ui

@@ -57,9 +57,6 @@
                     <property name="text">
                         <string>&amp;Add ...</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+A</string>
-                    </property>
                 </widget>
                 <widget class="KPushButton" row="1" column="3">
                     <property name="name">
@@ -68,9 +65,6 @@
                     <property name="text">
                         <string>Re&amp;move</string>
                     </property>
-                    <property name="accel">
-                        <string>Alt+M</string>
-                    </property>
                 </widget>
                 <widget class="TQLabel" row="0" column="0">
                     <property name="name">
@@ -271,15 +265,9 @@
     <tabstop>kcfg_PicProgrammerPort</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>

src/gui/processingoptionswidget.ui

@@ -89,10 +89,10 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>microselectwidget.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>

src/gui/programmerwidget.ui

@@ -116,8 +116,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>microselectwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>

src/gui/projectdlgs.cpp

@@ -270,6 +270,8 @@ void ProcessingOptionsDlg::accept()
 void ProcessingOptionsDlg::reject()
 {
 }
+
+#include "projectdlgs.moc"
 //END class ProcessingOptionsDlg
 
 

src/gui/sdccoptionswidget.ui

@@ -44,9 +44,6 @@
                         <property name="text">
                             <string>Don't search in the standard librar&amp;y directory (--nostdlib)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Y</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -55,9 +52,6 @@
                         <property name="text">
                             <string>Don't search in the standard include directory (--nostdinc)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -66,9 +60,6 @@
                         <property name="text">
                             <string>Disa&amp;ble pedantic warnings (--less-pedantic)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+B</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -77,9 +68,6 @@
                         <property name="text">
                             <string>Use C&amp;89 standard only (--std-c89)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+8</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Follow the C89 standard and disable SDCC features that conflict with the standard.</string>
                         </property>
@@ -91,9 +79,6 @@
                         <property name="text">
                             <string>Use C&amp;99 standard only (--std-c99)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+9</string>
-                        </property>
                         <property name="toolTip" stdset="0">
                             <string></string>
                         </property>
@@ -138,9 +123,6 @@
                         <property name="text">
                             <string>Stack auto&amp;matic variables (--stack-auto)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+M</string>
-                        </property>
                         <property name="toolTip" stdset="0">
                             <string></string>
                         </property>
@@ -155,9 +137,6 @@
                         <property name="text">
                             <string>Integer li&amp;braries were compiled as reentrant (--int-long-reent)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+B</string>
-                        </property>
                         <property name="toolTip" stdset="0">
                             <string></string>
                         </property>
@@ -172,9 +151,6 @@
                         <property name="text">
                             <string>Floating point librar&amp;y was compiled as reentrant (--float-reent)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Y</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Floating point library is compiled as reentrant.</string>
                         </property>
@@ -186,9 +162,6 @@
                         <property name="text">
                             <string>Leave out the frame pointer (--fommit-frame-pointer)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -197,9 +170,6 @@
                         <property name="text">
                             <string>Don't memcpy initialized &amp;xram from code (--no-xinit-opt)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+X</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Will not memcpy initialized data from code space into xdata space. This saves a few bytes in code space if you don't have initialized data.</string>
                         </property>
@@ -211,9 +181,6 @@
                         <property name="text">
                             <string>Callee will &amp;always save registers used (--all-callee-saves)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+A</string>
-                        </property>
                     </widget>
                     <spacer>
                         <property name="name">
@@ -252,9 +219,6 @@
                         <property name="text">
                             <string>Disable overlaying leaf function &amp;auto variables (--nooverlay)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+A</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>The compiler will not overlay parameters and local variables of any function, see section Parameters and local variables for more details.</string>
                         </property>
@@ -266,9 +230,6 @@
                         <property name="text">
                             <string>Disable the GCSE optimization (--nogcse)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -277,9 +238,6 @@
                         <property name="text">
                             <string>Disable label optimi&amp;zation (--nolabelopt)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Z</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Will not optimize labels (makes the dumpfiles more readable).</string>
                         </property>
@@ -291,9 +249,6 @@
                         <property name="text">
                             <string>Disable optimization of invariants (--noinvariant)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -302,9 +257,6 @@
                         <property name="text">
                             <string>Disable loop variable induction (--noinduction)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -313,9 +265,6 @@
                         <property name="text">
                             <string>Disable peep-hole optimization (--&amp;no-peep)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+N</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Disable peep-hole optimization.</string>
                         </property>
@@ -327,9 +276,6 @@
                         <property name="text">
                             <string>Disable loop reverse optimization (--noloopreverse)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Will not do loop reversal optimization.</string>
                         </property>
@@ -341,9 +287,6 @@
                         <property name="text">
                             <string>Opti&amp;mize for compact code (--opt-code-size)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+M</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>The compiler will optimize code generation towards compact code, possibly at the expense of code speed.</string>
                         </property>
@@ -355,9 +298,6 @@
                         <property name="text">
                             <string>&amp;Optimize for fast code (--opt-code-speed)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+O</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>The compiler will optimize code generation towards fast code, possibly at the expense of code size.</string>
                         </property>
@@ -369,9 +309,6 @@
                         <property name="text">
                             <string>Ena&amp;ble inline assembly peephole optimization (--peep-asm)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+B</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Pass the inline assembler code through the peep hole optimizer. This can cause unexpected changes to inline assembler code, please go through the peephole optimizer rules defined in the source file tree '&lt;target&gt;/peeph.def' before using this option.</string>
                         </property>
@@ -383,9 +320,6 @@
                         <property name="text">
                             <string>Don't generate boundary check for &amp;jump tables (--nojtbound)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+J</string>
-                        </property>
                     </widget>
                     <spacer>
                         <property name="name">
@@ -424,9 +358,6 @@
                         <property name="text">
                             <string>Don't use default libraries (--nodefaultlibs)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -435,9 +366,6 @@
                         <property name="text">
                             <string>Don't generate BANKSEL directives (--pno-banksel)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -446,9 +374,6 @@
                         <property name="text">
                             <string>Use large stac&amp;k model (--pstack-model=large)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+K</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -457,9 +382,6 @@
                         <property name="text">
                             <string>Show more debug info in assembl&amp;y output (--debug-xtra)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Y</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -468,9 +390,6 @@
                         <property name="text">
                             <string>E&amp;xplicit enable of peepholes (--denable-peeps)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+X</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -479,9 +398,6 @@
                         <property name="text">
                             <string>Du&amp;mp call tree in .calltree file (--calltree)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+M</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -490,9 +406,6 @@
                         <property name="text">
                             <string>Ena&amp;ble stack optimizations (--fstack)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+B</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -501,9 +414,6 @@
                         <property name="text">
                             <string>Try to use conditional BRA instead of GOTO (--optimi&amp;ze-goto)</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Z</string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -512,9 +422,6 @@
                         <property name="text">
                             <string>Try to optimize some compares (--optimize-cmp)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="TQCheckBox">
                         <property name="name">
@@ -523,9 +430,6 @@
                         <property name="text">
                             <string>Thorough data flow analyis (resource intensive) (--optimize-df)</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer>
                         <property name="name">
@@ -580,7 +484,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>

src/gui/symbolviewer.h

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #ifndef SYMBOLVIEWER_H

src/itemdocument.cpp

@@ -8,6 +8,10 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "canvasmanipulator.h"
 #include "circuitdocument.h"
 #include "connector.h"
@@ -807,7 +811,7 @@ void ItemDocument::exportToImage()
 	
 	// we need an object so we can retrieve which image type was selected by the user
 	// so setup the filedialog.
-	KFileDialog exportDialog(TQString(), "*.png|PNG Image\n*.bmp|BMP Image\n*.svg|SVG Image" , p_ktechlab, i18n("Export As Image"), true, cropCheck);
+	KFileDialog exportDialog(TQString(), "*.png|PNG Image\n*.bmp|BMP Image\n*.svg|SVG Image" , p_ktechlab, i18n("Export As Image").utf8(), true, cropCheck);
 	
 	exportDialog.setOperationMode( KFileDialog::Saving );
 	// now actually show it
@@ -907,21 +911,25 @@ void ItemDocument::exportToImage()
 	if ( cropCheck->isChecked() )
 	{
 		if( type == "SVG" )
-			saveResult = dynamic_cast<TQPicture*>(outputImage)->save( url.path(), type);
+			saveResult = dynamic_cast<TQPicture*>(outputImage)->save(url.path(), type.utf8());
 		
 		else
 		{
 			TQImage img = dynamic_cast<TQPixmap*>(outputImage)->convertToImage();
 			img = img.copy(cropArea);
-			saveResult = img.save(url.path(),type);
+			saveResult = img.save(url.path(), type.utf8());
 		}
 	}
 	else
 	{
 		if ( type=="SVG" )
-			saveResult = dynamic_cast<TQPicture*>(outputImage)->save( url.path(), type );
+		{
+			saveResult = dynamic_cast<TQPicture*>(outputImage)->save(url.path(), type.utf8());
+		}
 		else
-			saveResult = dynamic_cast<TQPixmap*>(outputImage)->save( url.path(), type );
+		{
+			saveResult = dynamic_cast<TQPixmap*>(outputImage)->save(url.path(), type.utf8());
+		}
 	}
 	
 	//if(saveResult == true)	KMessageBox::information( this, i18n("Sucessfully exported to \"%1\"").arg( url.filename() ), i18n("Image Export") );

src/itemdocumentdata.cpp

@@ -27,6 +27,8 @@
 #include <tqbitarray.h>
 #include <tqfile.h>
 
+#include <map>
+
 
 // Converts the TQBitArray into a string (e.g. "F289A9E") that can be stored in an xml file
 static TQString toAsciiHex( TQBitArray _data )
@@ -681,7 +683,7 @@ void ItemDocumentData::elementToConnectorData( TQDomElement element )
 	
 	ConnectorData connectorData;
 	
-	connectorData.manualRoute = element.attribute( "manual-route", "0" );
+	connectorData.manualRoute = element.attribute("manual-route", "0").toInt();
 	TQString route = element.attribute( "route", "" );
 	
 	TQStringList points = TQStringList::split( ",", route );
@@ -990,7 +992,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec
 	{
 		if ( !it.data().type.isEmpty() && !itemDocument->itemWithID( it.key() ) )
 		{
-			Item *item = itemLibrary()->createItem( it.data().type, itemDocument, false, it.key(), false );
+			Item *item = itemLibrary()->createItem(it.data().type, itemDocument, false, it.key().utf8(), false);
 			if ( item && !itemDocument->isValidItem(item) )
 			{
 				kdWarning() << "Attempted to create invalid item with id: " << it.key() << endl;

src/itemgroup.cpp

@@ -15,6 +15,7 @@
 
 #include <tqtimer.h>
 
+#include <map>
 
 ItemGroup::ItemGroup( ItemDocument *view, const char *name )
 	: TQObject( view, name )

src/itemlibrary.cpp

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "cnitem.h"
 #include "canvasitemparts.h"

src/itemview.cpp

@@ -51,10 +51,10 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
 	new TDEAction( i18n("Export as Image..."), 0, 0, itemDocument, TQT_SLOT(exportToImage()), ac, "file_export_image");
 
 	//BEGIN Item Alignment actions
-	new TDEAction( i18n("AlignQt::Horizontally"), 0, 0, itemDocument, TQT_SLOT(alignHorizontally()), ac, "align_horizontally" );
-	new TDEAction( i18n("AlignQt::Vertically"), 0, 0, itemDocument, TQT_SLOT(alignVertically()), ac, "align_vertically" );
-	new TDEAction( i18n("DistributeQt::Horizontally"), 0, 0, itemDocument, TQT_SLOT(distributeHorizontally()), ac, "distribute_horizontally" );
-	new TDEAction( i18n("DistributeQt::Vertically"), 0, 0, itemDocument, TQT_SLOT(distributeVertically()), ac, "distribute_vertically" );
+	new TDEAction( i18n("Align Horizontally"), 0, 0, itemDocument, TQT_SLOT(alignHorizontally()), ac, "align_horizontally" );
+	new TDEAction( i18n("Align Vertically"), 0, 0, itemDocument, TQT_SLOT(alignVertically()), ac, "align_vertically" );
+	new TDEAction( i18n("Distribute Horizontally"), 0, 0, itemDocument, TQT_SLOT(distributeHorizontally()), ac, "distribute_horizontally" );
+	new TDEAction( i18n("Distribute Vertically"), 0, 0, itemDocument, TQT_SLOT(distributeVertically()), ac, "distribute_vertically" );
 	//END Item Alignment actions
 
 

src/ktechlab.cpp

@@ -8,8 +8,11 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "circuitdocument.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#include "circuitdocument.h"
 #include "contexthelp.h"
 #include "docmanager.h"
 #include "filemetainfo.h"
@@ -589,7 +592,7 @@ void KTechlab::slotDragContextActivated( int id )
 
 TDEAction * KTechlab::action( const TQString & name ) const
 {
-	TDEAction * action = actionCollection()->action(name);
+	TDEAction * action = actionCollection()->action(name.utf8());
 	if ( !action )
 		kdError() << k_funcinfo << "No such action: " << name << endl;
 	return action;

src/ktechlab.desktop

@@ -1,12 +1,15 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KTechlab
+
 GenericName=Microcontroller and Electronics Simulator
+
+Comment=An IDE for microcontrollers and electronics
+
+Encoding=UTF-8
+Type=Application
 Exec=ktechlab %i %m -caption "%c"
 Icon=ktechlab
-Type=Application
-X-DocPath=ktechlab/index.html
-Comment=An IDE for microcontrollers and electronics
 Terminal=0
 MimeType=application/x-ktechlab;application/x-flowcode;application/x-circuit;application/x-microbe;
 Categories=Qt;TDE;Education;Science;Electronics
+X-DocPath=ktechlab/index.html

src/languages/CMakeLists.txt

@@ -0,0 +1,34 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/electronics
+  ${CMAKE_SOURCE_DIR}/src/flowparts
+  ${CMAKE_SOURCE_DIR}/src/gui
+  ${CMAKE_SOURCE_DIR}/src/micro
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### languages (static)
+
+tde_add_library( languages STATIC_PIC AUTOMOC
+
+  SOURCES
+        language.cpp languagemanager.cpp microbe.cpp
+        externallanguage.cpp gpasm.cpp gpdasm.cpp
+        processchain.cpp flowcode.cpp asmparser.cpp
+        sdcc.cpp gplink.cpp gplib.cpp sourceline.cpp
+        picprogrammer.cpp
+  LINK
+        gui-static
+  DEPENDENCIES
+	      core-static
+)

src/languages/Makefile.am

@@ -1,14 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/electronics -I$(top_srcdir)/src/electronics/components \
-	-I$(top_srcdir)/src/electronics/simulation -I$(top_srcdir)/src/flowparts -I$(top_srcdir)/src/gui \
-	-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro -Igui \
-	$(all_includes)
-METASOURCES = AUTO
-noinst_LTLIBRARIES = liblanguages.la
-liblanguages_la_SOURCES = language.cpp languagemanager.cpp microbe.cpp \
-		externallanguage.cpp gpasm.cpp gpdasm.cpp processchain.cpp flowcode.cpp asmparser.cpp \
-		sdcc.cpp gplink.cpp gplib.cpp sourceline.cpp picprogrammer.cpp
-noinst_HEADERS = externallanguage.h gpasm.h gpdasm.h language.h \
-		languagemanager.h microbe.h processchain.h flowcode.h asmparser.h sdcc.h gplink.h gplib.h \
-		sourceline.h picprogrammer.h
-liblanguages_la_LIBADD = $(top_builddir)/src/gui/libgui.la

src/languages/asmparser.cpp

@@ -8,8 +8,11 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "asmparser.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#include "asmparser.h"
 #include "gpsimprocessor.h"
 
 #include <kdebug.h>

src/languages/language.cpp

@@ -27,7 +27,7 @@
 
 //BEGIN class Language
 Language::Language( ProcessChain *processChain, KTechlab *parent, const TQString &name )
-	: TQObject(parent,name)
+	: TQObject(parent, name.utf8())
 {
 	p_ktechlab = parent;
 	p_processChain = processChain;

src/mechanics/CMakeLists.txt

@@ -0,0 +1,25 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/drawparts
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### mechanics (static)
+
+tde_add_library( mechanics STATIC_PIC AUTOMOC
+
+  SOURCES
+        mechanicsitem.cpp chassiscircular2.cpp
+        mechanicssimulation.cpp mechanicsdocument.cpp
+        mechanicsgroup.cpp mechanicsview.cpp
+)

src/mechanics/Makefile.am

@@ -1,8 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts $(all_includes)
-METASOURCES = AUTO
-noinst_HEADERS = mechanicsitem.h chassiscircular2.h mechanicssimulation.h \
-	mechanicsdocument.h mechanicsgroup.h mechanicsview.h
-
-noinst_LTLIBRARIES =  libmechanics.la
-libmechanics_la_SOURCES = mechanicsitem.cpp chassiscircular2.cpp \
-		mechanicssimulation.cpp mechanicsdocument.cpp mechanicsgroup.cpp mechanicsview.cpp

src/micro/CMakeLists.txt

@@ -0,0 +1,23 @@
+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}
+)
+
+
+##### micro (static)
+
+tde_add_library( micro STATIC_PIC AUTOMOC
+
+  SOURCES
+        microinfo.cpp picinfo.cpp picinfo16bit.cpp
+        picinfo14bit.cpp picinfo12bit.cpp
+        microlibrary.cpp micropackage.cpp asminfo.cpp
+)

src/micro/Makefile.am

@@ -1,7 +0,0 @@
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libmicro.la
-noinst_HEADERS = microinfo.h picinfo.h picinfo16bit.h picinfo14bit.h \
-	picinfo12bit.h microlibrary.h asminfo.h
-libmicro_la_SOURCES = microinfo.cpp picinfo.cpp picinfo16bit.cpp \
-	picinfo14bit.cpp picinfo12bit.cpp microlibrary.cpp micropackage.cpp asminfo.cpp

src/micro/microlibrary.h

@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef MICRoLIBRARY_H
-#define PICLIBRARY_H
+#ifndef MICROLIBRARY_H
+#define MICROLIBRARY_H
 
 #include "asminfo.h"
 #include "microinfo.h"

src/micro/micropackage.h

@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#ifndef PICPACKAGES_H
-#define PICPACKAGES_H
+#ifndef MICROPACKAGES_H
+#define MICROPACKAGES_H
 
 #include <tqstring.h>
 #include <tqstringlist.h>

src/microsettings.cpp

@@ -333,6 +333,8 @@ PinMappingMap MicroSettings::pinMappings() const
 {
 	return m_pinMappings;
 }
+
+#include "microsettings.moc"
 //END class MicroSettings
 
 

src/oscilloscopedata.cpp

@@ -166,6 +166,8 @@ void FloatingProbeData::setLowerAbsValue( double lowerAbsValue )
 	m_lowerAbsValue = lowerAbsValue;
 	emit displayAttributeChanged();
 }
+
+#include "oscilloscopedata.moc"
 //END class FloatingProbeData
 
 

src/textdocument.cpp

@@ -605,7 +605,7 @@ void TextDocument::slotUpdateMarksInfo()
 		{
 			TDEAction * a = new TDEAction( i18n("%1 - %2").arg( TQString::number( mark->line+1 ) ).arg( m_doc->textLine(mark->line) ),
 									   0, this, TQT_SLOT(slotBookmarkRequested()), this,
-									   TQString("bookmark_%1").arg(TQString::number(mark->line).ascii()) );
+									   TQString("bookmark_%1").arg(TQString::number(mark->line)).latin1() );
 			m_bookmarkActions.append(a);
 		}
 	}

src/textdocument.h

@@ -11,7 +11,10 @@
 #ifndef TEXTDOCUMENT_H
 #define TEXTDOCUMENT_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "document.h"
 
 #include <tqguardedptr.h>

src/textview.cpp

@@ -8,12 +8,15 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define protected public
 #include <kxmlguiclient.h>
 #undef protected
 
 #include "asmformatter.h"
-#include "config.h"
 #include "filemetainfo.h"
 #include "gpsimprocessor.h"
 #include "ktechlab.h"

src/textview.h

@@ -11,7 +11,10 @@
 #ifndef TEXTVIEW_H
 #define TEXTVIEW_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "view.h"
 
 #include <kate/view.h>

src/variablelabel.cpp

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #include "gpsimprocessor.h"

src/variablelabel.h

@@ -8,7 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifndef NO_GPSIM
 
 #ifndef VARIABLELABEL_H

src/view.cpp

@@ -61,7 +61,7 @@ class KVSSBSep : public TQWidget {
 
 //BEGIN class View
 View::View( Document *document, ViewContainer *viewContainer, uint viewAreaId, const char *name )
-	: TQWidget( viewContainer->viewArea(viewAreaId), name ? name : (const char *)("view_" + TQString::number(viewAreaId)) ),
+	: TQWidget( viewContainer->viewArea(viewAreaId), name ? name : TQString("view_%1").arg(TQString::number(viewAreaId)).latin1() ),
 	  KXMLGUIClient()
 {
 	m_dcopID = 0;
@@ -103,7 +103,7 @@ View::~View()
 
 TDEAction * View::action( const TQString & name ) const
 {
-	TDEAction * action = actionCollection()->action(name);
+	TDEAction * action = actionCollection()->action(name.utf8());
 	if ( !action )
 		kdError() << k_funcinfo << "No such action: " << name << endl;
 	return action;

src/viewcontainer.cpp

@@ -412,8 +412,8 @@ ViewArea *ViewArea::createViewArea( Position position, uint id )
 	
 	setOrientation( ( position == Right ) ? Qt::Horizontal : Qt::Vertical );
 	
-	p_viewArea1 = new ViewArea( this, p_viewContainer, m_id, (const char*)("viewarea_"+TQString::number(m_id)) );
-	p_viewArea2 = new ViewArea( this, p_viewContainer, id, (const char*)("viewarea_"+TQString::number(id)) );
+	p_viewArea1 = new ViewArea(this, p_viewContainer, m_id, TQString("viewarea_%1").arg(TQString::number(m_id)).latin1());
+	p_viewArea2 = new ViewArea(this, p_viewContainer, id, TQString("viewarea_%1").arg(TQString::number(id)).latin1());
 	
 	connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
 	connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
@@ -559,7 +559,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam
 			if ( contains.size() >= 1 )
 			{
 				int viewArea1Id = contains[0];
-				p_viewArea1 = new ViewArea( this, p_viewContainer, viewArea1Id, (const char*)("viewarea_"+TQString::number(viewArea1Id)) );
+				p_viewArea1 = new ViewArea(this, p_viewContainer, viewArea1Id, TQString("viewarea_%1").arg(TQString::number(viewArea1Id)).latin1());
 				connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
 				p_viewArea1->restoreState( config, viewArea1Id, groupName );
 				p_viewArea1->show();
@@ -568,7 +568,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam
 			if ( contains.size() >= 2 )
 			{
 				int viewArea2Id = contains[1];
-				p_viewArea2 = new ViewArea( this, p_viewContainer, viewArea2Id, (const char*)("viewarea_"+TQString::number(viewArea2Id)) );
+				p_viewArea2 = new ViewArea(this, p_viewContainer, viewArea2Id, TQString("viewarea_%1").arg(TQString::number(viewArea2Id)).latin1());
 				connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
 				p_viewArea2->restoreState( config, viewArea2Id, groupName );
 				p_viewArea2->show();

src/x-circuit.desktop

@@ -1,7 +1,8 @@
 [Desktop Entry]
+Comment=KTechlab Circuit
+
 Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-circuit
 Icon=ktechlab_circuit
 Patterns=*.circuit
-Comment=KTechlab Circuit

src/x-flowcode.desktop

@@ -1,7 +1,8 @@
 [Desktop Entry]
+Comment=KTechlab FlowCode
+
 Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-flowcode
 Icon=ktechlab_flowcode
 Patterns=*.flowcode
-Comment=KTechlab FlowCode

src/x-ktechlab.desktop

@@ -1,7 +1,8 @@
 [Desktop Entry]
+Comment=KTechlab Project
+
 Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-ktechlab
 Icon=ktechlab
 Patterns=*.ktechlab
-Comment=KTechlab Project

src/x-microbe.desktop

@@ -1,7 +1,8 @@
 [Desktop Entry]
+Comment=KTechlab Microbe
+
 Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-microbe
 Icon=ktechlab_microbe
 Patterns=*.microbe;*.basic
-Comment=KTechlab Microbe

subdirs

@@ -1,5 +0,0 @@
-doc
-icons
-microbe
-po
-src

translations/desktop_files/ktechlab-desktops.pot

@@ -0,0 +1,52 @@
+# 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: 2022-01-30 16:15+0100\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
+#: ktechlab.desktop:2
+msgid "KTechlab"
+msgstr ""
+
+#. GenericName
+#: ktechlab.desktop:4
+msgid "Microcontroller and Electronics Simulator"
+msgstr ""
+
+#. Comment
+#: ktechlab.desktop:6
+msgid "An IDE for microcontrollers and electronics"
+msgstr ""
+
+#. Comment
+#: x-circuit.desktop:2
+msgid "KTechlab Circuit"
+msgstr ""
+
+#. Comment
+#: x-flowcode.desktop:2
+msgid "KTechlab FlowCode"
+msgstr ""
+
+#. Comment
+#: x-ktechlab.desktop:2
+msgid "KTechlab Project"
+msgstr ""
+
+#. Comment
+#: x-microbe.desktop:2
+msgid "KTechlab Microbe"
+msgstr ""