Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
dc6b76cac4
100 changed files with 175 additions and 175 deletions
  1. 2
    2
      CMakeLists.txt
  2. 1
    1
      Makefile.am.in
  3. 1
    1
      README
  4. 5
    5
      README.pam
  5. 2
    2
      applnk/compat/konqhtml.desktop
  6. 1
    1
      applnk/tde-system-screensavers.directory
  7. 1
    1
      config.h.cmake
  8. 1
    1
      configure.in.in
  9. 1
    1
      doc/faq/webbrowse.docbook
  10. 3
    3
      doc/glossary/index.docbook
  11. 1
    1
      doc/glossary/tdeprintingglossary.docbook
  12. 1
    1
      doc/kcontrol/filemanager/index.docbook
  13. 1
    1
      doc/kcontrol/kcmcss/index.docbook
  14. 0
    2
      doc/kcontrol/khtml/Makefile.am
  15. 2
    2
      doc/kcontrol/spellchecking/index.docbook
  16. 1
    1
      doc/kcontrol/tdehtml/CMakeLists.txt
  17. 2
    0
      doc/kcontrol/tdehtml/Makefile.am
  18. 1
    1
      doc/kcontrol/tdehtml/index.docbook
  19. 0
    0
      doc/kcontrol/tdehtml/nsplugin.docbook
  20. 1
    1
      doc/konqueror/config.docbook
  21. 2
    2
      doc/userguide/groupware-kontact.docbook
  22. 6
    6
      doc/userguide/tde-for-admins.docbook
  23. 1
    1
      doc/userguide/tde-office.docbook
  24. 1
    1
      drkonqi/Makefile.am
  25. 2
    2
      kappfinder/Makefile.am
  26. 1
    1
      kate/AUTHORS
  27. 5
    5
      kate/ChangeLog
  28. 1
    1
      kate/app/CMakeLists.txt
  29. 1
    1
      kate/app/kateconfigdialog.h
  30. 1
    1
      kate/app/kateconsole.cpp
  31. 2
    2
      kate/app/katedocmanager.cpp
  32. 2
    2
      kate/app/katemainwindow.cpp
  33. 1
    1
      kate/app/katemainwindow.h
  34. 2
    2
      kate/app/katemdi.h
  35. 1
    1
      kate/app/katesavemodifieddialog.cpp
  36. 1
    1
      kate/app/kateviewmanager.cpp
  37. 2
    2
      kate/app/kateviewspacecontainer.cpp
  38. 9
    9
      kate/app/kwritemain.cpp
  39. 3
    3
      kate/app/kwritemain.h
  40. 1
    1
      kate/data/kateui.rc
  41. 1
    1
      kate/data/kwriteui.rc
  42. 1
    1
      kate/interfaces/Makefile.am
  43. 1
    1
      kate/interfaces/plugin.cpp
  44. 1
    1
      kate/interfaces/plugin.h
  45. 1
    1
      kcheckpass/README
  46. 1
    1
      kcheckpass/kcheckpass.c
  47. 1
    1
      kcheckpass/kcheckpass.h
  48. 2
    2
      kcminit/CMakeLists.txt
  49. 1
    1
      kcontrol/arts/CMakeLists.txt
  50. 1
    1
      kcontrol/arts/Makefile.am
  51. 2
    2
      kcontrol/arts/arts.cpp
  52. 2
    2
      kcontrol/background/bgrender.cpp
  53. 2
    2
      kcontrol/componentchooser/componentservices/Makefile.am
  54. 1
    1
      kcontrol/display/CMakeLists.txt
  55. 1
    1
      kcontrol/display/display.desktop
  56. 1
    1
      kcontrol/displayconfig/CMakeLists.txt
  57. 1
    1
      kcontrol/displayconfig/Makefile.am
  58. 1
    1
      kcontrol/displayconfig/displayconfig.h
  59. 4
    4
      kcontrol/dnssd/CMakeLists.txt
  60. 6
    6
      kcontrol/dnssd/Makefile.am
  61. 2
    2
      kcontrol/dnssd/kcm_tdednssd.desktop
  62. 4
    4
      kcontrol/dnssd/kcmdnssd.cpp
  63. 1
    1
      kcontrol/filetypes/Makefile.am
  64. 1
    1
      kcontrol/filetypes/filetypedetails.cpp
  65. 2
    2
      kcontrol/filetypes/filetypesview.cpp
  66. 1
    1
      kcontrol/filetypes/keditfiletype.cpp
  67. 1
    1
      kcontrol/filetypes/typeslistitem.h
  68. 1
    1
      kcontrol/iccconfig/CMakeLists.txt
  69. 1
    1
      kcontrol/iccconfig/Makefile.am
  70. 1
    1
      kcontrol/iccconfig/iccconfig.h
  71. 1
    1
      kcontrol/kcontrol/CMakeLists.txt
  72. 1
    1
      kcontrol/kcontrol/aboutwidget.cpp
  73. 1
    1
      kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
  74. 1
    1
      kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
  75. 2
    2
      kcontrol/kfontinst/viewpart/CMakeLists.txt
  76. 1
    1
      kcontrol/kfontinst/viewpart/FontViewPart.h
  77. 2
    2
      kcontrol/kfontinst/viewpart/FontViewerApp.h
  78. 1
    1
      kcontrol/kfontinst/viewpart/Makefile.am
  79. 1
    1
      kcontrol/kicker/CMakeLists.txt
  80. 1
    1
      kcontrol/kio/CMakeLists.txt
  81. 1
    1
      kcontrol/knotify/knotify.cpp
  82. 1
    1
      kcontrol/konq/CMakeLists.txt
  83. 4
    4
      kcontrol/konqhtml/CMakeLists.txt
  84. 3
    3
      kcontrol/konqhtml/Makefile.am
  85. 8
    8
      kcontrol/konqhtml/appearance.cpp
  86. 5
    5
      kcontrol/konqhtml/htmlopts.cpp
  87. 1
    1
      kcontrol/konqhtml/javaopts.cpp
  88. 1
    1
      kcontrol/konqhtml/jspolicies.h
  89. 6
    6
      kcontrol/konqhtml/main.cpp
  90. 3
    3
      kcontrol/konqhtml/tdehtml_behavior.desktop
  91. 3
    3
      kcontrol/konqhtml/tdehtml_filter.desktop
  92. 3
    3
      kcontrol/konqhtml/tdehtml_fonts.desktop
  93. 3
    3
      kcontrol/konqhtml/tdehtml_java_js.desktop
  94. 1
    1
      kcontrol/kthememanager/kthememanager.cpp
  95. 0
    0
      kcontrol/pics/cr128-app-tdescreensaver.png
  96. 0
    0
      kcontrol/pics/cr16-app-tdescreensaver.png
  97. 0
    0
      kcontrol/pics/cr22-app-tdescreensaver.png
  98. 0
    0
      kcontrol/pics/cr32-app-tdescreensaver.png
  99. 0
    0
      kcontrol/pics/cr48-app-tdescreensaver.png
  100. 0
    0
      kcontrol/pics/cr64-app-tdescreensaver.png

