Rename a number of libraries and executables to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 11 years ago
parent 936d3cec49
commit de7e5867a6

@ -22,7 +22,6 @@ set( VERSION "R14" )
include( FindPkgConfig ) include( FindPkgConfig )
include( CheckIncludeFile ) include( CheckIncludeFile )
include( CheckIncludeFiles )
include( CheckCSourceRuns ) include( CheckCSourceRuns )
include( CheckCXXSourceRuns ) include( CheckCXXSourceRuns )
include( CheckCXXSourceCompiles ) include( CheckCXXSourceCompiles )
@ -85,16 +84,15 @@ option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF ) option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} ) option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler" ${WITH_ALL_OPTIONS} )
##### options comments ########################## ##### options comments ##########################
# WITH_SASL affects kioslaves(kio_ldap kio_smtp kio_pop3) # WITH_SASL affects tdeioslaves(kio_ldap kio_smtp kio_pop3)
# WITH_LDAP affects kioslaves(kio_ldap) # WITH_LDAP affects tdeioslaves(kio_ldap)
# WITH_SAMBA affects kioslaves(kio_samba) kcontrol # WITH_SAMBA affects tdeioslaves(kio_samba) kcontrol
# WITH_OPENEXR affects kioslaves(thumbnail) # WITH_OPENEXR affects tdeioslaves(thumbnail)
# WITH_XCOMPOSITE affects twin kicker(taskmanager) tdm # WITH_XCOMPOSITE affects twin kicker(taskmanager) tdm
# WITH_XCURSOR affects kioslaves(thumbnail), kcontrol(input), kdesktop # WITH_XCURSOR affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
# WITH_XFIXES affects twin klipper kicker(taskmanager) # WITH_XFIXES affects twin klipper kicker(taskmanager)
# WITH_XDAMAGE affects <nothing> # WITH_XDAMAGE affects <nothing>
# WITH_XEXT affects <nothing> # WITH_XEXT affects <nothing>
@ -113,8 +111,8 @@ option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exceptio
# WITH_XINERAMA affects ksplashml # WITH_XINERAMA affects ksplashml
# WITH_ARTS affects libkonq khotkeys # WITH_ARTS affects libkonq khotkeys
# WITH_I8K affects ksysguard # WITH_I8K affects ksysguard
# WITH_HAL affects kioslaves(media) ksmserver # WITH_HAL affects tdeioslaves(media) ksmserver
# WITH_TDEHWLIB affects kioslaves(media), replaces WITH_HAL on systems without HAL # WITH_TDEHWLIB affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
# WITH_LIBRAW1394 affects kcontrol(view1394) # WITH_LIBRAW1394 affects kcontrol(view1394)
# WITH_PAM affects tdm kdesktop kcheckpass # WITH_PAM affects tdm kdesktop kcheckpass
# WITH_SHADOW affects tdm kcheckpass # WITH_SHADOW affects tdm kcheckpass
@ -145,7 +143,7 @@ option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
option( BUILD_TWIN "Build twin" ${BUILD_ALL} ) option( BUILD_TWIN "Build twin" ${BUILD_ALL} )
option( BUILD_KATE "Build kate" ${BUILD_ALL} ) option( BUILD_KATE "Build kate" ${BUILD_ALL} )
option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} ) option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} ) option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
option( BUILD_KICKER "Build kicker" ${BUILD_ALL} ) option( BUILD_KICKER "Build kicker" ${BUILD_ALL} )
option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} ) option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} )
option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} ) option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} )
@ -223,7 +221,7 @@ add_subdirectory( kcontrol )
tde_conditional_add_subdirectory( BUILD_TWIN twin ) tde_conditional_add_subdirectory( BUILD_TWIN twin )
tde_conditional_add_subdirectory( BUILD_KATE kate ) tde_conditional_add_subdirectory( BUILD_KATE kate )
tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror ) tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave ) tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslave )
tde_conditional_add_subdirectory( BUILD_KICKER kicker ) tde_conditional_add_subdirectory( BUILD_KICKER kicker )
tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop ) tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop )
tde_conditional_add_subdirectory( BUILD_KONSOLE konsole ) tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )

@ -11,13 +11,13 @@
tde_setup_architecture_flags( ) tde_setup_architecture_flags( )
# termios.h (tdm, kioslave) # termios.h (tdm, tdeioslave)
if( BUILD_TDM OR BUILD_KIOSLAVES ) if( BUILD_TDM OR BUILD_KIOSLAVES )
check_include_file( termios.h HAVE_TERMIOS_H ) check_include_file( termios.h HAVE_TERMIOS_H )
endif( ) endif( )
# sys/ioctl.h (kioslave/fish, kcontrol/info) # sys/ioctl.h (tdeioslave/fish, kcontrol/info)
if( BUILD_KIOSLAVES OR BUILD_KCONTROL ) if( BUILD_KIOSLAVES OR BUILD_KCONTROL )
check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H ) check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
endif( ) endif( )
@ -37,7 +37,7 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
endif( ) endif( )
# hal (ksmserver, kioslaves) # hal (ksmserver, tdeioslaves)
if( WITH_HAL ) if( WITH_HAL )
pkg_search_module( HAL hal ) pkg_search_module( HAL hal )
if( NOT HAL_FOUND ) if( NOT HAL_FOUND )
@ -80,7 +80,7 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K
endif( ) endif( )
# xcursor (kioslave, kcontrol) # xcursor (tdeioslave, kcontrol)
if( WITH_XCURSOR ) if( WITH_XCURSOR )
pkg_search_module( XCURSOR xcursor ) pkg_search_module( XCURSOR xcursor )
if( XCURSOR_FOUND ) if( XCURSOR_FOUND )
@ -259,7 +259,7 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
endif( ) endif( )
# dbus-tqt (tdm, ksmserver, kioslaves(media)) # dbus-tqt (tdm, ksmserver, tdeioslaves(media))
if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) ) if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
if( BUILD_KSMSERVER AND WITH_UPOWER ) if( BUILD_KSMSERVER AND WITH_UPOWER )

@ -78,7 +78,7 @@ libraries. Here is an overview of the directories:
* kicker * kicker
The panel at the botton with the K start button and the taskbar etc. The panel at the botton with the K start button and the taskbar etc.
* kioslave * tdeioslave
Infrastructure that helps make every application internet enabled Infrastructure that helps make every application internet enabled
e.g. to directly save a file to ftp://place.org/dir/file.txt e.g. to directly save a file to ftp://place.org/dir/file.txt

@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=laptop X-TDE-Library=laptop
X-TDE-FactoryName=battery X-TDE-FactoryName=battery
Exec=kcmshell laptop Exec=tdecmshell laptop
Icon=laptop_battery Icon=laptop_battery
Type=Application Type=Application

@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=laptop X-TDE-Library=laptop
X-TDE-FactoryName=bwarning X-TDE-FactoryName=bwarning
Exec=kcmshell laptop Exec=tdecmshell laptop
Icon=laptop_battery Icon=laptop_battery
Type=Application Type=Application

@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=laptop X-TDE-Library=laptop
X-TDE-FactoryName=cwarning X-TDE-FactoryName=cwarning
Exec=kcmshell laptop Exec=tdecmshell laptop
Icon=laptop_battery Icon=laptop_battery
Type=Application Type=Application

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=email Icon=email
Type=Application Type=Application
Exec=kcmshell kcm_useraccount Exec=tdecmshell kcm_useraccount
DocPath=kcontrol/email/index.html DocPath=kcontrol/email/index.html
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=useraccount X-TDE-Library=useraccount

@ -88,4 +88,4 @@ X-TDE-Library=konq
X-TDE-FactoryName=browser X-TDE-FactoryName=browser
Type=Application Type=Application
Icon=kfm Icon=kfm
Exec=kcmshell filebrowser Exec=tdecmshell filebrowser

@ -75,6 +75,6 @@ Name[zu]=TDE XML RPC Daemon
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=kded X-TDE-Library=kded
X-TDE-Factoryname=kded X-TDE-Factoryname=kded
Exec=kcmshell kcmkded Exec=tdecmshell kcmkded
Icon=kded Icon=kded
Type=Application Type=Application

@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器
Name[zh_TW]=Konqueror 網頁瀏覽器 Name[zh_TW]=Konqueror 網頁瀏覽器
Type=Application Type=Application
Icon=fonts Icon=fonts
Exec=kcmshell tdehtml_fonts Exec=tdecmshell tdehtml_fonts
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=konqhtml X-TDE-Library=konqhtml
X-TDE-FactoryName=tdehtml_fonts X-TDE-FactoryName=tdehtml_fonts

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Exec=kcmshell kcm_useraccount Exec=tdecmshell kcm_useraccount
Icon=password Icon=password
DocPath=kcontrol/passwords/index.html DocPath=kcontrol/passwords/index.html
NoDisplay=true NoDisplay=true

@ -69,7 +69,7 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=laptop X-TDE-Library=laptop
X-TDE-FactoryName=power X-TDE-FactoryName=power
Exec=kcmshell laptop Exec=tdecmshell laptop
NoDisplay=true NoDisplay=true
Icon=laptop_battery Icon=laptop_battery
Type=Application Type=Application

@ -17,7 +17,7 @@ Name[ta]=துளைகள்
Name[te]=సాక్స్ Name[te]=సాక్స్
Type=Application Type=Application
Icon=proxy Icon=proxy
Exec=kcmshell proxy Exec=tdecmshell proxy
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=kio X-TDE-Library=kio
X-TDE-FactoryName=proxy X-TDE-FactoryName=proxy

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Exec=kcmshell kcm_useraccount Exec=tdecmshell kcm_useraccount
Icon=tdmconfig Icon=tdmconfig
DocPath=kcontrol/userinfo/index.html DocPath=kcontrol/userinfo/index.html

@ -77,7 +77,7 @@ Name[zh_CN]=虚拟桌面
Name[zh_TW]=多重桌面 Name[zh_TW]=多重桌面
Type=Application Type=Application
Icon=desktop Icon=desktop
Exec=kcmshell desktop Exec=tdecmshell desktop
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=konq X-TDE-Library=konq
X-TDE-FactoryName=ddesktop X-TDE-FactoryName=ddesktop

@ -30,17 +30,17 @@
// libart // libart
#cmakedefine HAVE_LIBART 1 #cmakedefine HAVE_LIBART 1
// tdm, kioslave // tdm, tdeioslave
#cmakedefine HAVE_TERMIOS_H 1 #cmakedefine HAVE_TERMIOS_H 1
// kioslave/media // tdeioslave/media
#cmakedefine WITH_HAL 1 #cmakedefine WITH_HAL 1
#ifdef WITH_HAL #ifdef WITH_HAL
#define COMPILE_HALBACKEND #define COMPILE_HALBACKEND
#define COMPILE_LINUXCDPOLLING #define COMPILE_LINUXCDPOLLING
#endif #endif
// kioslave/media // tdeioslave/media
#cmakedefine WITH_TDEHWLIB 1 #cmakedefine WITH_TDEHWLIB 1
#ifdef WITH_TDEHWLIB #ifdef WITH_TDEHWLIB
// forcibly deactivate HAL support and substitute TDE hardware library support // forcibly deactivate HAL support and substitute TDE hardware library support
@ -48,10 +48,10 @@
#define COMPILE_TDEHARDWAREBACKEND #define COMPILE_TDEHARDWAREBACKEND
#endif #endif
// kioslave/fish, kcontrol/info // tdeioslave/fish, kcontrol/info
#cmakedefine HAVE_SYS_IOCTL_H 1 #cmakedefine HAVE_SYS_IOCTL_H 1
// kioslave/smtp, kioslave/pop3 // tdeioslave/smtp, tdeioslave/pop3
#cmakedefine HAVE_LIBSASL2 1 #cmakedefine HAVE_LIBSASL2 1
// tdm, kcontrol // tdm, kcontrol
@ -71,7 +71,7 @@
// kio_smtp, ksysguard // kio_smtp, ksysguard
#cmakedefine kde_socklen_t @kde_socklen_t@ #cmakedefine kde_socklen_t @kde_socklen_t@
// kfile_media // tdefile_media
#cmakedefine HAVE_STATVFS #cmakedefine HAVE_STATVFS
// taskmanager // taskmanager
@ -121,7 +121,6 @@
// kdesktop // kdesktop
#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@" #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
// tdm // tdm
#cmakedefine XBINDIR "@XBINDIR@" #cmakedefine XBINDIR "@XBINDIR@"

@ -239,7 +239,7 @@ KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory]) AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
AC_SUBST(KDE_BINDIR) AC_SUBST(KDE_BINDIR)
dnl libart is used by tdm, kcontrol and thumbnails code in kioslaves dnl libart is used by tdm, kcontrol and thumbnails code in tdeioslaves
KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
]) ])

@ -45,7 +45,7 @@ select Menus, then inside the TDE Menu grouping, select the TDE Menu button icon
User modifications to the &kmenu; are stored in User modifications to the &kmenu; are stored in
<filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu</filename>. <filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu</filename>.
Try moving this file out of the way and then issuing the Try moving this file out of the way and then issuing the
command <userinput><command>kbuildsycoca</command> command <userinput><command>tdebuildsycoca</command>
<option>--noincremental</option></userinput>. This should restore you to the <option>--noincremental</option></userinput>. This should restore you to the
default system menus. If that is the case you'll have to recreate your customized menu. default system menus. If that is the case you'll have to recreate your customized menu.
</para> </para>

@ -48,7 +48,7 @@ Slave</glossseealso>
configuration cache which, for example, guarantees fast access to the menu configuration cache which, for example, guarantees fast access to the menu
entries.</para> entries.</para>
<glossseealso <glossseealso
otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glossseealso> otherterm="gloss-tdebuildsycoca"><application>KBuildSycoca</application></glossseealso>
</glossdef> </glossdef>
</glossentry> </glossentry>
</glossdiv> </glossdiv>
@ -80,7 +80,7 @@ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glosssee
<glossdiv id="glossdiv-applications"> <glossdiv id="glossdiv-applications">
<title>Applications</title> <title>Applications</title>
<glossentry id="gloss-kbuildsycoca"> <glossentry id="gloss-tdebuildsycoca">
<glossterm><application>KBuildSycoca</application></glossterm> <glossterm><application>KBuildSycoca</application></glossterm>
<glossdef><para><application>KBuildSycoca</application> is a command line <glossdef><para><application>KBuildSycoca</application> is a command line
program and regenerates the program and regenerates the

@ -1127,7 +1127,7 @@ now.
</glossdef> </glossdef>
</glossentry> </glossentry>
<glossentry id="gloss-printkioslave"> <glossentry id="gloss-printtdeioslave">
<glossterm>print:/ KIO Slave</glossterm> <glossterm>print:/ KIO Slave</glossterm>
<glossdef><para>You can use a syntax of "print:/..." to get quick access <glossdef><para>You can use a syntax of "print:/..." to get quick access
to TDEPrint resources. Typing "print:/manager" as a Konqueror URL to TDEPrint resources. Typing "print:/manager" as a Konqueror URL

@ -155,7 +155,7 @@ download.</para>
<screenshot> <screenshot>
<screeninfo>Download Dialog Box</screeninfo> <screeninfo>Download Dialog Box</screeninfo>
<mediaobject> <mediaobject>
<imageobject><imagedata fileref="kfileman2.png" <imageobject><imagedata fileref="tdefileman2.png"
format="PNG"/></imageobject> format="PNG"/></imageobject>
<textobject> <phrase>Download Dialog Box</phrase> </textobject> <textobject> <phrase>Download Dialog Box</phrase> </textobject>
<caption> <caption>
@ -173,7 +173,7 @@ together under a single dialog box.</para>
<screenshot> <screenshot>
<screeninfo>Download Dialog Box</screeninfo> <screeninfo>Download Dialog Box</screeninfo>
<mediaobject> <mediaobject>
<imageobject><imagedata fileref="kfileman1.png" <imageobject><imagedata fileref="tdefileman1.png"
format="PNG"/></imageobject> format="PNG"/></imageobject>
<textobject><phrase>Download Dialog Box</phrase></textobject> <textobject><phrase>Download Dialog Box</phrase></textobject>
<caption> <caption>

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

@ -308,7 +308,7 @@ the control center.
<title>Running Individual Modules</title> <title>Running Individual Modules</title>
<para> <para>
You can run individual modules without running kcontrol using the command <command>kcmshell</command> from &konsole;. Type <userinput> <command>kcmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs. You can run individual modules without running kcontrol using the command <command>tdecmshell</command> from &konsole;. Type <userinput> <command>tdecmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
</para> </para>
</sect1> </sect1>

@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para>
<para>The other option is <guilabel>Use automatic login</guilabel>. <para>The other option is <guilabel>Use automatic login</guilabel>.
Select this option if you have already set up a login entry for your Select this option if you have already set up a login entry for your
proxy server in the proxy server in the
<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename> <filename>$<envar>TDEDIR</envar>/share/config/tdeionetrc</filename>
file.</para> file.</para>
</sect2> </sect2>

@ -2346,7 +2346,7 @@ Why is my <guisubmenu>Settings</guisubmenu> menu not working?
<answer> <answer>
<para> <para>
Your menu entries may be mixed up for some reason. Simply run Your menu entries may be mixed up for some reason. Simply run
<command>kbuildsycoca</command> on a commandline. <command>tdebuildsycoca</command> on a commandline.
</para> </para>
</answer> </answer>
</qandaentry> </qandaentry>

@ -446,15 +446,15 @@ just add a key line
<screen><userinput> <screen><userinput>
OverridenPorts=CommaSeparatedListOfAllowedPorts OverridenPorts=CommaSeparatedListOfAllowedPorts
</userinput></screen> </userinput></screen>
to <filename>$TDEDIR/share/config/kio_httprc to <filename>$TDEDIR/share/config/tdeio_httprc
</filename> or </filename> or
<filename>~/.trinity/share/config/kio_httprc</filename>.</para> <filename>~/.trinity/share/config/tdeio_httprc</filename>.</para>
<para>For example <para>For example
<screen><userinput>OverridenPorts=23,15 <screen><userinput>OverridenPorts=23,15
</userinput></screen> </userinput></screen>
(it should not include any embedded spaces).</para> (it should not include any embedded spaces).</para>
<para>&konqueror; will reject the following ports (the list is hardcoded in <para>&konqueror; will reject the following ports (the list is hardcoded in
<filename>tdelibs/kio/kio/job.cpp</filename>):</para> <filename>tdelibs/tdeio/tdeio/job.cpp</filename>):</para>
<para> <para>
1, 7, 9, 11, 13, 15, 17, 19, 1, 7, 9, 11, 13, 15, 17, 19,
20, 21, 22, 23, 25, 37, 42, 43, 20, 21, 22, 23, 25, 37, 42, 43,

@ -1084,7 +1084,7 @@ appropriate plugin.</para>
#include &lt;qwidget.h&gt; #include &lt;qwidget.h&gt;
#include &lt;kapplication.h&gt; #include &lt;kapplication.h&gt;
#include &lt;kconfig.h&gt; #include &lt;tdeconfig.h&gt;
#include &lt;kdebug.h&gt; #include &lt;kdebug.h&gt;
#include &lt;kdialogbase.h&gt; #include &lt;kdialogbase.h&gt;
#include &lt;kgenericfactory.h&gt; #include &lt;kgenericfactory.h&gt;

@ -83,7 +83,7 @@ list.</para>
configuration by selecting <guimenuitem>Configure...</guimenuitem> or configuration by selecting <guimenuitem>Configure...</guimenuitem> or
by opening <application>Control Center</application> and selecting by opening <application>Control Center</application> and selecting
Localization/Keyboard Layout. Alternatively, you can start it by Localization/Keyboard Layout. Alternatively, you can start it by
typing <command>kcmshell keyboard_layout</command> in a typing <command>tdecmshell keyboard_layout</command> in a
terminal.</para> terminal.</para>
</sect1> </sect1>

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION kioslave ) tde_create_handbook( DESTINATION tdeioslave )

