From b63b93fb56b967427b1e3ac1b8adb6d16c7d245f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 16 Nov 2011 16:06:07 -0600
Subject: Finish rename from prior commit

---
 doc/kdelibs/Makefile.am                |   5 -
 doc/kdelibs/man-artsmessage.1.docbook  |  92 --------------
 doc/kdelibs/man-checkXML.1.docbook     |  42 -------
 doc/kdelibs/man-dcop.1.docbook         | 161 ------------------------
 doc/kdelibs/man-kbuildsycoca.8.docbook | 221 --------------------------------
 doc/kdelibs/man-kdeoptions.7.docbook   |  88 -------------
 doc/kdelibs/man-qtoptions.7.docbook    | 223 ---------------------------------
 doc/tdelibs/Makefile.am                |   5 +
 doc/tdelibs/man-artsmessage.1.docbook  |  92 ++++++++++++++
 doc/tdelibs/man-checkXML.1.docbook     |  42 +++++++
 doc/tdelibs/man-dcop.1.docbook         | 161 ++++++++++++++++++++++++
 doc/tdelibs/man-kbuildsycoca.8.docbook | 221 ++++++++++++++++++++++++++++++++
 doc/tdelibs/man-kdeoptions.7.docbook   |  88 +++++++++++++
 doc/tdelibs/man-qtoptions.7.docbook    | 223 +++++++++++++++++++++++++++++++++
 kdelibs.lsm                            |  11 --
 networkstatus/networkstatus.kdevelop   | 108 ----------------
 networkstatus/networkstatus.tdevelop   | 108 ++++++++++++++++
 tdecore/kdelibs_export.h               |  86 -------------
 tdecore/kdeversion.cpp                 |  46 -------
 tdecore/kdeversion.h                   |  87 -------------
 tdecore/tdelibs_export.h               |  86 +++++++++++++
 tdecore/tdeversion.cpp                 |  46 +++++++
 tdecore/tdeversion.h                   |  87 +++++++++++++
 tdelibs.lsm                            |  11 ++
 win/kdelibs_export_win.h               | 152 ----------------------
 win/kdelibs_global_win.h               | 200 -----------------------------
 win/tdelibs_export_win.h               | 152 ++++++++++++++++++++++
 win/tdelibs_global_win.h               | 200 +++++++++++++++++++++++++++++
 win/tools/build_kdelibs_dbg            |  82 ------------
 win/tools/build_kdelibs_rel            |  73 -----------
 win/tools/build_tdelibs_dbg            |  82 ++++++++++++
 win/tools/build_tdelibs_rel            |  73 +++++++++++
 win/tools/collect_kdelibs_pro_files    |  22 ----
 win/tools/collect_tdelibs_pro_files    |  22 ++++
 win/tools/update_kdelibs_pro_files     |  30 -----
 win/tools/update_tdelibs_pro_files     |  30 +++++
 36 files changed, 1729 insertions(+), 1729 deletions(-)
 delete mode 100644 doc/kdelibs/Makefile.am
 delete mode 100644 doc/kdelibs/man-artsmessage.1.docbook
 delete mode 100644 doc/kdelibs/man-checkXML.1.docbook
 delete mode 100644 doc/kdelibs/man-dcop.1.docbook
 delete mode 100644 doc/kdelibs/man-kbuildsycoca.8.docbook
 delete mode 100644 doc/kdelibs/man-kdeoptions.7.docbook
 delete mode 100644 doc/kdelibs/man-qtoptions.7.docbook
 create mode 100644 doc/tdelibs/Makefile.am
 create mode 100644 doc/tdelibs/man-artsmessage.1.docbook
 create mode 100644 doc/tdelibs/man-checkXML.1.docbook
 create mode 100644 doc/tdelibs/man-dcop.1.docbook
 create mode 100644 doc/tdelibs/man-kbuildsycoca.8.docbook
 create mode 100644 doc/tdelibs/man-kdeoptions.7.docbook
 create mode 100644 doc/tdelibs/man-qtoptions.7.docbook
 delete mode 100644 kdelibs.lsm
 delete mode 100644 networkstatus/networkstatus.kdevelop
 create mode 100644 networkstatus/networkstatus.tdevelop
 delete mode 100644 tdecore/kdelibs_export.h
 delete mode 100644 tdecore/kdeversion.cpp
 delete mode 100644 tdecore/kdeversion.h
 create mode 100644 tdecore/tdelibs_export.h
 create mode 100644 tdecore/tdeversion.cpp
 create mode 100644 tdecore/tdeversion.h
 create mode 100644 tdelibs.lsm
 delete mode 100644 win/kdelibs_export_win.h
 delete mode 100644 win/kdelibs_global_win.h
 create mode 100644 win/tdelibs_export_win.h
 create mode 100644 win/tdelibs_global_win.h
 delete mode 100644 win/tools/build_kdelibs_dbg
 delete mode 100644 win/tools/build_kdelibs_rel
 create mode 100644 win/tools/build_tdelibs_dbg
 create mode 100644 win/tools/build_tdelibs_rel
 delete mode 100755 win/tools/collect_kdelibs_pro_files
 create mode 100755 win/tools/collect_tdelibs_pro_files
 delete mode 100755 win/tools/update_kdelibs_pro_files
 create mode 100755 win/tools/update_tdelibs_pro_files