+ 2
- 2
CMakeLists.txt View File

@@ -171,7 +171,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )
option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} )
option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} )
@@ -248,7 +248,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver )
tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )
tde_conditional_add_subdirectory( BUILD_KSTART kstart )
tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )

+ 1
- 1
Makefile.am.in View File

@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1

bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update

EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv
EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv

dist-hook:
cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin

+ 1
- 1
README View File

@@ -106,7 +106,7 @@ libraries. Here is an overview of the directories:
* krichtexteditor
A embeddable rich text editor and a wrapper application for it.

* kscreensaver
* tdescreensaver
The KDE screensaver environment and some basic screensavers. More
of them are in the tdeartwork package.


+ 5
- 5
README.pam View File

@@ -1,6 +1,6 @@
KDE can be configured to support the PAM ("Pluggable Authentication
Modules") system for password checking by the display manager tdm and
by the screen saver kscreensaver (for unlocking the display).
by the screen saver tdescreensaver (for unlocking the display).

PAM is a flexible application-transparent configurable user-authentication
system found on FreeBSD, Solaris, and Linux (and maybe other unixes).
@@ -27,26 +27,26 @@ By default, PAM is automatically used, if it is found. Use
If PAM is found, KDE usually uses the PAM service "kde". You may
override it for all KDE programs by using --with-pam=<service> and/or
individually by using --with-<prog>-pam=<service>, where <prog> is
one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver).
one of tdm, kcp and kss (for tdm, kcheckpass and tdescreensaver).

"make install" will attempt to create suitable service definitions; either
by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The
services are just copies of the "login" service.
You may want to edit these definitions to meet your needs.
There are also two example service definitions in this directory -
kde.pamd and kscreensaver.pamd - but don't just copy them!
kde.pamd and tdescreensaver.pamd - but don't just copy them!
If the services are misconfigured, you will NOT be able to login via TDM
and/or unlock a locked screen!

If there is ever any doubt about which PAM service a program was
compiled with, it can be determined by examining the PAM-generated
entries in the system log associated with tdm logins or kscreensaver
entries in the system log associated with tdm logins or tdescreensaver
authentication failures.


PAM configuration files have four types of entries for each service:

type used by tdm used by kscreensaver
type used by tdm used by tdescreensaver
---- ----------- --------------------
auth x x
account x

+ 2
- 2
applnk/compat/konqhtml.desktop View File

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

+ 1
- 1
applnk/tde-system-screensavers.directory View File

@@ -82,7 +82,7 @@ Name[xh]=Abagcini Bekhusi
Name[zh_CN]=屏幕保护程序
Name[zh_TW]=螢幕保護程式
Name[zu]=Abagcini Besikrini
Icon=kscreensaver
Icon=tdescreensaver
X-TDE-BaseGroup=screensavers

Comment=Screen saver demos

+ 1
- 1
config.h.cmake View File

@@ -88,7 +88,7 @@
// kcontrol/energy
#cmakedefine HAVE_DPMS 1

// kdesktop, kcontrol/screensaver, kscreensaver
// kdesktop, kcontrol/screensaver, tdescreensaver
#cmakedefine HAVE_GLXCHOOSEVISUAL 1

// kcontrol/crypto

+ 1
- 1
configure.in.in View File

@@ -7,7 +7,7 @@ KDE_PASSWDLIBS

DEF_PAM_SERVICE(tdm, tdm, TDM)
DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER)
DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER)

dnl Checks for header files.
AC_HEADER_DIRENT

+ 1
- 1
doc/faq/webbrowse.docbook View File

@@ -206,7 +206,7 @@ text->html in the tree view.</para>
<listitem><para>Click on the
<guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click
Action</guilabel> is set to <guilabel>Show file in embedded
viewer</guilabel>, and that <guilabel>KHTML (khtml)</guilabel> is at the top
viewer</guilabel>, and that <guilabel>KHTML (tdehtml)</guilabel> is at the top
of <guilabel>Services Preference Order</guilabel>.</para></listitem>
</orderedlist>
</para>

+ 3
- 3
doc/glossary/index.docbook View File