@ -11,19 +11,19 @@
used today, having been replaced with bzip2, which offers much better used today, having been replaced with bzip2, which offers much better
compression.</para> compression.</para>
<para>The bzip kioslave is not directly usable, and is intended for use <para>The bzip tdeioslave is not directly usable, and is intended for use
as a filter. For example, the tar kioslave can filter a file through as a filter. For example, the tar tdeioslave can filter a file through
the bzip kioslave, in order to display the contents of a <literal the bzip tdeioslave, in order to display the contents of a <literal
role="extension">tar.bz</literal> file directly in a &konqueror; role="extension">tar.bz</literal> file directly in a &konqueror;
window.</para> window.</para>
<para>If you click on a file compressed with a <literal <para>If you click on a file compressed with a <literal
role="extension">bz</literal> extension in &konqueror;, this kioslave is role="extension">bz</literal> extension in &konqueror;, this tdeioslave is
used to uncompress it and display it as a normal (uncompressed) used to uncompress it and display it as a normal (uncompressed)
file.</para> file.</para>
<para>If you are a developer, and would like to use the bzip filter, <para>If you are a developer, and would like to use the bzip filter,
you can find documentation on using kioslaves at <ulink you can find documentation on using tdeioslaves at <ulink
url="http://developer.kde.org">http://developer.kde.org</ulink></para> url="http://developer.kde.org">http://developer.kde.org</ulink></para>
</article> </article>

@ -9,18 +9,18 @@
<para>Bzip2 is a compression program</para> <para>Bzip2 is a compression program</para>
<para>The bzip2 kioslave is not directly usable, and is intended for use <para>The bzip2 tdeioslave is not directly usable, and is intended for use
as a filter. For example, the tar kioslave can filter a file through as a filter. For example, the tar tdeioslave can filter a file through
the bzip2 kioslave, in order to display the contents of a <literal the bzip2 tdeioslave, in order to display the contents of a <literal
role="extension">tar.bz2</literal> file directly in a &konqueror; role="extension">tar.bz2</literal> file directly in a &konqueror;
window.</para> window.</para>
<para>If you click on a file compressed with a <literal <para>If you click on a file compressed with a <literal
role="extension">.bz2</literal> in &konqueror;, this kioslave is used to role="extension">.bz2</literal> in &konqueror;, this tdeioslave is used to
uncompress it and display it as a normal (uncompressed) file.</para> uncompress it and display it as a normal (uncompressed) file.</para>
<para>If you are a developer, and would like to use the bzip2 filter, <para>If you are a developer, and would like to use the bzip2 filter,
you can find documentation on using kioslaves at <ulink you can find documentation on using tdeioslaves at <ulink
url="http://developer.kde.org">http://developer.kde.org</ulink></para> url="http://developer.kde.org">http://developer.kde.org</ulink></para>
<para> See the manual: <ulink url="man:/bzip2">bzip2</ulink>. <para> See the manual: <ulink url="man:/bzip2">bzip2</ulink>.

@ -24,7 +24,7 @@ you may find that you get no useful answer for most people.</para>
hold such information as <acronym>PGP</acronym> keys, the fact they are hold such information as <acronym>PGP</acronym> keys, the fact they are
on vacation, and all sorts of information.</para> on vacation, and all sorts of information.</para>
<para>Use the finger kioslave like this: <para>Use the finger tdeioslave like this:
<userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para> <userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para>
<para> See the manual: <ulink url="man:/finger">finger</ulink>. <para> See the manual: <ulink url="man:/finger">finger</ulink>.

@ -14,7 +14,7 @@
<para>Allows you to access another computer's files using the SEcure Shell (<acronym>SSH</acronym>) protocol. The remote computer needs to be running the <acronym>SSH</acronym> daemon, but the remainder of the protocol uses standard commandline tools as discussed below.</para> <para>Allows you to access another computer's files using the SEcure Shell (<acronym>SSH</acronym>) protocol. The remote computer needs to be running the <acronym>SSH</acronym> daemon, but the remainder of the protocol uses standard commandline tools as discussed below.</para>
<para>You can use the fish kioslave like this: <para>You can use the fish tdeioslave like this:
<userinput>fish://<replaceable>hostname</replaceable></userinput> or <userinput>fish://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput>.</para> <userinput>fish://<replaceable>hostname</replaceable></userinput> or <userinput>fish://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput>.</para>
<note><para>You need to use double forward slashes.</para></note> <note><para>You need to use double forward slashes.</para></note>

@ -9,19 +9,19 @@
<para><command>gzip</command> is a compression program</para> <para><command>gzip</command> is a compression program</para>
<para>The gzip kioslave is not directly usable, and is intended for use <para>The gzip tdeioslave is not directly usable, and is intended for use
as a filter. For example, the tar kioslave can filter a file through as a filter. For example, the tar tdeioslave can filter a file through
the gzip kioslave, in order to display the contents of a <literal the gzip tdeioslave, in order to display the contents of a <literal
role="extension">tar.gz</literal> file directly in a &konqueror; role="extension">tar.gz</literal> file directly in a &konqueror;
window.</para> window.</para>
<para>If you click on a file compressed with a <literal <para>If you click on a file compressed with a <literal
role="extension">gz</literal> extension in &konqueror;, this kioslave is role="extension">gz</literal> extension in &konqueror;, this tdeioslave is
used to uncompress it and display it as a normal (uncompressed) used to uncompress it and display it as a normal (uncompressed)
file.</para> file.</para>
<para>If you are a developer, and would like to use the gzip filter, you <para>If you are a developer, and would like to use the gzip filter, you
can find documentation on using kioslaves at <ulink can find documentation on using tdeioslaves at <ulink
url="http://developer.kde.org">http://developer.kde.org</ulink></para> url="http://developer.kde.org">http://developer.kde.org</ulink></para>
<para> See the manual: <ulink url="man:/gzip">gzip</ulink>. <para> See the manual: <ulink url="man:/gzip">gzip</ulink>.

@ -11,11 +11,11 @@
<emphasis>H</emphasis>yper<emphasis>T</emphasis>ext <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
<emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para> <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
<para>The http kioslave is used by all &tde; applications to handle <para>The http tdeioslave is used by all &tde; applications to handle
connections to http servers, that is, web servers. The most common connections to http servers, that is, web servers. The most common
usage is to view web pages in the &konqueror; web browser.</para> usage is to view web pages in the &konqueror; web browser.</para>
<para>You can use the http kioslave in &konqueror; by giving it a <para>You can use the http tdeioslave in &konqueror; by giving it a
<acronym>URL</acronym>. <acronym>URL</acronym>.
<userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para> <userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>

@ -8,7 +8,7 @@
</articleinfo> </articleinfo>
<para> <para>
HTTPS is HTTPS is
<ulink url="help:/kioslave/http.html">HTTP</ulink> <ulink url="help:/tdeioslave/http.html">HTTP</ulink>
encapsulated in an SSL/TLS stream. encapsulated in an SSL/TLS stream.
</para> </para>
<para> <para>

@ -19,7 +19,7 @@ everywhere. Messages can be stored on the server, retrieved from there or
moved between folders.</para> moved between folders.</para>
<para>This plugin is currently mainly used by KMail, but you can also use it <para>This plugin is currently mainly used by KMail, but you can also use it
in any other KDE application that uses kioslave plugins.</para> in any other KDE application that uses tdeioslave plugins.</para>
<para>For example in &konqueror;, simply type <para>For example in &konqueror;, simply type
<userinput>imap://username@your.mail.server/</userinput> to get your IMAP <userinput>imap://username@your.mail.server/</userinput> to get your IMAP

@ -11,7 +11,7 @@
</articleinfo> </articleinfo>
<para>IMAPS is the <ulink url="help:/kioslave/imap.html">IMAP</ulink> protocol <para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol
encrypted via SSL.</para> encrypted via SSL.</para>
</article> </article>

@ -12,7 +12,7 @@ This protocol is intended to provide a kind of <quote>network
neighborhood</quote> but only relying on the TCP/IP protocol stack and with neighborhood</quote> but only relying on the TCP/IP protocol stack and with
the ability to use other protocols than just <acronym>SMB</acronym>.</para> the ability to use other protocols than just <acronym>SMB</acronym>.</para>
<para>The lan kioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, <para>The lan tdeioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>,
<acronym>NFS</acronym>, and <acronym>FISH</acronym></para> <acronym>NFS</acronym>, and <acronym>FISH</acronym></para>
<para>It must first be configured in &kcontrol;, <para>It must first be configured in &kcontrol;,

@ -11,7 +11,7 @@
protocol. It provides access to an X.500 directory, or to a stand-alone protocol. It provides access to an X.500 directory, or to a stand-alone
<acronym>LDAP</acronym> server.</para> <acronym>LDAP</acronym> server.</para>
<para>You can use the ldap kioslave as follows:</para> <para>You can use the ldap tdeioslave as follows:</para>
<para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput> <para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput>
for a subtree-query</para> for a subtree-query</para>

@ -6,7 +6,7 @@
<!-- TRANS:ROLES_OF_TRANSLATORS --> <!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup> </authorgroup>
</articleinfo> </articleinfo>
<para>The mailto kioslave is used when you click on a mailto link in an <para>The mailto tdeioslave is used when you click on a mailto link in an
<acronym>HTML</acronym> page. &konqueror; will open the preferred mail <acronym>HTML</acronym> page. &konqueror; will open the preferred mail
client you have configured, with a composer window. Any information client you have configured, with a composer window. Any information
supplied in the <acronym>URL</acronym> will be filled in for you.</para> supplied in the <acronym>URL</acronym> will be filled in for you.</para>

@ -8,7 +8,7 @@
</articleinfo> </articleinfo>
<para>The news kioslave is used when you click on a news link on a web <para>The news tdeioslave is used when you click on a news link on a web
page. It will open &knode;, and if the group referred to in the news page. It will open &knode;, and if the group referred to in the news
link is available from your server, it will subscribe you to the group, in link is available from your server, it will subscribe you to the group, in
the first available account you have configured in &knode;</para> the first available account you have configured in &knode;</para>

@ -6,10 +6,10 @@
<!-- TRANS:ROLES_OF_TRANSLATORS --> <!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup> </authorgroup>
</articleinfo> </articleinfo>
<para>The nntp kioslave accesses <acronym>NNTP</acronym> servers <para>The nntp tdeioslave accesses <acronym>NNTP</acronym> servers
directly.</para> directly.</para>
<para>This kioslave can not be used with servers that do not implement <para>This tdeioslave can not be used with servers that do not implement
the <command>GROUP</command> command, including some versions of the the <command>GROUP</command> command, including some versions of the
popular <application>INN</application> news server which is often used popular <application>INN</application> news server which is often used
by <acronym>ISP</acronym>s. It does work with by <acronym>ISP</acronym>s. It does work with
@ -17,7 +17,7 @@ by <acronym>ISP</acronym>s. It does work with
offline cache of news articles on their own hard drive or within their offline cache of news articles on their own hard drive or within their
<acronym>LAN</acronym>.</para> <acronym>LAN</acronym>.</para>
<para>You can use the nntp kioslave by typing <para>You can use the nntp tdeioslave by typing
<userinput>nntp://yourserver/groupname</userinput> into the &konqueror; <userinput>nntp://yourserver/groupname</userinput> into the &konqueror;
<acronym>URL</acronym> bar.</para> <acronym>URL</acronym> bar.</para>

@ -54,7 +54,7 @@ and a short explanation of what they represent:</para>
<varlistentry> <varlistentry>
<term><userinput>print:/ </userinput> (&ie; the root of <term><userinput>print:/ </userinput> (&ie; the root of
print-kioslave)</term> print-tdeioslave)</term>
<listitem> <listitem>
<para> virtual root for browsing your print subsystem. <para> virtual root for browsing your print subsystem.
It displays subfolders <quote>Classes</quote>, It displays subfolders <quote>Classes</quote>,

@ -9,14 +9,14 @@
<para>Using &konqueror; you can start up an <command>rlogin</command> <para>Using &konqueror; you can start up an <command>rlogin</command>
session with a server hosting the rlogin service.</para> session with a server hosting the rlogin service.</para>
<para>To use this kioslave feature, in the &konqueror; <para>To use this tdeioslave feature, in the &konqueror;
<acronym>URL</acronym> bar, type <acronym>URL</acronym> bar, type
<userinput>rlogin:/host_to_connect_to</userinput></para> <userinput>rlogin:/host_to_connect_to</userinput></para>
<para>This will initialize &konsole; with an <command>rlogin</command> <para>This will initialize &konsole; with an <command>rlogin</command>
session, prompting you for your password.</para> session, prompting you for your password.</para>
<para>The <command>rlogin</command> kioslave uses the username of the <para>The <command>rlogin</command> tdeioslave uses the username of the
account you are currently using in &tde;.</para> account you are currently using in &tde;.</para>
<para>After you have successfully entered your password, you can begin <para>After you have successfully entered your password, you can begin

@ -41,7 +41,7 @@ You can set your default user name and password in the &kcontrol; in
<menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows <menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows
Shares</guimenuitem></menuchoice>. This is especially useful if you are a Shares</guimenuitem></menuchoice>. This is especially useful if you are a
member of a &Windows; <acronym>NT</acronym> domain. There you can also set your member of a &Windows; <acronym>NT</acronym> domain. There you can also set your
workgroup name, but in most cases this is not required. The kioslave will ask for your username and password if a default is not set. workgroup name, but in most cases this is not required. The tdeioslave will ask for your username and password if a default is not set.
</para> </para>
<para> <para>

@ -6,23 +6,23 @@
<!-- TRANS:ROLES_OF_TRANSLATORS --> <!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup> </authorgroup>
</articleinfo> </articleinfo>
<para>The thumbnail kioslave is used by &tde; for network transparent <para>The thumbnail tdeioslave is used by &tde; for network transparent
and persistent generation of thumbnails.</para> and persistent generation of thumbnails.</para>
<para>The thumbnail kioslave uses plugins to generate the actual <para>The thumbnail tdeioslave uses plugins to generate the actual
thumbnails. You can enable viewing of these thumbnails from the thumbnails. You can enable viewing of these thumbnails from the
<menuchoice><guimenu>View</guimenu> <menuchoice><guimenu>View</guimenu>
<guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in <guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in
&konqueror; in file manager mode.</para> &konqueror; in file manager mode.</para>
<para>The thumbnail kioslave is not directly useful to a user, but if <para>The thumbnail tdeioslave is not directly useful to a user, but if
you are a developer, you can use it within your own applications to you are a developer, you can use it within your own applications to
create file previews.</para> create file previews.</para>
<para>See the documentation in the sources for more information. You <para>See the documentation in the sources for more information. You
will find these at will find these at
<filename>$<envar>TDEDIR</envar>/include/kio/thumbcreator.h</filename> or <filename>$<envar>TDEDIR</envar>/include/tdeio/thumbcreator.h</filename> or
in the source folder <filename in the source folder <filename
class="directory">tdebase/kioslave/thumbnail</filename></para> class="directory">tdebase/tdeioslave/thumbnail</filename></para>
</article> </article>

@ -13,7 +13,7 @@
<emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning
protocol for the World Wide Web. It allows for easy management of protocol for the World Wide Web. It allows for easy management of
documents and scripts on a <ulink documents and scripts on a <ulink
url="help:/kioslave/webdav.html">http</ulink> server, and has url="help:/tdeioslave/webdav.html">http</ulink> server, and has
additional features designed to simplify version management amongst additional features designed to simplify version management amongst
multiple authors.</para> multiple authors.</para>
@ -60,6 +60,6 @@ such as the author.</para>
<para>To take advantage of these additional capabilities, you will need an <para>To take advantage of these additional capabilities, you will need an
application which supports them. No application currently supports them application which supports them. No application currently supports them
through through
this kioslave.</para> this tdeioslave.</para>
</article> </article>

@ -11,7 +11,7 @@
</articleinfo> </articleinfo>
<para>WebDAVS is the <ulink url="help:/kioslave/webdav.html">WebDAV</ulink> protocol <para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol
encrypted via SSL.</para> encrypted via SSL.</para>
</article> </article>

@ -369,7 +369,7 @@ functions that were provided by <application>qtcups</application> and
<para>Instead of <command>qtcups</command> you can now use the <para>Instead of <command>qtcups</command> you can now use the
<command>kprinter</command> command. And in place of <command>kprinter</command> command. And in place of
<command>kups</command> you will probably use <command>kups</command> you will probably use
<command>kcmshell printers</command> from now on. <command>tdecmshell printers</command> from now on.
</para> </para>
<para>The &tdeprint; module for &CUPS; also lets you fully administer <para>The &tdeprint; module for &CUPS; also lets you fully administer

@ -220,7 +220,7 @@ you switch to other parts of the &kcontrol;</para></listitem>
<listitem><para>from a command line (&konsole; or <listitem><para>from a command line (&konsole; or
mini-<acronym>CLI</acronym>) type <userinput> mini-<acronym>CLI</acronym>) type <userinput>
<command>kcmshell</command> <option>printers</option></userinput>. <command>tdecmshell</command> <option>printers</option></userinput>.
This opens just the &tdeprint; part of &kcontrol; to change your settings This opens just the &tdeprint; part of &kcontrol; to change your settings
</para></listitem> </para></listitem>
</itemizedlist> </itemizedlist>

@ -335,7 +335,7 @@ slow data updates.</para>
<para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
data source for it's various components. From the &kmenu;, choose data source for it's various components. From the &kmenu;, choose
<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell <guimenuitem>Run command</guimenuitem>, run <userinput><command>tdecmshell
tderesources</command></userinput>. In the combo box select tderesources</command></userinput>. In the combo box select
<guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton> <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and