diff --git a/doc/kdelibs/Makefile.am b/doc/kdelibs/Makefile.am
deleted file mode 100644
index a95ec29b3..000000000
--- a/doc/kdelibs/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KDE_LANG = en
-KDE_MANS = AUTO
-KDE_XSL_MAN_STYLESHEET = $(top_srcdir)/kdoctools/customization/kde-man.xsl
-
-KDE_DOCS_DEPS = $(MEINPROC_DEP)
diff --git a/doc/kdelibs/man-artsmessage.1.docbook b/doc/kdelibs/man-artsmessage.1.docbook
deleted file mode 100644
index f7ccb9a28..000000000
--- a/doc/kdelibs/man-artsmessage.1.docbook
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY % English "INCLUDE">
-]>
-
-
-<refentry lang="&language;">
-  <refentryinfo>
-    <author>
-      <personname><firstname>Chris</firstname><surname>Cheney</surname></personname>
-      <email>ccheney@debian.org</email></author>
-    <date>2003-03-07</date>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle><command>artsmessage</command></refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname><command>artsmessage</command></refname>
-    <refpurpose>Utility to display &arts; error messages</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>artsmessage</command>
-      <group><option>&kde; generic options</option></group>
-      <group><option>&Qt; generic options</option></group>
-      <group choice="opt">
-      <option>-e, --error</option><option>-w,
-      --warning</option><option>-i,--info</option>
-      </group>
-      <arg><replaceable>message</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-    <para><command>artsmessage</command> is a utility to display &arts; error messages.</para>
-  </refsect1>
-  <refsect1>
-    <title>Options</title>
-
-    <para><command>artsmessage</command> accepts the standard &Qt; and &kde;
-    command-line options.</para>
-
-
-  </refsect1>
-
-  <refsect1>
-    <title>Application Options</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-e</option>, <option>--error</option>
-        </term>
-        <listitem>
-          <para>Display error message (default).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-i</option>, <option>--info</option>
-        </term>
-        <listitem>
-          <para>Display informational message.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-w</option>, <option>--warning</option>
-        </term>
-        <listitem>
-          <para>Display warning message.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-
-    <title>Author</title>
-
-    <para>This manual page was written by <personname><firstname>Chris</firstname><surname>Cheney</surname></personname><email>ccheney@debian.org</email> for
-      the Debian system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> Free Documentation
-      License, Version 1.1 or any later version published by the Free
-      Software Foundation; with no Invariant Sections, no Front-Cover
-      Texts and no Back-Cover Texts.</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/doc/kdelibs/man-checkXML.1.docbook b/doc/kdelibs/man-checkXML.1.docbook
deleted file mode 100644
index a083c4739..000000000
--- a/doc/kdelibs/man-checkXML.1.docbook
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY % English "INCLUDE">
-]>
-
-<refentry lang="&language;">
-<refentryinfo>
-<author><personname><firstname>Lauri</firstname><surname>Watts</surname></personname><email>lauri@kde.org</email></author>
-<date>2003-07-03</date>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle><command>checkXML</command></refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname><command>checkXML</command></refname>
-<refpurpose>An &XML; lint tool for &kde; DocBook &XML; documents.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>checkXML</command> <arg><replaceable>filename</replaceable></arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-
-<para><command>checkXML</command> is a tool to check for syntax errors in &kde;
-DocBook &XML; files.  It can also be used for other DocBook based
-&XML; files, but you should use the less specific xmllint(1) tool if
-you are not writing or otherwise working on &kde;
-documentation.</para>
-</refsect1>
-
-<refsect1>
-<title>See Also</title>
-<para>meinproc(1) xmllint(1)</para>
-</refsect1>
-</refentry>
\ No newline at end of file
diff --git a/doc/kdelibs/man-dcop.1.docbook b/doc/kdelibs/man-dcop.1.docbook
deleted file mode 100644
index ba200e09b..000000000
--- a/doc/kdelibs/man-dcop.1.docbook
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY kdeoptions SYSTEM "kdeoptions.docbook">
-<!ENTITY qtoptions SYSTEM "qtoptions.docbook">
-<!ENTITY % English "INCLUDE">
-]>
-
-<refentry lang="&language;">
-<refentryinfo>
-<author><personname><firstname>Chris</firstname><surname>Cheney</surname></personname>
-<email>ccheney@debian.org</email></author>
-<date>March 7, 2003</date>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle><command>dcop</command></refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname><command>dcop</command></refname>
-<refpurpose>Console &DCOP; client</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>dcop</command>
-<group><option>--pipe</option></group>
-<group><option>--user</option> <replaceable> user</replaceable></group>
-<group><option>--all-users</option></group>
-<group><option>--session</option> <replaceable> session</replaceable></group>
-<group><option>--all-sessions</option></group>
-<group><option>--list-sessions</option></group>
-<group><option>--no-user-time</option></group>
-<group>
-  <arg><replaceable>application</replaceable></arg>
-  <group>
-    <arg><replaceable>object</replaceable></arg>
-	<group>
-           <arg choice="opt"><replaceable>function</replaceable></arg> 
-<group><arg choice="opt" rep="repeat"><replaceable>arguments</replaceable></arg></group>
-</group>
-</group>
-</group>
-</cmdsynopsis>
-
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-<para>Console &DCOP; client</para>
-
-<para><!-- Write some stuff here --></para>
-
-</refsect1>
-
-<refsect1>
-<title>Options</title>
-
-<variablelist>
-<varlistentry>
-<term><option>--pipe</option></term>
-<listitem>
-<para>Call &DCOP; for each line read from stdin.</para>
-<para>This is roughly equivalent to calling <userinput>while read line
-; do dcop $line ; done</userinput> but because no new
-<command>dcop</command> instance has to be started for each line this
-is generally much faster, especially for the slower GNU dynamic
-linkers.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--user</option> <replaceable>user</replaceable></term>
-<listitem>
-<para>Connect to the given user's &DCOP; server. This option will
-ignore the values of the environment vars $<envar>DCOPSERVER</envar>
-and  $<envar>ICEAUTHORITY</envar>, even if they are set.</para>
-<para>If the user has more than one open session, you must also use
-one of the <option>--list-sessions</option>,
-<option>--session</option> or <option>--all-sessions</option>
-command-line options.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--all-users</option></term>
-<listitem>
-<para>Send the same &DCOP; call to all users with a running &DCOP;
-server.  Only failed calls to existing &DCOP; servers will generate an
-error message.  If no &DCOP; server is available at all, no error will
-be generated.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--session</option>
-<replaceable>session</replaceable></term>
-<listitem><para>Send to the given &kde; session.  This option can only
-be used in combination with the <option>--user</option> option.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--all-sessions</option></term>
-<listitem>
-<para>Send to all sessions found. Only works with the
-<option>--user</option> and <option>--all-users</option>
-options.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--list-sessions</option></term>
-<listitem>
-<para>List all active &kde; sessions for a user or all users.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--no-user-time</option></term>
-<listitem>
-<para>Don't update the user activity timestamp in the called application (for use in scripts running in the background).</para>
-</listitem></varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1>
-<title>Environment</title>
-
-<variablelist>
-<varlistentry>
-<term><envar>DCOPSERVER</envar></term>
-<listitem>
-<para><!-- What does this tell dcop? --></para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term><envar>ICEAUTHORITY</envar></term>
-<listitem><para><!-- What does this tell dcop? --></para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refsect1>
-
-<!--
-<refsect1>
-<title>Examples</title>
-
-<para>Write some examples</para>
-
-</refsect1>
--->
-<refsect1>
-<title>See Also</title>
-
-<para>dcopclient(1) dcopref(1) dcopfind(1) kdcop(1)</para>
-
-<para>Inside &kde;, you can enter <userinput>help:/kdcop</userinput>
-in &konqueror; to see the User Manual for
-<application>kdcop</application> graphical dcop tool.</para>
-
-<!--
-<para> Info on where to find proper dcop docs </para>
--->
-</refsect1>
-</refentry>
diff --git a/doc/kdelibs/man-kbuildsycoca.8.docbook b/doc/kdelibs/man-kbuildsycoca.8.docbook
deleted file mode 100644
index 1105f8e48..000000000
--- a/doc/kdelibs/man-kbuildsycoca.8.docbook
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY % English "INCLUDE"><!-- change language only here -->
-]>
-
-<refentry>
-
-<refentryinfo>
-
-<author>
-<firstname>Darian</firstname>
-<surname>Lanx</surname>
-<affiliation>
-<address><email>content@openprojects.net</email></address>
-</affiliation>
-</author>
-
-<date>2001-04-25</date>
-<releaseinfo>0.01.01</releaseinfo>
-
-</refentryinfo>
-
-<refmeta>
-<refentrytitle>KBuildSycoca</refentrytitle>
-<manvolnum>8</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>Description</refname>
-<refpurpose>Rebuilds the system configuration cache.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<title>Synopsis</title>
-
-<cmdsynopsis>
-<command>kbuildsycoca</command>
-
-<group>
-<arg choice="opt">--nosignal</arg>
-<arg choice="opt">--incremental</arg>
-<arg choice="opt">--help</arg>
-<arg choice="opt">--help-qt</arg>
-<arg choice="opt">--help-kde</arg>
-<arg choice="opt">--help-all</arg>
-<arg choice="opt">--author</arg>
-<arg choice="opt">-v, --version</arg>
-<arg choice="opt">--license</arg>
-</group>
-</cmdsynopsis>
-
-</refsynopsisdiv>
-
-<refsect1>
-<title>Description</title>
-
-<para>
-<command>kbuildsyscoca</command>, as part of the &kde; command line
-tools ensures the proper operation of &kde; by reading in all the
-<literal role="extension">.desktop</literal>, <literal
-role="extension">.directory</literal>, <literal
-role="extension">.kimgio</literal> and <literal
-role="extension">.protocol</literal> files to constructs a binary
-database. 
-</para>
-
-<para>
-&kde; itself accesses this databse during operation to provide
-configurational information a program needs to run.
-</para>
-
-<para>
-This tool is part of ksyscoca, which stands for &kde; System
-Configuration Cache
-</para>
-
-</refsect1>
-
-<refsect1>
-<title>Options</title>
-
-<variablelist>
-<varlistentry>
-<term><option>--nosignal</option></term>
-<listitem>
-<para>Don't signal applications </para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--incremental</option></term>
-<listitem>
-<para>Incremental Update</para>
-</listitem>
-</varlistentry>
-
-<!-- this entire section from here to the end of the section could be an -->
-<!-- entity.. or maybe just so irrelevant as to leave it out -->
-
-<varlistentry>
-<term><option>--help</option></term>
-<listitem>
-<para>
-Show help about options
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--help-qt</option></term>
-<listitem>
-<para>
-Show Qt specific options
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--help-kde</option></term>
-<listitem>
-<para>
-Show KDE specific options
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--help-all</option></term>
-<listitem>
-<para>
-Show all options
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--author</option></term>
-<listitem>
-<para>
-Show author information
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--version</option></term>
-<listitem>
-<para>
-Show version information
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><option>--license</option></term>
-<listitem>
-<para>
-Show license information
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</refsect1>
-
-<refsect1>
-<title>Usage</title>
-<para>
-A standard way to run this program is by simply specifying the following
-command at the prompt
-<userinput><command>kbuildsyscoca</command></userinput>
-</para>
-
-</refsect1>
-
-<refsect1>
-<title>Files</title>
-
-<variablelist>
-<varlistentry>
-<term><filename>/tmp/kde-$USER/ksyscoca</filename></term>
-<listitem>
-<para>...</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</refsect1>
-
-<refsect1>
-<title>Environment Variables</title>
-<variablelist>
-<varlistentry>
-<term>$<envar>KDEDIRS</envar></term>
-<listitem>
-<para>Specifies which directories are part of the KDE
-installations</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</refsect1>
-
-<refsect1>
-<title>See Also</title>
-
-<para>ksycoca(3), kblah(4), knogga(6)</para>
-
-</refsect1>
-
-<refsect1>
-<title>Bugs</title>
-
-<para>There are no known bugs at the time of writing.</para>
-
-</refsect1>
-
-</refentry>
-
-
-
diff --git a/doc/kdelibs/man-kdeoptions.7.docbook b/doc/kdelibs/man-kdeoptions.7.docbook
deleted file mode 100644
index 248daa5e0..000000000
--- a/doc/kdelibs/man-kdeoptions.7.docbook
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY % English "INCLUDE">
-]>
-
-<refentry lang="&language;">
-<refentryinfo>
-<title>KDE User's Manual</title>
-<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
-<date>2004-02-02</date>
-<productname>K Desktop Environment</productname>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle>kdeoptions</refentrytitle>
-<manvolnum>7</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>KDE options</refname>
-<refpurpose>Common commandline options for all applications based on the KDE libraries</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command><replaceable>KDE application</replaceable></command>
-<arg choice="opt">KDE Generic Options</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1>
-<title>Options</title>
-
-<para>The following options apply to all &kde; applications:</para>
-
-
-<para>The following options apply to all &kde; applications:</para>
-<variablelist>
-<varlistentry>
-<term><option>--caption</option> <parameter>caption</parameter></term>
-<listitem><para>Use <parameter>caption</parameter> as name in the
-titlebar.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--icon</option> <parameter>icon</parameter></term>
-<listitem><para>Use <parameter>icon</parameter> as the application icon.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--miniicon</option> <parameter>icon</parameter></term>
-<listitem><para>Use <parameter>icon</parameter> as the icon in the titlebar</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--dcopserver</option> <parameter>server</parameter></term>
-<listitem><para>Use the <acronym>DCOP</acronym> Server specified by <parameter>server</parameter>.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--nocrashhandler</option></term>
-<listitem><para>Disable the crash handler, to get core dumps.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--waitforwm</option></term>
-<listitem><para>Waits for a WM_NET compatible windowmanager.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--style</option> <parameter>style</parameter></term>
-<listitem><para>Sets the appliction &GUI; style.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><option>--geometry</option> <parameter>geometry</parameter></term>
-<listitem><para>Sets the client geometry of the main widget.</para></listitem>
-</varlistentry>
-</variablelist>
-
-</refsect1>
-
-<refsect1>
-<title>See Also</title>
-<para>qtoptions.7</para>
-
-</refsect1>
-
-<refsect1>
-<title>Authors</title>
-<para>Man page written by &Lauri.Watts; &Lauri.Watts.mail;</para>
-</refsect1>
-
-</refentry>
\ No newline at end of file
diff --git a/doc/kdelibs/man-qtoptions.7.docbook b/doc/kdelibs/man-qtoptions.7.docbook
deleted file mode 100644
index b6ce61dc6..000000000
--- a/doc/kdelibs/man-qtoptions.7.docbook
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-<!ENTITY % English "INCLUDE">
-]>
-
-<refentry lang="&language;">
-<refentryinfo>
-<title>KDE User's Manual</title>
-<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
-<date>2004-02-02</date>
-<productname>K Desktop Environment</productname>
-</refentryinfo>
-
-<refmeta>
-<refentrytitle>qtoptions</refentrytitle>
-<manvolnum>7</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>Qt options</refname>
-<refpurpose>Common commandline options for all applications based on the Qt toolkit</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command><replaceable>Qt application</replaceable></command>
-<arg choice="opt">Qt Generic Options</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1>
-<title>Options</title>
-
-<para>The following options apply to all &Qt; applications:</para>
-
-<variablelist> <!-- all this could be entitiesan entity -->
-<varlistentry>
-<term>
-<option>--display</option> <parameter>displayname</parameter>
-</term>
-<listitem>
-<para>Use the X-server display
-<parameter>displayname</parameter>.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--session</option> <parameter>sessionId</parameter>
-</term>
-<listitem>
-<para>Restore the application for the given
-<parameter>sessionId</parameter>.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--cmap</option>
-</term>
-<listitem>
-<para>Causes the application to install a private color map on an
-8-bit display.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--ncols</option> <parameter>count</parameter>
-</term>
-<listitem>
-<para>Limits the number of colors allocated in the color cube on an
-8-bit display, if the application is using the
-<methodname>QApplication::ManyColor</methodname> color
-specification.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--nograb</option>
-</term>
-<listitem>
-<para>Tells &Qt; to never grab the mouse or the keyboard.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--dograb</option>
-</term>
-<listitem>
-<para>Running under a debugger can cause an implicit
-<option>--nograb</option>, use <option>--dograb</option> to
-override.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--sync</option>
-</term>
-<listitem>
-<para>Switches to synchronous mode for debugging.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--fn</option>,<option>--font</option>
-<parameter>fontname</parameter>
-</term>
-<listitem>
-<para>Defines the application font.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--bg</option>,<option>--background</option>
-<parameter>color</parameter>
-</term>
-<listitem>
-<para>Sets the default background color and an application palette
-(light and dark shades are calculated).</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--fg</option>,<option>--foreground</option>
-<parameter>color</parameter>
-</term>
-<listitem>
-<para>Sets the default foreground color</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--btn</option>,<option>--button</option>
-<parameter>color</parameter>
-</term>
-<listitem>
-<para>Sets the default button color.</para>
-</listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term>
-<option>--name</option> <parameter>name</parameter>
-</term>
-<listitem>
-<para>Sets the application name.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--title</option> <parameter>title</parameter>
-</term>
-<listitem>
-<para>Sets the application title (caption).</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--visual</option> <parameter>TrueColor</parameter>
-</term>
-<listitem>
-<para>Forces the application to use a <parameter>TrueColor</parameter>
-visual on an 8-bit display.</para>
-</listitem>
-</varlistentry>
-
-
-<varlistentry>
-<term>
-<option>--inputstyle</option> <parameter>inputstyle</parameter>
-</term>
-<listitem>
-<para>Sets XIM (X Input Method) input style.  Possible values are
-<parameter>onthespot</parameter>, <parameter>overthespot</parameter>,
-<parameter>offthespot</parameter> and
-<parameter>root</parameter>.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--im</option> <parameter>XIM server</parameter>
-</term>
-<listitem>
-<para>Set XIM server.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<option>--noxim</option>
-</term>
-<listitem>
-<para>Disable XIM</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1>
-<title>See Also</title>
-<para>kde-options.7</para>
-
-</refsect1>
-
-<refsect1>
-<title>Authors</title>
-<para>Man page written by &Lauri.Watts; &Lauri.Watts.mail;</para>
-</refsect1>
-
-</refentry>
diff --git a/doc/tdelibs/Makefile.am b/doc/tdelibs/Makefile.am
new file mode 100644
index 000000000..a95ec29b3
--- /dev/null
+++ b/doc/tdelibs/Makefile.am
@@ -0,0 +1,5 @@
+KDE_LANG = en
+KDE_MANS = AUTO
+KDE_XSL_MAN_STYLESHEET = $(top_srcdir)/kdoctools/customization/kde-man.xsl
+
+KDE_DOCS_DEPS = $(MEINPROC_DEP)
diff --git a/doc/tdelibs/man-artsmessage.1.docbook b/doc/tdelibs/man-artsmessage.1.docbook
new file mode 100644
index 000000000..f7ccb9a28
--- /dev/null
+++ b/doc/tdelibs/man-artsmessage.1.docbook
@@ -0,0 +1,92 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!ENTITY % English "INCLUDE">
+]>
+
+
+<refentry lang="&language;">
+  <refentryinfo>
+    <author>
+      <personname><firstname>Chris</firstname><surname>Cheney</surname></personname>
+      <email>ccheney@debian.org</email></author>
+    <date>2003-03-07</date>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle><command>artsmessage</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname><command>artsmessage</command></refname>
+    <refpurpose>Utility to display &arts; error messages</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>artsmessage</command>
+      <group><option>&kde; generic options</option></group>
+      <group><option>&Qt; generic options</option></group>
+      <group choice="opt">
+      <option>-e, --error</option><option>-w,
+      --warning</option><option>-i,--info</option>
+      </group>
+      <arg><replaceable>message</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+    <para><command>artsmessage</command> is a utility to display &arts; error messages.</para>
+  </refsect1>
+  <refsect1>
+    <title>Options</title>
+
+    <para><command>artsmessage</command> accepts the standard &Qt; and &kde;
+    command-line options.</para>
+
+
+  </refsect1>
+
+  <refsect1>
+    <title>Application Options</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-e</option>, <option>--error</option>
+        </term>
+        <listitem>
+          <para>Display error message (default).</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-i</option>, <option>--info</option>
+        </term>
+        <listitem>
+          <para>Display informational message.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-w</option>, <option>--warning</option>
+        </term>
+        <listitem>
+          <para>Display warning message.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+
+    <title>Author</title>
+
+    <para>This manual page was written by <personname><firstname>Chris</firstname><surname>Cheney</surname></personname><email>ccheney@debian.org</email> for
+      the Debian system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> Free Documentation
+      License, Version 1.1 or any later version published by the Free
+      Software Foundation; with no Invariant Sections, no Front-Cover
+      Texts and no Back-Cover Texts.</para>
+
+  </refsect1>
+</refentry>
+
diff --git a/doc/tdelibs/man-checkXML.1.docbook b/doc/tdelibs/man-checkXML.1.docbook
new file mode 100644
index 000000000..a083c4739
--- /dev/null
+++ b/doc/tdelibs/man-checkXML.1.docbook
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!ENTITY % English "INCLUDE">
+]>
+
+<refentry lang="&language;">
+<refentryinfo>
+<author><personname><firstname>Lauri</firstname><surname>Watts</surname></personname><email>lauri@kde.org</email></author>
+<date>2003-07-03</date>
+</refentryinfo>
+
+<refmeta>
+<refentrytitle><command>checkXML</command></refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname><command>checkXML</command></refname>
+<refpurpose>An &XML; lint tool for &kde; DocBook &XML; documents.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>checkXML</command> <arg><replaceable>filename</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+<title>Description</title>
+
+<para><command>checkXML</command> is a tool to check for syntax errors in &kde;
+DocBook &XML; files.  It can also be used for other DocBook based
+&XML; files, but you should use the less specific xmllint(1) tool if
+you are not writing or otherwise working on &kde;
+documentation.</para>
+</refsect1>
+
+<refsect1>
+<title>See Also</title>
+<para>meinproc(1) xmllint(1)</para>
+</refsect1>
+</refentry>
\ No newline at end of file
diff --git a/doc/tdelibs/man-dcop.1.docbook b/doc/tdelibs/man-dcop.1.docbook
new file mode 100644
index 000000000..ba200e09b
--- /dev/null
+++ b/doc/tdelibs/man-dcop.1.docbook
@@ -0,0 +1,161 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!ENTITY kdeoptions SYSTEM "kdeoptions.docbook">
+<!ENTITY qtoptions SYSTEM "qtoptions.docbook">
+<!ENTITY % English "INCLUDE">
+]>
+
+<refentry lang="&language;">
+<refentryinfo>
+<author><personname><firstname>Chris</firstname><surname>Cheney</surname></personname>
+<email>ccheney@debian.org</email></author>
+<date>March 7, 2003</date>
+</refentryinfo>
+
+<refmeta>
+<refentrytitle><command>dcop</command></refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname><command>dcop</command></refname>
+<refpurpose>Console &DCOP; client</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>dcop</command>
+<group><option>--pipe</option></group>
+<group><option>--user</option> <replaceable> user</replaceable></group>
+<group><option>--all-users</option></group>
+<group><option>--session</option> <replaceable> session</replaceable></group>
+<group><option>--all-sessions</option></group>
+<group><option>--list-sessions</option></group>
+<group><option>--no-user-time</option></group>
+<group>
+  <arg><replaceable>application</replaceable></arg>
+  <group>
+    <arg><replaceable>object</replaceable></arg>
+	<group>
+           <arg choice="opt"><replaceable>function</replaceable></arg> 
+<group><arg choice="opt" rep="repeat"><replaceable>arguments</replaceable></arg></group>
+</group>
+</group>
+</group>
+</cmdsynopsis>
+
+</refsynopsisdiv>
+
+<refsect1>
+<title>Description</title>
+<para>Console &DCOP; client</para>
+
+<para><!-- Write some stuff here --></para>
+
+</refsect1>
+
+<refsect1>
+<title>Options</title>
+
+<variablelist>
+<varlistentry>
+<term><option>--pipe</option></term>
+<listitem>
+<para>Call &DCOP; for each line read from stdin.</para>
+<para>This is roughly equivalent to calling <userinput>while read line
+; do dcop $line ; done</userinput> but because no new
+<command>dcop</command> instance has to be started for each line this
+is generally much faster, especially for the slower GNU dynamic
+linkers.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--user</option> <replaceable>user</replaceable></term>
+<listitem>
+<para>Connect to the given user's &DCOP; server. This option will
+ignore the values of the environment vars $<envar>DCOPSERVER</envar>
+and  $<envar>ICEAUTHORITY</envar>, even if they are set.</para>
+<para>If the user has more than one open session, you must also use
+one of the <option>--list-sessions</option>,
+<option>--session</option> or <option>--all-sessions</option>
+command-line options.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--all-users</option></term>
+<listitem>
+<para>Send the same &DCOP; call to all users with a running &DCOP;
+server.  Only failed calls to existing &DCOP; servers will generate an
+error message.  If no &DCOP; server is available at all, no error will
+be generated.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--session</option>
+<replaceable>session</replaceable></term>
+<listitem><para>Send to the given &kde; session.  This option can only
+be used in combination with the <option>--user</option> option.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--all-sessions</option></term>
+<listitem>
+<para>Send to all sessions found. Only works with the
+<option>--user</option> and <option>--all-users</option>
+options.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--list-sessions</option></term>
+<listitem>
+<para>List all active &kde; sessions for a user or all users.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--no-user-time</option></term>
+<listitem>
+<para>Don't update the user activity timestamp in the called application (for use in scripts running in the background).</para>
+</listitem></varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1>
+<title>Environment</title>
+
+<variablelist>
+<varlistentry>
+<term><envar>DCOPSERVER</envar></term>
+<listitem>
+<para><!-- What does this tell dcop? --></para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><envar>ICEAUTHORITY</envar></term>
+<listitem><para><!-- What does this tell dcop? --></para>
+</listitem>
+</varlistentry>
+</variablelist>
+</refsect1>
+
+<!--
+<refsect1>
+<title>Examples</title>
+
+<para>Write some examples</para>
+
+</refsect1>
+-->
+<refsect1>
+<title>See Also</title>
+
+<para>dcopclient(1) dcopref(1) dcopfind(1) kdcop(1)</para>
+
+<para>Inside &kde;, you can enter <userinput>help:/kdcop</userinput>
+in &konqueror; to see the User Manual for
+<application>kdcop</application> graphical dcop tool.</para>
+
+<!--
+<para> Info on where to find proper dcop docs </para>
+-->
+</refsect1>
+</refentry>
diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-kbuildsycoca.8.docbook
new file mode 100644
index 000000000..1105f8e48
--- /dev/null
+++ b/doc/tdelibs/man-kbuildsycoca.8.docbook
@@ -0,0 +1,221 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+  <!ENTITY % English "INCLUDE"><!-- change language only here -->
+]>
+
+<refentry>
+
+<refentryinfo>
+
+<author>
+<firstname>Darian</firstname>
+<surname>Lanx</surname>
+<affiliation>
+<address><email>content@openprojects.net</email></address>
+</affiliation>
+</author>
+
+<date>2001-04-25</date>
+<releaseinfo>0.01.01</releaseinfo>
+
+</refentryinfo>
+
+<refmeta>
+<refentrytitle>KBuildSycoca</refentrytitle>
+<manvolnum>8</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>Description</refname>
+<refpurpose>Rebuilds the system configuration cache.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<title>Synopsis</title>
+
+<cmdsynopsis>
+<command>kbuildsycoca</command>
+
+<group>
+<arg choice="opt">--nosignal</arg>
+<arg choice="opt">--incremental</arg>
+<arg choice="opt">--help</arg>
+<arg choice="opt">--help-qt</arg>
+<arg choice="opt">--help-kde</arg>
+<arg choice="opt">--help-all</arg>
+<arg choice="opt">--author</arg>
+<arg choice="opt">-v, --version</arg>
+<arg choice="opt">--license</arg>
+</group>
+</cmdsynopsis>
+
+</refsynopsisdiv>
+
+<refsect1>
+<title>Description</title>
+
+<para>
+<command>kbuildsyscoca</command>, as part of the &kde; command line
+tools ensures the proper operation of &kde; by reading in all the
+<literal role="extension">.desktop</literal>, <literal
+role="extension">.directory</literal>, <literal
+role="extension">.kimgio</literal> and <literal
+role="extension">.protocol</literal> files to constructs a binary
+database. 
+</para>
+
+<para>
+&kde; itself accesses this databse during operation to provide
+configurational information a program needs to run.
+</para>
+
+<para>
+This tool is part of ksyscoca, which stands for &kde; System
+Configuration Cache
+</para>
+
+</refsect1>
+
+<refsect1>
+<title>Options</title>
+
+<variablelist>
+<varlistentry>
+<term><option>--nosignal</option></term>
+<listitem>
+<para>Don't signal applications </para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--incremental</option></term>
+<listitem>
+<para>Incremental Update</para>
+</listitem>
+</varlistentry>
+
+<!-- this entire section from here to the end of the section could be an -->
+<!-- entity.. or maybe just so irrelevant as to leave it out -->
+
+<varlistentry>
+<term><option>--help</option></term>
+<listitem>
+<para>
+Show help about options
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--help-qt</option></term>
+<listitem>
+<para>
+Show Qt specific options
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--help-kde</option></term>
+<listitem>
+<para>
+Show KDE specific options
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--help-all</option></term>
+<listitem>
+<para>
+Show all options
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--author</option></term>
+<listitem>
+<para>
+Show author information
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--version</option></term>
+<listitem>
+<para>
+Show version information
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--license</option></term>
+<listitem>
+<para>
+Show license information
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</refsect1>
+
+<refsect1>
+<title>Usage</title>
+<para>
+A standard way to run this program is by simply specifying the following
+command at the prompt
+<userinput><command>kbuildsyscoca</command></userinput>
+</para>
+
+</refsect1>
+
+<refsect1>
+<title>Files</title>
+
+<variablelist>
+<varlistentry>
+<term><filename>/tmp/kde-$USER/ksyscoca</filename></term>
+<listitem>
+<para>...</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</refsect1>
+
+<refsect1>
+<title>Environment Variables</title>
+<variablelist>
+<varlistentry>
+<term>$<envar>KDEDIRS</envar></term>
+<listitem>
+<para>Specifies which directories are part of the KDE
+installations</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</refsect1>
+
+<refsect1>
+<title>See Also</title>
+
+<para>ksycoca(3), kblah(4), knogga(6)</para>
+
+</refsect1>
+
+<refsect1>
+<title>Bugs</title>
+
+<para>There are no known bugs at the time of writing.</para>
+
+</refsect1>
+
+</refentry>
+
+
+
diff --git a/doc/tdelibs/man-kdeoptions.7.docbook b/doc/tdelibs/man-kdeoptions.7.docbook
new file mode 100644
index 000000000..248daa5e0
--- /dev/null
+++ b/doc/tdelibs/man-kdeoptions.7.docbook
@@ -0,0 +1,88 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!ENTITY % English "INCLUDE">
+]>
+
+<refentry lang="&language;">
+<refentryinfo>
+<title>KDE User's Manual</title>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<date>2004-02-02</date>
+<productname>K Desktop Environment</productname>
+</refentryinfo>
+
+<refmeta>
+<refentrytitle>kdeoptions</refentrytitle>
+<manvolnum>7</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>KDE options</refname>
+<refpurpose>Common commandline options for all applications based on the KDE libraries</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command><replaceable>KDE application</replaceable></command>
+<arg choice="opt">KDE Generic Options</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1>
+<title>Options</title>
+
+<para>The following options apply to all &kde; applications:</para>
+
+
+<para>The following options apply to all &kde; applications:</para>
+<variablelist>
+<varlistentry>
+<term><option>--caption</option> <parameter>caption</parameter></term>
+<listitem><para>Use <parameter>caption</parameter> as name in the
+titlebar.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--icon</option> <parameter>icon</parameter></term>
+<listitem><para>Use <parameter>icon</parameter> as the application icon.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--miniicon</option> <parameter>icon</parameter></term>
+<listitem><para>Use <parameter>icon</parameter> as the icon in the titlebar</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--dcopserver</option> <parameter>server</parameter></term>
+<listitem><para>Use the <acronym>DCOP</acronym> Server specified by <parameter>server</parameter>.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--nocrashhandler</option></term>
+<listitem><para>Disable the crash handler, to get core dumps.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--waitforwm</option></term>
+<listitem><para>Waits for a WM_NET compatible windowmanager.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--style</option> <parameter>style</parameter></term>
+<listitem><para>Sets the appliction &GUI; style.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--geometry</option> <parameter>geometry</parameter></term>
+<listitem><para>Sets the client geometry of the main widget.</para></listitem>
+</varlistentry>
+</variablelist>
+
+</refsect1>
+
+<refsect1>
+<title>See Also</title>
+<para>qtoptions.7</para>
+
+</refsect1>
+
+<refsect1>
+<title>Authors</title>
+<para>Man page written by &Lauri.Watts; &Lauri.Watts.mail;</para>
+</refsect1>
+
+</refentry>
\ No newline at end of file
diff --git a/doc/tdelibs/man-qtoptions.7.docbook b/doc/tdelibs/man-qtoptions.7.docbook
new file mode 100644
index 000000000..b6ce61dc6
--- /dev/null
+++ b/doc/tdelibs/man-qtoptions.7.docbook
@@ -0,0 +1,223 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!ENTITY % English "INCLUDE">
+]>
+
+<refentry lang="&language;">
+<refentryinfo>
+<title>KDE User's Manual</title>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<date>2004-02-02</date>
+<productname>K Desktop Environment</productname>
+</refentryinfo>
+
+<refmeta>
+<refentrytitle>qtoptions</refentrytitle>
+<manvolnum>7</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>Qt options</refname>
+<refpurpose>Common commandline options for all applications based on the Qt toolkit</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command><replaceable>Qt application</replaceable></command>
+<arg choice="opt">Qt Generic Options</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1>
+<title>Options</title>
+
+<para>The following options apply to all &Qt; applications:</para>
+
+<variablelist> <!-- all this could be entitiesan entity -->
+<varlistentry>
+<term>
+<option>--display</option> <parameter>displayname</parameter>
+</term>
+<listitem>
+<para>Use the X-server display
+<parameter>displayname</parameter>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--session</option> <parameter>sessionId</parameter>
+</term>
+<listitem>
+<para>Restore the application for the given
+<parameter>sessionId</parameter>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--cmap</option>
+</term>
+<listitem>
+<para>Causes the application to install a private color map on an
+8-bit display.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--ncols</option> <parameter>count</parameter>
+</term>
+<listitem>
+<para>Limits the number of colors allocated in the color cube on an
+8-bit display, if the application is using the
+<methodname>QApplication::ManyColor</methodname> color
+specification.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--nograb</option>
+</term>
+<listitem>
+<para>Tells &Qt; to never grab the mouse or the keyboard.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--dograb</option>
+</term>
+<listitem>
+<para>Running under a debugger can cause an implicit
+<option>--nograb</option>, use <option>--dograb</option> to
+override.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--sync</option>
+</term>
+<listitem>
+<para>Switches to synchronous mode for debugging.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--fn</option>,<option>--font</option>
+<parameter>fontname</parameter>
+</term>
+<listitem>
+<para>Defines the application font.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--bg</option>,<option>--background</option>
+<parameter>color</parameter>
+</term>
+<listitem>
+<para>Sets the default background color and an application palette
+(light and dark shades are calculated).</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--fg</option>,<option>--foreground</option>
+<parameter>color</parameter>
+</term>
+<listitem>
+<para>Sets the default foreground color</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--btn</option>,<option>--button</option>
+<parameter>color</parameter>
+</term>
+<listitem>
+<para>Sets the default button color.</para>
+</listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term>
+<option>--name</option> <parameter>name</parameter>
+</term>
+<listitem>
+<para>Sets the application name.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--title</option> <parameter>title</parameter>
+</term>
+<listitem>
+<para>Sets the application title (caption).</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--visual</option> <parameter>TrueColor</parameter>
+</term>
+<listitem>
+<para>Forces the application to use a <parameter>TrueColor</parameter>
+visual on an 8-bit display.</para>
+</listitem>
+</varlistentry>
+
+
+<varlistentry>
+<term>
+<option>--inputstyle</option> <parameter>inputstyle</parameter>
+</term>
+<listitem>
+<para>Sets XIM (X Input Method) input style.  Possible values are
+<parameter>onthespot</parameter>, <parameter>overthespot</parameter>,
+<parameter>offthespot</parameter> and
+<parameter>root</parameter>.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--im</option> <parameter>XIM server</parameter>
+</term>
+<listitem>
+<para>Set XIM server.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>
+<option>--noxim</option>
+</term>
+<listitem>
+<para>Disable XIM</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1>
+<title>See Also</title>
+<para>kde-options.7</para>
+
+</refsect1>
+
+<refsect1>
+<title>Authors</title>
+<para>Man page written by &Lauri.Watts; &Lauri.Watts.mail;</para>
+</refsect1>
+
+</refentry>
diff --git a/kdelibs.lsm b/kdelibs.lsm
deleted file mode 100644
index 30f438679..000000000
--- a/kdelibs.lsm
+++ /dev/null
@@ -1,11 +0,0 @@
-Begin4
-Title:          tdelibs
-Version:        Trinity 3.5.11
-Entered-date:   2008-08-26
-Description:    libraries for the K Desktop Environment (KDE)
-Keywords:       KDE X11 desktop Qt 
-Author:         http://bugs.pearsoncomputing.net/ (KDE Trinity Bugtracking System)
-Primary-site:   http://trinity.pearsoncomputing.net/
-Platforms:      Unix, Qt
-Copying-policy: LGPL, Artistic
-End
diff --git a/networkstatus/networkstatus.kdevelop b/networkstatus/networkstatus.kdevelop
deleted file mode 100644
index 543efe323..000000000
--- a/networkstatus/networkstatus.kdevelop
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
-  <general>
-    <author>Will Stephenson</author>
-    <email>wstephenson@suse.de</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevKDEAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>Qt</keyword>
-      <keyword>KDE</keyword>
-    </keywords>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*.po;*.ts" name="Translations" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell>libtool</dbgshell>
-    </general>
-  </kdevdebugger>
-  <kdevfilecreate>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevautoproject>
-    <make>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-    </make>
-    <run>
-      <directoryradio>executable</directoryradio>
-    </run>
-    <general>
-      <activetarget>kded_networkstatus.la</activetarget>
-    </general>
-  </kdevautoproject>
-  <kdevcppsupport>
-    <references/>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-  </kdevcppsupport>
-</tdevelop>
diff --git a/networkstatus/networkstatus.tdevelop b/networkstatus/networkstatus.tdevelop
new file mode 100644
index 000000000..543efe323
--- /dev/null
+++ b/networkstatus/networkstatus.tdevelop
@@ -0,0 +1,108 @@
+<?xml version = '1.0'?>
+<tdevelop>
+  <general>
+    <author>Will Stephenson</author>
+    <email>wstephenson@suse.de</email>
+    <version>$VERSION$</version>
+    <projectmanagement>KDevKDEAutoProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>Qt</keyword>
+      <keyword>KDE</keyword>
+    </keywords>
+  </general>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.ui" name="User Interface" />
+      <group pattern="*.png" name="Icons" />
+      <group pattern="*.po;*.ts" name="Translations" />
+      <group pattern="*" name="Others" />
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
+    <tree>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+    </tree>
+  </kdevfileview>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>ada</toc>
+      <toc>ada_bugs_gcc</toc>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>opengl</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>stl</toc>
+      <toc>sw</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>w3c-svg</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoreqt_xml>
+      <toc>qmake User Guide</toc>
+    </ignoreqt_xml>
+  </kdevdoctreeview>
+  <kdevdebugger>
+    <general>
+      <dbgshell>libtool</dbgshell>
+    </general>
+  </kdevdebugger>
+  <kdevfilecreate>
+    <useglobaltypes>
+      <type ext="ui" />
+      <type ext="cpp" />
+      <type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevautoproject>
+    <make>
+      <envvars>
+        <envvar value="1" name="WANT_AUTOCONF_2_5" />
+        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
+      </envvars>
+    </make>
+    <run>
+      <directoryradio>executable</directoryradio>
+    </run>
+    <general>
+      <activetarget>kded_networkstatus.la</activetarget>
+    </general>
+  </kdevautoproject>
+  <kdevcppsupport>
+    <references/>
+    <codecompletion>
+      <includeGlobalFunctions>true</includeGlobalFunctions>
+      <includeTypes>true</includeTypes>
+      <includeEnums>true</includeEnums>
+      <includeTypedefs>false</includeTypedefs>
+      <automaticCodeCompletion>true</automaticCodeCompletion>
+      <automaticArgumentsHint>true</automaticArgumentsHint>
+      <automaticHeaderCompletion>true</automaticHeaderCompletion>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</argumentsHintDelay>
+      <headerCompletionDelay>250</headerCompletionDelay>
+    </codecompletion>
+  </kdevcppsupport>
+</tdevelop>
diff --git a/tdecore/kdelibs_export.h b/tdecore/kdelibs_export.h
deleted file mode 100644
index b644985b5..000000000
--- a/tdecore/kdelibs_export.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-   This file is part of the KDE libraries
-   Copyright (C) 2004 Jaroslaw Staniek <js@iidea.pl>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef _KDELIBS_EXPORT_H
-#define _KDELIBS_EXPORT_H
-
-/* needed for KDE_EXPORT macros */
-#include <kdemacros.h>
-
-/* needed, because e.g. Q_OS_UNIX is so frequently used */
-#include <tqglobal.h>
-
-#ifdef Q_WS_WIN
-#include <tdelibs_export_win.h>
-
-#else /* Q_OS_UNIX */
-
-/* export statements for unix */
-#define TDECORE_EXPORT KDE_EXPORT
-#define TDEUI_EXPORT KDE_EXPORT
-#define TDEFX_EXPORT KDE_EXPORT
-#define TDEPRINT_EXPORT KDE_EXPORT
-#define KDNSSD_EXPORT KDE_EXPORT
-#define KIO_EXPORT KDE_EXPORT
-#define DCOP_EXPORT KDE_EXPORT
-#define KPARTS_EXPORT KDE_EXPORT
-#define KTEXTEDITOR_EXPORT KDE_EXPORT
-#define KABC_EXPORT KDE_EXPORT
-#define TDESU_EXPORT KDE_EXPORT
-#define KVCARD_EXPORT KDE_EXPORT
-#define KRESOURCES_EXPORT KDE_EXPORT
-#define KSTYLE_EXPORT KDE_EXPORT
-#define KHTML_EXPORT KDE_EXPORT
-#define KMDI_EXPORT KDE_EXPORT
-#define KUTILS_EXPORT KDE_EXPORT
-#define KATEPARTINTERFACES_EXPORT KDE_EXPORT
-#define KATEPART_EXPORT KDE_EXPORT
-#define KMID_EXPORT KDE_EXPORT
-#define KRANDR_EXPORT KDE_EXPORT
-#define KIMPROXY_EXPORT KDE_EXPORT
-#define KDE_ARTS_EXPORT KDE_EXPORT
-#define KUNITTEST_EXPORT KDE_EXPORT
-
-#define KPATH_SEPARATOR ':'
-
-#ifndef O_BINARY
-#define O_BINARY 0 /* for open() */
-#endif
-
-#endif
-
-#endif /*_KDELIBS_EXPORT_H*/
-
-/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
-   between 'class' keyword and <classname>: */
-#ifdef KDE_DEPRECATED
-# ifndef TDECORE_EXPORT_DEPRECATED
-#  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
-# endif
-# ifndef KIO_EXPORT_DEPRECATED
-#  define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
-# endif
-# ifndef TDEUI_EXPORT_DEPRECATED
-#  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
-# endif
-# ifndef KABC_EXPORT_DEPRECATED
-#  define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT
-# endif
-#endif
-/* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */
diff --git a/tdecore/kdeversion.cpp b/tdecore/kdeversion.cpp
deleted file mode 100644
index 4dfaec53c..000000000
--- a/tdecore/kdeversion.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file is part of the KDE libraries
-    Copyright (c) 2002 KDE Team
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "tdeversion.h"
-
-unsigned int KDE::version()
-{
-    return TDE_VERSION;
-}
-
-unsigned int KDE::versionMajor()
-{
-    return TDE_VERSION_MAJOR;
-}
-
-unsigned int KDE::versionMinor()
-{
-    return TDE_VERSION_MINOR;
-}
-
-unsigned int KDE::versionRelease()
-{
-    return TDE_VERSION_RELEASE;
-}
-
-const char *KDE::versionString()
-{
-    return TDE_VERSION_STRING;
-}
-
diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h
deleted file mode 100644
index bde3b686e..000000000
--- a/tdecore/kdeversion.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* This file is part of the KDE libraries
-    Copyright (c) 2002-2005 KDE Team
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef _TDE_VERSION_H_
-#define _TDE_VERSION_H_
-
-#include "tdelibs_export.h"
-
-/*
-    R <ABI VERSION> . <BUGFIX REVISION> . <SECURITY PATCHLEVEL>
-    Security patchlevel is not present on initial release
-    It is added on the first security release, starting with ".a"
-    ".a" would correspond to a TDE_VERSION_RELEASE of 1, ".b" would be 2, etc.
-    A new bugfix revision resets the security level
-    A new ABI version resets both the bugfix revision and the security level
-*/
-#define TDE_VERSION_STRING "R14.0 [DEVELOPMENT]"
-#define TDE_VERSION_MAJOR 14
-#define TDE_VERSION_MINOR 0
-#define TDE_VERSION_RELEASE 0
-#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
-
-#define TDE_VERSION \
-  KDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE)
-
-#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= KDE_MAKE_VERSION(a,b,c) )
-
-/**
- * Namespace for general KDE functions.
- */
-namespace KDE
-{
-    /**
-     * Returns the encoded number of KDE's version, see the TDE_VERSION macro.
-     * In contrary to that macro this function returns the number of the actully
-     * installed KDE version, not the number of the KDE version that was
-     * installed when the program was compiled.
-     * @return the version number, encoded in a single uint
-     * @since 3.2
-     */
-    TDECORE_EXPORT unsigned int version();
-    /**
-     * Returns the major number of KDE's version, e.g.
-     * 3 for KDE 3.1.2. 
-     * @return the major version number
-     * @since 3.1
-     */
-    TDECORE_EXPORT unsigned int versionMajor();
-    /**
-     * Returns the minor number of KDE's version, e.g.
-     * 1 for KDE 3.1.2. 
-     * @return the minor version number
-     * @since 3.1
-     */
-    TDECORE_EXPORT unsigned int versionMinor();
-    /**
-     * Returns the release of KDE's version, e.g.
-     * 2 for KDE 3.1.2. 
-     * @return the release number
-     * @since 3.1
-     */
-    TDECORE_EXPORT unsigned int versionRelease();
-    /**
-     * Returns the KDE version as string, e.g. "3.1.2".
-     * @return the KDE version. You can keep the string forever
-     * @since 3.1
-     */
-    TDECORE_EXPORT const char *versionString();
-}
-
-#endif // _TDE_VERSION_H_
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
new file mode 100644
index 000000000..b644985b5
--- /dev/null
+++ b/tdecore/tdelibs_export.h
@@ -0,0 +1,86 @@
+/*
+   This file is part of the KDE libraries
+   Copyright (C) 2004 Jaroslaw Staniek <js@iidea.pl>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _KDELIBS_EXPORT_H
+#define _KDELIBS_EXPORT_H
+
+/* needed for KDE_EXPORT macros */
+#include <kdemacros.h>
+
+/* needed, because e.g. Q_OS_UNIX is so frequently used */
+#include <tqglobal.h>
+
+#ifdef Q_WS_WIN
+#include <tdelibs_export_win.h>
+
+#else /* Q_OS_UNIX */
+
+/* export statements for unix */
+#define TDECORE_EXPORT KDE_EXPORT
+#define TDEUI_EXPORT KDE_EXPORT
+#define TDEFX_EXPORT KDE_EXPORT
+#define TDEPRINT_EXPORT KDE_EXPORT
+#define KDNSSD_EXPORT KDE_EXPORT
+#define KIO_EXPORT KDE_EXPORT
+#define DCOP_EXPORT KDE_EXPORT
+#define KPARTS_EXPORT KDE_EXPORT
+#define KTEXTEDITOR_EXPORT KDE_EXPORT
+#define KABC_EXPORT KDE_EXPORT
+#define TDESU_EXPORT KDE_EXPORT
+#define KVCARD_EXPORT KDE_EXPORT
+#define KRESOURCES_EXPORT KDE_EXPORT
+#define KSTYLE_EXPORT KDE_EXPORT
+#define KHTML_EXPORT KDE_EXPORT
+#define KMDI_EXPORT KDE_EXPORT
+#define KUTILS_EXPORT KDE_EXPORT
+#define KATEPARTINTERFACES_EXPORT KDE_EXPORT
+#define KATEPART_EXPORT KDE_EXPORT
+#define KMID_EXPORT KDE_EXPORT
+#define KRANDR_EXPORT KDE_EXPORT
+#define KIMPROXY_EXPORT KDE_EXPORT
+#define KDE_ARTS_EXPORT KDE_EXPORT
+#define KUNITTEST_EXPORT KDE_EXPORT
+
+#define KPATH_SEPARATOR ':'
+
+#ifndef O_BINARY
+#define O_BINARY 0 /* for open() */
+#endif
+
+#endif
+
+#endif /*_KDELIBS_EXPORT_H*/
+
+/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
+   between 'class' keyword and <classname>: */
+#ifdef KDE_DEPRECATED
+# ifndef TDECORE_EXPORT_DEPRECATED
+#  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
+# endif
+# ifndef KIO_EXPORT_DEPRECATED
+#  define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
+# endif
+# ifndef TDEUI_EXPORT_DEPRECATED
+#  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
+# endif
+# ifndef KABC_EXPORT_DEPRECATED
+#  define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT
+# endif
+#endif
+/* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */
diff --git a/tdecore/tdeversion.cpp b/tdecore/tdeversion.cpp
new file mode 100644
index 000000000..4dfaec53c
--- /dev/null
+++ b/tdecore/tdeversion.cpp
@@ -0,0 +1,46 @@
+/* This file is part of the KDE libraries
+    Copyright (c) 2002 KDE Team
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "tdeversion.h"
+
+unsigned int KDE::version()
+{
+    return TDE_VERSION;
+}
+
+unsigned int KDE::versionMajor()
+{
+    return TDE_VERSION_MAJOR;
+}
+
+unsigned int KDE::versionMinor()
+{
+    return TDE_VERSION_MINOR;
+}
+
+unsigned int KDE::versionRelease()
+{
+    return TDE_VERSION_RELEASE;
+}
+
+const char *KDE::versionString()
+{
+    return TDE_VERSION_STRING;
+}
+
diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h
new file mode 100644
index 000000000..bde3b686e
--- /dev/null
+++ b/tdecore/tdeversion.h
@@ -0,0 +1,87 @@
+/* This file is part of the KDE libraries
+    Copyright (c) 2002-2005 KDE Team
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _TDE_VERSION_H_
+#define _TDE_VERSION_H_
+
+#include "tdelibs_export.h"
+
+/*
+    R <ABI VERSION> . <BUGFIX REVISION> . <SECURITY PATCHLEVEL>
+    Security patchlevel is not present on initial release
+    It is added on the first security release, starting with ".a"
+    ".a" would correspond to a TDE_VERSION_RELEASE of 1, ".b" would be 2, etc.
+    A new bugfix revision resets the security level
+    A new ABI version resets both the bugfix revision and the security level
+*/
+#define TDE_VERSION_STRING "R14.0 [DEVELOPMENT]"
+#define TDE_VERSION_MAJOR 14
+#define TDE_VERSION_MINOR 0
+#define TDE_VERSION_RELEASE 0
+#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
+
+#define TDE_VERSION \
+  KDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE)
+
+#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= KDE_MAKE_VERSION(a,b,c) )
+
+/**
+ * Namespace for general KDE functions.
+ */
+namespace KDE
+{
+    /**
+     * Returns the encoded number of KDE's version, see the TDE_VERSION macro.
+     * In contrary to that macro this function returns the number of the actully
+     * installed KDE version, not the number of the KDE version that was
+     * installed when the program was compiled.
+     * @return the version number, encoded in a single uint
+     * @since 3.2
+     */
+    TDECORE_EXPORT unsigned int version();
+    /**
+     * Returns the major number of KDE's version, e.g.
+     * 3 for KDE 3.1.2. 
+     * @return the major version number
+     * @since 3.1
+     */
+    TDECORE_EXPORT unsigned int versionMajor();
+    /**
+     * Returns the minor number of KDE's version, e.g.
+     * 1 for KDE 3.1.2. 
+     * @return the minor version number
+     * @since 3.1
+     */
+    TDECORE_EXPORT unsigned int versionMinor();
+    /**
+     * Returns the release of KDE's version, e.g.
+     * 2 for KDE 3.1.2. 
+     * @return the release number
+     * @since 3.1
+     */
+    TDECORE_EXPORT unsigned int versionRelease();
+    /**
+     * Returns the KDE version as string, e.g. "3.1.2".
+     * @return the KDE version. You can keep the string forever
+     * @since 3.1
+     */
+    TDECORE_EXPORT const char *versionString();
+}
+
+#endif // _TDE_VERSION_H_
diff --git a/tdelibs.lsm b/tdelibs.lsm
new file mode 100644
index 000000000..30f438679
--- /dev/null
+++ b/tdelibs.lsm
@@ -0,0 +1,11 @@
+Begin4
+Title:          tdelibs
+Version:        Trinity 3.5.11
+Entered-date:   2008-08-26
+Description:    libraries for the K Desktop Environment (KDE)
+Keywords:       KDE X11 desktop Qt 
+Author:         http://bugs.pearsoncomputing.net/ (KDE Trinity Bugtracking System)
+Primary-site:   http://trinity.pearsoncomputing.net/
+Platforms:      Unix, Qt
+Copying-policy: LGPL, Artistic
+End
diff --git a/win/kdelibs_export_win.h b/win/kdelibs_export_win.h
deleted file mode 100644
index 17663a5fa..000000000
--- a/win/kdelibs_export_win.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-   This file is part of the KDE libraries
-   Copyright (C) 2004 Jaroslaw Staniek <js@iidea.pl>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include <io.h> /* to avoid #includes */
-
-#define KPATH_SEPARATOR ';'
-#define popen _popen
-#define pclose _pclose
-
-#define KDE_IMPORT __declspec(dllimport)
-
-#ifdef MAKE_TDECORE_LIB
-# define TDECORE_EXPORT KDE_EXPORT
-#else
-# ifndef TDECORE_EXPORT
-#  define TDECORE_EXPORT KDE_IMPORT //for apps and other libs
-# endif
-#endif
-
-#ifdef MAKE_KDEWIN32_LIB
-# define KDEWIN32_EXPORT KDE_EXPORT
-#else
-# define KDEWIN32_EXPORT KDE_IMPORT
-#endif
-
-/* some classes, i.e. KDock* already use EXPORT_* macro: define it too */
-#ifdef MAKE_TDEUI_LIB
-# define TDEUI_EXPORT KDE_EXPORT
-# define EXPORT_DOCKCLASS KDE_EXPORT
-#elif KDE_MAKE_LIB
-# define TDEUI_EXPORT KDE_IMPORT
-# define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */
-#else
-# define TDEUI_EXPORT
-# define EXPORT_DOCKCLASS
-#endif
-
-#ifdef MAKE_TDEFX_LIB
-# define TDEFX_EXPORT  KDE_EXPORT
-#else
-# define TDEFX_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_TDEPRINT_LIB
-# define TDEPRINT_EXPORT  KDE_EXPORT
-#else
-# define TDEPRINT_EXPORT KDE_IMPORT
-#endif
-
-#ifndef KIO_EXPORT
-# ifdef MAKE_KIO_LIB
-#  define KIO_EXPORT KDE_EXPORT
-# else
-#  define KIO_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#ifdef MAKE_DCOP_LIB
-# define DCOP_EXPORT KDE_EXPORT
-#else
-# define DCOP_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KPARTS_LIB
-# define KPARTS_EXPORT KDE_EXPORT
-#else
-# define KPARTS_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KTEXTEDITOR_LIB
-# define KTEXTEDITOR_EXPORT KDE_EXPORT
-#else
-# define KTEXTEDITOR_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KABC_LIB
-# define KABC_EXPORT KDE_EXPORT
-#else
-# define KABC_EXPORT KDE_IMPORT
-#endif
-
-
-#ifdef MAKE_KVCARD_LIB
-# define KVCARD_EXPORT KDE_EXPORT
-#else
-# define KVCARD_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KRESOURCES_LIB
-# define KRESOURCES_EXPORT KDE_EXPORT
-#else
-# define KRESOURCES_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_TDESU_LIB
-# define TDESU_EXPORT KDE_EXPORT
-#else
-# define TDESU_EXPORT KDE_IMPORT
-#endif
-
-// all KStyle libs
-#ifdef MAKE_KSTYLE_LIB
-# define KSTYLE_EXPORT KDE_EXPORT
-#else
-# define KSTYLE_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KMDI_LIB
-# define KMDI_EXPORT  KDE_EXPORT
-#else
-# define KMDI_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KUTILS_LIB
-# define KUTILS_EXPORT  KDE_EXPORT
-#else
-# define KUTILS_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KATEPARTINTERFACES_LIB
-# define KATEPARTINTERFACES_EXPORT  KDE_EXPORT
-#else
-# define KATEPARTINTERFACES_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KATEPART_LIB
-# define KATEPART_EXPORT  KDE_EXPORT
-#else
-# define KATEPART_EXPORT KDE_IMPORT
-#endif
-
-#ifdef MAKE_KHTML_LIB
-# define KHTML_EXPORT KDE_EXPORT
-#else
-# define KHTML_EXPORT KDE_IMPORT
-#endif
diff --git a/win/kdelibs_global_win.h b/win/kdelibs_global_win.h
deleted file mode 100644
index dfb3432e8..000000000
--- a/win/kdelibs_global_win.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2003-2005 Jaroslaw Staniek <js@iidea.pl>
-
-   Global definitions for KDElibs/win32 (win32)
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include <tqglobal.h>
-
-/*! Bootstrap */
-#define kdemain \
-kde_start(int argc, char **argv); \
-__declspec(dllimport) void kde_bootstrap(); \
-__declspec(dllimport) void kde_destroy(); \
-int main(int argc, char **argv) \
-{ kde_bootstrap(); const int retcode = kde_start(argc, argv); kde_destroy(); return retcode; } \
-int kde_start
-
-
-#ifndef WIN32
-# define WIN32
-#endif
-
-#ifndef HAVE_CONFIG_H
-# define HAVE_CONFIG_H 1
-#endif
-
-#ifndef HAVE_STRING_H
-# define HAVE_STRING_H 1
-#endif
-
-#ifndef HAVE_SYS_STAT_H
-# define HAVE_SYS_STAT_H 1
-#endif
-
-#ifndef HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-#endif
-
-#define KDE_DISTRIBUTION_TEXT "KDE Libraries for MS Windows"
-#define KDE_COMPILING_OS "win32"
-#ifdef _MSC_VER
-# if _MSC_VER < 1300
-#  define KDE_COMPILER_VERSION "MSVC++ 6.0"
-# elif _MSC_VER <= 1300
-#  define KDE_COMPILER_VERSION "MSVC++ 7.0"
-# elif _MSC_VER <= 1310
-#  define KDE_COMPILER_VERSION "MSVC++ 7.1"
-# elif _MSC_VER <= 1400
-#  define KDE_COMPILER_VERSION "MSVC++ 8.0"
-# else 1400
-#  define KDE_COMPILER_VERSION "MSVC++ >8.0"
-# endif
-#endif
-
-#ifndef M_PI
-# define M_PI 3.14159265358979323846
-#endif
-
-#ifndef NULL
-# define NULL 0
-#endif
-
-/*
-#ifdef __cplusplus
-#include <tqstring.h>
-
-# ifndef KDEDIR
-#  define KDEDIR TQString(KDEWIN32_DIR)
-# endif
-# ifndef __KDE_BINDIR 
-#  define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin")
-# endif
-#endif
-*/
-
-# ifndef __pid_t_defined
-  //typedef __pid_t pid_t;
-  typedef unsigned int pid_t;
-#  define __pid_t_defined
-# endif
-
-# ifndef __uid_t_defined
-//typedef __uid_t uid_t;
-  typedef unsigned int __uid_t;
-  typedef __uid_t uid_t;
-#  define __uid_t_defined
-# endif
-
-# ifndef __gid_t_defined
-//typedef __uid_t uid_t;
-  typedef unsigned int __gid_t;
-  typedef __gid_t gid_t;
-#  define __gid_t_defined
-# endif
-
-  typedef char* caddr_t;
-
-
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-
-
-/* should be in <sys/types.h> */
-typedef int mode_t;
-
-#if defined(_MSC_VER)
-
-# if (_MSC_VER <= 1200)
- /* Force Conformance for For Loop Scope (/Zc:forScope) is only allowed for 
-    MSVC++ version > 6.0
-   -this option controls the scope of variables
-  defined as part of the For loop control statement. Traditionally, Microsoft 
-  extended the scope of loop control variables defined in the loop control statement 
-  beyond the scope of the loop. Such behavior violates the ANSI C/C++ standard 
-  and may cause compiler errors when compiling ANSI C/C++ code with Microsoft C++.
-  Simple (dirty) macro trick to fix the compile problem for msvc6
-  ( see http://q12.org/pipermail/ode/2003-January/002811.html
-    and http://support.microsoft.com/default.aspx?scid=kb;EN-US;167748 )
- */
-#  define for  if (0); else for
-# endif
-
-//operator (char*) caused errors
-//#define QT_NO_ASCII_CAST
-
-/* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called
-
-The delete operator was called to delete the given type, which was 
-declared but not defined. The compiler was unable to find any destructors for the given type.
-*/
-#pragma warning( disable: 4150 )
-
-
-/* warning C4521: qmultiple copy constructors specified
-*/
-#pragma warning( disable: 4521 )
-
-/* warning C4251: 'identifier' : class 'type' needs to have dll-interface 
-   to be used by clients of class 'type2'
-*/
-#pragma warning( disable: 4251 )
-
-/* identifier was truncated to '255'.. */
-# pragma warning(disable: 4786)
-
-/* warning C4250: ...: inherits ... via dominanceidentifier */
-# pragma warning(disable: 4250)
-
-# pragma warning(disable: 4006) /*libxxx : warning LNK4006: 
-         ".... already defined in kaction.obj; second definition ignored" */
-
-/* disable C4100: unreferenced formal parameter */
-# pragma warning(disable: 4100)
-
-/* disable C4101: unreferenced local variable */
-# pragma warning(disable: 4101)
-
-/* disable C4189: local variable is initialized but not referenced */
-# pragma warning(disable: 4189)
-
-# if (_MSC_VER >= 1300)
-/* disable C4288: nonstandard extension used : 'i' : loop control variable 
- declared in the for-loop is used outside the for-loop scope; 
- it conflicts with the declaration in the outer scope */
-#  pragma warning(disable: 4288)
-
-/* disable 4996: warnings for deprecated symbols */
-#  pragma warning(disable: 4996)
-# endif
-
-#endif
-
-/*#if (_MSC_VER >= 1300) && (WINVER < 0x0500)
-#ifdef __cplusplus
-extern "C" {
-#endif
-*/
-/* VC7 or later, building with pre-VC7 runtime libraries */
-/*extern "C"*/ long _ftol( double ); /* defined by VC6 C libs */
-/*extern "C" KDEWIN32_EXPORT long _ftol2( double dblSource ); */
-/*#ifdef __cplusplus
-inline long _cdecl _ftol2( double dblSource ) { return _ftol( dblSource ); }
-}
-#endif*/
-
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
new file mode 100644
index 000000000..17663a5fa
--- /dev/null
+++ b/win/tdelibs_export_win.h
@@ -0,0 +1,152 @@
+/*
+   This file is part of the KDE libraries
+   Copyright (C) 2004 Jaroslaw Staniek <js@iidea.pl>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include <io.h> /* to avoid #includes */
+
+#define KPATH_SEPARATOR ';'
+#define popen _popen
+#define pclose _pclose
+
+#define KDE_IMPORT __declspec(dllimport)
+
+#ifdef MAKE_TDECORE_LIB
+# define TDECORE_EXPORT KDE_EXPORT
+#else
+# ifndef TDECORE_EXPORT
+#  define TDECORE_EXPORT KDE_IMPORT //for apps and other libs
+# endif
+#endif
+
+#ifdef MAKE_KDEWIN32_LIB
+# define KDEWIN32_EXPORT KDE_EXPORT
+#else
+# define KDEWIN32_EXPORT KDE_IMPORT
+#endif
+
+/* some classes, i.e. KDock* already use EXPORT_* macro: define it too */
+#ifdef MAKE_TDEUI_LIB
+# define TDEUI_EXPORT KDE_EXPORT
+# define EXPORT_DOCKCLASS KDE_EXPORT
+#elif KDE_MAKE_LIB
+# define TDEUI_EXPORT KDE_IMPORT
+# define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */
+#else
+# define TDEUI_EXPORT
+# define EXPORT_DOCKCLASS
+#endif
+
+#ifdef MAKE_TDEFX_LIB
+# define TDEFX_EXPORT  KDE_EXPORT
+#else
+# define TDEFX_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_TDEPRINT_LIB
+# define TDEPRINT_EXPORT  KDE_EXPORT
+#else
+# define TDEPRINT_EXPORT KDE_IMPORT
+#endif
+
+#ifndef KIO_EXPORT
+# ifdef MAKE_KIO_LIB
+#  define KIO_EXPORT KDE_EXPORT
+# else
+#  define KIO_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#ifdef MAKE_DCOP_LIB
+# define DCOP_EXPORT KDE_EXPORT
+#else
+# define DCOP_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KPARTS_LIB
+# define KPARTS_EXPORT KDE_EXPORT
+#else
+# define KPARTS_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KTEXTEDITOR_LIB
+# define KTEXTEDITOR_EXPORT KDE_EXPORT
+#else
+# define KTEXTEDITOR_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KABC_LIB
+# define KABC_EXPORT KDE_EXPORT
+#else
+# define KABC_EXPORT KDE_IMPORT
+#endif
+
+
+#ifdef MAKE_KVCARD_LIB
+# define KVCARD_EXPORT KDE_EXPORT
+#else
+# define KVCARD_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KRESOURCES_LIB
+# define KRESOURCES_EXPORT KDE_EXPORT
+#else
+# define KRESOURCES_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_TDESU_LIB
+# define TDESU_EXPORT KDE_EXPORT
+#else
+# define TDESU_EXPORT KDE_IMPORT
+#endif
+
+// all KStyle libs
+#ifdef MAKE_KSTYLE_LIB
+# define KSTYLE_EXPORT KDE_EXPORT
+#else
+# define KSTYLE_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KMDI_LIB
+# define KMDI_EXPORT  KDE_EXPORT
+#else
+# define KMDI_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KUTILS_LIB
+# define KUTILS_EXPORT  KDE_EXPORT
+#else
+# define KUTILS_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KATEPARTINTERFACES_LIB
+# define KATEPARTINTERFACES_EXPORT  KDE_EXPORT
+#else
+# define KATEPARTINTERFACES_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KATEPART_LIB
+# define KATEPART_EXPORT  KDE_EXPORT
+#else
+# define KATEPART_EXPORT KDE_IMPORT
+#endif
+
+#ifdef MAKE_KHTML_LIB
+# define KHTML_EXPORT KDE_EXPORT
+#else
+# define KHTML_EXPORT KDE_IMPORT
+#endif
diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h
new file mode 100644
index 000000000..dfb3432e8
--- /dev/null
+++ b/win/tdelibs_global_win.h
@@ -0,0 +1,200 @@
+/* This file is part of the KDE project
+   Copyright (C) 2003-2005 Jaroslaw Staniek <js@iidea.pl>
+
+   Global definitions for KDElibs/win32 (win32)
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include <tqglobal.h>
+
+/*! Bootstrap */
+#define kdemain \
+kde_start(int argc, char **argv); \
+__declspec(dllimport) void kde_bootstrap(); \
+__declspec(dllimport) void kde_destroy(); \
+int main(int argc, char **argv) \
+{ kde_bootstrap(); const int retcode = kde_start(argc, argv); kde_destroy(); return retcode; } \
+int kde_start
+
+
+#ifndef WIN32
+# define WIN32
+#endif
+
+#ifndef HAVE_CONFIG_H
+# define HAVE_CONFIG_H 1
+#endif
+
+#ifndef HAVE_STRING_H
+# define HAVE_STRING_H 1
+#endif
+
+#ifndef HAVE_SYS_STAT_H
+# define HAVE_SYS_STAT_H 1
+#endif
+
+#ifndef HAVE_SYS_PARAM_H
+# define HAVE_SYS_PARAM_H 1
+#endif
+
+#define KDE_DISTRIBUTION_TEXT "KDE Libraries for MS Windows"
+#define KDE_COMPILING_OS "win32"
+#ifdef _MSC_VER
+# if _MSC_VER < 1300
+#  define KDE_COMPILER_VERSION "MSVC++ 6.0"
+# elif _MSC_VER <= 1300
+#  define KDE_COMPILER_VERSION "MSVC++ 7.0"
+# elif _MSC_VER <= 1310
+#  define KDE_COMPILER_VERSION "MSVC++ 7.1"
+# elif _MSC_VER <= 1400
+#  define KDE_COMPILER_VERSION "MSVC++ 8.0"
+# else 1400
+#  define KDE_COMPILER_VERSION "MSVC++ >8.0"
+# endif
+#endif
+
+#ifndef M_PI
+# define M_PI 3.14159265358979323846
+#endif
+
+#ifndef NULL
+# define NULL 0
+#endif
+
+/*
+#ifdef __cplusplus
+#include <tqstring.h>
+
+# ifndef KDEDIR
+#  define KDEDIR TQString(KDEWIN32_DIR)
+# endif
+# ifndef __KDE_BINDIR 
+#  define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin")
+# endif
+#endif
+*/
+
+# ifndef __pid_t_defined
+  //typedef __pid_t pid_t;
+  typedef unsigned int pid_t;
+#  define __pid_t_defined
+# endif
+
+# ifndef __uid_t_defined
+//typedef __uid_t uid_t;
+  typedef unsigned int __uid_t;
+  typedef __uid_t uid_t;
+#  define __uid_t_defined
+# endif
+
+# ifndef __gid_t_defined
+//typedef __uid_t uid_t;
+  typedef unsigned int __gid_t;
+  typedef __gid_t gid_t;
+#  define __gid_t_defined
+# endif
+
+  typedef char* caddr_t;
+
+
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+
+
+/* should be in <sys/types.h> */
+typedef int mode_t;
+
+#if defined(_MSC_VER)
+
+# if (_MSC_VER <= 1200)
+ /* Force Conformance for For Loop Scope (/Zc:forScope) is only allowed for 
+    MSVC++ version > 6.0
+   -this option controls the scope of variables
+  defined as part of the For loop control statement. Traditionally, Microsoft 
+  extended the scope of loop control variables defined in the loop control statement 
+  beyond the scope of the loop. Such behavior violates the ANSI C/C++ standard 
+  and may cause compiler errors when compiling ANSI C/C++ code with Microsoft C++.
+  Simple (dirty) macro trick to fix the compile problem for msvc6
+  ( see http://q12.org/pipermail/ode/2003-January/002811.html
+    and http://support.microsoft.com/default.aspx?scid=kb;EN-US;167748 )
+ */
+#  define for  if (0); else for
+# endif
+
+//operator (char*) caused errors
+//#define QT_NO_ASCII_CAST
+
+/* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called
+
+The delete operator was called to delete the given type, which was 
+declared but not defined. The compiler was unable to find any destructors for the given type.
+*/
+#pragma warning( disable: 4150 )
+
+
+/* warning C4521: qmultiple copy constructors specified
+*/
+#pragma warning( disable: 4521 )
+
+/* warning C4251: 'identifier' : class 'type' needs to have dll-interface 
+   to be used by clients of class 'type2'
+*/
+#pragma warning( disable: 4251 )
+
+/* identifier was truncated to '255'.. */
+# pragma warning(disable: 4786)
+
+/* warning C4250: ...: inherits ... via dominanceidentifier */
+# pragma warning(disable: 4250)
+
+# pragma warning(disable: 4006) /*libxxx : warning LNK4006: 
+         ".... already defined in kaction.obj; second definition ignored" */
+
+/* disable C4100: unreferenced formal parameter */
+# pragma warning(disable: 4100)
+
+/* disable C4101: unreferenced local variable */
+# pragma warning(disable: 4101)
+
+/* disable C4189: local variable is initialized but not referenced */
+# pragma warning(disable: 4189)
+
+# if (_MSC_VER >= 1300)
+/* disable C4288: nonstandard extension used : 'i' : loop control variable 
+ declared in the for-loop is used outside the for-loop scope; 
+ it conflicts with the declaration in the outer scope */
+#  pragma warning(disable: 4288)
+
+/* disable 4996: warnings for deprecated symbols */
+#  pragma warning(disable: 4996)
+# endif
+
+#endif
+
+/*#if (_MSC_VER >= 1300) && (WINVER < 0x0500)
+#ifdef __cplusplus
+extern "C" {
+#endif
+*/
+/* VC7 or later, building with pre-VC7 runtime libraries */
+/*extern "C"*/ long _ftol( double ); /* defined by VC6 C libs */
+/*extern "C" KDEWIN32_EXPORT long _ftol2( double dblSource ); */
+/*#ifdef __cplusplus
+inline long _cdecl _ftol2( double dblSource ) { return _ftol( dblSource ); }
+}
+#endif*/
+
diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg
deleted file mode 100644
index cabec259f..000000000
--- a/win/tools/build_kdelibs_dbg
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# compile entire tdelibs/win32 in debug mode
-# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
-
-if [ "$1" == "noclean" ] ; then
-	noclean=1
-fi
-
-update_tdelibs_pro_files || exit 1
-.copy_missing_headers || exit 1
-source .build_tdelibs_comon || exit 1
-
-cd "$KDELIBS"
-
-echo "-------------------------------------------------"
-echo "Building Debug Version of KDElibs/win32"
-echo "Source directory: \$KDELIBS = $KDELIBS"
-echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
-echo "Destination directory: \$KDEDIR = $KDEDIR"
-if [ -n $noclean ] ; then
-	echo "Options: noclean"
-fi
-echo "-------------------------------------------------"
-echo
-
-# special
-cd win/9x && $make || exit 1
-cd "$pwd"
-
-if [ -d "kstyles/thinkeramik/widget-engine" ] ; then
-	additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine "
-fi
-
-# all
-for d in \
-win \
-libltdl \
-dcop/KDE-ICE \
-dcop \
-dcop/dcopidl \
-dcop/dcopidl2cpp \
-dcop/dcopserver \
-dcop/dcopserver_shutdown \
-dcop/iceauth \
-tdefx \
-$additional \
-tdecore \
-tdeui \
-kio \
-kresources \
-kabc/vcard \
-kabc \
-kutils \
-kparts \
-kmdi \
-kioslave/gzip \
-kioslave/bzip2 \
-interfaces/ktexteditor \
-kate/interfaces \
-kate/part \
- ; do 
-	echo ================== $d =================
-	cd $d || exit 1
-	if [ -z $noclean ] ; then
-		$make clean
-	fi
-	qmake && $make || exit 1
-	cd $pwd
-done
-
-cd kdewidgets
-qmake makekdewidgets.pro && $make clean && $make || exit 1
-qmake && $make clean && $make || exit 1
-
-# copy kdewidgets plugin for Qt Designer
-cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
-
-cd $pwd
-
-cd kded
-./makeall.sh || exit 1
-cd $pwd
diff --git a/win/tools/build_kdelibs_rel b/win/tools/build_kdelibs_rel
deleted file mode 100644
index 7490c4866..000000000
--- a/win/tools/build_kdelibs_rel
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-# compile entire tdelibs/win32 in release mode
-# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
-
-if [ "$1" == "noclean" ] ; then
-	noclean=1
-fi
-
-update_tdelibs_pro_files || exit 1
-.copy_missing_headers || exit 1
-source .build_tdelibs_comon || exit 1
-
-cd "$KDELIBS"
-
-echo "-------------------------------------------------"
-echo "Building Release Version of KDElibs/win32"
-echo "Source directory: \$KDELIBS = $KDELIBS"
-echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
-echo "Destination directory: \$KDEDIR = $KDEDIR"
-if [ -n $noclean ] ; then
-	echo "Options: noclean"
-fi
-echo "-------------------------------------------------"
-echo
-
-# special
-cd win/9x || exit 1
-if [ "$1" != "noclean" ] ; then
-	$make -f Makefile.rel clean
-fi
-$make -f Makefile.rel || exit 1
-cd $pwd
-
-# all
-for d in \
-win \
-libltdl \
-dcop/KDE-ICE \
-dcop \
-dcop/dcopidl \
-dcop/dcopidl2cpp \
-dcop/dcopserver \
-dcop/dcopserver_shutdown \
-dcop/iceauth \
-tdefx \
-tdecore \
-tdeui \
-kstyles/thinkeramik/widget-engine \
-kio \
-kresources \
-kabc/vcard \
-kabc \
-kutils \
-kparts \
-kmdi \
-kioslave/gzip \
-kioslave/bzip2 \
-interfaces/ktexteditor \
-kate/interfaces \
-kate/part \
- ; do 
-	echo ================== $d =================
-	cd $d || exit 1
-	if [ -z $noclean ] ; then
-		$make -f Makefile.release clean
-	fi
-	mkrel || exit 1
-	cd $pwd
-done
-
-cd kded
-./makeall_rel.sh || exit 1
-cd $pwd
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
new file mode 100644
index 000000000..cabec259f
--- /dev/null
+++ b/win/tools/build_tdelibs_dbg
@@ -0,0 +1,82 @@
+#!/bin/bash
+# compile entire tdelibs/win32 in debug mode
+# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
+
+if [ "$1" == "noclean" ] ; then
+	noclean=1
+fi
+
+update_tdelibs_pro_files || exit 1
+.copy_missing_headers || exit 1
+source .build_tdelibs_comon || exit 1
+
+cd "$KDELIBS"
+
+echo "-------------------------------------------------"
+echo "Building Debug Version of KDElibs/win32"
+echo "Source directory: \$KDELIBS = $KDELIBS"
+echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
+echo "Destination directory: \$KDEDIR = $KDEDIR"
+if [ -n $noclean ] ; then
+	echo "Options: noclean"
+fi
+echo "-------------------------------------------------"
+echo
+
+# special
+cd win/9x && $make || exit 1
+cd "$pwd"
+
+if [ -d "kstyles/thinkeramik/widget-engine" ] ; then
+	additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine "
+fi
+
+# all
+for d in \
+win \
+libltdl \
+dcop/KDE-ICE \
+dcop \
+dcop/dcopidl \
+dcop/dcopidl2cpp \
+dcop/dcopserver \
+dcop/dcopserver_shutdown \
+dcop/iceauth \
+tdefx \
+$additional \
+tdecore \
+tdeui \
+kio \
+kresources \
+kabc/vcard \
+kabc \
+kutils \
+kparts \
+kmdi \
+kioslave/gzip \
+kioslave/bzip2 \
+interfaces/ktexteditor \
+kate/interfaces \
+kate/part \
+ ; do 
+	echo ================== $d =================
+	cd $d || exit 1
+	if [ -z $noclean ] ; then
+		$make clean
+	fi
+	qmake && $make || exit 1
+	cd $pwd
+done
+
+cd kdewidgets
+qmake makekdewidgets.pro && $make clean && $make || exit 1
+qmake && $make clean && $make || exit 1
+
+# copy kdewidgets plugin for Qt Designer
+cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
+
+cd $pwd
+
+cd kded
+./makeall.sh || exit 1
+cd $pwd
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
new file mode 100644
index 000000000..7490c4866
--- /dev/null
+++ b/win/tools/build_tdelibs_rel
@@ -0,0 +1,73 @@
+#!/bin/bash
+# compile entire tdelibs/win32 in release mode
+# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
+
+if [ "$1" == "noclean" ] ; then
+	noclean=1
+fi
+
+update_tdelibs_pro_files || exit 1
+.copy_missing_headers || exit 1
+source .build_tdelibs_comon || exit 1
+
+cd "$KDELIBS"
+
+echo "-------------------------------------------------"
+echo "Building Release Version of KDElibs/win32"
+echo "Source directory: \$KDELIBS = $KDELIBS"
+echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
+echo "Destination directory: \$KDEDIR = $KDEDIR"
+if [ -n $noclean ] ; then
+	echo "Options: noclean"
+fi
+echo "-------------------------------------------------"
+echo
+
+# special
+cd win/9x || exit 1
+if [ "$1" != "noclean" ] ; then
+	$make -f Makefile.rel clean
+fi
+$make -f Makefile.rel || exit 1
+cd $pwd
+
+# all
+for d in \
+win \
+libltdl \
+dcop/KDE-ICE \
+dcop \
+dcop/dcopidl \
+dcop/dcopidl2cpp \
+dcop/dcopserver \
+dcop/dcopserver_shutdown \
+dcop/iceauth \
+tdefx \
+tdecore \
+tdeui \
+kstyles/thinkeramik/widget-engine \
+kio \
+kresources \
+kabc/vcard \
+kabc \
+kutils \
+kparts \
+kmdi \
+kioslave/gzip \
+kioslave/bzip2 \
+interfaces/ktexteditor \
+kate/interfaces \
+kate/part \
+ ; do 
+	echo ================== $d =================
+	cd $d || exit 1
+	if [ -z $noclean ] ; then
+		$make -f Makefile.release clean
+	fi
+	mkrel || exit 1
+	cd $pwd
+done
+
+cd kded
+./makeall_rel.sh || exit 1
+cd $pwd
diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files
deleted file mode 100755
index 3925f675e..000000000
--- a/win/tools/collect_kdelibs_pro_files
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Copies all used .pro (and a few shell) files tdelibs/ to tdelibs/win/pro_files/
-# what makes it easier to commit that to KDE CVS
-# (c) 2005, Jaroslaw Staniek
-
-dest=win/pro_files
-mkdir -p $dest
-
-.check_kde_env || exit 1
-
-cd "$KDELIBS"
-
-for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do
-	dir=`dirname "$pro"`
-	mkdir -p "$dest/$dir"
-	if [ "$pro" -nt "$dest/$pro" ] ; then
-		cp -p "$pro" "$dest/$pro"
-		echo "$pro"
-	fi
-done
-
diff --git a/win/tools/collect_tdelibs_pro_files b/win/tools/collect_tdelibs_pro_files
new file mode 100755
index 000000000..3925f675e
--- /dev/null
+++ b/win/tools/collect_tdelibs_pro_files
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copies all used .pro (and a few shell) files tdelibs/ to tdelibs/win/pro_files/
+# what makes it easier to commit that to KDE CVS
+# (c) 2005, Jaroslaw Staniek
+
+dest=win/pro_files
+mkdir -p $dest
+
+.check_kde_env || exit 1
+
+cd "$KDELIBS"
+
+for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do
+	dir=`dirname "$pro"`
+	mkdir -p "$dest/$dir"
+	if [ "$pro" -nt "$dest/$pro" ] ; then
+		cp -p "$pro" "$dest/$pro"
+		echo "$pro"
+	fi
+done
+
diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files
deleted file mode 100755
index 92125fec1..000000000
--- a/win/tools/update_kdelibs_pro_files
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Copies all used .pro (and a few shell) files from tdelibs/win/pro_files/ to tdelibs/
-# so they can be used to build tdelibs.
-# Note: only newer files are copied over older.
-# (c) 2005, Jaroslaw Staniek, js@iidea.pl
-
-.check_kde_env || exit 1
-
-src=win/pro_files
-dest=../..
-
-cd "$KDELIBS/$src"
-
-for pro in `find . -name \*.pro -o -name \*.sh` ; do
-	dir=`dirname "$pro"`
-	if [ ! -d "$KDELIBS/$dir" ] ; then
-		echo "no \$KDELIBS/$dir directory: creating it"
-		mkdir -p "$KDELIBS/$dir"
-	fi
-
-	if [ ! "$pro" -nt "$dest/$pro" ] ; then
-		true
-#			echo "*SKIPPED* $pro is not newer than destination in $KDELIBS"
-	else
-		echo "UPDATING \$KDELIBS/$pro"
-		cp $pro $dest/$pro
-	fi
-done
-
diff --git a/win/tools/update_tdelibs_pro_files b/win/tools/update_tdelibs_pro_files
new file mode 100755
index 000000000..92125fec1
--- /dev/null
+++ b/win/tools/update_tdelibs_pro_files
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copies all used .pro (and a few shell) files from tdelibs/win/pro_files/ to tdelibs/
+# so they can be used to build tdelibs.
+# Note: only newer files are copied over older.
+# (c) 2005, Jaroslaw Staniek, js@iidea.pl
+
+.check_kde_env || exit 1
+
+src=win/pro_files
+dest=../..
+
+cd "$KDELIBS/$src"
+
+for pro in `find . -name \*.pro -o -name \*.sh` ; do
+	dir=`dirname "$pro"`
+	if [ ! -d "$KDELIBS/$dir" ] ; then
+		echo "no \$KDELIBS/$dir directory: creating it"
+		mkdir -p "$KDELIBS/$dir"
+	fi
+
+	if [ ! "$pro" -nt "$dest/$pro" ] ; then
+		true
+#			echo "*SKIPPED* $pro is not newer than destination in $KDELIBS"
+	else
+		echo "UPDATING \$KDELIBS/$pro"
+		cp $pro $dest/$pro
+	fi
+done
+
-- 
cgit v1.2.3