@@ -33,7 +33,7 @@ Slave</glossseealso>
<glossseealso otherterm="gloss-kde">&tde;</glossseealso>
</glossdef>
</glossentry>
<glossentry id="gloss-kparts">
<glossentry id="gloss-tdeparts">
<glossterm>KParts</glossterm>
<glossdef><para>KParts is an embedding technology which allows &tde;
applications to embed other &tde; applications. For example, the text
@@ -41,7 +41,7 @@ Slave</glossseealso>
<glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
</glossdef>
</glossentry>
<glossentry id="gloss-ksycoca">
<glossentry id="gloss-tdesycoca">
<glossterm><acronym>KSycoca</acronym></glossterm>
<glossdef><para><acronym>KSycoca</acronym> (&tde; <emphasis>Sy</emphasis>stem
<emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a
@@ -88,7 +88,7 @@ program and regenerates the
or all modules in
&kcontrol; are missing.</para>
<glossseealso
otherterm="gloss-ksycoca"><acronym>KSycoca</acronym></glossseealso>
otherterm="gloss-tdesycoca"><acronym>KSycoca</acronym></glossseealso>
<glossseealso otherterm="gloss-kcontrol">&kcontrol;</glossseealso>
</glossdef>
</glossentry>

+ 1
- 1
doc/glossary/tdeprintingglossary.docbook View File

@@ -1134,7 +1134,7 @@ now.
address gives administrative access to TDEPrint. Konqueror uses &tde;'s
famous "KParts" technology to achieve that.</para>
<glossseealso otherterm="gloss-ioslave">IO Slave</glossseealso>
<glossseealso otherterm="gloss-kparts">KParts</glossseealso>
<glossseealso otherterm="gloss-tdeparts">KParts</glossseealso>
</glossdef>
</glossentry>


+ 1
- 1
doc/kcontrol/filemanager/index.docbook View File

@@ -29,7 +29,7 @@
&konqueror;'s file manager functionality.</para>

<note><para>&konqueror;'s web browser functionality has its <ulink
url="help:/kcontrol/khtml/index.html">own configuration
url="help:/kcontrol/tdehtml/index.html">own configuration
modules</ulink>.</para></note>

<sect2 id="fileman-use">

+ 1
- 1
doc/kcontrol/kcmcss/index.docbook View File

@@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced
vision.</para>

<para>Your choices here affect every &tde; application that renders HTML
with &tde;'s own renderer, which is called khtml. These include
with &tde;'s own renderer, which is called tdehtml. These include
&kmail;, &khelpcenter; and of course &konqueror;. Choices here do not
affect other browsers such as &Netscape;.</para>


+ 0
- 2
doc/kcontrol/khtml/Makefile.am View File

@@ -1,2 +0,0 @@
KDE_LANG = en
KDE_DOCS = kcontrol/khtml

+ 2
- 2
doc/kcontrol/spellchecking/index.docbook View File

@@ -30,7 +30,7 @@
<title>Spell Checker</title>

<para>The configuration options available here are used by all &tde;
applications that use &kspell;, which is a front end to
applications that use &tdespell;, which is a front end to
<command>ispell</command> or <command>aspell</command>.</para>

<variablelist>
@@ -57,7 +57,7 @@ error.</para></listitem>
<term><guilabel>Dictionary:</guilabel></term>
<listitem>
<para>Choose from the available dictionaries, which one to use for
&kspell;.</para>
&tdespell;.</para>
</listitem>
</varlistentry>


doc/kcontrol/khtml/CMakeLists.txt → doc/kcontrol/tdehtml/CMakeLists.txt View File

@@ -9,4 +9,4 @@
#
#################################################

tde_create_handbook( DESTINATION kcontrol/khtml )
tde_create_handbook( DESTINATION kcontrol/tdehtml )

+ 2
- 0
doc/kcontrol/tdehtml/Makefile.am View File

@@ -0,0 +1,2 @@
KDE_LANG = en
KDE_DOCS = kcontrol/tdehtml

doc/kcontrol/khtml/index.docbook → doc/kcontrol/tdehtml/index.docbook View File

@@ -305,7 +305,7 @@ creates one.</para>

</sect2>

<sect2 id="khtml-adblock">
<sect2 id="tdehtml-adblock">
<title>AdBlocK</title>

<para>&konqueror; AdBlocK can be configured to replace or remove

doc/kcontrol/khtml/nsplugin.docbook → doc/kcontrol/tdehtml/nsplugin.docbook View File


+ 1
- 1
doc/konqueror/config.docbook View File

@@ -48,7 +48,7 @@ position and icon size</para>
Toolbars...</guimenuitem></menuchoice> option, which brings up the
<guilabel>Configure Toolbars</guilabel> dialog box. The Main and Extra Toolbars
are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main
Toolbar &lt;khtmlpart&gt; and Extra Toolbar &lt;khtmlsettingsplugin&gt;. The
Toolbar &lt;tdehtmlpart&gt; and Extra Toolbar &lt;tdehtmlsettingsplugin&gt;. The
number and type of these sections will depend on whether &konqueror; is in Web
Browser or File Manager mode and whether you have &konqueror; plugins
installed.</para>

+ 2
- 2
doc/userguide/groupware-kontact.docbook View File

@@ -242,7 +242,7 @@ class="username">groupware</systemitem> user (already previously
done!)</para></step>

<step><para>Create/configure an <acronym>IMAP</acronym> account in &kmail;
for login as that user</para></step> <step><para>Use kresources to make
for login as that user</para></step> <step><para>Use tderesources to make
&kontact; components work with data taken from <acronym>IMAP</acronym>
source</para></step>

@@ -336,7 +336,7 @@ slow data updates.</para>
<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
<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
kresources</command></userinput>. In the combo box select
tderesources</command></userinput>. In the combo box select
<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
press <guibutton>Use as Standard</guibutton> button. Do the same for

+ 6
- 6
doc/userguide/tde-for-admins.docbook View File

@@ -858,7 +858,7 @@ also unique per X-server display. The processes are:</para>
<varlistentry>
<term><command>kded</command></term>
<listitem><para>Generic service daemon.</para>
<para>Triggers <link linkend="ksycoca">Sycoca</link> database updates when
<para>Triggers <link linkend="tdesycoca">Sycoca</link> database updates when
needed</para>
</listitem>
</varlistentry>
@@ -1819,14 +1819,14 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
(user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para>
</sect2>

<sect2 id="ksycoca">
<sect2 id="tdesycoca">
<title><application>KSycoca</application></title>
<para><application>KSycoca</application> caches menu structure and
information about all available applications. You can rebuild the
database with
<userinput><command>kbuildsycoca</command></userinput>. The database
which is built lives in <filename
class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>.
class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
It is automatically updated by <application>KDED</application>,
checked during &tde; login, and <application>KDED</application>
watches for changes while logged in.</para>
@@ -1839,7 +1839,7 @@ CheckSycoca=false
</programlisting>
</para>

<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para>
<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_tdesycoca</command></userinput>.</para>

</sect2>

@@ -2031,7 +2031,7 @@ shell_access=false</screen>
<para>Since this affects the &tde; menu and the available applications, we
must force an update of the sycoca database:</para>

<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen>
<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_tdesycoca</filename></userinput></screen>

<para>Now re-login to &tde; and check the following points:</para>

@@ -2488,7 +2488,7 @@ KDebug
MainApplication-Interface
konsole (default)
konsole-mainwindow#1
ksycoca
tdesycoca
session-1
session-2
session-3

+ 1
- 1
doc/userguide/tde-office.docbook View File

@@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format.
<!-- comment out for final commit before freeze
<chapter id="tde-office-embedding">
<title>Component Embedding</title>
<sect1 id="tde-office-kparts">
<sect1 id="tde-office-tdeparts">
<title>KParts and &koffice;</title>
<para>To be written</para>
</sect1>

+ 1
- 1
drkonqi/Makefile.am View File

@@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE
bin_PROGRAMS = drkonqi crashtest

# Libraries:
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = $(LIB_TDEUI) $(LIB_KIO)

# toplevel.cpp must be last in row due to X-headers being included. (--enable-final)

+ 2
- 2
kappfinder/Makefile.am View File

@@ -3,12 +3,12 @@ SUBDIRS = apps
bin_PROGRAMS = kappfinder
kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
kappfinder_LDADD = $(LIB_TDEUI) $(LIB_KIO)
kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

noinst_PROGRAMS = kappfinder_install
kappfinder_install_SOURCES = main_install.cpp common.cpp
kappfinder_install_LDADD = $(LIB_TDEUI)
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

INCLUDES = $(all_includes)
METASOURCES = AUTO

+ 1
- 1
kate/AUTHORS View File

@@ -27,7 +27,7 @@ Kate/KWrite Team:
(original author of kwrite in kde 1.x until kde 2.1)

- Glen Parker <glenebob@nwlink.com>
(undo history, kspell-integration)
(undo history, tdespell-integration)

- Michael Koch <koch@kde.org>
(port to KParts)

+ 5
- 5
kate/ChangeLog View File

@@ -1,18 +1,18 @@
2004-04-22 Christoph Cullmann <cullmann@kde.org>
* kate switched over to katemdi, even smaller replacement for kmdi2 :)
* kate switched over to katemdi, even smaller replacement for tdemdi2 :)