@ -830,7 +830,7 @@ Running...</computeroutput>. The arguments after <command>tdeinit</command>
are the names of additional processes to be started. The <token>+</token> are the names of additional processes to be started. The <token>+</token>
indicates that <command>tdeinit</command> needs to wait till the process has indicates that <command>tdeinit</command> needs to wait till the process has
finished. <command>tdeinit</command> also starts finished. <command>tdeinit</command> also starts
<command>dcopserver</command>, <command>klauncher</command> and <command>dcopserver</command>, <command>tdelauncher</command> and
<command>kded</command>.</para> <command>kded</command>.</para>
<para>The second of the two lines asks <command>tdeinit</command> to start <para>The second of the two lines asks <command>tdeinit</command> to start
@ -871,11 +871,11 @@ needed</para>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><command>klauncher</command></term> <term><command>tdelauncher</command></term>
<listitem><para>Program launch (this is <emphasis>not</emphasis> the <listitem><para>Program launch (this is <emphasis>not</emphasis> the
<keycombo action="simul">&Alt;<keycap>F2</keycap> <keycombo action="simul">&Alt;<keycap>F2</keycap>
</keycombo>dialog!)</para> </keycombo>dialog!)</para>
<para>See <xref linkend="klauncher"/> for more information.</para> <para>See <xref linkend="tdelauncher"/> for more information.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -916,7 +916,7 @@ to see the actual program name:</para>
<computeroutput> <computeroutput>
waba 23184 0.2 2.1 23428 11124 ? S 21:41 0:00 tdeinit: Running... waba 23184 0.2 2.1 23428 11124 ? S 21:41 0:00 tdeinit: Running...
waba 23187 0.1 2.1 23200 11124 ? S 21:41 0:00 tdeinit: dcopserver --nosid waba 23187 0.1 2.1 23200 11124 ? S 21:41 0:00 tdeinit: dcopserver --nosid
waba 23189 0.2 2.4 25136 12496 ? S 21:41 0:00 tdeinit: klauncher waba 23189 0.2 2.4 25136 12496 ? S 21:41 0:00 tdeinit: tdelauncher
waba 23192 0.7 2.8 25596 14772 ? S 21:41 0:00 tdeinit: kded waba 23192 0.7 2.8 25596 14772 ? S 21:41 0:00 tdeinit: kded
waba 23203 0.8 3.4 31516 17892 ? S 21:41 0:00 tdeinit: waba 23203 0.8 3.4 31516 17892 ? S 21:41 0:00 tdeinit:
knotify knotify
@ -928,7 +928,7 @@ master <command>tdeinit</command> process. The other processes listed are
programs started as <acronym>KLM</acronym>s.</para> programs started as <acronym>KLM</acronym>s.</para>
<para>When <command>tdeinit</command> starts for the first time it will <para>When <command>tdeinit</command> starts for the first time it will
launch <command>dcopserver</command>, <command>klauncher</command>, and launch <command>dcopserver</command>, <command>tdelauncher</command>, and
<command>kded</command>, as well as any additional programs specified on its <command>kded</command>, as well as any additional programs specified on its
command line in the <command>starttde</command> script, normally command line in the <command>starttde</command> script, normally
<command>kcminit</command> and <command>knotify</command>.</para> <command>kcminit</command> and <command>knotify</command>.</para>
@ -980,7 +980,7 @@ applications or services via the <varname>X-TDE-Init</varname> line:</para>
<programlisting> <programlisting>
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Exec=kcmshell energy Exec=tdecmshell energy
Icon=energy_star Icon=energy_star
Type=Application Type=Application
X-TDE-Library=energy X-TDE-Library=energy
@ -999,21 +999,21 @@ startup problems.</para>
</sect2> </sect2>
<sect2 id="klauncher"> <sect2 id="tdelauncher">
<title><command>klauncher</command></title> <title><command>tdelauncher</command></title>
<para><command>klauncher</command> is a daemon which is responsible for <para><command>tdelauncher</command> is a daemon which is responsible for
service activation within &tde;. It operates in close connection with the service activation within &tde;. It operates in close connection with the
<command>tdeinit</command> master process to start new processes. &tde; <command>tdeinit</command> master process to start new processes. &tde;
applications communicate with <command>klauncher</command> over &DCOP; in applications communicate with <command>tdelauncher</command> over &DCOP; in
order to start new applications or services.</para> order to start new applications or services.</para>
<para>Best known from the error message: <computeroutput><errortext> <para>Best known from the error message: <computeroutput><errortext>
KLauncher could not be reached via DCOP </errortext></computeroutput> which KLauncher could not be reached via DCOP </errortext></computeroutput> which
either indicates a serious problem with the <command>dcopserver</command> or either indicates a serious problem with the <command>dcopserver</command> or
that <command>klauncher</command> crashed.</para> that <command>tdelauncher</command> crashed.</para>
<para><command>klauncher</command> can be restarted by restarting <para><command>tdelauncher</command> can be restarted by restarting
<command>tdeinit</command> from a console window. Make sure that <command>tdeinit</command> from a console window. Make sure that
$<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various
$<envar>TDEDIR(S)</envar> are set correctly when doing so!</para> $<envar>TDEDIR(S)</envar> are set correctly when doing so!</para>
@ -1190,7 +1190,7 @@ on a multi-head system.</para>
<listitem><para>Set this variable to spawn <listitem><para>Set this variable to spawn
<acronym>KIO</acronym>-slaves directly from the application process <acronym>KIO</acronym>-slaves directly from the application process
itself. By default <acronym>KIO</acronym>-slaves are spawned using itself. By default <acronym>KIO</acronym>-slaves are spawned using
<command>klauncher</command>/<command>tdeinit</command>. This option is <command>tdelauncher</command>/<command>tdeinit</command>. This option is
useful if the <acronym>KIO</acronym>-slave should run in the same useful if the <acronym>KIO</acronym>-slave should run in the same
environment as the application. This can be the case with environment as the application. This can be the case with
<application>Clearcase</application>.</para> <application>Clearcase</application>.</para>
@ -1323,7 +1323,7 @@ output of <command>top</command> and <command>ps</command>. Use
<computeroutput> <computeroutput>
bastian 26061 0.0 2.2 24284 11492 ? S 21:27 0:00 tdeinit: Running... bastian 26061 0.0 2.2 24284 11492 ? S 21:27 0:00 tdeinit: Running...
bastian 26064 0.0 2.2 24036 11524 ? S 21:27 0:00 tdeinit: dcopserver bastian 26064 0.0 2.2 24036 11524 ? S 21:27 0:00 tdeinit: dcopserver
bastian 26066 0.1 2.5 26056 12988 ? S 21:27 0:00 tdeinit: klauncher bastian 26066 0.1 2.5 26056 12988 ? S 21:27 0:00 tdeinit: tdelauncher
bastian 26069 0.4 3.2 27356 16744 ? S 21:27 0:00 tdeinit: kded bastian 26069 0.4 3.2 27356 16744 ? S 21:27 0:00 tdeinit: kded
bastian 26161 0.2 2.7 25344 14096 ? S 21:27 0:00 tdeinit: ksmserver bastian 26161 0.2 2.7 25344 14096 ? S 21:27 0:00 tdeinit: ksmserver
bastian 26179 1.1 3.4 29716 17812 ? S 21:27 0:00 tdeinit: kicker bastian 26179 1.1 3.4 29716 17812 ? S 21:27 0:00 tdeinit: kicker
@ -1619,7 +1619,7 @@ class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></lis
</sect2> </sect2>
</sect1> </sect1>
<sect1 id="kde-menu"> <sect1 id="tde-menu">
<title>&tde; Menu</title> <title>&tde; Menu</title>
<sect2 id="how-it-works"> <sect2 id="how-it-works">
@ -1824,7 +1824,7 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
<para><application>KSycoca</application> caches menu structure and <para><application>KSycoca</application> caches menu structure and
information about all available applications. You can rebuild the information about all available applications. You can rebuild the
database with database with
<userinput><command>kbuildsycoca</command></userinput>. The database <userinput><command>tdebuildsycoca</command></userinput>. The database
which is built lives in <filename which is built lives in <filename
class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>. class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
It is automatically updated by <application>KDED</application>, It is automatically updated by <application>KDED</application>,
@ -2281,13 +2281,13 @@ as part of the <guilabel>Configure Konqueror</guilabel> dialog in
&konqueror;</para> &konqueror;</para>
<para>Individual configuration modules can be started with <para>Individual configuration modules can be started with
<command>kcmshell</command> <replaceable>module</replaceable></para> <command>tdecmshell</command> <replaceable>module</replaceable></para>
<para>To start the Proxy module use:</para> <para>To start the Proxy module use:</para>
<itemizedlist> <itemizedlist>
<listitem><para><command>kcmshell</command> <listitem><para><command>tdecmshell</command>
<filename>tde-proxy.desktop</filename></para></listitem> <filename>tde-proxy.desktop</filename></para></listitem>
<listitem><para><command>kcmshell</command> proxy</para></listitem> <listitem><para><command>tdecmshell</command> proxy</para></listitem>
</itemizedlist> </itemizedlist>
<para><note><para>Not all applications use configuration modules, often the <para><note><para>Not all applications use configuration modules, often the
@ -2306,14 +2306,14 @@ class="directory">$<envar>TDEDIR</envar>/share/applications/tde</filename>
and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by
the <filename>kde-settings.menu</filename>, included from the <filename>kde-settings.menu</filename>, included from
<filename>kde-essential.menu</filename></para> <filename>kde-essential.menu</filename></para>
<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen> <screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
</listitem> </listitem>
<listitem> <listitem>
<para>Application specific modules normally have a <literal role="extension">.desktop</literal> file under <para>Application specific modules normally have a <literal role="extension">.desktop</literal> file under
<filename>$<envar>TDEDIR</envar>/share/applnk/.hidden</filename> which <filename>$<envar>TDEDIR</envar>/share/applnk/.hidden</filename> which
corresponds to the hidden .hidden menu, included as a result of corresponds to the hidden .hidden menu, included as a result of
<markup>&lt;KDELegacyDirs/&gt;</markup></para> <markup>&lt;KDELegacyDirs/&gt;</markup></para>
<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen> <screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
</listitem> </listitem>
<listitem><para>In &tde; 3.3 it is possible to edit the Control Center with <listitem><para>In &tde; 3.3 it is possible to edit the Control Center with
<application>kcontroledit</application>. <application>kcontroledit</application>.
@ -2481,7 +2481,7 @@ konsole-8954
<para>One &konsole; is running with a <acronym>PID</acronym> of 8954.</para> <para>One &konsole; is running with a <acronym>PID</acronym> of 8954.</para>
<screen><prompt>&percnt; </prompt><userinput><command>dcop</command><option> konsole-8954</option></userinput> <screen><prompt>&percnt; </prompt><userinput><command>dcop</command><option> konsole-8954</option></userinput>
KBookmarkManager-.../share/apps/kfile/bookmarks.xml KBookmarkManager-.../share/apps/tdefile/bookmarks.xml
KBookmarkManager-.../share/apps/konqueror/bookmarks.xml KBookmarkManager-.../share/apps/konqueror/bookmarks.xml
KBookmarkNotifier KBookmarkNotifier
KDebug KDebug