2004-10-06 Christoph Cullmann <cullmann@kde.org>
* kate switched over to kmdi2, a slim version of old kmdi
* kate switched over to tdemdi2, a slim version of old tdemdi
which allows only IDEA mode, but should be much less buggy
beside this, we now allow tabbing thx to the new kmdi stuff
beside this, we now allow tabbing thx to the new tdemdi stuff
and therefor should now be really feature complete at least mdi
wise, having the features to allow multiple main windows,
tabbing, splitters, widget stacks for the views, now only missing thingy
would be to allow non kate view's to be embeded, like a khtml widget for
would be to allow non kate view's to be embeded, like a tdehtml widget for
documentation browsing or something like that

2003-08-28 Christoph Cullmann <cullmann@kde.org>
* jowenn switch kate over to use kmdi, seems to work well
* jowenn switch kate over to use tdemdi, seems to work well
for the first port, but still needs some fixes ;)

2002-07-19 Christoph Cullmann <cullmann@kde.org>

+ 1
- 1
kate/app/CMakeLists.txt View File

@@ -46,7 +46,7 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
EMBED kateinterfacesprivate-static
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${LIB_INSTALL_DIR}
)


+ 1
- 1
kate/app/kateconfigdialog.h View File

@@ -27,7 +27,7 @@
#include "../interfaces/pluginconfiginterfaceextension.h"

#include <kate/document.h>
#include <ktexteditor/configinterfaceextension.h>
#include <tdetexteditor/configinterfaceextension.h>

#include <kdialogbase.h>


+ 1
- 1
kate/app/kateconsole.cpp View File

@@ -31,7 +31,7 @@

#include <kde_terminal_interface.h>

#include <kparts/part.h>
#include <tdeparts/part.h>

#include <kurl.h>
#include <klibloader.h>

+ 2
- 2
kate/app/katedocmanager.cpp View File

@@ -28,9 +28,9 @@

#include <kate/view.h>

#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>

#include <kparts/factory.h>
#include <tdeparts/factory.h>

#include <klocale.h>
#include <kdebug.h>

+ 2
- 2
kate/app/katemainwindow.cpp View File

@@ -73,7 +73,7 @@
#include <kurldrag.h>
#include <kdesktopfile.h>
#include <khelpmenu.h>
#include <kmultitabbar.h>
#include <tdemultitabbar.h>
#include <ktip.h>
#include <kmenubar.h>
#include <kstringhandler.h>
@@ -209,7 +209,7 @@ void KateMainWindow::setupMainWindow ()

m_viewManager = new KateViewManager (this);

KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("kmultiple"), i18n("Documents"));
KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("tdemultiple"), i18n("Documents"));
filelist = new KateFileList (this, m_viewManager, ft, "filelist");
filelist->readConfig(KateApp::self()->config(), "Filelist");


+ 1
- 1
kate/app/katemainwindow.h View File

@@ -27,7 +27,7 @@
#include <kate/view.h>
#include <kate/document.h>

#include <kparts/part.h>
#include <tdeparts/part.h>

#include <kaction.h>


+ 2
- 2
kate/app/katemdi.h View File

@@ -21,9 +21,9 @@
#ifndef __KATE_MDI_H__
#define __KATE_MDI_H__

#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>

#include <kmultitabbar.h>
#include <tdemultitabbar.h>
#include <kxmlguiclient.h>
#include <kaction.h>


+ 1
- 1
kate/app/katesavemodifieddialog.cpp View File

@@ -32,7 +32,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
#include <kencodingfiledialog.h>
#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>

class AbstractKateSaveModifiedDialogCheckListItem:public TQCheckListItem {
public:

+ 1
- 1
kate/app/kateviewmanager.cpp View File

@@ -45,7 +45,7 @@
#include <kglobalsettings.h>
#include <kstdaccel.h>

#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>

#include <tqobjectlist.h>
#include <tqstringlist.h>

+ 2
- 2
kate/app/kateviewspacecontainer.cpp View File

@@ -46,7 +46,7 @@
#include <kglobalsettings.h>
#include <kstringhandler.h>

#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>

#include <tqlayout.h>
#include <tqobjectlist.h>
@@ -120,7 +120,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
view->actionCollection()->remove (view->actionCollection()->action( "set_confdlg" ));

// popup menu
view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("ktexteditor_popup", mainWindow())) );
view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) );

connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));

+ 9
- 9
kate/app/kwritemain.cpp View File

@@ -24,13 +24,13 @@
#include <kate/document.h>
#include <kate/view.h>