@ -31,7 +31,7 @@ tde_add_executable( drkonqi AUTOMOC
SOURCES SOURCES
krashdcopinterface.skel main.cpp debugger.cpp krashdcopinterface.skel main.cpp debugger.cpp
krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -41,7 +41,7 @@ if( BUILD_CRASHTEST )
tde_add_executable( crashtest AUTOMOC tde_add_executable( crashtest AUTOMOC
SOURCES SOURCES
crashtest.cpp crashtest.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
endif( BUILD_CRASHTEST ) endif( BUILD_CRASHTEST )

@ -33,7 +33,7 @@
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>

@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************/ *****************************************************************/
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>

@ -33,7 +33,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/System RENAME k
tde_add_executable( kappfinder AUTOMOC tde_add_executable( kappfinder AUTOMOC
SOURCES main.cpp toplevel.cpp common.cpp SOURCES main.cpp toplevel.cpp common.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -32,7 +32,7 @@
#include <tdeversion.h> #include <tdeversion.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <twin.h> #include <twin.h>
#include <ktip.h> #include <ktip.h>
#include <kdebug.h> #include <kdebug.h>

@ -34,12 +34,12 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klibloader.h> #include <klibloader.h>
#include <kmdcodec.h> #include <kmdcodec.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kencodingfiledialog.h> #include <kencodingfiledialog.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <twin.h> #include <twin.h>
#include <tqdatetime.h> #include <tqdatetime.h>

@ -38,7 +38,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmimetypechooser.h> #include <kmimetypechooser.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <krun.h> #include <krun.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

@ -39,7 +39,7 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>

@ -53,7 +53,7 @@
#include <kurlcompletion.h> #include <kurlcompletion.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kdiroperator.h> #include <kdiroperator.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kaction.h> #include <kaction.h>
@ -66,7 +66,7 @@
//END Includes //END Includes
//BEGIN Toolbar //BEGIN Toolbar
// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) // from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
static void silenceQToolBar(TQtMsgType, const char *){} static void silenceQToolBar(TQtMsgType, const char *){}
// helper classes to be able to have a toolbar without move handle // helper classes to be able to have a toolbar without move handle

@ -26,7 +26,7 @@
#include <kate/document.h> #include <kate/document.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <kfile.h> #include <tdefile.h>
#include <kurl.h> #include <kurl.h>
#include <ktoolbar.h> #include <ktoolbar.h>
#include <tqframe.h> #include <tqframe.h>

@ -34,7 +34,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kaccelmanager.h> #include <kaccelmanager.h>
#include <kbuttonbox.h> #include <kbuttonbox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kprocess.h> #include <kprocess.h>
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>

@ -24,7 +24,7 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kinstance.h> #include <kinstance.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>
#include <dcopclient.h> #include <dcopclient.h>

@ -53,7 +53,7 @@
#include <kdiroperator.h> #include <kdiroperator.h>
#include <kdockwidget.h> #include <kdockwidget.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

@ -29,7 +29,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -26,7 +26,7 @@
#include "../interfaces/application.h" #include "../interfaces/application.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdebug.h> #include <kdebug.h>

@ -30,7 +30,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <ksqueezedtextlabel.h> #include <ksqueezedtextlabel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqwidgetstack.h> #include <tqwidgetstack.h>

@ -32,7 +32,7 @@
#include <tdetexteditor/editorchooser.h> #include <tdetexteditor/editorchooser.h>
#include <tdetexteditor/popupmenuinterface.h> #include <tdetexteditor/popupmenuinterface.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <dcopclient.h> #include <dcopclient.h>
@ -49,7 +49,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kkeydialog.h> #include <kkeydialog.h>

@ -15,5 +15,5 @@ install( FILES kateplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kate.desktop kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kate.desktop kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kateui.rc externaltools tips DESTINATION ${DATA_INSTALL_DIR}/kate ) install( FILES kateui.rc externaltools tips DESTINATION ${DATA_INSTALL_DIR}/kate )
install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite ) install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )
install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
install( FILES katerc DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES katerc DESTINATION ${CONFIG_INSTALL_DIR} )

@ -12,7 +12,7 @@ rckwrite_DATA = kwriteui.rc
tipdir = $(kde_datadir)/kate tipdir = $(kde_datadir)/kate
tip_DATA = tips tip_DATA = tips
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
update_DATA = kate-2.4.upd update_DATA = kate-2.4.upd
kde_conf_DATA = katerc kde_conf_DATA = katerc

@ -33,7 +33,7 @@
#include <klibloader.h> #include <klibloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -185,7 +185,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
TQByteArray params; TQByteArray params;
TQDataStream stream(params, IO_WriteOnly); TQDataStream stream(params, IO_WriteOnly);
stream << name << value; stream << name << value;
kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params); kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
setenv( name, value, 1 ); // apply effect also to itself setenv( name, value, 1 ); // apply effect also to itself
if( startup ) if( startup )

@ -117,7 +117,7 @@ properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to
* Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue. * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue.
If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used. If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used.
* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs. * Rewrite tdecmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
-------------------------------------------------------------------------- --------------------------------------------------------------------------

@ -31,7 +31,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kaccess )
tde_add_kpart( kcm_access AUTOMOC tde_add_kpart( kcm_access AUTOMOC
SOURCES kcmaccess.cpp SOURCES kcmaccess.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -14,7 +14,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kaudioplayer.h> #include <kaudioplayer.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <netwm.h> #include <netwm.h>

@ -26,7 +26,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kshortcut.h> #include <kshortcut.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=access Icon=access
Type=Application Type=Application
Exec=kcmshell kcmaccess Exec=tdecmshell kcmaccess
DocPath=kcontrol/kcmaccess/index.html DocPath=kcontrol/kcmaccess/index.html

@ -24,7 +24,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <knuminput.h> #include <knuminput.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell accessibility Exec=tdecmshell accessibility
Icon=access Icon=access
Type=Application Type=Application

@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_arts AUTOMOC tde_add_kpart( kcm_arts AUTOMOC
SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
LINK kio-shared tdemid-shared LINK tdeio-shared tdemid-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell arts Exec=tdecmshell arts
Icon=arts Icon=arts
Type=Application Type=Application
DocPath=kcontrol/arts/index.html DocPath=kcontrol/arts/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell background Exec=tdecmshell background
Icon=background Icon=background
Type=Application Type=Application
DocPath=kcontrol/background/index.html DocPath=kcontrol/background/index.html

@ -32,7 +32,7 @@
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -40,10 +40,10 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kimageio.h> #include <kimageio.h>
@ -1243,10 +1243,10 @@ void BGDialog::slotGetNewStuff()
{ {
//FIXME set this to a server when we get one //FIXME set this to a server when we get one
//should really be in a .rc file but could be either //should really be in a .rc file but could be either
//kcmshellrc or kcontrolrc //tdecmshellrc or kcontrolrc
TDEConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff"); config->setGroup("KNewStuff");
config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" ); config->writeEntry( "ProvidersUrl", "http://download.kde.org/tdehotnewstuff/wallpaper-providers.xml" );
config->writeEntry( "StandardResource", "wallpaper" ); config->writeEntry( "StandardResource", "wallpaper" );
config->sync(); config->sync();

@ -30,7 +30,7 @@
#include <ktempfile.h> #include <ktempfile.h>
#include <kcursor.h> #include <kcursor.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#ifdef HAVE_LIBART #ifdef HAVE_LIBART
#include <ksvgiconengine.h> #include <ksvgiconengine.h>

@ -27,7 +27,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kimageio.h> #include <kimageio.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -18,7 +18,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kimageio.h> #include <kimageio.h>

@ -27,7 +27,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <knotifyclient.h> #include <knotifyclient.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell bell Exec=tdecmshell bell
Icon=bell Icon=bell
Type=Application Type=Application
DocPath=kcontrol/bell/index.html DocPath=kcontrol/bell/index.html

@ -29,6 +29,6 @@ install( FILES clock.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_clock AUTOMOC tde_add_kpart( kcm_clock AUTOMOC
SOURCES dtime.cpp tzone.cpp main.cpp SOURCES dtime.cpp tzone.cpp main.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Exec=kcmshell tde-clock.desktop Exec=tdecmshell tde-clock.desktop
Icon=date Icon=date
DocPath=kcontrol/clock/index.html DocPath=kcontrol/clock/index.html

@ -37,7 +37,7 @@
#include <kprocess.h> #include <kprocess.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdialog.h> #include <kdialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "dtime.h" #include "dtime.h"
#include "dtime.moc" #include "dtime.moc"

@ -32,7 +32,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdialog.h> #include <kdialog.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
//#include "xpm/world.xpm" //#include "xpm/world.xpm"
#include "tzone.h" #include "tzone.h"

@ -29,6 +29,6 @@ install( FILES colors.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_colors AUTOMOC tde_add_kpart( kcm_colors AUTOMOC
SOURCES colorscm.cpp widgetcanvas.cpp SOURCES colorscm.cpp widgetcanvas.cpp
LINK krdb-static kio-shared LINK krdb-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell colors Exec=tdecmshell colors
Icon=colorscm Icon=colorscm
Type=Application Type=Application
DocPath=kcontrol/colors/index.html DocPath=kcontrol/colors/index.html

@ -24,11 +24,11 @@
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kcursor.h> #include <kcursor.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kipc.h> #include <kipc.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>

@ -16,7 +16,7 @@
#include <kcolordrag.h> #include <kcolordrag.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kpixmap.h> #include <kpixmap.h>

@ -33,6 +33,6 @@ tde_add_kpart( kcm_componentchooser AUTOMOC
componentchooser_ui.ui componentconfig_ui.ui componentchooser_ui.ui componentconfig_ui.ui
emailclientconfig_ui.ui terminalemulatorconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui
browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
SUBDIRS= . componentservices SUBDIRS= . componentservices
AM_CPPFLAGS = -I../ -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes) AM_CPPFLAGS = -I../ -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -262,7 +262,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
delete config; delete config;
KIPC::sendMessageAll(KIPC::SettingsChanged); KIPC::sendMessageAll(KIPC::SettingsChanged);
kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", TQString::null); kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
emit changed(false); emit changed(false);
} }

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell componentchooser Exec=tdecmshell componentchooser
Icon=misc Icon=misc
Type=Application Type=Application

@ -44,6 +44,6 @@ install( FILES crypto.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_crypto AUTOMOC tde_add_kpart( kcm_crypto AUTOMOC
SOURCES crypto.cpp certexport.cpp kdatetimedlg.cpp SOURCES crypto.cpp certexport.cpp kdatetimedlg.cpp
LINK kio-shared ${SSL_LIBRARIES} LINK tdeio-shared ${SSL_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -26,7 +26,7 @@
#include "certexport.h" #include "certexport.h"
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <klineedit.h> #include <klineedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -50,11 +50,11 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdatepicker.h> #include <kdatepicker.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kglobal.h> #include <kglobal.h>
#include <klineedit.h> #include <klineedit.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=encrypted Icon=encrypted
Type=Application Type=Application
Exec=kcmshell crypto Exec=tdecmshell crypto
DocPath=kcontrol/crypto/index.html DocPath=kcontrol/crypto/index.html
X-TDE-Library=crypto X-TDE-Library=crypto

@ -29,6 +29,6 @@ install( FILES template.css DESTINATION ${DATA_INSTALL_DIR}/kcmcss )
tde_add_kpart( kcm_css AUTOMOC tde_add_kpart( kcm_css AUTOMOC
SOURCES template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui SOURCES template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -7,7 +7,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=stylesheet Icon=stylesheet
Type=Application Type=Application
Exec=kcmshell kcmcss Exec=tdecmshell kcmcss
DocPath=kcontrol/kcmcss/index.html DocPath=kcontrol/kcmcss/index.html

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=tdescreensaver Icon=tdescreensaver
Type=Application Type=Application
Exec=kcmshell display Exec=tdecmshell display
DocPath=kcontrol/kcmdisplay/index.html DocPath=kcontrol/kcmdisplay/index.html
X-TDE-Library=display X-TDE-Library=display

@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO
tde_add_kpart( kcm_displayconfig AUTOMOC tde_add_kpart( kcm_displayconfig AUTOMOC
SOURCES SOURCES
monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel
LINK kio-shared tderandr-shared tdeutils-shared LINK tdeio-shared tderandr-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,7 +30,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>

@ -3,7 +3,7 @@ Categories=Qt;TDE;X-TDE-settings-system;
Comment=Configure display Comment=Configure display
Comment[en_US]=Configure display Comment[en_US]=Configure display
DocPath=kcontrol/displayconfig.html DocPath=kcontrol/displayconfig.html
Exec=kcmshell displayconfig Exec=tdecmshell displayconfig
GenericName= GenericName=
GenericName[en_US]= GenericName[en_US]=
Icon=background Icon=background

@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá
Comment[wa]=Apontiaedjes do discovraedje do siervice Comment[wa]=Apontiaedjes do discovraedje do siervice
Comment[zh_CN]=配置探索服务 Comment[zh_CN]=配置探索服务
Comment[zh_TW]=設定服務偵測 Comment[zh_TW]=設定服務偵測
Exec=kcmshell kcm_tdednssd Exec=tdecmshell kcm_tdednssd
GenericName= GenericName=
GenericName[ko]=일반 GenericName[ko]=일반
Icon=network_local Icon=network_local

@ -30,6 +30,6 @@ install( FILES ebrowsing.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_kurifilt AUTOMOC tde_add_kpart( kcm_kurifilt AUTOMOC
SOURCES filteropts.cpp main.cpp SOURCES filteropts.cpp main.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -11,7 +11,7 @@ kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
# Don't link this lib to the plugins. They are dlopened and linking to them # Don't link this lib to the plugins. They are dlopened and linking to them
# results in crashes when closing kcmshell. # results in crashes when closing tdecmshell.
# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
messages: rc.cpp messages: rc.cpp

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/ebrowsing/index.html DocPath=kcontrol/ebrowsing/index.html
Icon=enhanced_browsing Icon=enhanced_browsing
Exec=kcmshell ebrowsing Exec=tdecmshell ebrowsing
X-TDE-Library=kurifilt X-TDE-Library=kurifilt

@ -34,7 +34,7 @@ tde_add_kpart( libkuriikwsfilter AUTOMOC
SOURCES SOURCES
kuriikwsfiltereng.cpp kuriikwsfilter.skel kuriikwsfiltereng.cpp kuriikwsfilter.skel
kuriikwsfilter.cpp searchprovider.cpp kuriikwsfilter.cpp searchprovider.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -46,6 +46,6 @@ tde_add_kpart( libkurisearchfilter AUTOMOC
kurisearchfilter.cpp kurisearchfilter.skel kurisearchfilter.cpp kurisearchfilter.skel
kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp
searchprovider.cpp searchproviderdlg_ui.ui ikwsopts_ui.ui searchprovider.cpp searchproviderdlg_ui.ui ikwsopts_ui.ui
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -22,7 +22,7 @@ libkurisearchfilter_la_SOURCES = kurisearchfilter.cpp kurisearchfilter.skel \
searchproviderdlg_ui.ui ikwsopts_ui.ui searchproviderdlg_ui.ui ikwsopts_ui.ui
update_DATA = kuriikwsfilter.upd update_DATA = kuriikwsfilter.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
service_DATA = kuriikwsfilter.desktop kurisearchfilter.desktop service_DATA = kuriikwsfilter.desktop kurisearchfilter.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -32,7 +32,7 @@
#include <dcopref.h> #include <dcopref.h>
#include <kapplication.h> #include <kapplication.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klistview.h> #include <klistview.h>
#include <klocale.h> #include <klocale.h>

@ -32,7 +32,7 @@
/** /**
* IMPORTANT: If you change anything here, please run the regression test * IMPORTANT: If you change anything here, please run the regression test
* tdelibs/kio/tests/kurifiltertest * tdelibs/tdeio/tests/kurifiltertest
*/ */
typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory; typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory;

@ -31,7 +31,7 @@
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
@ -46,7 +46,7 @@
/** /**
* IMPORTANT: If you change anything here, please run the regression test * IMPORTANT: If you change anything here, please run the regression test
* tdelibs/kio/tests/kurifiltertest * tdelibs/tdeio/tests/kurifiltertest
*/ */
KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0; KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0;

@ -32,7 +32,7 @@
/** /**
* IMPORTANT: If you change anything here, please run the regression test * IMPORTANT: If you change anything here, please run the regression test
* tdelibs/kio/tests/kurifiltertest * tdelibs/tdeio/tests/kurifiltertest
*/ */
typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory; typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory;

@ -29,7 +29,7 @@ install( FILES localdomainurifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR}
tde_add_kpart( liblocaldomainurifilter AUTOMOC tde_add_kpart( liblocaldomainurifilter AUTOMOC
SOURCES localdomainurifilter.cpp localdomainurifilter.skel SOURCES localdomainurifilter.cpp localdomainurifilter.skel
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -33,7 +33,7 @@
/** /**
* IMPORTANT: If you change anything here, please run the regression test * IMPORTANT: If you change anything here, please run the regression test
* tdelibs/kio/tests/kurifiltertest * tdelibs/tdeio/tests/kurifiltertest
*/ */
LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,

@ -29,6 +29,6 @@ install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
tde_add_kpart( libkshorturifilter AUTOMOC tde_add_kpart( libkshorturifilter AUTOMOC
SOURCES kshorturifilter.cpp kshorturifilter.skel SOURCES kshorturifilter.cpp kshorturifilter.skel
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -33,7 +33,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmimetype.h> #include <kmimetype.h>
#include "kshorturifilter.h" #include "kshorturifilter.h"
@ -48,10 +48,10 @@
/** /**
* IMPORTANT: * IMPORTANT:
* If you change anything here, please run the regression test * If you change anything here, please run the regression test
* tdelibs/kio/tests/kurifiltertest. * tdelibs/tdeio/tests/kurifiltertest.
* *
* If you add anything here, make sure to add a corresponding * If you add anything here, make sure to add a corresponding
* test code to tdelibs/kio/tests/kurifiltertest. * test code to tdelibs/tdeio/tests/kurifiltertest.
*/ */
typedef TQMap<TQString,TQString> EntryMap; typedef TQMap<TQString,TQString> EntryMap;

@ -60,6 +60,6 @@ install( FILES energy.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
tde_add_kpart( kcm_energy AUTOMOC tde_add_kpart( kcm_energy AUTOMOC
SOURCES energy.cpp SOURCES energy.cpp
LINK kio-shared ${XEXT_LIBRARY} LINK tdeio-shared ${XEXT_LIBRARY}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -27,7 +27,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcursor.h> #include <kcursor.h>
#include <kdialog.h> #include <kdialog.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell energy Exec=tdecmshell energy
Icon=energy_star Icon=energy_star
DocPath=kcontrol/energy/index.html DocPath=kcontrol/energy/index.html
Type=Application Type=Application

@ -28,7 +28,7 @@ install( FILES filetypes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_filetypes AUTOMOC tde_add_kpart( kcm_filetypes AUTOMOC
SOURCES control.cpp SOURCES control.cpp
LINK filetypes-static kio-shared LINK filetypes-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -46,6 +46,6 @@ tde_add_library( filetypes STATIC_PIC AUTOMOC
tde_add_executable( keditfiletype AUTOMOC tde_add_executable( keditfiletype AUTOMOC
SOURCES keditfiletype.cpp SOURCES keditfiletype.cpp
LINK filetypes-static kio-shared LINK filetypes-static tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <klineedit.h> #include <klineedit.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=filetypes Icon=filetypes
Type=Application Type=Application
Exec=kcmshell filetypes Exec=tdecmshell filetypes
DocPath=kcontrol/filetypes/index.html DocPath=kcontrol/filetypes/index.html
Categories=Qt;TDE;X-TDE-settings-components; Categories=Qt;TDE;X-TDE-settings-components;

@ -4,7 +4,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqmap.h> #include <tqmap.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdecmodule.h> #include <tdecmodule.h>
#include "typeslistitem.h" #include "typeslistitem.h"

@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell fonts Exec=tdecmshell fonts
Icon=fonts Icon=fonts
Type=Application Type=Application
DocPath=kcontrol/fonts/index.html DocPath=kcontrol/fonts/index.html

@ -34,6 +34,6 @@ set_source_files_properties( hwmanager.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
tde_add_kpart( kcm_hwmanager AUTOMOC tde_add_kpart( kcm_hwmanager AUTOMOC
SOURCES SOURCES
hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui hwmanager.skel hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui hwmanager.skel
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,7 +28,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kwmanager Exec=tdecmshell kwmanager
Icon=background Icon=background
Type=Application Type=Application
DocPath=kcontrol/hwmanager/index.html DocPath=kcontrol/hwmanager/index.html

@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
tde_add_kpart( kcm_iccconfig AUTOMOC tde_add_kpart( kcm_iccconfig AUTOMOC
SOURCES SOURCES
iccconfig.cpp iccconfigbase.ui iccconfig.skel iccconfig.cpp iccconfigbase.ui iccconfig.skel
LINK kio-shared tderandr-shared LINK tdeio-shared tderandr-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,7 +28,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell iccconfig Exec=tdecmshell iccconfig
Icon=background Icon=background
Type=Application Type=Application
DocPath=kcontrol/iccconfig/index.html DocPath=kcontrol/iccconfig/index.html

@ -31,6 +31,6 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Settings/LookNF
tde_add_kpart( kcm_icons AUTOMOC tde_add_kpart( kcm_icons AUTOMOC
SOURCES iconthemes.cpp icons.cpp main.cpp SOURCES iconthemes.cpp icons.cpp main.cpp
LINK kio-shared ${LIBART_LIBRARIES} LINK tdeio-shared ${LIBART_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -20,7 +20,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/icons/index.html DocPath=kcontrol/icons/index.html
Icon=icons Icon=icons
Exec=kcmshell icons Exec=tdecmshell icons
X-TDE-Library=icons X-TDE-Library=icons

@ -41,8 +41,8 @@
#include <kprogress.h> #include <kprogress.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <ktar.h> #include <ktar.h>
#ifdef HAVE_LIBART #ifdef HAVE_LIBART

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell cdinfo Exec=tdecmshell cdinfo
Icon=kcmdevices Icon=kcmdevices
Type=Application Type=Application
DocPath=kinfocenter/cdinfo/index.html DocPath=kinfocenter/cdinfo/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell devices Exec=tdecmshell devices
Icon=kcmdevices Icon=kcmdevices
Type=Application Type=Application
DocPath=kinfocenter/devices/index.html DocPath=kinfocenter/devices/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell dma Exec=tdecmshell dma
Icon=kcmmemory Icon=kcmmemory
Type=Application Type=Application
DocPath=kinfocenter/dma/index.html DocPath=kinfocenter/dma/index.html

@ -43,7 +43,7 @@
#include <tqtextstream.h> #include <tqtextstream.h>
#include <kdebug.h> #include <kdebug.h>
#include <kio/global.h> /* for TDEIO::convertSize() */ #include <tdeio/global.h> /* for TDEIO::convertSize() */
typedef struct typedef struct
{ {

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell interrupts Exec=tdecmshell interrupts
Icon=kcmmemory Icon=kcmmemory
Type=Application Type=Application
DocPath=kinfocenter/interrupts/index.html DocPath=kinfocenter/interrupts/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell ioports Exec=tdecmshell ioports
Icon=kcmmemory Icon=kcmmemory
Type=Application Type=Application
DocPath=kinfocenter/ioports/index.html DocPath=kinfocenter/ioports/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell memory Exec=tdecmshell memory
Icon=kcmmemory Icon=kcmmemory
Type=Application Type=Application
DocPath=kinfocenter/memory/index.html DocPath=kinfocenter/memory/index.html

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
NoDisplay=true NoDisplay=true
Exec=kcmshell opengl Exec=tdecmshell opengl
Icon=kcmopengl Icon=kcmopengl
Type=Application Type=Application
DocPath=kinfocenter/opengl/index.html DocPath=kinfocenter/opengl/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell partitions Exec=tdecmshell partitions
Icon=kcmpartitions Icon=kcmpartitions
Type=Application Type=Application
DocPath=kinfocenter/partitions/index.html DocPath=kinfocenter/partitions/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell pci Exec=tdecmshell pci
Icon=kcmpci Icon=kcmpci
Type=Application Type=Application
DocPath=kinfocenter/pci/index.html DocPath=kinfocenter/pci/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell processor Exec=tdecmshell processor
Icon=kcmprocessor Icon=kcmprocessor
Type=Application Type=Application
DocPath=kinfocenter/processor/index.html DocPath=kinfocenter/processor/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell scsi Exec=tdecmshell scsi
Icon=kcmscsi Icon=kcmscsi
Type=Application Type=Application
DocPath=kinfocenter/scsi/index.html DocPath=kinfocenter/scsi/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell sound Exec=tdecmshell sound
Icon=kcmsound Icon=kcmsound
Type=Application Type=Application
DocPath=kinfocenter/sound/index.html DocPath=kinfocenter/sound/index.html

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell xserver Exec=tdecmshell xserver
Icon=kcmx Icon=kcmx
Type=Application Type=Application
DocPath=kinfocenter/xserver/index.html DocPath=kinfocenter/xserver/index.html

@ -53,7 +53,7 @@ tde_add_kpart( kcm_input AUTOMOC
SOURCES SOURCES
mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp
logitechmouse_base.ui logitechmouse_base.ui
LINK themepage-static kio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES} LINK themepage-static tdeio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -37,7 +37,7 @@ EXTRA_DIST = $(font_DATA)
update_DATA = mouse_cursor_theme.upd update_DATA = mouse_cursor_theme.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
install-data-hook: install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(datadir)/fonts/override $(mkinstalldirs) $(DESTDIR)$(datadir)/fonts/override

@ -23,11 +23,11 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kprocess.h> #include <kprocess.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klistview.h> #include <klistview.h>
#include <kdialog.h> #include <kdialog.h>

@ -28,7 +28,7 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <config.h> #include <config.h>

@ -27,7 +27,7 @@
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <dcopref.h> #include <dcopref.h>
#include <tqfile.h> #include <tqfile.h>
@ -80,13 +80,13 @@ extern "C"
XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle); XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle);
XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
// Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
// variables when launching applications. // variables when launching applications.
DCOPRef klauncher("klauncher"); DCOPRef tdelauncher("tdelauncher");
if( !theme.isEmpty()) if( !theme.isEmpty())
klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme); tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
if( !size.isEmpty()) if( !size.isEmpty())
klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size); tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
#endif #endif
delete config; delete config;

@ -58,7 +58,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdialog.h> #include <kdialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdebug.h> #include <kdebug.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell mouse Exec=tdecmshell mouse
Icon=mouse Icon=mouse
Type=Application Type=Application
DocPath=kcontrol/mouse/index.html DocPath=kcontrol/mouse/index.html

@ -29,8 +29,8 @@
#include <kdialog.h> #include <kdialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kurlrequesterdlg.h> #include <kurlrequesterdlg.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <ktar.h> #include <ktar.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -29,6 +29,6 @@ tde_install_empty_directory( ${DATA_INSTALL_DIR}/Settings/Information )
tde_add_kpart( kcm_ioslaveinfo AUTOMOC tde_add_kpart( kcm_ioslaveinfo AUTOMOC
SOURCES kcmioslaveinfo.cpp SOURCES kcmioslaveinfo.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -78,7 +78,7 @@ Comment[zh_CN]=可用协议的信息
Comment[zh_TW]=可用協定的資訊 Comment[zh_TW]=可用協定的資訊
Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona
DocPath=kinfocenter/protocols/index.html DocPath=kinfocenter/protocols/index.html
Exec=kcmshell ioslaveinfo Exec=tdecmshell ioslaveinfo
Icon=history Icon=history
Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout
Keywords[ar]=الميفاق,IO Slaves,Slaves,الشبكة,معلومات نفاذ الوقت Keywords[ar]=الميفاق,IO Slaves,Slaves,الشبكة,معلومات نفاذ الوقت

@ -32,13 +32,13 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <klocale.h> #include <klocale.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -118,7 +118,7 @@ void KCMIOSlaveInfo::slotResult(TDEIO::Job *)
void KCMIOSlaveInfo::showInfo(const TQString& protocol) void KCMIOSlaveInfo::showInfo(const TQString& protocol)
{ {
TQString file = TQString("kioslave/%1.docbook").arg( protocol ); TQString file = TQString("tdeioslave/%1.docbook").arg( protocol );
file = TDEGlobal::locale()->langLookup( file ); file = TDEGlobal::locale()->langLookup( file );
if (m_tfj) if (m_tfj)
{ {
@ -129,7 +129,7 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol)
if (!file.isEmpty()) if (!file.isEmpty())
{ {
helpData.truncate( 0 ); helpData.truncate( 0 );
m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); m_tfj = TDEIO::get( KURL( TQString("help:/tdeioslave/%1.html").arg( protocol ) ), true, false );
connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) ); connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) );
connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
return; return;

@ -29,7 +29,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <klistbox.h> #include <klistbox.h>
#include <ktextbrowser.h> #include <ktextbrowser.h>

@ -66,7 +66,7 @@ Comment[vi]=cần điều khiển - một mô đun điều khiển TDE đêr ki
Comment[wa]=djîsse di djeu - on module di kcontrol po sayî les djîsses di djeu Comment[wa]=djîsse di djeu - on module di kcontrol po sayî les djîsses di djeu
Comment[zh_CN]=Joystick - 测试游戏杆的 kcontrol 模块 Comment[zh_CN]=Joystick - 测试游戏杆的 kcontrol 模块
Comment[zh_TW]=搖桿 - 用來測試搖桿的 kcontrol 模組 Comment[zh_TW]=搖桿 - 用來測試搖桿的 kcontrol 模組
Exec=kcmshell joystick Exec=tdecmshell joystick
Keywords=joystick,gamepad Keywords=joystick,gamepad
Keywords[be]=Джойстык,joystick,gamepad Keywords[be]=Джойстык,joystick,gamepad
Keywords[bg]=джойстик, игра, игри, управление, joystick, gamepad Keywords[bg]=джойстик, игра, игри, управление, joystick, gamepad

@ -38,7 +38,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "main.h" #include "main.h"

@ -21,7 +21,7 @@
#include "moduleIface.moc" #include "moduleIface.moc"
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
ModuleIface::ModuleIface(TQObject *parent, const char *name) ModuleIface::ModuleIface(TQObject *parent, const char *name)
: TQObject(parent, name), DCOPObject(name) { : TQObject(parent, name), DCOPObject(name) {

@ -141,7 +141,7 @@ void ConfigModule::runAsRoot()
delete _embedStack; delete _embedStack;
// create an embed widget that will embed the // create an embed widget that will embed the
// kcmshell running as root // tdecmshell running as root
_embedLayout = new TQVBoxLayout(_module->parentWidget()); _embedLayout = new TQVBoxLayout(_module->parentWidget());
_embedFrame = new TQVBox( _module->parentWidget() ); _embedFrame = new TQVBox( _module->parentWidget() );
_embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
@ -165,7 +165,7 @@ void ConfigModule::runAsRoot()
_embedStack->raiseWidget(_busy); _embedStack->raiseWidget(_busy);
connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded()));
// prepare the process to run the kcmshell // prepare the process to run the tdecmshell
TQString cmd = service()->exec().stripWhiteSpace(); TQString cmd = service()->exec().stripWhiteSpace();
bool kdeshell = false; bool kdeshell = false;
if (cmd.left(5) == "tdesu") if (cmd.left(5) == "tdesu")
@ -179,7 +179,7 @@ void ConfigModule::runAsRoot()
} }
} }
if (cmd.left(8) == "kcmshell") if (cmd.left(8) == "tdecmshell")
{ {
cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
kdeshell = true; kdeshell = true;
@ -198,7 +198,7 @@ void ConfigModule::runAsRoot()
// We also don't have a way to close the module in that case. // We also don't have a way to close the module in that case.
*_rootProcess << "--n"; // Don't keep password. *_rootProcess << "--n"; // Don't keep password.
if (kdeshell) { if (kdeshell) {
*_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "tdecmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language());
} }
else { else {
*_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() );

@ -20,7 +20,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kbugreport.h> #include <kbugreport.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -28,6 +28,6 @@ install( FILES kcmkded.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_kded AUTOMOC tde_add_kpart( kcm_kded AUTOMOC
SOURCES kcmkded.cpp SOURCES kcmkded.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kcmkded Exec=tdecmshell kcmkded
Icon=services Icon=services
Type=Application Type=Application

@ -38,6 +38,6 @@ tde_add_kpart( kcm_keys AUTOMOC
SOURCES SOURCES
shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp
treeview.cpp commandShortcuts.cpp treeview.cpp commandShortcuts.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -14,7 +14,7 @@ messages:
update_DATA = kaccel.upd update_DATA = kaccel.upd
update_SCRIPTS = convertShortcuts.pl update_SCRIPTS = convertShortcuts.pl
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
xdg_apps_DATA = keys.desktop xdg_apps_DATA = keys.desktop

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell keys Exec=tdecmshell keys
Icon=key_bindings Icon=key_bindings
Type=Application Type=Application
DocPath=kcontrol/keys/index.html DocPath=kcontrol/keys/index.html

@ -7,7 +7,7 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kkeynative.h> #include <kkeynative.h>

@ -13,7 +13,7 @@ add_subdirectory( lib )
add_subdirectory( thumbnail ) add_subdirectory( thumbnail )
add_subdirectory( viewpart ) add_subdirectory( viewpart )
add_subdirectory( kcmfontinst ) add_subdirectory( kcmfontinst )
add_subdirectory( kfile-plugin ) add_subdirectory( tdefile-plugin )
add_subdirectory( kfontinst ) add_subdirectory( kfontinst )
add_subdirectory( kio ) add_subdirectory( kio )

@ -118,11 +118,11 @@ KDE3.1 -> KDE3.2
4. Settings are saved on "Apply". 4. Settings are saved on "Apply".
5. Settings tab simplified - some uneccesary settings removed. 5. Settings tab simplified - some uneccesary settings removed.
6. Removal of Anti-Alias tab - relevant settings moved to kcmfonts. 6. Removal of Anti-Alias tab - relevant settings moved to kcmfonts.
7. Add kfile-plugin to display Meta data for fonts. 7. Add tdefile-plugin to display Meta data for fonts.
8. Remove settings wizard. 8. Remove settings wizard.
9. Drop use of internal version numbering - not tagging CVS anyway, so whats the point? 9. Drop use of internal version numbering - not tagging CVS anyway, so whats the point?
10. DCOP interface. 10. DCOP interface.
11. Remember size of main window when run via kcmshell. 11. Remember size of main window when run via tdecmshell.
0.10->0.11 (KDE3.0) 0.10->0.11 (KDE3.0)
=================== ===================

@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
FONTINST_VP_SUBDIR=viewpart FONTINST_VP_SUBDIR=viewpart
endif endif
SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst kfile-plugin kfontinst kio SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio
EXTRA_DIST = TODO EXTRA_DIST = TODO

@ -51,12 +51,12 @@
#include <ktoolbar.h> #include <ktoolbar.h>
#include <ktoolbarbutton.h> #include <ktoolbarbutton.h>
#include <kstdaccel.h> #include <kstdaccel.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kapplication.h> #include <kapplication.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kguiitem.h> #include <kguiitem.h>

@ -36,8 +36,8 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kio/job.h> #include <tdeio/job.h>
#ifdef HAVE_XFT #ifdef HAVE_XFT
#include <tdeparts/part.h> #include <tdeparts/part.h>
#endif #endif

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <tqevent.h> #include <tqevent.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kurldrag.h> #include <kurldrag.h>
#include "KFileFontIconView.h" #include "KFileFontIconView.h"

@ -29,7 +29,7 @@
// (C) Craig Drummond, 2003, 2004 // (C) Craig Drummond, 2003, 2004
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <kfileiconview.h> #include <tdefileiconview.h>
namespace KFI namespace KFI
{ {

@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
// NOTE: HEAVILY copied from kfiledetailview.cpp... // NOTE: HEAVILY copied from tdefiledetailview.cpp...
// //
// Copyright (C) 1997 Stephan Kulow <coolo@kde.org> // Copyright (C) 1997 Stephan Kulow <coolo@kde.org>
// 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org> // 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org>
@ -39,7 +39,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kapplication.h> #include <kapplication.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kicontheme.h> #include <kicontheme.h>

@ -30,7 +30,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
// NOTE: HEAVILY copied from kfiledetailview.cpp... // NOTE: HEAVILY copied from tdefiledetailview.cpp...
// //
// Copyright (C) 1997 Stephan Kulow <coolo@kde.org> // Copyright (C) 1997 Stephan Kulow <coolo@kde.org>
// 2000, 2001 Carste // 2000, 2001 Carste
@ -42,7 +42,7 @@ class TQKeyEvent;
#include <klistview.h> #include <klistview.h>
#include <kmimetyperesolver.h> #include <kmimetyperesolver.h>
#include "kfileview.h" #include "tdefileview.h"
/** /**
* An item for the listiew, that has a reference to its corresponding * An item for the listiew, that has a reference to its corresponding

@ -34,10 +34,10 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
namespace KFI namespace KFI
{ {

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kcmfontinst Exec=tdecmshell kcmfontinst
Icon=fonts Icon=fonts
Type=Application Type=Application
DocPath=kcontrol/kcmfontinst/index.html DocPath=kcontrol/kcmfontinst/index.html

@ -1,13 +0,0 @@
kde_module_LTLIBRARIES = kfile_font.la
kfile_font_la_SOURCES = KFileFont.cpp
kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = kfile_font.desktop
AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
METASOURCES = AUTO
noinst_HEADERS = KFileFont.h

@ -31,6 +31,6 @@ tde_add_executable( kfontinst
SOURCES SOURCES
Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c
XConfig.cpp XConfig.cpp
LINK kxftconfig-static kfontinst-shared kio-shared LINK kxftconfig-static kfontinst-shared tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -44,11 +44,11 @@
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/ioslave_defaults.h> #include <tdeio/ioslave_defaults.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kio/slaveinterface.h> #include <tdeio/slaveinterface.h>
#include <kio/connection.h> #include <tdeio/connection.h>
#include <tqtextstream.h> #include <tqtextstream.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -31,7 +31,7 @@
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
#include <time.h> #include <time.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <kurl.h> #include <kurl.h>
#include <klocale.h> #include <klocale.h>
#include <tqstring.h> #include <tqstring.h>

@ -28,6 +28,6 @@ link_directories(
tde_add_library( kfontinst SHARED tde_add_library( kfontinst SHARED
SOURCES Misc.cpp FcEngine.cpp SOURCES Misc.cpp FcEngine.cpp
VERSION 0.0.0 VERSION 0.0.0
LINK kio-shared ${XFT_LIBRARIES} LINK tdeio-shared ${XFT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -4,9 +4,9 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <math.h> #include <math.h>
#include "FcEngine.h" #include "FcEngine.h"
#include "KfiConstants.h" #include "KfiConstants.h"

@ -31,7 +31,7 @@
#include <kprocess.h> #include <kprocess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klargefile.h> #include <klargefile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <unistd.h> #include <unistd.h>
namespace KFI namespace KFI

@ -24,13 +24,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kfile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
##### kfile_font (module) ####################### ##### tdefile_font (module) #######################
tde_add_kpart( kfile_font tde_add_kpart( tdefile_font
SOURCES KFileFont.cpp SOURCES KFileFont.cpp
LINK kfontinst-shared kio-shared LINK kfontinst-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -31,7 +31,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
static void addEntry(int face, TQString &existing, const TQString &add) static void addEntry(int face, TQString &existing, const TQString &add)
{ {
@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
} }
typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory; typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst")) K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst"))
namespace KFI namespace KFI
{ {

@ -29,7 +29,7 @@
// (C) Craig Drummond, 2003, 2004 // (C) Craig Drummond, 2003, 2004
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include "FcEngine.h" #include "FcEngine.h"
namespace KFI namespace KFI

@ -0,0 +1,13 @@
kde_module_LTLIBRARIES = tdefile_font.la
tdefile_font_la_SOURCES = KFileFont.cpp
tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = tdefile_font.desktop
AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
METASOURCES = AUTO
noinst_HEADERS = KFileFont.h

@ -80,7 +80,7 @@ Name[zh_CN]=字体信息
Name[zh_TW]=字型資訊 Name[zh_TW]=字型資訊
Name[zu]=Ulwazi lohlobo lwamagama Name[zu]=Ulwazi lohlobo lwamagama
ServiceTypes=KFilePlugin ServiceTypes=KFilePlugin
X-TDE-Library=kfile_font X-TDE-Library=tdefile_font
MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm
PreferredGroups=General PreferredGroups=General
PreferredItems=Full,Family,Foundry,Weight,Width,Spacing,Slant PreferredItems=Full,Family,Foundry,Weight,Width,Spacing,Slant

@ -29,7 +29,7 @@
// (C) Craig Drummond, 2003, 2004 // (C) Craig Drummond, 2003, 2004
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <kio/thumbcreator.h> #include <tdeio/thumbcreator.h>
#include "FcEngine.h" #include "FcEngine.h"
namespace KFI namespace KFI

@ -44,7 +44,7 @@
#include <tqsettings.h> #include <tqsettings.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kinstance.h> #include <kinstance.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <knuminput.h> #include <knuminput.h>

@ -33,8 +33,8 @@
#include <klibloader.h> #include <klibloader.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#define CFG_GROUP "FontViewer Settings" #define CFG_GROUP "FontViewer Settings"
#define CFG_SIZE_KEY "Window Size" #define CFG_SIZE_KEY "Window Size"

@ -27,7 +27,7 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kdialog.h> #include <kdialog.h>
@ -137,7 +137,7 @@ void AppletTab::load( bool useDefaults )
} }
} }
else else
l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quicklauncher" l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quictdelauncher"
<< "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet"; << "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet";
for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it )

@ -2,7 +2,7 @@
Icon=kcmkicker Icon=kcmkicker
Type=Application Type=Application
DocPath=kcontrol/panel/index.html DocPath=kcontrol/panel/index.html
Exec=kcmshell panel Exec=tdecmshell panel
X-TDE-Library=kicker X-TDE-Library=kicker

@ -2,7 +2,7 @@
Icon=kcmkicker Icon=kcmkicker
Type=Application Type=Application
DocPath=kcontrol/panel/index.html#panel-looknfeel DocPath=kcontrol/panel/index.html#panel-looknfeel
Exec=kcmshell kicker_appearance Exec=tdecmshell kicker_appearance
X-TDE-Library=kicker X-TDE-Library=kicker

@ -2,7 +2,7 @@
Icon=kcmkicker Icon=kcmkicker
Type=Application Type=Application
DocPath=kcontrol/panel/index.html#panel-position DocPath=kcontrol/panel/index.html#panel-position
Exec=kcmshell kicker_arrangement Exec=tdecmshell kicker_arrangement
X-TDE-Library=kicker X-TDE-Library=kicker
X-TDE-FactoryName=kicker_arrangement X-TDE-FactoryName=kicker_arrangement

@ -2,7 +2,7 @@
Icon=kcmkicker Icon=kcmkicker
Type=Application Type=Application
DocPath=kcontrol/panel/index.html#panel-hiding DocPath=kcontrol/panel/index.html#panel-hiding
Exec=kcmshell kicker_hiding Exec=tdecmshell kicker_hiding
X-TDE-Library=kicker X-TDE-Library=kicker
X-TDE-FactoryName=kicker_hiding X-TDE-FactoryName=kicker_hiding

@ -2,7 +2,7 @@
Icon=kcmkicker Icon=kcmkicker
Type=Application Type=Application
DocPath=kcontrol/panel/index.html#panel-menus DocPath=kcontrol/panel/index.html#panel-menus
Exec=kcmshell kicker_menus Exec=tdecmshell kicker_menus
X-TDE-Library=kicker X-TDE-Library=kicker
X-TDE-FactoryName=kicker_menus X-TDE-FactoryName=kicker_menus

@ -25,7 +25,7 @@
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kimageio.h> #include <kimageio.h>
#include <klineedit.h> #include <klineedit.h>

@ -19,7 +19,7 @@
#define __main_h__ #define __main_h__
#include <dcopobject.h> #include <dcopobject.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "extensionInfo.h" #include "extensionInfo.h"

@ -2,7 +2,7 @@
Icon=kcmkicker Icon=kcmkicker
Type=Application Type=Application
DocPath=kcontrol/panel/index.html DocPath=kcontrol/panel/index.html
Exec=kcmshell panel Exec=tdecmshell panel
X-TDE-Library=kicker X-TDE-Library=kicker

@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC
kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui
policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui
manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
LINK kio-shared tdeutils-shared LINK tdeio-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -23,7 +23,7 @@ messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot $(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
update_DATA = socks.upd update_DATA = socks.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
servicetypes_DATA = uasprovider.desktop servicetypes_DATA = uasprovider.desktop
servicetypesdir = $(kde_servicetypesdir) servicetypesdir = $(kde_servicetypesdir)

@ -33,7 +33,7 @@
#include <knuminput.h> #include <knuminput.h>
#include "ksaveioconfig.h" #include "ksaveioconfig.h"
#include <kio/http_slave_defaults.h> #include <tdeio/http_slave_defaults.h>
#include "cache.h" #include "cache.h"
#include "cache_ui.h" #include "cache_ui.h"

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/cache/index.html DocPath=kcontrol/cache/index.html
Icon=cache Icon=cache
Exec=kcmshell cache Exec=tdecmshell cache
X-TDE-Library=kio X-TDE-Library=kio

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/cookies/index.html DocPath=kcontrol/cookies/index.html
Icon=cookie Icon=cookie
Exec=kcmshell cookies Exec=tdecmshell cookies
X-TDE-Library=kio X-TDE-Library=kio

@ -38,7 +38,7 @@
#include <klistview.h> #include <klistview.h>
#include <klistviewsearchline.h> #include <klistviewsearchline.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <dcopref.h> #include <dcopref.h>
#include "ksaveioconfig.h" #include "ksaveioconfig.h"

@ -36,7 +36,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kio/ioslave_defaults.h> #include <tdeio/ioslave_defaults.h>
#include "manualproxy_ui.h" #include "manualproxy_ui.h"
#include "kmanualproxydlg.h" #include "kmanualproxydlg.h"

@ -18,11 +18,11 @@
*/ */
#include <dcopref.h> #include <dcopref.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kio/ioslave_defaults.h> #include <tdeio/ioslave_defaults.h>
#include "ksaveioconfig.h" #include "ksaveioconfig.h"
@ -57,7 +57,7 @@ TDEConfig* KSaveIOConfig::config()
d = new KSaveIOConfigPrivate; d = new KSaveIOConfigPrivate;
if (!d->config) if (!d->config)
d->config = new TDEConfig("kioslaverc", false, false); d->config = new TDEConfig("tdeioslaverc", false, false);
return d->config; return d->config;
} }

@ -29,7 +29,7 @@ class KSaveIOConfig
{ {
public: public:
/* Reload config file (kioslaverc) */ /* Reload config file (tdeioslaverc) */
static void reparseConfiguration(); static void reparseConfiguration();

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Icon=samba Icon=samba
Exec=kcmshell lanbrowser Exec=tdecmshell lanbrowser
X-TDE-Library=kio X-TDE-Library=kio

@ -3,11 +3,11 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
#include <kio/ioslave_defaults.h> #include <tdeio/ioslave_defaults.h>
#include <knuminput.h> #include <knuminput.h>
#include <klocale.h> #include <klocale.h>
#include <kdialog.h> #include <kdialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "ksaveioconfig.h" #include "ksaveioconfig.h"
#include "netpref.h" #include "netpref.h"

@ -75,7 +75,7 @@ Comment[xh]=Qwalasela iinketho zomsebenzi womnatha ka wonke-wonke, njengamaxabis
Comment[zh_CN]=配置通用网络首选项,例如超时值 Comment[zh_CN]=配置通用网络首选项,例如超时值
Comment[zh_TW]=設定一般網路喜好設定,例如逾時值 Comment[zh_TW]=設定一般網路喜好設定,例如逾時值
Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma
Exec=kcmshell netpref Exec=tdecmshell netpref
Icon=network Icon=network
Keywords=timeout,iopref,netpref,network preferences,ftp Keywords=timeout,iopref,netpref,network preferences,ftp
Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/proxy/index.html DocPath=kcontrol/proxy/index.html
Icon=proxy Icon=proxy
Exec=kcmshell proxy Exec=tdecmshell proxy
X-TDE-Library=kio X-TDE-Library=kio

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/smb/index.html DocPath=kcontrol/smb/index.html
Icon=samba Icon=samba
Exec=kcmshell smb Exec=tdecmshell smb
X-TDE-Library=kio X-TDE-Library=kio

@ -23,7 +23,7 @@
#include <tqtextcodec.h> #include <tqtextcodec.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kcharsets.h> #include <kcharsets.h>
#include <kcombobox.h> #include <kcombobox.h>
@ -91,7 +91,7 @@ SMBRoOptions::~SMBRoOptions()
void SMBRoOptions::load() void SMBRoOptions::load()
{ {
TDEConfig *cfg = new TDEConfig("kioslaverc"); TDEConfig *cfg = new TDEConfig("tdeioslaverc");
TQString tmp; TQString tmp;
cfg->setGroup( "Browser Settings/SMBro" ); cfg->setGroup( "Browser Settings/SMBro" );
@ -124,7 +124,7 @@ void SMBRoOptions::load()
void SMBRoOptions::save() void SMBRoOptions::save()
{ {
TDEConfig *cfg = new TDEConfig("kioslaverc"); TDEConfig *cfg = new TDEConfig("tdeioslaverc");
cfg->setGroup( "Browser Settings/SMBro" ); cfg->setGroup( "Browser Settings/SMBro" );
cfg->writeEntry( "User", m_userLe->text()); cfg->writeEntry( "User", m_userLe->text());

@ -25,7 +25,7 @@
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klistview.h> #include <klistview.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ksocks.h> #include <ksocks.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Icon=agent Icon=agent
Exec=kcmshell useragent Exec=tdecmshell useragent
DocPath=kcontrol/useragent/index.html DocPath=kcontrol/useragent/index.html

@ -32,12 +32,12 @@
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <klistview.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kio/http_slave_defaults.h> #include <tdeio/http_slave_defaults.h>
#include "ksaveioconfig.h" #include "ksaveioconfig.h"
#include "fakeuaprovider.h" #include "fakeuaprovider.h"

@ -31,6 +31,6 @@ install( FILES play.png DESTINATION ${DATA_INSTALL_DIR}/kcontrol/pics )
tde_add_kpart( kcm_knotify AUTOMOC tde_add_kpart( kcm_knotify AUTOMOC
SOURCES knotify.cpp playersettings.ui SOURCES knotify.cpp playersettings.ui
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kcmnotify Exec=tdecmshell kcmnotify
Icon=knotify Icon=knotify
Type=Application Type=Application
DocPath=kcontrol/kcmnotify/index.html DocPath=kcontrol/kcmnotify/index.html

@ -29,7 +29,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <knotifydialog.h> #include <knotifydialog.h>
#include <tdeparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -135,7 +135,7 @@ void KCMKNotify::slotAppActivated( const TQString& text )
void KCMKNotify::slotPlayerSettings() void KCMKNotify::slotPlayerSettings()
{ {
// kcmshell is a modal dialog, and apparently, we can't put a non-modal // tdecmshell is a modal dialog, and apparently, we can't put a non-modal
// dialog besides a modal dialog. sigh. // dialog besides a modal dialog. sigh.
if ( !m_playerSettings ) if ( !m_playerSettings )
m_playerSettings = new PlayerSettingsDialog( this, true ); m_playerSettings = new PlayerSettingsDialog( this, true );

@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC
behaviour.cpp desktop.cpp desktopbehavior_impl.cpp behaviour.cpp desktop.cpp desktopbehavior_impl.cpp
previews.cpp browser.cpp main.cpp rootopts.cpp previews.cpp browser.cpp main.cpp rootopts.cpp
fontopts.cpp desktopbehavior.ui fontopts.cpp desktopbehavior.ui
LINK kio-shared tdeutils-shared LINK tdeio-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -21,7 +21,7 @@ kcmkonq_datadir = $(kde_appsdir)/.hidden
xdg_apps_DATA = desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop xdg_apps_DATA = desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop
uiserver_DIR = $(kde_includes)/kio uiserver_DIR = $(kde_includes)/tdeio
EXTRA_DIST = $(kcm_konq_la_DATA) $(kcmkonq_data_DATA) EXTRA_DIST = $(kcm_konq_la_DATA) $(kcmkonq_data_DATA)

@ -29,8 +29,8 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kio/uiserver_stub.h> #include <tdeio/uiserver_stub.h>
#include <klocale.h> #include <klocale.h>
#include <konq_defaults.h> #include <konq_defaults.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -258,9 +258,9 @@ void KBehaviourOptions::save()
config.writeEntry( "ShowList", cbListProgress->isChecked() ); config.writeEntry( "ShowList", cbListProgress->isChecked() );
config.sync(); config.sync();
// Tell the running server // Tell the running server
if ( kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) ) if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
{ {
UIServer_stub uiserver( "kio_uiserver", "UIServer" ); UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
uiserver.setListMode( cbListProgress->isChecked() ); uiserver.setListMode( cbListProgress->isChecked() );
} }

@ -31,7 +31,7 @@
#include <kdialog.h> #include <kdialog.h>
#include <klineedit.h> #include <klineedit.h>
#include <knuminput.h> #include <knuminput.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <netwm.h> #include <netwm.h>

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/desktop/index.html#desktop-number DocPath=kcontrol/desktop/index.html#desktop-number
Icon=desktop Icon=desktop
Exec=kcmshell desktop Exec=tdecmshell desktop
X-TDE-Library=konq X-TDE-Library=konq

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/desktopbehavior/index.html DocPath=kcontrol/desktopbehavior/index.html
Icon=desktop Icon=desktop
Exec=kcmshell desktopbehavior Exec=tdecmshell desktopbehavior
X-TDE-Library=konq X-TDE-Library=konq

@ -23,7 +23,7 @@
#include "desktopbehavior.h" #include "desktopbehavior.h"
#include "tqlistview.h" #include "tqlistview.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <tdecmodule.h> #include <tdecmodule.h>
class DesktopBehavior : public DesktopBehaviorBase class DesktopBehavior : public DesktopBehaviorBase

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/desktop/index.html#desktop-desktop-path DocPath=kcontrol/desktop/index.html#desktop-desktop-path
Icon=kfm Icon=kfm
Exec=kcmshell desktoppath Exec=tdecmshell desktoppath
X-TDE-Library=konq X-TDE-Library=konq

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/filemanager/index.html DocPath=kcontrol/filemanager/index.html
Icon=kfm Icon=kfm
Exec=kcmshell fileappearance Exec=tdecmshell fileappearance
X-TDE-Library=konq X-TDE-Library=konq

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/filemanager/index.html DocPath=kcontrol/filemanager/index.html
Icon=kfm Icon=kfm
Exec=kcmshell filebehavior Exec=tdecmshell filebehavior
X-TDE-Library=konq X-TDE-Library=konq

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/filemanager/index.html DocPath=kcontrol/filemanager/index.html
Icon=kfm Icon=kfm
Exec=kcmshell filebrowser Exec=tdecmshell filebrowser
X-TDE-Library=konq X-TDE-Library=konq

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/filemanager/index.html DocPath=kcontrol/filemanager/index.html
Icon=kfm Icon=kfm
Exec=kcmshell filepreviews Exec=tdecmshell filepreviews
X-TDE-Library=konq X-TDE-Library=konq

@ -28,7 +28,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfontcombo.h> #include <kfontcombo.h>
#include <kfontdialog.h> #include <kfontdialog.h>

@ -30,7 +30,7 @@
#include "browser.h" #include "browser.h"
#include "desktopbehavior_impl.h" #include "desktopbehavior_impl.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
static TQCString configname() static TQCString configname()

@ -27,7 +27,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <klistview.h> #include <klistview.h>

@ -26,11 +26,11 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcustommenueditor.h> #include <kcustommenueditor.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kipc.h> #include <kipc.h>
#include <klistview.h> #include <klistview.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmimetype.h> #include <kmimetype.h>

@ -16,7 +16,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kurl.h> #include <kurl.h>
class TQCheckBox; class TQCheckBox;

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/filemanager/index.html DocPath=kcontrol/filemanager/index.html
Icon=kfm Icon=kfm
Exec=kcmshell fileappearance Exec=tdecmshell fileappearance
X-TDE-Library=konq X-TDE-Library=konq

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/filemanager/index.html DocPath=kcontrol/filemanager/index.html
Icon=kfm Icon=kfm
Exec=kcmshell filebehavior Exec=tdecmshell filebehavior
X-TDE-Library=konq X-TDE-Library=konq

@ -28,7 +28,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "advancedTabDialog.h" #include "advancedTabDialog.h"
#include "advancedTabOptions.h" #include "advancedTabOptions.h"

@ -9,7 +9,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcharsets.h> #include <kcharsets.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kfontcombo.h> #include <kfontcombo.h>

@ -23,7 +23,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klistview.h> #include <klistview.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -16,11 +16,11 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -25,7 +25,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdecmodule.h> #include <tdecmodule.h>
class TQRadioButton; class TQRadioButton;
class KIntNumInput; class KIntNumInput;

@ -14,7 +14,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klistview.h> #include <klistview.h>
#include <kdebug.h> #include <kdebug.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -25,7 +25,7 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>

@ -8,7 +8,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kconfig.h> #include <tdeconfig.h>
/** /**

@ -17,7 +17,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klistview.h> #include <klistview.h>
#include <klocale.h> #include <klocale.h>

@ -19,7 +19,7 @@
*/ */
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "policies.h" #include "policies.h"

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/tdehtml/index.html#kbrowse-html DocPath=kcontrol/tdehtml/index.html#kbrowse-html
Icon=konqueror Icon=konqueror
Exec=kcmshell tdehtml_behavior Exec=tdecmshell tdehtml_behavior
X-TDE-Library=konqhtml X-TDE-Library=konqhtml

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
Icon=filter Icon=filter
Exec=kcmshell tdehtml_filter Exec=tdecmshell tdehtml_filter
X-TDE-Library=konqhtml X-TDE-Library=konqhtml
X-TDE-FactoryName=tdehtml_filter X-TDE-FactoryName=tdehtml_filter

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
Icon=fonts Icon=fonts
Exec=kcmshell tdehtml_fonts Exec=tdecmshell tdehtml_fonts
X-TDE-Library=konqhtml X-TDE-Library=konqhtml

@ -2,7 +2,7 @@
Type=Application Type=Application
DocPath=kcontrol/tdehtml/index.html#kbrowse-java DocPath=kcontrol/tdehtml/index.html#kbrowse-java
Icon=konqueror Icon=konqueror
Exec=kcmshell tdehtml_java_js Exec=tdecmshell tdehtml_java_js
X-TDE-Library=konqhtml X-TDE-Library=konqhtml

@ -32,6 +32,6 @@ tde_add_kpart( kcm_konsole AUTOMOC
SOURCES SOURCES
schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp
schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -23,7 +23,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
@ -154,7 +154,7 @@ void KCMKonsole::save()
DCOPClient *dcc = kapp->dcopClient(); DCOPClient *dcc = kapp->dcopClient();
dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray()); dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
dcc->send("kdesktop", "default", "configure()", TQByteArray()); dcc->send("kdesktop", "default", "configure()", TQByteArray());
dcc->send("klauncher", "klauncher", "reparseConfiguration()", TQByteArray()); dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray());
if (xonXoffOrig != xonXoffNew) if (xonXoffOrig != xonXoffNew)
{ {

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=konsole Icon=konsole
Type=Application Type=Application
Exec=kcmshell kcmkonsole Exec=tdecmshell kcmkonsole
DocPath=kcontrol/kcmkonsole/index.html DocPath=kcontrol/kcmkonsole/index.html
X-TDE-Library=konsole X-TDE-Library=konsole

@ -35,7 +35,7 @@
#include <tqslider.h> #include <tqslider.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -24,7 +24,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -27,7 +27,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
##### krdb (static) ############################# ##### krdb (static) #############################

@ -12,4 +12,4 @@ messages:
$(XGETTEXT) *.cpp -o $(podir)/krdb.pot $(XGETTEXT) *.cpp -o $(podir)/krdb.pot
update_DATA = kcmdisplayrc.upd update_DATA = kcmdisplayrc.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update

@ -30,7 +30,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version)
TQByteArray params; TQByteArray params;
TQDataStream stream(params, IO_WriteOnly); TQDataStream stream(params, IO_WriteOnly);
stream << name << value; stream << name << value;
kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params); kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -261,7 +261,7 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
/* ##### looks like kcmfonts skips this, so we don't do this here */ /* ##### looks like kcmfonts skips this, so we don't do this here */
/*bool usexft = kglobals.readBoolEntry("AntiAliasing", false); /*bool usexft = kglobals.readBoolEntry("AntiAliasing", false);
kconfig.setGroup("General"); tdeconfig.setGroup("General");
settings.writeEntry("/qt/enableXft", usexft); settings.writeEntry("/qt/enableXft", usexft);
settings.writeEntry("/qt/useXft", usexft); */ settings.writeEntry("/qt/useXft", usexft); */

@ -33,6 +33,6 @@ tde_add_kpart( kcm_kthememanager AUTOMOC
SOURCES SOURCES
kthemedlg.ui newthemewidget.ui knewthemedlg.cpp kthemedlg.ui newthemewidget.ui knewthemedlg.cpp
ktheme.cpp kthememanager.cpp ktheme.cpp kthememanager.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdatastream.h> #include <kdatastream.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kipc.h> #include <kipc.h>
#include <klocale.h> #include <klocale.h>
#include <kservice.h> #include <kservice.h>

@ -16,34 +16,34 @@ void KThemeDlg::startKonqui( const TQString & url )
void KThemeDlg::startBackground() void KThemeDlg::startBackground()
{ {
KRun::runCommand("kcmshell kde-background"); KRun::runCommand("tdecmshell kde-background");
} }
void KThemeDlg::startColors() void KThemeDlg::startColors()
{ {
KRun::runCommand("kcmshell kde-colors"); KRun::runCommand("tdecmshell kde-colors");
} }
void KThemeDlg::startStyle() void KThemeDlg::startStyle()
{ {
KRun::runCommand("kcmshell kde-style"); KRun::runCommand("tdecmshell kde-style");
} }
void KThemeDlg::startIcons() void KThemeDlg::startIcons()
{ {
KRun::runCommand("kcmshell kde-icons"); KRun::runCommand("tdecmshell kde-icons");
} }
void KThemeDlg::startFonts() void KThemeDlg::startFonts()
{ {
KRun::runCommand("kcmshell kde-fonts"); KRun::runCommand("tdecmshell kde-fonts");
} }
void KThemeDlg::startSaver() void KThemeDlg::startSaver()
{ {
KRun::runCommand("kcmshell kde-screensaver"); KRun::runCommand("tdecmshell kde-screensaver");
} }

@ -28,7 +28,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kemailsettings.h> #include <kemailsettings.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klistview.h> #include <klistview.h>

@ -66,7 +66,7 @@ Comment[vi]=Trình quản lý các sắc thái của TDE
Comment[wa]=Manaedjî tinmes pol rivnance globåle di TDE Comment[wa]=Manaedjî tinmes pol rivnance globåle di TDE
Comment[zh_CN]=管理全局 TDE 视觉主题 Comment[zh_CN]=管理全局 TDE 视觉主题
Comment[zh_TW]=管理全域 TDE 視覺佈景 Comment[zh_TW]=管理全域 TDE 視覺佈景
Exec=kcmshell kthememanager Exec=tdecmshell kthememanager
Icon=kthememgr Icon=kthememgr
Keywords=themes,look and feel Keywords=themes,look and feel
Keywords[af]=themes,look and feel,temas Keywords[af]=themes,look and feel,temas

@ -25,7 +25,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <knuminput.h> #include <knuminput.h>

@ -2,7 +2,7 @@
Icon=launch Icon=launch
Type=Application Type=Application
DocPath=kcontrol/kcmlaunch/index.html DocPath=kcontrol/kcmlaunch/index.html
Exec=kcmshell kcmlaunch Exec=tdecmshell kcmlaunch
X-TDE-Library=launch X-TDE-Library=launch

@ -33,6 +33,6 @@ tde_add_kpart( kcm_locale AUTOMOC
SOURCES SOURCES
main.cpp toplevel.cpp kcmlocale.cpp klocalesample.cpp main.cpp toplevel.cpp kcmlocale.cpp klocalesample.cpp
localenum.cpp localemon.cpp localetime.cpp localeother.cpp localenum.cpp localemon.cpp localetime.cpp localeother.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell language Exec=tdecmshell language
Icon=locale Icon=locale
Type=Application Type=Application
DocPath=kcontrol/language/index.html DocPath=kcontrol/language/index.html

@ -29,7 +29,7 @@
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -36,6 +36,6 @@ install( FILES nic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_nic AUTOMOC tde_add_kpart( kcm_nic AUTOMOC
SOURCES nic.cpp SOURCES nic.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell nic Exec=tdecmshell nic
Type=Application Type=Application
DocPath=kinfocenter/nics/index.html DocPath=kinfocenter/nics/index.html
Icon=network Icon=network

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=launch Icon=launch
Type=Application Type=Application
Exec=kcmshell kcmkonqyperformance Exec=tdecmshell kcmkonqyperformance
X-TDE-Library=performance X-TDE-Library=performance

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=launch Icon=launch
Type=Application Type=Application
Exec=kcmshell kcmperformance Exec=tdecmshell kcmperformance
X-TDE-Library=performance X-TDE-Library=performance

@ -19,7 +19,7 @@
#include "konqueror.h" #include "konqueror.h"
#include <dcopref.h> #include <dcopref.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqspinbox.h> #include <tqspinbox.h>

@ -18,7 +18,7 @@
#include "system.h" #include "system.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -49,9 +49,9 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
" handler will refuse to provide backtrace for the bugreport with this option" " handler will refuse to provide backtrace for the bugreport with this option"
" turned on (you will need to reproduce it again with this option turned off," " turned on (you will need to reproduce it again with this option turned off,"
" or turn on the developer mode for the crash handler).</p>" ); " or turn on the developer mode for the crash handler).</p>" );
TQWhatsThis::add( cb_disable_kbuildsycoca, tmp ); TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp );
TQWhatsThis::add( label_kbuildsycoca, tmp ); TQWhatsThis::add( label_tdebuildsycoca, tmp );
connect( cb_disable_kbuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
defaults(); defaults();
} }
@ -60,14 +60,14 @@ void SystemWidget::load(bool useDefaults )
TDEConfig cfg( "kdedrc", true ); TDEConfig cfg( "kdedrc", true );
cfg.setReadDefaults( useDefaults ); cfg.setReadDefaults( useDefaults );
cfg.setGroup( "General" ); cfg.setGroup( "General" );
cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false )); cb_disable_tdebuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
} }
void SystemWidget::save() void SystemWidget::save()
{ {
TDEConfig cfg( "kdedrc" ); TDEConfig cfg( "kdedrc" );
cfg.setGroup( "General" ); cfg.setGroup( "General" );
cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked()); cfg.writeEntry( "DelayedCheck", cb_disable_tdebuildsycoca->isChecked());
} }
void SystemWidget::defaults() void SystemWidget::defaults()

@ -29,7 +29,7 @@
</property> </property>
<widget class="TQCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>cb_disable_kbuildsycoca</cstring> <cstring>cb_disable_tdebuildsycoca</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Disable &amp;system configuration startup check</string> <string>Disable &amp;system configuration startup check</string>
@ -37,7 +37,7 @@
</widget> </widget>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>label_kbuildsycoca</cstring> <cstring>label_tdebuildsycoca</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;b&gt;WARNING:&lt;/b&gt; This option may in rare cases lead to various problems. Consult the What's This? (Shift+F1) help for details.</string> <string>&lt;b&gt;WARNING:&lt;/b&gt; This option may in rare cases lead to various problems. Consult the What's This? (Shift+F1) help for details.</string>

@ -28,6 +28,6 @@ install( FILES privacy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_privacy AUTOMOC tde_add_kpart( kcm_privacy AUTOMOC
SOURCES privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp SOURCES privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -21,7 +21,7 @@
#include "kprivacymanager.h" #include "kprivacymanager.h"
#include <kapplication.h> #include <kapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kprocess.h> #include <kprocess.h>
#include <kglobal.h> #include <kglobal.h>

@ -27,7 +27,7 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <klistview.h> #include <klistview.h>

@ -66,7 +66,7 @@ Comment[vi]=Riêng tư - trình điều khiển giúp xoá các dấu vết mà
Comment[wa]=Vikereye da vosse - on module di kcontrol po rnetyî les passêyes nén volowes ki l' uzeu leye sol sistinme Comment[wa]=Vikereye da vosse - on module di kcontrol po rnetyî les passêyes nén volowes ki l' uzeu leye sol sistinme
Comment[zh_CN]=隐私 - 清除用户留在系统中痕迹的 kcontrol 模块 Comment[zh_CN]=隐私 - 清除用户留在系统中痕迹的 kcontrol 模块
Comment[zh_TW]=隱私權 - 一個控制模組用來清除使用者不希望留在系統中的痕跡 Comment[zh_TW]=隱私權 - 一個控制模組用來清除使用者不希望留在系統中的痕跡
Exec=kcmshell privacy Exec=tdecmshell privacy
Keywords=Privacy,privacy Keywords=Privacy,privacy
Keywords[ar]=خصوصية، الخصوصية Keywords[ar]=خصوصية، الخصوصية
Keywords[az]=Gizlilik,gizlilik Keywords[az]=Gizlilik,gizlilik

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=randr Icon=randr
Type=Application Type=Application
Exec=kcmshell randr Exec=tdecmshell randr
X-TDE-Library=randr X-TDE-Library=randr
#X-TDE-Init=randr #X-TDE-Init=randr
X-TDE-Test-Module=true X-TDE-Test-Module=true

@ -31,6 +31,6 @@ tde_add_kpart( kcm_samba AUTOMOC
SOURCES SOURCES
main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp
kcmsambastatistics.cpp kcmsambastatistics.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -26,7 +26,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <kconfig.h> #include <tdeconfig.h>
class ImportsView: public TQWidget class ImportsView: public TQWidget
{ {

@ -30,7 +30,7 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <tqevent.h> #include <tqevent.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -24,7 +24,7 @@
#include <kprocess.h> #include <kprocess.h>
#include <tqcstring.h> #include <tqcstring.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <kconfig.h> #include <tdeconfig.h>
#define SCREEN_XY_OFFSET 20 #define SCREEN_XY_OFFSET 20

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell smbstatus Exec=tdecmshell smbstatus
Icon=samba Icon=samba
Type=Application Type=Application
DocPath=kinfocenter/samba/index.html DocPath=kinfocenter/samba/index.html

@ -32,6 +32,6 @@ tde_add_kpart( kcm_screensaver AUTOMOC
advanceddialogimpl.ui scrnsave.cpp testwin.cpp advanceddialogimpl.ui scrnsave.cpp testwin.cpp
saverlist.cpp saverconfig.cpp advanceddialog.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp
kswidget.cpp kswidget.cpp
LINK kio-shared ${GL_LIBRARY} LINK tdeio-shared ${GL_LIBRARY}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -3,7 +3,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell screensaver Exec=tdecmshell screensaver
Icon=tdescreensaver Icon=tdescreensaver
Type=Application Type=Application
DocPath=kcontrol/screensaver/index.html DocPath=kcontrol/screensaver/index.html

@ -32,7 +32,7 @@
#include <kcarddb.h> #include <kcarddb.h>
#include <kcardfactory.h> #include <kcardfactory.h>
#include <kcardgsm_impl.h> #include <kcardgsm_impl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kglobal.h> #include <kglobal.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=identity Icon=identity
Type=Application Type=Application
Exec=kcmshell smartcard Exec=tdecmshell smartcard
DocPath=kcontrol/smartcard.html DocPath=kcontrol/smartcard.html
X-TDE-Library=smartcard X-TDE-Library=smartcard

@ -26,7 +26,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <klineedit.h> #include <klineedit.h>

@ -2,7 +2,7 @@
Icon=exit Icon=exit
Type=Application Type=Application
DocPath=kcontrol/kcmsmserver/index.html DocPath=kcontrol/kcmsmserver/index.html
Exec=kcmshell kcmsmserver Exec=tdecmshell kcmsmserver
X-TDE-Library=smserver X-TDE-Library=smserver

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell spellchecking Exec=tdecmshell spellchecking
Icon=spellcheck Icon=spellcheck
Type=Application Type=Application
DocPath=kcontrol/spellchecking/index.html DocPath=kcontrol/spellchecking/index.html

@ -33,6 +33,6 @@ tde_add_kpart( kcm_style AUTOMOC
SOURCES SOURCES
kcmstyle.cpp stylepreview.ui menupreview.cpp kcmstyle.cpp stylepreview.ui menupreview.cpp
styleconfdialog.cpp styleconfdialog.cpp
LINK krdb-static kio-shared LINK krdb-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -634,9 +634,9 @@ void KCMStyle::save()
if (m_bStyleDirty | m_bEffectsDirty) // Export only if necessary if (m_bStyleDirty | m_bEffectsDirty) // Export only if necessary
{ {
uint flags = KRdbExportQtSettings; uint flags = KRdbExportQtSettings;
TDEConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); TDEConfig tdeconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
kconfig.setGroup("X11"); tdeconfig.setGroup("X11");
bool exportKDEColors = kconfig.readBoolEntry("exportKDEColors", true); bool exportKDEColors = tdeconfig.readBoolEntry("exportKDEColors", true);
if (exportKDEColors) if (exportKDEColors)
flags |= KRdbExportColors; flags |= KRdbExportColors;
runRdb( flags ); runRdb( flags );

@ -23,7 +23,7 @@ link_directories(
##### kstyle_keramik_config (module) ############ ##### kstyle_keramik_config (module) ############
tde_add_kpart( kstyle_keramik_config AUTOMOC tde_add_kpart( kstyle_keramik_config AUTOMOC
SOURCES keramikconf.cpp SOURCES keramitdeconf.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,10 +1,10 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
noinst_HEADERS = keramikconf.h noinst_HEADERS = keramitdeconf.h
kde_module_LTLIBRARIES = kstyle_keramik_config.la kde_module_LTLIBRARIES = kstyle_keramik_config.la
kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI) kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI)
kstyle_keramik_config_la_SOURCES = keramikconf.cpp kstyle_keramik_config_la_SOURCES = keramitdeconf.cpp
METASOURCES = AUTO METASOURCES = AUTO

@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include "keramikconf.h" #include "keramitdeconf.h"
extern "C" extern "C"
{ {
@ -100,4 +100,4 @@ void KeramikStyleConfig::updateChanged()
emit changed(true); emit changed(true);
} }
#include "keramikconf.moc" #include "keramitdeconf.moc"

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell style Exec=tdecmshell style
Icon=style Icon=style
Type=Application Type=Application
DocPath=kcontrol/kcmstyle/index.html DocPath=kcontrol/kcmstyle/index.html

@ -28,7 +28,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <twin.h> #include <twin.h>

@ -2,7 +2,7 @@
Icon=kmenu Icon=kmenu
Type=Application Type=Application
DocPath=kcontrol/kcmtaskbar/index.html DocPath=kcontrol/kcmtaskbar/index.html
Exec=kcmshell kcmtaskbar Exec=tdecmshell kcmtaskbar
X-TDE-Library=taskbar X-TDE-Library=taskbar

@ -41,7 +41,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>

@ -29,7 +29,7 @@
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kurl.h> #include <kurl.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "klanguagebutton.h" #include "klanguagebutton.h"

@ -29,10 +29,10 @@
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kimageio.h> #include <kimageio.h>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell tdm Exec=tdecmshell tdm
Icon=tdmconfig Icon=tdmconfig
Type=Application Type=Application
DocPath=tdm/index.html#configuring-tdm DocPath=tdm/index.html#configuring-tdm

@ -2,7 +2,7 @@
Icon=usb Icon=usb
Type=Application Type=Application
DocPath=kinfocenter/usb/index.html DocPath=kinfocenter/usb/index.html
Exec=kcmshell kcmusb Exec=tdecmshell kcmusb
X-TDE-Library=usb X-TDE-Library=usb
X-TDE-ParentApp=kinfocenter X-TDE-ParentApp=kinfocenter

@ -2,7 +2,7 @@
Icon=ieee1394 Icon=ieee1394
Type=Application Type=Application
DocPath=kinfocenter/view1394/index.html DocPath=kinfocenter/view1394/index.html
Exec=kcmshell kcmview1394 Exec=tdecmshell kcmview1394
X-TDE-Library=view1394 X-TDE-Library=view1394
X-TDE-ParentApp=kinfocenter X-TDE-ParentApp=kinfocenter

@ -23,7 +23,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=identity Icon=identity
Type=Application Type=Application
Exec=kcmshell xinerama Exec=tdecmshell xinerama
DocPath=kcontrol/multiplemonitors.html DocPath=kcontrol/multiplemonitors.html
X-TDE-Library=xinerama X-TDE-Library=xinerama

@ -31,6 +31,6 @@ install( FILES kdcopui.rc DESTINATION ${DATA_INSTALL_DIR}/kdcop )
tde_add_executable( kdcop AUTOMOC tde_add_executable( kdcop AUTOMOC
SOURCES SOURCES
kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -18,7 +18,7 @@
*/ */
#include "kabstractdebugdialog.h" #include "kabstractdebugdialog.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <kapplication.h> #include <kapplication.h>

@ -33,7 +33,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kdialog.h> #include <kdialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kseparator.h> #include <kseparator.h>
#include <kapplication.h> #include <kapplication.h>
#include <dcopclient.h> #include <dcopclient.h>

@ -19,7 +19,7 @@
#include "klistdebugdialog.h" #include "klistdebugdialog.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -26,7 +26,7 @@
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqfile.h> #include <tqfile.h>

@ -32,6 +32,6 @@ install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_executable( kdepasswd AUTOMOC tde_add_executable( kdepasswd AUTOMOC
SOURCES kdepasswd.cpp passwd.cpp passwddlg.cpp SOURCES kdepasswd.cpp passwd.cpp passwddlg.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -36,7 +36,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconview.h> #include <kiconview.h>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>
#include <kimageio.h> #include <kimageio.h>

@ -4,7 +4,7 @@ Categories=Qt;TDE;X-TDE-settings-security;
X-TDE-ParentApp=kcontrol X-TDE-ParentApp=kcontrol
X-TDE-Library=useraccount X-TDE-Library=useraccount
Type=Application Type=Application
Exec=kcmshell kcm_useraccount Exec=tdecmshell kcm_useraccount
Name=Password & User Account Name=Password & User Account
Name[af]=Gebruiker rekening en Wagwoord Name[af]=Gebruiker rekening en Wagwoord
Name[ar]=كلمة المرور و حساب المستخدم Name[ar]=كلمة المرور و حساب المستخدم

@ -42,7 +42,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <kurldrag.h> #include <kurldrag.h>

@ -85,7 +85,7 @@ set( ${target}_SRCS
pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
xautolock_diy.c xautolock_engine.c kshadowengine.cpp xautolock_diy.c xautolock_engine.c kshadowengine.cpp
kshadowsettings.cpp kdesktopshadowsettings.cpp kshadowsettings.cpp kdesktopshadowsettings.cpp
kfileividesktop.cpp kdesktopapp.cpp tdefileividesktop.cpp kdesktopapp.cpp
) )
tde_add_tdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC

@ -14,10 +14,3 @@
if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) ) if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" ) set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
endif( ) endif( )
if( WITH_KDESKTOP_LOCK_BACKTRACE )
check_include_files( "bfd.h;demangle.h;libiberty.h" HAVE_BINUTILS_DEV )
if( NOT HAVE_BINUTILS_DEV )
tde_message_fatal( "binutils-dev are required, but not found on your system" )
endif( )
endif( )

@ -37,8 +37,8 @@ lock* : screen saver/locker
Libs used by KDesktop Libs used by KDesktop
====================== ======================
tdecore, tdeui, kfile - usual stuff :) tdecore, tdeui, tdefile - usual stuff :)
libkio - I/O stuff, mimetypes, services, registry libtdeio - I/O stuff, mimetypes, services, registry
libkonq - properties dialog, templates ("new") menu, dir lister, settings libkonq - properties dialog, templates ("new") menu, dir lister, settings
Screensaver Screensaver

@ -23,7 +23,7 @@ kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \ startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
kshadowengine.cpp kshadowsettings.cpp \ kshadowengine.cpp kshadowsettings.cpp \
kdesktopshadowsettings.cpp kfileividesktop.cpp \ kdesktopshadowsettings.cpp tdefileividesktop.cpp \
kdesktopapp.cpp kdesktopapp.cpp
include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h

@ -22,7 +22,7 @@
#include <tqscrollview.h> #include <tqscrollview.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <twin.h> #include <twin.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>

@ -33,7 +33,7 @@
#include <kcolordrag.h> #include <kcolordrag.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <stdlib.h> #include <stdlib.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqdir.h> #include <tqdir.h>
@ -49,7 +49,7 @@
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kipc.h> #include <kipc.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kprocess.h> #include <kprocess.h>
#include <tdesycoca.h> #include <tdesycoca.h>
#include <ktempfile.h> #include <ktempfile.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

@ -20,7 +20,7 @@
#include <tqimage.h> #include <tqimage.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kapplication.h> #include <kapplication.h>

@ -65,7 +65,7 @@
<label>Sort directories first</label> <label>Sort directories first</label>
<whatsthis></whatsthis> <whatsthis></whatsthis>
<!-- krootwm.cc:251 --> <!-- krootwm.cc:251 -->
<!-- aSortDirsFirst->setChecked( kconfig->readBoolEntry("SortDirectoriesFirst", true)); --> <!-- aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
<!-- krootwm.cc:496 --> <!-- krootwm.cc:496 -->
<!-- config->writeEntry( "SortDirectoriesFirst", b ); --> <!-- config->writeEntry( "SortDirectoriesFirst", b ); -->
</entry> </entry>

@ -25,7 +25,7 @@
#include <tqcolor.h> #include <tqcolor.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kshadowsettings.h> #include <kshadowsettings.h>

@ -22,7 +22,7 @@
#include "desktop.h" #include "desktop.h"
#include "kdesktopsettings.h" #include "kdesktopsettings.h"
#include <kio/paste.h> #include <tdeio/paste.h>
#include <kaccel.h> #include <kaccel.h>
#include <kapplication.h> #include <kapplication.h>
#include <kcolordrag.h> #include <kcolordrag.h>
@ -57,7 +57,7 @@
#include "kshadowengine.h" #include "kshadowengine.h"
#include "kdesktopshadowsettings.h" #include "kdesktopshadowsettings.h"
#include "kfileividesktop.h" #include "tdefileividesktop.h"
// for multihead // for multihead
extern int kdesktop_screen_number; extern int kdesktop_screen_number;

@ -24,7 +24,7 @@
#include <konq_iconviewwidget.h> #include <konq_iconviewwidget.h>
#include <kaction.h> #include <kaction.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kdirnotify.h> #include <kdirnotify.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -36,7 +36,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcmultidialog.h> #include <kcmultidialog.h>
#include <kbookmarkmenu.h> #include <kbookmarkmenu.h>
#include <konqbookmarkmanager.h> #include <konqbookmarkmanager.h>

@ -22,13 +22,13 @@
#include <config.h> #include <config.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kurifilter.h> #include <kurifilter.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <tqscrollview.h> #include <tqscrollview.h>
#include "kwebdesktop.h" #include "kwebdesktop.h"

@ -30,7 +30,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <stdlib.h> #include <stdlib.h>

@ -32,16 +32,11 @@ set( target kdesktop_lock )
set( ${target}_SRCS set( ${target}_SRCS
lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
securedlg.cc autologout.cc main.cc securedlg.cc autologout.cc main.cc backtrace_symbols.c
) )
if( WITH_KDESKTOP_LOCK_BACKTRACE )
list( APPEND ${target}_SRCS backtrace_symbols.c )
set( BACKTRACE_LIBRARY bfd )
endif( )
tde_add_executable( ${target} AUTOMOC tde_add_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdesktopsettings-static dmctl-static kio-shared Xext ${BACKTRACE_LIBRARY} ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}" LINK kdesktopsettings-static dmctl-static tdeio-shared Xext bfd ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -10,7 +10,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopref.h> #include <dcopref.h>

@ -16,7 +16,7 @@
#include <kseparator.h> #include <kseparator.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -21,7 +21,7 @@
#include <kseparator.h> #include <kseparator.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -137,7 +137,6 @@ static Atom gXA_SCREENSAVER_VERSION;
void print_trace() void print_trace()
{ {
#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
void *array[10]; void *array[10];
size_t size; size_t size;
char **strings; char **strings;
@ -153,7 +152,6 @@ void print_trace()
} }
free (strings); free (strings);
#endif
} }
static void segv_handler(int) static void segv_handler(int)

@ -16,7 +16,7 @@
#include <kseparator.h> #include <kseparator.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -16,7 +16,7 @@
#include <kseparator.h> #include <kseparator.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -16,7 +16,7 @@
#include <kseparator.h> #include <kseparator.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdesu/defaults.h> #include <tdesu/defaults.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -28,7 +28,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmanagerselection.h> #include <kmanagerselection.h>
#include "desktop.h" #include "desktop.h"

@ -60,7 +60,7 @@
#include <twin.h> #include <twin.h>
#include <tdesu/su.h> #include <tdesu/su.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kguiitem.h> #include <kguiitem.h>

@ -27,7 +27,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqbitmap.h> #include <tqbitmap.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define KDE_STARTUP_ICON "kmenu" #define KDE_STARTUP_ICON "kmenu"

@ -35,7 +35,7 @@
#include <kshadowengine.h> #include <kshadowengine.h>
#include "kdesktopshadowsettings.h" #include "kdesktopshadowsettings.h"
#include "kfileividesktop.h" #include "tdefileividesktop.h"
//#define DEBUG //#define DEBUG

@ -28,7 +28,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqstring.h> #include <tqstring.h>
#include <kfileivi.h> #include <tdefileivi.h>
/* /*
* The dither flags used to display the shadow image * The dither flags used to display the shadow image

@ -26,6 +26,6 @@ tde_add_executable( kdialog AUTOMOC
SOURCES SOURCES
kdialog.cpp widgets.cpp klistboxdialog.cpp kdialog.cpp widgets.cpp klistboxdialog.cpp
progressdialog.cpp progressdialogiface.skel progressdialog.cpp progressdialogiface.skel
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -44,7 +44,7 @@
#include <tqdialog.h> #include <tqdialog.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>

@ -1,7 +1,7 @@
Fri Jul 30 22:33:25 1999 Carsten Pfeiffer <pfeiffer@kde.org> Fri Jul 30 22:33:25 1999 Carsten Pfeiffer <pfeiffer@kde.org>
* kfwin.cpp, kfwin.h: The listview items show a mini-pixmap, like those * kfwin.cpp, kfwin.h: The listview items show a mini-pixmap, like those
in kfiledialog. For now, they're static icons (only folder and document in tdefiledialog. For now, they're static icons (only folder and document
icons), maybe we can show the correct icons for the mimetypes, later. icons), maybe we can show the correct icons for the mimetypes, later.
Also introduced drag-support, you can drag files from the list. Also introduced drag-support, you can drag files from the list.

@ -8,7 +8,7 @@
#define KFIND_H #define KFIND_H
#include <tqwidget.h> #include <tqwidget.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kdirlister.h> #include <kdirlister.h>
class TQString; class TQString;

@ -22,7 +22,7 @@
#include <tdeparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <konq_dirpart.h> #include <konq_dirpart.h>

@ -22,7 +22,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
#include <tdeparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -21,7 +21,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <krun.h> #include <krun.h>
@ -32,7 +32,7 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <kglobal.h> #include <kglobal.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kdebug.h> #include <kdebug.h>

@ -8,7 +8,7 @@
#define KFWIN_H #define KFWIN_H
#include <klistview.h> #include <klistview.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kurl.h> #include <kurl.h>
class KfArchiver; class KfArchiver;

@ -2,8 +2,8 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include <kapplication.h> #include <kapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>

@ -9,7 +9,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
#include <kprocess.h> #include <kprocess.h>

@ -30,7 +30,7 @@ Icon string Name of icon for document
DocPath URI Location of document. In addition to the DocPath URI Location of document. In addition to the
standard URI schemes like http: and file: standard URI schemes like http: and file:
all schemes which are supported through all schemes which are supported through
kioslaves can be used. In particular the tdeioslaves can be used. In particular the
following non-standard URI schemes are following non-standard URI schemes are
supported: supported:
help: KDE manual identified by app name help: KDE manual identified by app name
@ -91,7 +91,7 @@ X-TDE-KHelpcenter string If this entry is set to one of the
'kinfocenter' kinfocenter docs 'kinfocenter' kinfocenter docs
'kcontrol' kcontrol module docs 'kcontrol' kcontrol module docs
'konqueror' konqueror plugin docs 'konqueror' konqueror plugin docs
'kioslave' kioslave docs 'tdeioslave' tdeioslave docs
'info' info pages 'info' info pages
X-DOC-DocumentType string Type of document. The type is used to look X-DOC-DocumentType string Type of document. The type is used to look
up corresponding search handlers. up corresponding search handlers.

@ -22,7 +22,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcharsets.h> #include <kcharsets.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kfontcombo.h> #include <kfontcombo.h>
#include <tdehtmldefaults.h> #include <tdehtmldefaults.h>
#include <klocale.h> #include <klocale.h>

@ -23,7 +23,7 @@
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tqfile.h> #include <tqfile.h>

@ -21,7 +21,7 @@
#include "view.h" #include "view.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>

@ -1,5 +1,5 @@
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "docentry.h" #include "docentry.h"

@ -7,7 +7,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kprocess.h> #include <kprocess.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "progressdialog.h" #include "progressdialog.h"

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell htmlsearch Exec=tdecmshell htmlsearch
Icon=help_index Icon=help_index
Type=Application Type=Application
DocPath=kcontrol/help-index.html DocPath=kcontrol/help-index.html

@ -25,7 +25,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kprocess.h> #include <kprocess.h>
#include "klangcombo.h" #include "klangcombo.h"
#include <kurlrequester.h> #include <kurlrequester.h>

@ -26,7 +26,7 @@
#include <klocale.h> #include <klocale.h>
#include <kurllabel.h> #include <kurllabel.h>
#include <kapplication.h> #include <kapplication.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <klineedit.h> #include <klineedit.h>

@ -24,7 +24,7 @@
#include "docentry.h" #include "docentry.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klistview.h> #include <klistview.h>
@ -98,7 +98,7 @@ void InfoTree::build( NavigatorItem *parent )
TDEConfig *cfg = kapp->config(); TDEConfig *cfg = kapp->config();
cfg->setGroup( "Info pages" ); cfg->setGroup( "Info pages" );
TQStringList infoDirFiles = cfg->readListEntry( "Search paths" ); TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
// Default paths taken fron tdebase/kioslave/info/kde-info2html.conf // Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf
if ( infoDirFiles.isEmpty() ) { if ( infoDirFiles.isEmpty() ) {
infoDirFiles << "/usr/share/info"; infoDirFiles << "/usr/share/info";
infoDirFiles << "/usr/info"; infoDirFiles << "/usr/info";

@ -26,7 +26,7 @@
#include "searchhandler.h" #include "searchhandler.h"
#include "searchengine.h" #include "searchengine.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Exec=kcmshell kcmhelpcenter Exec=tdecmshell kcmhelpcenter
Icon=help Icon=help
X-TDE-SubstituteUID=true X-TDE-SubstituteUID=true

@ -31,7 +31,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kprocess.h> #include <kprocess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>

@ -28,7 +28,7 @@
#include "prefs.h" #include "prefs.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmimemagic.h> #include <kmimemagic.h>

@ -4,7 +4,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kmainwindow.h> #include <kmainwindow.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
#include <tdeparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <dcopclient.h> #include <dcopclient.h>

@ -18,5 +18,5 @@ install( FILES
applets.desktop contact.desktop faq.desktop info.desktop applets.desktop contact.desktop faq.desktop info.desktop
links.desktop support.desktop userguide.desktop welcome.desktop links.desktop support.desktop userguide.desktop welcome.desktop
hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop
kioslaves.desktop quickstart.desktop visualdict.desktop tdeioslaves.desktop quickstart.desktop visualdict.desktop
DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins ) DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins )

@ -5,6 +5,6 @@ SUBDIRS = Applications Manpages Scrollkeeper
plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \ plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \
links.desktop support.desktop userguide.desktop welcome.desktop \ links.desktop support.desktop userguide.desktop welcome.desktop \
kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \ kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \
kioslaves.desktop quickstart.desktop visualdict.desktop tdeioslaves.desktop quickstart.desktop visualdict.desktop
plugindir = $(kde_datadir)/khelpcenter/plugins plugindir = $(kde_datadir)/khelpcenter/plugins

@ -32,4 +32,4 @@ Icon=contents2
X-DOC-Weight=-400 X-DOC-Weight=-400
X-TDE-KHelpcenter-Special=kioslave X-TDE-KHelpcenter-Special=tdeioslave

@ -24,7 +24,7 @@
#include "navigatoritem.h" #include "navigatoritem.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -94,7 +94,7 @@ void PluginTraverser::process( DocEntry *entry )
entry->khelpcenterSpecial() == "kcontrol" || entry->khelpcenterSpecial() == "kcontrol" ||
entry->khelpcenterSpecial() == "konqueror" ) { entry->khelpcenterSpecial() == "konqueror" ) {
mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem ); mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem );
} else if ( entry->khelpcenterSpecial() == "kioslave" ) { } else if ( entry->khelpcenterSpecial() == "tdeioslave" ) {
mNavigator->insertIOSlaveDocs( entry->khelpcenterSpecial(), mCurrentItem ); mNavigator->insertIOSlaveDocs( entry->khelpcenterSpecial(), mCurrentItem );
} else if ( entry->khelpcenterSpecial() == "info" ) { } else if ( entry->khelpcenterSpecial() == "info" ) {
mNavigator->insertInfoDocs( mCurrentItem ); mNavigator->insertInfoDocs( mCurrentItem );

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=khelpcenter.kcfg File=khelpcenter.kcfg
ClassName=Prefs ClassName=Prefs
Singleton=true Singleton=true

@ -24,7 +24,7 @@
#include "docentry.h" #include "docentry.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -2,7 +2,7 @@
#include <tqstylesheet.h> #include <tqstylesheet.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kprocess.h> #include <kprocess.h>

@ -6,7 +6,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "docentrytraverser.h" #include "docentrytraverser.h"

@ -17,7 +17,7 @@
#include "app.h" #include "app.h"
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <stdio.h> #include <stdio.h>

@ -17,7 +17,7 @@
#include "kded.h" #include "kded.h"
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>

@ -2,6 +2,6 @@ khotkeys_data_DATA = trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys p
khotkeys_datadir = $(kde_datadir)/khotkeys khotkeys_datadir = $(kde_datadir)/khotkeys
khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_trinity21_update.upd khotkeys_printscreen.upd khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_trinity21_update.upd khotkeys_printscreen.upd
khotkeys_updatedir = $(kde_datadir)/kconf_update khotkeys_updatedir = $(kde_datadir)/tdeconf_update
EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA) EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA)

@ -16,7 +16,7 @@
#include <dcopref.h> #include <dcopref.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <stdlib.h> #include <stdlib.h>

@ -26,14 +26,14 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kglobal.h> #include <kglobal.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <dcopref.h> #include <dcopref.h>
#include <klibloader.h> #include <klibloader.h>

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell khotkeys Exec=tdecmshell khotkeys
Icon=khotkeys Icon=khotkeys
Type=Application Type=Application

@ -28,7 +28,7 @@
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <kshortcut.h> #include <kshortcut.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kshortcutlist.h> #include <kshortcutlist.h>
#include <kkeybutton.h> #include <kkeybutton.h>
#include <kkeydialog.h> #include <kkeydialog.h>

@ -37,6 +37,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.0.0 VERSION 1.0.0
LINK kio-shared ${XTEST_LIBRARIES} LINK tdeio-shared ${XTEST_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -16,7 +16,7 @@
#include "action_data.h" #include "action_data.h"
#include <kconfig.h> #include <tdeconfig.h>
#include "actions.h" #include "actions.h"

@ -17,7 +17,7 @@
#include "actions.h" #include "actions.h"
#include <krun.h> #include <krun.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kurifilter.h> #include <kurifilter.h>
#include <kglobal.h> #include <kglobal.h>

@ -20,7 +20,7 @@
#include <typeinfo> #include <typeinfo>
#endif #endif
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <assert.h> #include <assert.h>

@ -16,7 +16,7 @@
#include "settings.h" #include "settings.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kaccel.h> #include <kaccel.h>

@ -17,7 +17,7 @@
#include "triggers.h" #include "triggers.h"
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <twinmodule.h> #include <twinmodule.h>
#include <klocale.h> #include <klocale.h>

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "voicesignature.h" #include "voicesignature.h"
#include "sound.h" #include "sound.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <math.h> #include <math.h>
#ifdef PI #ifdef PI

@ -19,7 +19,7 @@
#include <assert.h> #include <assert.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <twinmodule.h> #include <twinmodule.h>
#include <twin.h> #include <twin.h>

@ -27,5 +27,5 @@ link_directories(
tde_add_executable( khotkeys_update tde_add_executable( khotkeys_update
SOURCES update.cpp SOURCES update.cpp
LINK khotkeys_shared-shared LINK khotkeys_shared-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
) )

@ -1,5 +1,5 @@
kconf_PROGRAMS = khotkeys_update tdeconf_PROGRAMS = khotkeys_update
kconfdir = $(libdir)/kconf_update_bin tdeconfdir = $(libdir)/tdeconf_update_bin
khotkeys_update_SOURCES = update.cpp khotkeys_update_SOURCES = update.cpp

@ -17,7 +17,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>

@ -19,7 +19,7 @@ clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI)
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -ltdefile
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot

@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kfontrequester.h> #include <kfontrequester.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfigdialogmanager.h> #include <tdeconfigdialogmanager.h>
#include <kcalendarsystem.h> #include <kcalendarsystem.h>
#include <kicontheme.h> #include <kicontheme.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -1518,12 +1518,12 @@ void ClockApplet::contextMenuActivated(int result)
proc << locate("exe", "tdesu"); proc << locate("exe", "tdesu");
proc << "--nonewdcop"; proc << "--nonewdcop";
proc << TQString("%1 tde-clock.desktop --lang %2") proc << TQString("%1 tde-clock.desktop --lang %2")
.arg(locate("exe", "kcmshell")) .arg(locate("exe", "tdecmshell"))
.arg(TDEGlobal::locale()->language()); .arg(TDEGlobal::locale()->language());
proc.start(TDEProcess::DontCare); proc.start(TDEProcess::DontCare);
break; break;
case 104: case 104:
proc << locate("exe", "kcmshell"); proc << locate("exe", "tdecmshell");
proc << "tde-language.desktop"; proc << "tde-language.desktop";
proc.start(TDEProcess::DontCare); proc.start(TDEProcess::DontCare);
break; break;

@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopobject.h> #include <dcopobject.h>
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kconfigdialog.h> #include <tdeconfigdialog.h>
#include <kickertip.h> #include <kickertip.h>
#include "settings.h" #include "settings.h"

@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kfontrequester.h> #include <kfontrequester.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfigdialogmanager.h> #include <tdeconfigdialogmanager.h>
#include <kcalendarsystem.h> #include <kcalendarsystem.h>
#include <kicontheme.h> #include <kicontheme.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=clockapplet.kcfg File=clockapplet.kcfg
ClassName=Prefs ClassName=Prefs
Singleton=false Singleton=false

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "zone.h" #include "zone.h"
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kstringhandler.h> #include <kstringhandler.h>

@ -26,7 +26,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES quicklauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) install( FILES quictdelauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
@ -37,7 +37,7 @@ install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
tde_add_kpart( launcher_panelapplet AUTOMOC tde_add_kpart( launcher_panelapplet AUTOMOC
SOURCES SOURCES
quicklauncher.skel quicklauncher.cpp quickbutton.cpp quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp
quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp
configdlgbase.ui prefs.kcfgc configdlg.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
LINK LINK

@ -4,9 +4,9 @@
* Empty panel now has size>0, so user can still drop icons on it. * Empty panel now has size>0, so user can still drop icons on it.
* Fixed gcc 3.4 incompatibilities in EasyVector * Fixed gcc 3.4 incompatibilities in EasyVector
* Fixed Drag and Drop Bugs : * Fixed Drag and Drop Bugs :
* Crash when non-url dropped on quicklauncher * Crash when non-url dropped on quictdelauncher
* Crash panel button dropped on quicklauncher * Crash panel button dropped on quictdelauncher
* Able to drop objects when quicklauncher is locked * Able to drop objects when quictdelauncher is locked
* Add application context menu now inserts new app at current location * Add application context menu now inserts new app at current location
2004-06-14 Dan Bullok <dan.kde@bullok.com> 2004-06-14 Dan Bullok <dan.kde@bullok.com>
@ -28,7 +28,7 @@
* Spouts tons of debugging info to kdDebug (for now). * Spouts tons of debugging info to kdDebug (for now).
2004-06-12 Dan Bullok <dan.kde@bullok.com> 2004-06-12 Dan Bullok <dan.kde@bullok.com>
* Fixed bug #75351: Tooltips change to filenames after rearranging applications in quicklauncher. * Fixed bug #75351: Tooltips change to filenames after rearranging applications in quictdelauncher.
* Moved the URL->(menuID,service,kurl) functionality from the QuickButton constructor to its own class: QuickURL. Very similar code is used elsewhere in kicker, and should eventually be merged. * Moved the URL->(menuID,service,kurl) functionality from the QuickButton constructor to its own class: QuickURL. Very similar code is used elsewhere in kicker, and should eventually be merged.
* Renamed some methods in QuickButton (getId -> menuId, getURL -> url) This matches the predominant KDE naming style. * Renamed some methods in QuickButton (getId -> menuId, getURL -> url) This matches the predominant KDE naming style.
* Groundwork laid for variable-sized buttons. * Groundwork laid for variable-sized buttons.

@ -3,13 +3,13 @@ INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui $(a
kde_module_LTLIBRARIES = launcher_panelapplet.la kde_module_LTLIBRARIES = launcher_panelapplet.la
launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp launcher_panelapplet_la_SOURCES = quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h noinst_HEADERS = quictdelauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
lnkdir = $(kde_datadir)/kicker/applets lnkdir = $(kde_datadir)/kicker/applets
lnk_DATA = quicklauncher.desktop lnk_DATA = quictdelauncher.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)
@ -21,7 +21,7 @@ launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kick
kde_kcfg_DATA = launcherapplet.kcfg kde_kcfg_DATA = launcherapplet.kcfg
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot $(XGETTEXT) *.cpp *.h -o $(podir)/quictdelauncher.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui kdoc -a -p -H -d $$HOME/web/src/quictdelauncher quictdelauncher *.h -lqt -ltdecore -ltdeui

@ -3,6 +3,6 @@ TODO:
x * Remove debugging code (makes everything slow). x * Remove debugging code (makes everything slow).
* Tooltip or other popup to alert user that buttons are locked (with a "don't show this again" checkbox). * Tooltip or other popup to alert user that buttons are locked (with a "don't show this again" checkbox).
* Docs. * Docs.
* Use old quicklauncher config file if found. #77959 * Use old quictdelauncher config file if found. #77959
X * "Add application" context menu should add the new application at the index of the button that summoned the context menu. X * "Add application" context menu should add the new application at the index of the button that summoned the context menu.
X * Make sure to always have a little space to drop things on, even when there are no buttons. X * Make sure to always have a little space to drop things on, even when there are no buttons.

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef CONFIG_DLG_H #ifndef CONFIG_DLG_H
#define CONFIG_DLG_H #define CONFIG_DLG_H
#include <kconfigdialog.h> #include <tdeconfigdialog.h>
class ConfigDlgBase; class ConfigDlgBase;
class Prefs; class Prefs;

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h> #include <assert.h>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <list> #include <list>
#include <set> #include <set>

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=launcherapplet.kcfg File=launcherapplet.kcfg
ClassName=Prefs ClassName=Prefs
Singleton=false Singleton=false

@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <knuminput.h> #include <knuminput.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kdebug.h> #include <kdebug.h>
@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "configdlg.h" #include "configdlg.h"
#include "popularity.h" #include "popularity.h"
#include "quicklauncher.h" #include "quictdelauncher.h"
#include "quickbutton.h" #include "quickbutton.h"
#include "quickaddappsmenu.h" #include "quickaddappsmenu.h"
#include "quickbuttongroup.h" #include "quickbuttongroup.h"
@ -71,10 +71,10 @@ extern "C"
{ {
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{ {
TDEGlobal::locale()->insertCatalogue("quicklauncher"); TDEGlobal::locale()->insertCatalogue("quictdelauncher");
return new QuickLauncher(configFile, KPanelApplet::Normal, return new QuickLauncher(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences, KPanelApplet::Preferences,
parent, "quicklauncher"); parent, "quictdelauncher");
} }
} }
@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
m_oldButtons = 0; m_oldButtons = 0;
m_dragButtons = 0; m_dragButtons = 0;
m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(), m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
m_saveTimer = new TQTimer(this, "m_saveTimer"); m_saveTimer = new TQTimer(this, "m_saveTimer");
@ -135,7 +135,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
"QuickLauncherApplet", "QuickLauncherApplet",
"serviceStartedByStorageId(TQString,TQString)", "serviceStartedByStorageId(TQString,TQString)",
false); false);
kdDebug() << "Quicklauncher registered DCOP signal" << endl; kdDebug() << "Quictdelauncher registered DCOP signal" << endl;
} }
@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
QuickLauncher::~QuickLauncher() QuickLauncher::~QuickLauncher()
{ {
TDEGlobal::locale()->removeCatalogue("quicklauncher"); TDEGlobal::locale()->removeCatalogue("quictdelauncher");
setCustomMenu(0); setCustomMenu(0);
delete m_popup; delete m_popup;
delete m_appletPopup; delete m_appletPopup;
@ -496,7 +496,7 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender)
void QuickLauncher::about() void QuickLauncher::about()
{ {
TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0", TDEAboutData about("quictdelauncher", I18N_NOOP("Quick Launcher"), "2.0",
I18N_NOOP("A simple application launcher"), I18N_NOOP("A simple application launcher"),
TDEAboutData::License_GPL_V2, TDEAboutData::License_GPL_V2,
"(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen"); "(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen");
@ -949,7 +949,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
QuickURL url = QuickURL(locate("apps", service->desktopEntryPath())); QuickURL url = QuickURL(locate("apps", service->desktopEntryPath()));
TQString desktopMenuId(url.menuId()); TQString desktopMenuId(url.menuId());
kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl; kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl;
// A service was started somwhere else. If the quicklauncher contains // A service was started somwhere else. If the quictdelauncher contains
// this service too, we flash the icon // this service too, we flash the icon
QuickButton *startedButton = 0; QuickButton *startedButton = 0;
std::set<TQString> buttonIdSet; std::set<TQString> buttonIdSet;
@ -1127,4 +1127,4 @@ void QuickLauncher::positionChange(Position)
} }
#include "quicklauncher.moc" #include "quictdelauncher.moc"

@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/ ******************************************************************/
#ifndef __quicklauncher_h__ #ifndef __quictdelauncher_h__
#define __quicklauncher_h__ #define __quictdelauncher_h__
#include <dcopobject.h> #include <dcopobject.h>
#include <tqimage.h> #include <tqimage.h>

@ -250,7 +250,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
void Lockout::slotLockPrefs() void Lockout::slotLockPrefs()
{ {
// Run the screensaver settings // Run the screensaver settings
KRun::run( "kcmshell screensaver", KURL::List() ); KRun::run( "tdecmshell screensaver", KURL::List() );
} }
void Lockout::slotTransparent() void Lockout::slotTransparent()
@ -266,7 +266,7 @@ void Lockout::slotTransparent()
void Lockout::slotLogoutPrefs() void Lockout::slotLogoutPrefs()
{ {
// Run the logout settings. // Run the logout settings.
KRun::run( "kcmshell kcmsmserver", KURL::List() ); KRun::run( "tdecmshell kcmsmserver", KURL::List() );
} }
void Lockout::slotIconChanged() void Lockout::slotIconChanged()

@ -19,7 +19,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>

@ -26,9 +26,9 @@
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <tqstring.h> #include <tqstring.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurl.h> #include <kurl.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <tqptrlist.h> #include <tqptrlist.h>

@ -26,7 +26,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqcursor.h> #include <tqcursor.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <kactioncollection.h> #include <kactioncollection.h>

@ -24,7 +24,7 @@
#include <tqvbox.h> #include <tqvbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <klistview.h> #include <klistview.h>
#include <kfiledetailview.h> #include <tdefiledetailview.h>
class MediumTypeItem : public TQCheckListItem class MediumTypeItem : public TQCheckListItem
{ {

@ -22,7 +22,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kfileitem.h> #include <tdefileitem.h>
/** /**
*@author ervin *@author ervin

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqvariant.h> // avoid X11 #define's #include <tqvariant.h> // avoid X11 #define's
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -22,4 +22,4 @@ messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -ltdefile

@ -28,7 +28,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>

@ -29,6 +29,6 @@ install( FILES runapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
tde_add_kpart( run_panelapplet AUTOMOC tde_add_kpart( run_panelapplet AUTOMOC
SOURCES runapplet.cpp SOURCES runapplet.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kurifilter.h> #include <kurifilter.h>
#include <kdialog.h> #include <kdialog.h>

@ -25,7 +25,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -21,4 +21,4 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/ksystemtrayapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/ksystemtrayapplet.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -ltdefile

@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <krun.h> #include <krun.h>

@ -19,4 +19,4 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot $(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot
srcdoc: srcdoc:
kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -lkfile kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -ltdefile

@ -19,7 +19,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>

@ -26,7 +26,7 @@
#include <krun.h> #include <krun.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <konq_popupmenu.h> #include <konq_popupmenu.h>

@ -26,7 +26,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqcursor.h> #include <tqcursor.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <kactioncollection.h> #include <kactioncollection.h>

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h> #include <klocale.h>
#include <twinmodule.h> #include <twinmodule.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kprocess.h> #include <kprocess.h>
#include <kshell.h> #include <kshell.h>
#include <twin.h> #include <twin.h>

@ -53,7 +53,7 @@
*/ */
#include <kapplication.h> #include <kapplication.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <twin.h> #include <twin.h>

@ -59,7 +59,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -63,7 +63,7 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -55,13 +55,13 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kactionclasses.h> #include <kactionclasses.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
//#include <kconfiggroupsaver.h> //#include <tdeconfiggroupsaver.h>
#include <taskmanager.h> #include <taskmanager.h>

@ -30,12 +30,12 @@ link_directories( ${TQT_LIBRARY_DIRS} )
install( FILES panel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES panel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kcmkicker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kcmkicker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
install( PROGRAMS install( PROGRAMS
kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl
kicker-3.5-kconfigXTize.pl kicker-3.5-tdeconfigXTize.pl
DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
##### kicker-3.4-reverseLayout (executable) ##### ##### kicker-3.4-reverseLayout (executable) #####
@ -43,7 +43,7 @@ install( PROGRAMS
tde_add_executable( kicker-3.4-reverseLayout tde_add_executable( kicker-3.4-reverseLayout
SOURCES kicker-3.4-reverseLayout.cpp SOURCES kicker-3.4-reverseLayout.cpp
LINK tdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
) )

@ -28,14 +28,14 @@ messages: rc.cpp
dummy.cpp: dummy.cpp:
echo > $@ echo > $@
kconf_PROGRAMS = kicker-3.4-reverseLayout tdeconf_PROGRAMS = kicker-3.4-reverseLayout
kconfdir = $(libdir)/kconf_update_bin tdeconfdir = $(libdir)/tdeconf_update_bin
kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp
kicker_3_4_reverseLayout_LDADD = $(LIB_QT) $(LIB_TDECORE) kicker_3_4_reverseLayout_LDADD = $(LIB_QT) $(LIB_TDECORE)
kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries) kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries)
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
update_DATA = kickerrc.upd update_DATA = kickerrc.upd
update_SCRIPTS = kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.5-kconfigXTize.pl update_SCRIPTS = kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.5-tdeconfigXTize.pl

@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include "kicker.h" #include "kicker.h"
#include "browser_mnu.h" #include "browser_mnu.h"

@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h> #include <klocale.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include "showdesktop.h" #include "showdesktop.h"
#include "kicker.h" #include "kicker.h"

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kpanelmenu.h> #include <kpanelmenu.h>
#include "menuinfo.h" #include "menuinfo.h"

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <klocale.h> #include <klocale.h>

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqfile.h> #include <tqfile.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <kicontheme.h> #include <kicontheme.h>
#include <kglobal.h> #include <kglobal.h>

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopclient.h> #include <dcopclient.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "global.h" #include "global.h"

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqlayout.h> #include <tqlayout.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <tdemultipledrag.h> #include <tdemultipledrag.h>

@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqcolor.h> #include <tqcolor.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kglobal.h> #include <kglobal.h>

@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <krootpixmap.h> #include <krootpixmap.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kservice.h> #include <kservice.h>
#include <kurldrag.h> #include <kurldrag.h>

@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdlib.h> #include <stdlib.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -233,7 +233,7 @@ void ExtensionManager::migrateMenubar()
// will have a menubar in it, and if so, abort creating one of our // will have a menubar in it, and if so, abort creating one of our
// own. // own.
// //
// the reason i didn't do this as a kconfig_update script is that // the reason i didn't do this as a tdeconfig_update script is that
// most people don't use this feature, so no reason to penalize // most people don't use this feature, so no reason to penalize
// everyone, and moreover the user may added this to their main // everyone, and moreover the user may added this to their main
// panel, meaning kickerrc itself would have to be vastly modified // panel, meaning kickerrc itself would have to be vastly modified

@ -29,7 +29,7 @@
#include <tqtooltip.h> #include <tqtooltip.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kcmultidialog.h> #include <kcmultidialog.h>
#include <kcrash.h> #include <kcrash.h>

@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h> #include <kdebug.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <dcopref.h> #include <dcopref.h>

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobal.h> #include <kglobal.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
#include "container_applet.h" #include "container_applet.h"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save