#include <ktexteditor/configinterface.h>
#include <ktexteditor/sessionconfiginterface.h>
#include <ktexteditor/viewcursorinterface.h>
#include <ktexteditor/printinterface.h>
#include <ktexteditor/encodinginterface.h>
#include <ktexteditor/editorchooser.h>
#include <ktexteditor/popupmenuinterface.h>
#include <tdetexteditor/configinterface.h>
#include <tdetexteditor/sessionconfiginterface.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/printinterface.h>
#include <tdetexteditor/encodinginterface.h>
#include <tdetexteditor/editorchooser.h>
#include <tdetexteditor/popupmenuinterface.h>

#include <kio/netaccess.h>

@@ -54,7 +54,7 @@
#include <kmessagebox.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
#include <kparts/event.h>
#include <tdeparts/event.h>
#include <kmenubar.h>

#include <tqdropsite.h>
@@ -108,7 +108,7 @@ KWrite::KWrite (KTextEditor::Document *doc)

// install a working kate part popup dialog thingy
if (static_cast<Kate::View*>(m_view->tqt_cast("Kate::View")))
static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("tdetexteditor_popup", this)) );

// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())

+ 3
- 3
kate/app/kwritemain.h View File

@@ -21,10 +21,10 @@
#ifndef __KWRITE_MAIN_H__
#define __KWRITE_MAIN_H__

#include <ktexteditor/view.h>
#include <ktexteditor/document.h>
#include <tdetexteditor/view.h>
#include <tdetexteditor/document.h>

#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>

#include <kdialogbase.h>


+ 1
- 1
kate/data/kateui.rc View File

@@ -135,7 +135,7 @@
<DefineGroup name="zoom_operations" />
</ToolBar>

<Menu name="ktexteditor_popup" noMerge="1">
<Menu name="tdetexteditor_popup" noMerge="1">
<DefineGroup name="popup_operations" />
</Menu>


+ 1
- 1
kate/data/kwriteui.rc View File

@@ -88,7 +88,7 @@
<DefineGroup name="zoom_operations" />
</ToolBar>

<Menu name="ktexteditor_popup" noMerge="1">
<Menu name="tdetexteditor_popup" noMerge="1">
<DefineGroup name="popup_operations" />
</Menu>


+ 1
- 1
kate/interfaces/Makefile.am View File

@@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman
pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp

libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces
libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
kateincludedir = $(includedir)/kate

+ 1
- 1
kate/interfaces/plugin.cpp View File

@@ -21,7 +21,7 @@
#include "plugin.h"
#include "plugin.moc"

#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>

namespace Kate
{

+ 1
- 1
kate/interfaces/plugin.h View File

@@ -56,7 +56,7 @@ KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application

/*
* view plugin class
* this plugin will be bound to a ktexteditor::view
* this plugin will be bound to a tdetexteditor::view
*/
class KDE_EXPORT PluginViewInterface
{

+ 1
- 1
kcheckpass/README View File

@@ -45,7 +45,7 @@ Olaf Kirch <okir@caldera.de> General Framework and PAM support
Christian Esken <esken@kde.org> Shadow and /etc/passwd support
Oswald Buddenhagen <ossi@kde.org> Binary conversation interface, etc.

Some parts were taken from kscreensaver's passwd.cpp
Some parts were taken from tdescreensaver's passwd.cpp

Currently this software is maintained by Oswald Buddenhagen <ossi@kde.org>.
Please send new authentication modules (checkpass_*.c) to me.

+ 1
- 1
kcheckpass/kcheckpass.c View File

@@ -41,7 +41,7 @@
* Roberto Teixeira <maragato@kde.org> other user (-U) support
* Oswald Buddenhagen <ossi@kde.org> Binary server mode
*
* Other parts were taken from kscreensaver's passwd.cpp.
* Other parts were taken from tdescreensaver's passwd.cpp.
*
*****************************************************************/


+ 1
- 1
kcheckpass/kcheckpass.h View File

@@ -31,7 +31,7 @@
* Christian Esken <esken@kde.org> Shadow and /etc/passwd support
* Oswald Buddenhagen <ossi@kde.org> Binary server mode
*
* Other parts were taken from kscreensaver's passwd.cpp
* Other parts were taken from tdescreensaver's passwd.cpp
*****************************************************************/

#ifndef KCHECKPASS_H_

+ 2
- 2
kcminit/CMakeLists.txt View File

@@ -25,7 +25,7 @@ link_directories(

tde_add_tdeinit_executable( kcminit AUTOMOC
SOURCES main.cpp main.skel
LINK kutils-shared
LINK tdeutils-shared
)


@@ -33,5 +33,5 @@ tde_add_tdeinit_executable( kcminit AUTOMOC

tde_add_tdeinit_executable( kcminit_startup AUTOMOC
SOURCES main.cpp main.skel
LINK kutils-shared
LINK tdeutils-shared
)

+ 1
- 1
kcontrol/arts/CMakeLists.txt View File

@@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )

tde_add_kpart( kcm_arts AUTOMOC
SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
LINK kio-shared kmid-shared
LINK kio-shared tdemid-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
kcontrol/arts/Makefile.am View File

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la
kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp

kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -lkmid
kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid

AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes)


+ 2
- 2
kcontrol/arts/arts.cpp View File

@@ -48,7 +48,7 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
#include <libkmid/deviceman.h>
#include <libtdemid/deviceman.h>

#include "arts.h"

@@ -158,7 +158,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
general = new generalTab(tab);
hardware = new hardwareTab(tab);
//mixer = TDECModuleLoader::loadModule("kmixcfg", tab);
//midi = new KMidConfig(tab, "kmidconfig");
//midi = new KMidConfig(tab, "tdemidconfig");

general->layout()->setMargin( KDialog::marginHint() );
hardware->layout()->setMargin( KDialog::marginHint() );

+ 2
- 2
kcontrol/background/bgrender.cpp View File

@@ -311,7 +311,7 @@ wp_load:
goto wp_out;
}

// _Don't_ use KMimeType, as it relies on ksycoca which we really
// _Don't_ use KMimeType, as it relies on tdesycoca which we really
// don't want in krootimage (tdm context).
//if ( KMimeType::findByPath( file )->is( "image/svg+xml" ) ) {
if (file.endsWith(".svg") || file.endsWith(".svgz")) {
@@ -399,7 +399,7 @@ wp_load:
}

// HACK: Use KFileMetaInfo only when we're attached to DCOP.
// KFileMetaInfo needs ksycoca and so on, but this code is
// KFileMetaInfo needs tdesycoca and so on, but this code is
// used also in krootimage (which in turn is used by tdm).
if( kapp->dcopClient()->isAttached()) {
KFileMetaInfo metaInfo(file);

+ 2
- 2
kcontrol/componentchooser/componentservices/Makefile.am View File

@@ -1,3 +1,3 @@
kcm_ktexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop
kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser
kcm_tdetexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop
kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser


+ 1
- 1
kcontrol/display/CMakeLists.txt View File

@@ -28,6 +28,6 @@ install( FILES display.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )

tde_add_kpart( kcm_display AUTOMOC
SOURCES display.cpp
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
kcontrol/display/display.desktop View File

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

+ 1
- 1
kcontrol/displayconfig/CMakeLists.txt View File

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

+ 1
- 1
kcontrol/displayconfig/Makefile.am View File

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_displayconfig.la

kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displayconfig.skel

kcm_displayconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
kcm_displayconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined

kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)


+ 1
- 1
kcontrol/displayconfig/displayconfig.h View File

@@ -34,7 +34,7 @@

#include <dcopobject.h>

#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
#include <tdehardwaredevices.h>

#include "monitorworkspace.h"

+ 4
- 4
kcontrol/dnssd/CMakeLists.txt View File

@@ -22,15 +22,15 @@ link_directories(

##### other data ################################

install( FILES kcm_kdnssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )


##### kcm_kdnssd (module) #######################
##### kcm_tdednssd (module) #######################

set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )

tde_add_kpart( kcm_kdnssd AUTOMOC
tde_add_kpart( kcm_tdednssd AUTOMOC
SOURCES configdialog.ui kcmdnssd.cpp
LINK kdnssd-shared tdeui-shared
LINK tdednssd-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 6
- 6
kcontrol/dnssd/Makefile.am View File

@@ -1,12 +1,12 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kdnssd.la
kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
kde_module_LTLIBRARIES = kcm_tdednssd.la
kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h

xdg_apps_DATA = kcm_kdnssd.desktop
kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
xdg_apps_DATA = kcm_tdednssd.desktop
kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)

messages: rc.cpp
$(EXTRACTRC) *.ui *.rc >> rc.cpp
$(XGETTEXT) $(kcm_kdnssd_la_SOURCES) rc.cpp -o $(podir)/kcmkdnssd.pot
$(XGETTEXT) $(kcm_tdednssd_la_SOURCES) rc.cpp -o $(podir)/kcmtdednssd.pot

kcontrol/dnssd/kcm_kdnssd.desktop → kcontrol/dnssd/kcm_tdednssd.desktop View File

@@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá
Comment[wa]=Apontiaedjes do discovraedje do siervice
Comment[zh_CN]=配置探索服务
Comment[zh_TW]=設定服務偵測
Exec=kcmshell kcm_kdnssd
Exec=kcmshell kcm_tdednssd
GenericName=
GenericName[ko]=일반
Icon=network_local
@@ -146,7 +146,7 @@ Terminal=false
Type=Application
X-DCOP-ServiceType=
X-TDE-HasReadOnlyMode=false
X-TDE-Library=kdnssd
X-TDE-Library=tdednssd
X-TDE-ModuleType=Library
X-TDE-ParentApp=kcontrol
#root parts unused with Avahi

+ 4
- 4
kcontrol/dnssd/kcmdnssd.cpp View File

@@ -34,7 +34,7 @@

#include <klocale.h>
#include <kglobal.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kprocess.h>
#include <klineedit.h>
#include <kpassdlg.h>
@@ -51,12 +51,12 @@
#define MDNSD_PID "/var/run/mdnsd.pid"

typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
K_EXPORT_COMPONENT_FACTORY( kcm_tdednssd, KCMDnssdFactory("kcmtdednssd"))

KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
: ConfigDialog(parent, name), m_wdchanged(false)
{
setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"),
setAboutData(new TDEAboutData(I18N_NOOP("kcm_tdednssd"),
I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL,
I18N_NOOP("(C) 2004,2005 Jakub Stachowski")));
setQuickHelp(i18n("Setup services browsing with ZeroConf"));
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
else if (getenv("TDESU_USER")!=0) tabs->removePage(tab);
addConfig(DNSSD::Configuration::self(),this);
// it is host-wide setting so it has to be in global config file
domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
domain->setGroup("publishing");
load();
connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));

+ 1
- 1
kcontrol/filetypes/Makefile.am View File

@@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails

keditfiletype_SOURCES = keditfiletype.cpp
keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

messages:
$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot

+ 1
- 1
kcontrol/filetypes/filetypedetails.cpp View File

@@ -235,7 +235,7 @@ void FileTypeDetails::updateAskSave()
// - images (reasoning: no need to save, most of the time, because fast to see)
// e.g. postscript is different, because takes longer to read, so
// it's more likely that the user might want to save it.
// - multipart/* ("server push", see kmultipart)
// - multipart/* ("server push", see tdemultipart)
// - other strange 'internal' mimetypes like print/manager...
if ( mime->is( "text/html" ) ||
mime->is( "text/xml" ) ||

+ 2
- 2
kcontrol/filetypes/filetypesview.cpp View File

@@ -22,7 +22,7 @@
#include "filetypedetails.h"
#include "filegroupdetails.h"
#include "filetypesview.h"
#include <ksycoca.h>
#include <tdesycoca.h>

FileTypesView::FileTypesView(TQWidget *p, const char *name)
: TDECModule(p, name)
@@ -418,7 +418,7 @@ void FileTypesView::slotDatabaseChanged()
{
if ( KSycoca::self()->isChanged( "mime" ) )
{
// ksycoca has new KMimeTypes objects for us, make sure to update
// tdesycoca has new KMimeTypes objects for us, make sure to update
// our 'copies' to be in sync with it. Not important for OK, but
// important for Apply (how to differentiate those 2?).
// See BR 35071.

+ 1
- 1
kcontrol/filetypes/keditfiletype.cpp View File

@@ -26,7 +26,7 @@
#include <kaboutdata.h>
#include <kdebug.h>
#include <kcmdlineargs.h>
#include <ksycoca.h>
#include <tdesycoca.h>
#include <kstandarddirs.h>

#ifdef Q_WS_X11

+ 1
- 1
kcontrol/filetypes/typeslistitem.h View File

@@ -89,7 +89,7 @@ public:
bool isDirty() const;
void sync();
void setup();
void refresh(); // update m_mimetype from ksycoca when Apply is pressed
void refresh(); // update m_mimetype from tdesycoca when Apply is pressed

static bool defaultEmbeddingSetting( const TQString& major );
static void reset();

+ 1
- 1
kcontrol/iccconfig/CMakeLists.txt View File

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

+ 1
- 1
kcontrol/iccconfig/Makefile.am View File

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_iccconfig.la

kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel

kcm_iccconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
kcm_iccconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined

kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)


+ 1
- 1
kcontrol/iccconfig/iccconfig.h View File

@@ -27,7 +27,7 @@

#include <dcopobject.h>

#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>

#include "iccconfigbase.h"


+ 1
- 1
kcontrol/kcontrol/CMakeLists.txt View File

@@ -44,7 +44,7 @@ set( ${target}_SRCS

tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK khtml-shared
LINK tdehtml-shared
)

tde_install_symlink( kcontrol ${BIN_INSTALL_DIR}/kinfocenter )

+ 1
- 1
kcontrol/kcontrol/aboutwidget.cpp View File

@@ -30,7 +30,7 @@
#include <kpixmapeffect.h>
#include <kcursor.h>
#include <kglobalsettings.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kapplication.h>
#include <kiconloader.h>


+ 1
- 1
kcontrol/kfontinst/kcmfontinst/KCmFontInst.h View File

@@ -39,7 +39,7 @@
#include <kconfig.h>
#include <kio/job.h>
#ifdef HAVE_XFT
#include <kparts/part.h>
#include <tdeparts/part.h>
#endif

class KDirOperator;

+ 1
- 1
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp View File

@@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject()
urls.append( (*it)->url() );

if(urls.count()> 1)
pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall);
pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
if(pixmap.isNull())
pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);


+ 2
- 2
kcontrol/kfontinst/viewpart/CMakeLists.txt View File

@@ -33,7 +33,7 @@ install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/k

tde_add_kpart( libkfontviewpart AUTOMOC
SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
LINK kfontinstprint-static kfontinst-shared kparts-shared
LINK kfontinstprint-static kfontinst-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@@ -42,7 +42,7 @@ tde_add_kpart( libkfontviewpart AUTOMOC

tde_add_executable( kfontview AUTOMOC
SOURCES FontViewerApp.cpp
LINK kparts-shared
LINK tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)


+ 1
- 1
kcontrol/kfontinst/viewpart/FontViewPart.h View File

@@ -29,7 +29,7 @@
// (C) Craig Drummond, 2002, 2003, 2004
////////////////////////////////////////////////////////////////////////////////

#include <kparts/part.h>
#include <tdeparts/part.h>

class TQPushButton;
class TQFrame;

+ 2
- 2
kcontrol/kfontinst/viewpart/FontViewerApp.h View File

@@ -30,8 +30,8 @@
////////////////////////////////////////////////////////////////////////////////

#include <kapplication.h>
#include <kparts/part.h>
#include <kparts/mainwindow.h>
#include <tdeparts/part.h>
#include <tdeparts/mainwindow.h>

namespace KFI
{

+ 1
- 1
kcontrol/kfontinst/viewpart/Makefile.am View File

@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
METASOURCES = AUTO

kfontview_LDADD = $(LIB_KPARTS)
kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

bin_PROGRAMS = kfontview
xdg_apps_DATA = kfontview.desktop

+ 1
- 1
kcontrol/kicker/CMakeLists.txt View File

@@ -77,6 +77,6 @@ set( ${target}_SRCS

tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK bgnd-static kickermain-shared kutils-shared
LINK bgnd-static kickermain-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
kcontrol/kio/CMakeLists.txt View File

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

+ 1
- 1
kcontrol/knotify/knotify.cpp View File

@@ -31,7 +31,7 @@
#include <kcombobox.h>
#include <kconfig.h>
#include <knotifydialog.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kstandarddirs.h>
#include <kurlcompletion.h>
#include <kurlrequester.h>

+ 1
- 1
kcontrol/konq/CMakeLists.txt View File

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

+ 4
- 4
kcontrol/konqhtml/CMakeLists.txt View File

@@ -24,8 +24,8 @@ link_directories(
##### other data ################################

install( FILES
khtml_behavior.desktop khtml_java_js.desktop
khtml_fonts.desktop khtml_filter.desktop
tdehtml_behavior.desktop tdehtml_java_js.desktop
tdehtml_fonts.desktop tdehtml_filter.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR} )

install(
@@ -36,7 +36,7 @@ install(
install(
FILES uninstall.desktop
DESTINATION ${APPS_INSTALL_DIR}/Settings/WebBrowsing
RENAME khtml_appearance.desktop )
RENAME tdehtml_appearance.desktop )

##### kcm_konqhtml (module) #####################

@@ -48,6 +48,6 @@ tde_add_kpart( kcm_konqhtml AUTOMOC
jspolicies.cpp nsconfigwidget.ui policies.cpp
domainlistview.cpp advancedTabOptions.ui
filteropts.cpp
LINK khtml-shared
LINK tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 3
- 3
kcontrol/konqhtml/Makefile.am View File

@@ -13,9 +13,9 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
filteropts.cpp

kcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui
kcm_konqhtml_la_LIBADD = -ltdehtml -ltdeui

xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop

messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
@@ -23,4 +23,4 @@ messages: rc.cpp
install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/tdehtml_appearance.desktop

+ 8
- 8
kcontrol/konqhtml/appearance.cpp View File

@@ -14,7 +14,7 @@
#include <kdialog.h>
#include <kfontcombo.h>
#include <kglobal.h>
#include <khtmldefaults.h>
#include <tdehtmldefaults.h>
#include <klocale.h>
#include <knuminput.h>

@@ -320,15 +320,15 @@ void KAppearanceOptions::load()

void KAppearanceOptions::load( bool useDefaults )
{
TDEConfig khtmlrc("khtmlrc", true, false);
TDEConfig tdehtmlrc("tdehtmlrc", true, false);
m_pConfig->setReadDefaults( useDefaults );

khtmlrc.setReadDefaults( useDefaults );
tdehtmlrc.setReadDefaults( useDefaults );

#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y))
#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y))
#define READ_LIST(x) m_pConfig->readListEntry(x, khtmlrc.readListEntry(x))
#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
#define READ_NUM(x,y) m_pConfig->readNumEntry(x, tdehtmlrc.readNumEntry(x, y))
#define READ_ENTRY(x,y) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x, y))
#define READ_LIST(x) m_pConfig->readListEntry(x, tdehtmlrc.readListEntry(x))

SET_GROUP(m_groupname);
fSize = READ_NUM( "MediumFontSize", 12 );
@@ -348,7 +348,7 @@ void KAppearanceOptions::load( bool useDefaults )
if (m_pConfig->hasKey("Fonts"))
fonts = m_pConfig->readListEntry( "Fonts" );
else
fonts = khtmlrc.readListEntry( "Fonts" );
fonts = tdehtmlrc.readListEntry( "Fonts" );
while (fonts.count() < 7)
fonts.append(TQString::null);


+ 5
- 5
kcontrol/konqhtml/htmlopts.cpp View File

@@ -230,13 +230,13 @@ void KMiscHTMLOptions::load()

void KMiscHTMLOptions::load( bool useDefaults )
{
TDEConfig khtmlrc("khtmlrc", true, false);
khtmlrc.setReadDefaults( useDefaults );
TDEConfig tdehtmlrc("tdehtmlrc", true, false);
tdehtmlrc.setReadDefaults( useDefaults );
m_pConfig->setReadDefaults( useDefaults );

#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y))
#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x))
#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, tdehtmlrc.readBoolEntry(x, y))
#define READ_ENTRY(x) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x))


// *** load ***

+ 1
- 1
kcontrol/konqhtml/javaopts.cpp View File

@@ -17,7 +17,7 @@
#include <kdebug.h>
#include <klineedit.h>
#include <klocale.h>
#include <khtml_settings.h>
#include <tdehtml_settings.h>
#include <knuminput.h>

#include <tqlayout.h>

+ 1
- 1
kcontrol/konqhtml/jspolicies.h View File

@@ -25,7 +25,7 @@
#include <tqgroupbox.h>
#include <tqstring.h>

#include <khtml_settings.h>
#include <tdehtml_settings.h>

#include "policies.h"


+ 6
- 6
kcontrol/konqhtml/main.cpp View File

@@ -43,33 +43,33 @@

extern "C"
{
KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
{
TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
}

KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
{
TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
return new KAppearanceOptions(c, "HTML Settings", parent, name);
}

KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
{
TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
return new KJSParts(c, parent, "kcmkonqhtml");
}

KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
{
TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
}

KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name )
KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
{
TDEConfig *c = new TDEConfig( "khtmlrc", false, false );
TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
return new KCMFilter(c, "Filter Settings", parent, name);
}
}

kcontrol/konqhtml/khtml_behavior.desktop → kcontrol/konqhtml/tdehtml_behavior.desktop View File

@@ -1,12 +1,12 @@
[Desktop Entry]
Type=Application
DocPath=kcontrol/khtml/index.html#kbrowse-html
DocPath=kcontrol/tdehtml/index.html#kbrowse-html
Icon=konqueror
Exec=kcmshell khtml_behavior
Exec=kcmshell tdehtml_behavior


X-TDE-Library=konqhtml
X-TDE-FactoryName=khtml_behavior
X-TDE-FactoryName=tdehtml_behavior

Name=Web Behavior
Name[af]=Web Gedrag

kcontrol/konqhtml/khtml_filter.desktop → kcontrol/konqhtml/tdehtml_filter.desktop View File

@@ -1,11 +1,11 @@
[Desktop Entry]
Type=Application
DocPath=kcontrol/khtml/index.html#khtml-adblock
DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
Icon=filter
Exec=kcmshell khtml_filter
Exec=kcmshell tdehtml_filter

X-TDE-Library=konqhtml
X-TDE-FactoryName=khtml_filter
X-TDE-FactoryName=tdehtml_filter

Name=AdBlocK Filters
Name[af]=Advertensie blok filters

kcontrol/konqhtml/khtml_fonts.desktop → kcontrol/konqhtml/tdehtml_fonts.desktop View File

@@ -1,12 +1,12 @@
[Desktop Entry]
Type=Application
DocPath=kcontrol/khtml/index.html#kbrowse-appearance
DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
Icon=fonts
Exec=kcmshell khtml_fonts
Exec=kcmshell tdehtml_fonts


X-TDE-Library=konqhtml
X-TDE-FactoryName=khtml_fonts
X-TDE-FactoryName=tdehtml_fonts

Name=Fonts
Name[af]=Skriftipes

kcontrol/konqhtml/khtml_java_js.desktop → kcontrol/konqhtml/tdehtml_java_js.desktop View File

@@ -1,12 +1,12 @@
[Desktop Entry]
Type=Application
DocPath=kcontrol/khtml/index.html#kbrowse-java
DocPath=kcontrol/tdehtml/index.html#kbrowse-java
Icon=konqueror
Exec=kcmshell khtml_java_js
Exec=kcmshell tdehtml_java_js


X-TDE-Library=konqhtml
X-TDE-FactoryName=khtml_java_js
X-TDE-FactoryName=tdehtml_java_js

Name=Java & JavaScript
Name[af]=Java & Javaskrip

+ 1
- 1
kcontrol/kthememanager/kthememanager.cpp View File

@@ -398,7 +398,7 @@ void kthememanager::queryLNFModules()
dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
dlg->btnSaver->setIconSet( il->loadIconSet( "kscreensaver", KIcon::Desktop, 32 ) );
dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
}

void kthememanager::updatePreview( const TQString & pixFile )

kcontrol/pics/cr128-app-kscreensaver.png → kcontrol/pics/cr128-app-tdescreensaver.png View File


kcontrol/pics/cr16-app-kscreensaver.png → kcontrol/pics/cr16-app-tdescreensaver.png View File


kcontrol/pics/cr22-app-kscreensaver.png → kcontrol/pics/cr22-app-tdescreensaver.png View File


kcontrol/pics/cr32-app-kscreensaver.png → kcontrol/pics/cr32-app-tdescreensaver.png View File


kcontrol/pics/cr48-app-kscreensaver.png → kcontrol/pics/cr48-app-tdescreensaver.png View File


kcontrol/pics/cr64-app-kscreensaver.png → kcontrol/pics/cr64-app-tdescreensaver.png View File


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

Loading…
Cancel
Save