Browse Source

Additional k => tde renaming and fixes

tags/r14.0.0
Slávek Banko 6 years ago
parent
commit
3e88ddfbc3
100 changed files with 267 additions and 267 deletions
  1. 1
    1
      applnk/compat/socks.desktop
  2. 1
    1
      doc/faq/intro.docbook
  3. 2
    2
      doc/glossary/index.docbook
  4. 1
    1
      doc/glossary/tdeprintingglossary.docbook
  5. 2
    2
      doc/kcontrol/tdehtml/index.docbook
  6. 78
    78
      doc/tdeioslave/index.docbook
  7. 1
    1
      doc/tdeioslave/mac.docbook
  8. 2
    2
      doc/userguide/base-tde-applications.docbook
  9. 1
    1
      doc/userguide/extragear-applications.docbook
  10. 3
    3
      doc/userguide/tde-for-admins.docbook
  11. 2
    2
      doc/userguide/tde-office.docbook
  12. 1
    1
      doc/userguide/under-the-hood.docbook
  13. 2
    2
      drkonqi/Makefile.am
  14. 3
    3
      kappfinder/Makefile.am
  15. 3
    3
      kate/ChangeLog
  16. 1
    1
      kate/app/Makefile.am
  17. 1
    1
      kate/interfaces/Makefile.am
  18. 1
    1
      kate/utils/Makefile.am
  19. 2
    2
      kcminit/Makefile.am
  20. 1
    1
      kcontrol/Makefile.am
  21. 1
    1
      kcontrol/access/Makefile.am
  22. 1
    1
      kcontrol/accessibility/Makefile.am
  23. 1
    1
      kcontrol/arts/Makefile.am
  24. 1
    1
      kcontrol/clock/Makefile.am
  25. 1
    1
      kcontrol/colors/Makefile.am
  26. 1
    1
      kcontrol/componentchooser/Makefile.am
  27. 1
    1
      kcontrol/crypto/Makefile.am
  28. 1
    1
      kcontrol/css/Makefile.am
  29. 1
    1
      kcontrol/display/Makefile.am
  30. 1
    1
      kcontrol/displayconfig/Makefile.am
  31. 1
    1
      kcontrol/dnssd/Makefile.am
  32. 1
    1
      kcontrol/ebrowsing/Makefile.am
  33. 2
    2
      kcontrol/ebrowsing/plugins/ikws/Makefile.am
  34. 1
    1
      kcontrol/ebrowsing/plugins/localdomain/Makefile.am
  35. 1
    1
      kcontrol/ebrowsing/plugins/shorturi/Makefile.am
  36. 2
    2
      kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
  37. 1
    1
      kcontrol/energy/Makefile.am
  38. 3
    3
      kcontrol/filetypes/Makefile.am
  39. 1
    1
      kcontrol/iccconfig/Makefile.am
  40. 1
    1
      kcontrol/icons/Makefile.am
  41. 1
    1
      kcontrol/input/Makefile.am
  42. 1
    1
      kcontrol/input/xcursor/themepage.cpp
  43. 1
    1
      kcontrol/ioslaveinfo/Makefile.am
  44. 1
    1
      kcontrol/ioslaveinfo/ioslaveinfo.desktop
  45. 1
    1
      kcontrol/kcontrol/Makefile.am
  46. 1
    1
      kcontrol/kded/Makefile.am
  47. 3
    3
      kcontrol/keys/tdeaccelaction.h
  48. 1
    1
      kcontrol/kicker/Makefile.am
  49. 1
    1
      kcontrol/knotify/Makefile.am
  50. 1
    1
      kcontrol/konq/Makefile.am
  51. 2
    2
      kcontrol/konqhtml/javaopts.cpp
  52. 1
    1
      kcontrol/konsole/Makefile.am
  53. 1
    1
      kcontrol/kthememanager/Makefile.am
  54. 1
    1
      kcontrol/locale/Makefile.am
  55. 1
    1
      kcontrol/nics/Makefile.am
  56. 1
    1
      kcontrol/randr/Makefile.am
  57. 1
    1
      kcontrol/samba/Makefile.am
  58. 1
    1
      kcontrol/screensaver/Makefile.am
  59. 1
    1
      kcontrol/smartcard/Makefile.am
  60. 1
    1
      kcontrol/style/Makefile.am
  61. 1
    1
      kcontrol/tdefontinst/Makefile.am
  62. 3
    3
      kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
  63. 1
    1
      kcontrol/tdefontinst/kcmfontinst/Makefile.am
  64. 1
    1
      kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
  65. 2
    2
      kcontrol/tdefontinst/lib/FcEngine.cpp
  66. 4
    4
      kcontrol/tdefontinst/lib/KfiConstants.h
  67. 1
    1
      kcontrol/tdefontinst/lib/Makefile.am
  68. 1
    1
      kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
  69. 1
    1
      kcontrol/tdefontinst/tdefile-plugin/Makefile.am
  70. 1
    1
      kcontrol/tdefontinst/tdefontinst/Makefile.am
  71. 41
    41
      kcontrol/tdefontinst/tdeio/KioFonts.cpp
  72. 2
    2
      kcontrol/tdefontinst/tdeio/KioFonts.h
  73. 1
    1
      kcontrol/tdefontinst/tdeio/Makefile.am
  74. 1
    1
      kcontrol/tdefontinst/thumbnail/Makefile.am
  75. 10
    10
      kcontrol/tdefontinst/viewpart/FontViewPart.cpp
  76. 3
    3
      kcontrol/tdefontinst/viewpart/Makefile.am
  77. 1
    1
      kcontrol/tdeio/Makefile.am
  78. 2
    2
      kcontrol/tdeio/lanbrowser.desktop
  79. 1
    1
      kcontrol/tdm/Makefile.am
  80. 1
    1
      kdcop/Makefile.am
  81. 2
    2
      kdebugdialog/tdelistdebugdialog.h
  82. 2
    2
      kdesktop/Makefile.am
  83. 1
    1
      kdesktop/kwebdesktop/Makefile.am
  84. 2
    2
      kdesktop/lock/Makefile.am
  85. 2
    2
      kdialog/Makefile.am
  86. 2
    2
      kdialog/tdelistboxdialog.h
  87. 3
    3
      kfind/Makefile.am
  88. 1
    1
      kfind/kfinddlg.cpp
  89. 1
    1
      kfind/kquery.h
  90. 2
    2
      khelpcenter/DESIGN
  91. 3
    3
      khelpcenter/Makefile.am
  92. 3
    3
      khelpcenter/htmlsearch/Makefile.am
  93. 1
    1
      khotkeys/shared/Makefile.am
  94. 2
    2
      kicker/applets/launcher/Makefile.am
  95. 1
    1
      kicker/applets/lockout/Makefile.am
  96. 1
    1
      kicker/applets/media/Makefile.am
  97. 1
    1
      kicker/applets/run/Makefile.am
  98. 1
    1
      kicker/applets/swallow/Makefile.am
  99. 1
    1
      kicker/applets/systemtray/Makefile.am
  100. 0
    0
      kicker/applets/trash/Makefile.am

+ 1
- 1
applnk/compat/socks.desktop View File

@@ -19,5 +19,5 @@ Type=Application
Icon=proxy
Exec=tdecmshell proxy
X-TDE-ModuleType=Library
X-TDE-Library=kio
X-TDE-Library=tdeio
X-TDE-FactoryName=proxy

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

@@ -162,7 +162,7 @@ Trinity developers want to maintain a "traditional" desktop environment.</para>
<itemizedlist>

<listitem>
<para>Desktop search through the locate:/ kio-slave and Beagle</para>
<para>Desktop search through the locate:/ tdeio-slave and Beagle</para>
</listitem>

<listitem>

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

@@ -24,8 +24,8 @@
<glossseealso otherterm="gloss-kde">&tde;</glossseealso>
</glossdef>
</glossentry>
<glossentry id="gloss-kio">
<glossterm><acronym>KIO</acronym></glossterm>
<glossentry id="gloss-tdeio">
<glossterm><acronym>TDEIO</acronym></glossterm>
<glossdef><para>The &tde; Input/Output system which makes use of so-called
<quote><acronym>IO</acronym> Slaves</quote>.</para>
<glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym>

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

@@ -1128,7 +1128,7 @@ now.
</glossentry>

<glossentry id="gloss-printtdeioslave">
<glossterm>print:/ KIO Slave</glossterm>
<glossterm>print:/ TDEIO Slave</glossterm>
<glossdef><para>You can use a syntax of "print:/..." to get quick access
to TDEPrint resources. Typing "print:/manager" as a Konqueror URL
address gives administrative access to TDEPrint. Konqueror uses &tde;'s

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

@@ -225,8 +225,8 @@ which &Java; applications can read and write text. While most &Java;
applications will not require such a console, it could be helpful in
diagnosing problems with &Java; applications.</para>

<para><guilabel>Use KIO</guilabel> will cause the
<acronym>JVM</acronym>to use &tde;'s own <acronym>KIO</acronym>
<para><guilabel>Use TDEIO</guilabel> will cause the
<acronym>JVM</acronym>to use &tde;'s own <acronym>TDEIO</acronym>
transports for network connections.</para>

<para><guilabel>Use security

+ 78
- 78
doc/tdeioslave/index.docbook View File

@@ -1,45 +1,45 @@
<?xml version="1.0" ?>
<!DOCTYPE part PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
<!ENTITY kio-bzip SYSTEM "bzip.docbook">
<!ENTITY kio-bzip2 SYSTEM "bzip2.docbook">
<!ENTITY kio-cgi SYSTEM "cgi.docbook">
<!ENTITY kio-data SYSTEM "data.docbook">
<!ENTITY kio-file SYSTEM "file.docbook">
<!ENTITY kio-finger SYSTEM "finger.docbook">
<!ENTITY kio-fish SYSTEM "fish.docbook">
<!ENTITY kio-floppy SYSTEM "floppy.docbook">
<!ENTITY kio-ftp SYSTEM "ftp.docbook">
<!ENTITY kio-gopher SYSTEM "gopher.docbook">
<!ENTITY kio-gzip SYSTEM "gzip.docbook">
<!ENTITY kio-help SYSTEM "help.docbook">
<!ENTITY kio-http SYSTEM "http.docbook">
<!ENTITY kio-https SYSTEM "https.docbook">
<!ENTITY kio-imap SYSTEM "imap.docbook">
<!ENTITY kio-imaps SYSTEM "imaps.docbook">
<!ENTITY kio-info SYSTEM "info.docbook">
<!ENTITY kio-lan SYSTEM "lan.docbook">
<!ENTITY kio-ldap SYSTEM "ldap.docbook">
<!ENTITY kio-mailto SYSTEM "mailto.docbook">
<!ENTITY kio-mac SYSTEM "mac.docbook">
<!ENTITY kio-man SYSTEM "man.docbook">
<!ENTITY kio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
<!ENTITY kio-news SYSTEM "news.docbook">
<!ENTITY kio-nfs SYSTEM "nfs.docbook">
<!ENTITY kio-nntp SYSTEM "nntp.docbook">
<!ENTITY kio-pop3 SYSTEM "pop3.docbook">
<!ENTITY kio-pop3s SYSTEM "pop3s.docbook">
<!ENTITY kio-print SYSTEM "print.docbook">
<!ENTITY kio-rlan SYSTEM "rlan.docbook">
<!ENTITY kio-rlogin SYSTEM "rlogin.docbook">
<!ENTITY kio-sftp SYSTEM "sftp.docbook">
<!ENTITY kio-smb SYSTEM "smb.docbook">
<!ENTITY kio-smtp SYSTEM "smtp.docbook">
<!ENTITY kio-tar SYSTEM "tar.docbook">
<!ENTITY kio-telnet SYSTEM "telnet.docbook">
<!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook">
<!ENTITY kio-webdav SYSTEM "webdav.docbook">
<!ENTITY kio-webdavs SYSTEM "webdavs.docbook">
<!ENTITY tdeio-bzip SYSTEM "bzip.docbook">
<!ENTITY tdeio-bzip2 SYSTEM "bzip2.docbook">
<!ENTITY tdeio-cgi SYSTEM "cgi.docbook">
<!ENTITY tdeio-data SYSTEM "data.docbook">
<!ENTITY tdeio-file SYSTEM "file.docbook">
<!ENTITY tdeio-finger SYSTEM "finger.docbook">
<!ENTITY tdeio-fish SYSTEM "fish.docbook">
<!ENTITY tdeio-floppy SYSTEM "floppy.docbook">
<!ENTITY tdeio-ftp SYSTEM "ftp.docbook">
<!ENTITY tdeio-gopher SYSTEM "gopher.docbook">
<!ENTITY tdeio-gzip SYSTEM "gzip.docbook">
<!ENTITY tdeio-help SYSTEM "help.docbook">
<!ENTITY tdeio-http SYSTEM "http.docbook">
<!ENTITY tdeio-https SYSTEM "https.docbook">
<!ENTITY tdeio-imap SYSTEM "imap.docbook">
<!ENTITY tdeio-imaps SYSTEM "imaps.docbook">
<!ENTITY tdeio-info SYSTEM "info.docbook">
<!ENTITY tdeio-lan SYSTEM "lan.docbook">
<!ENTITY tdeio-ldap SYSTEM "ldap.docbook">
<!ENTITY tdeio-mailto SYSTEM "mailto.docbook">
<!ENTITY tdeio-mac SYSTEM "mac.docbook">
<!ENTITY tdeio-man SYSTEM "man.docbook">
<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
<!ENTITY tdeio-news SYSTEM "news.docbook">
<!ENTITY tdeio-nfs SYSTEM "nfs.docbook">
<!ENTITY tdeio-nntp SYSTEM "nntp.docbook">
<!ENTITY tdeio-pop3 SYSTEM "pop3.docbook">
<!ENTITY tdeio-pop3s SYSTEM "pop3s.docbook">
<!ENTITY tdeio-print SYSTEM "print.docbook">
<!ENTITY tdeio-rlan SYSTEM "rlan.docbook">
<!ENTITY tdeio-rlogin SYSTEM "rlogin.docbook">
<!ENTITY tdeio-sftp SYSTEM "sftp.docbook">
<!ENTITY tdeio-smb SYSTEM "smb.docbook">
<!ENTITY tdeio-smtp SYSTEM "smtp.docbook">
<!ENTITY tdeio-tar SYSTEM "tar.docbook">
<!ENTITY tdeio-telnet SYSTEM "telnet.docbook">
<!ENTITY tdeio-thumbnail SYSTEM "thumbnail.docbook">
<!ENTITY tdeio-webdav SYSTEM "webdav.docbook">
<!ENTITY tdeio-webdavs SYSTEM "webdavs.docbook">
<!ENTITY tdeprint "<application>TDEPrint</application>">
<!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
<!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
@@ -49,45 +49,45 @@

<part lang="&language;">
<title>IO-Slaves</title>
&kio-bzip;
&kio-bzip2;
&kio-cgi;
&kio-data;
&kio-file;
&kio-finger;
&kio-fish;
&kio-floppy;
&kio-ftp;
&kio-gopher;
&kio-gzip;
&kio-help;
&kio-http;
&kio-https;
&kio-imap;
&kio-imaps;
&kio-info;
&kio-lan;
&kio-ldap;
&kio-mailto;
&kio-mac;
&kio-man;
&kio-mrml;
&kio-news;
&kio-nfs;
&kio-nntp;
&kio-pop3;
&kio-pop3s;
&kio-print;
&kio-rlan;
&kio-rlogin;
&kio-sftp;
&kio-smb;
&kio-smtp;
&kio-tar;
&kio-telnet;
&kio-thumbnail;
&kio-webdav;
&kio-webdavs;
&tdeio-bzip;
&tdeio-bzip2;
&tdeio-cgi;
&tdeio-data;
&tdeio-file;
&tdeio-finger;
&tdeio-fish;
&tdeio-floppy;
&tdeio-ftp;
&tdeio-gopher;
&tdeio-gzip;
&tdeio-help;
&tdeio-http;
&tdeio-https;
&tdeio-imap;
&tdeio-imaps;
&tdeio-info;
&tdeio-lan;
&tdeio-ldap;
&tdeio-mailto;
&tdeio-mac;
&tdeio-man;
&tdeio-mrml;
&tdeio-news;
&tdeio-nfs;
&tdeio-nntp;
&tdeio-pop3;
&tdeio-pop3s;
&tdeio-print;
&tdeio-rlan;
&tdeio-rlogin;
&tdeio-sftp;
&tdeio-smb;
&tdeio-smtp;
&tdeio-tar;
&tdeio-telnet;
&tdeio-thumbnail;
&tdeio-webdav;
&tdeio-webdavs;

</part>


+ 1
- 1
doc/tdeioslave/mac.docbook View File

@@ -15,7 +15,7 @@ tools</ulink>, so you will need these installed for it to work.</para>

<para>Enter <userinput>mac:/</userinput> into &konqueror; and you
should see the contents of your &MacOS; partition. If you have not
used kio-mac before, you will probably get an error message saying you
used tdeio-mac before, you will probably get an error message saying you
have not specified the right partition. Enter something like
<userinput>mac:/<option>?dev=/dev/hda2</option></userinput> to specify
the partition (if you don't know which partition &MacOS; is on, you

+ 2
- 2
doc/userguide/base-tde-applications.docbook View File

@@ -23,7 +23,7 @@
<variablelist>
<varlistentry>
<term>&konqueror;</term>
<listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
<listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from TDEIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
<itemizedlist>
<listitem><para>Website: <ulink url="http://konqueror.org">http://konqueror.org</ulink></para></listitem>
@@ -122,7 +122,7 @@
<itemizedlist>
<title>Related Information</title>
<listitem><para><ulink url="http://kde-apps.org">http://kde-apps.org</ulink> -- mdash; The largest directory of third-party &tde; applications.</para></listitem>
<listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help KIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
<listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help TDEIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
<listitem><para>You can also likely find out quite a bit of information from the &tde; website, itself, at <ulink url="http://kde.org">http://kde.org</ulink>.</para></listitem>
</itemizedlist>


+ 1
- 1
doc/userguide/extragear-applications.docbook View File

@@ -70,7 +70,7 @@

<varlistentry>
<term><application>Gwenview</application></term>
<listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for KIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
<listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for TDEIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
<itemizedlist>
<listitem><para>Website: <ulink url="http://gwenview.sourceforge.net/">http://gwenview.sourceforge.net/</ulink></para></listitem>

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

@@ -1188,10 +1188,10 @@ on a multi-head system.</para>

<varlistentry><term>$<envar>TDE_FORK_SLAVES</envar></term>
<listitem><para>Set this variable to spawn
<acronym>KIO</acronym>-slaves directly from the application process
itself. By default <acronym>KIO</acronym>-slaves are spawned using
<acronym>TDEIO</acronym>-slaves directly from the application process
itself. By default <acronym>TDEIO</acronym>-slaves are spawned using
<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>TDEIO</acronym>-slave should run in the same
environment as the application. This can be the case with
<application>Clearcase</application>.</para>
</listitem>

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

@@ -49,7 +49,7 @@ the &tde; desktop. This section was written with version 1.4 of
&koffice; is a highly integrated office suite that builds directly on the
TDE technology. This has many advantages in terms of integration, features,
performance, familiar look and feel and so on. All technologies like &DCOP;,
KIO, KParts are directly available.
TDEIO, KParts are directly available.
</para>
<para>
In particular the KParts technology is extended for the &koffice;
@@ -289,7 +289,7 @@ actually use the OASIS OpenDocument file format.
<para>Each Koffice component comes with its own manual.
These manuals offer all the latest information about the
various components &koffice; has to offer and should be
read to learn more about &koffice;. The application manuals can be accessed by using the documentation KIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
read to learn more about &koffice;. The application manuals can be accessed by using the documentation TDEIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
also a good place to find out more; it is at <ulink url="http://www.koffice.org">http://www.koffice.org</ulink>.</para>
</sect1>


+ 1
- 1
doc/userguide/under-the-hood.docbook View File

@@ -401,7 +401,7 @@ select/deselect --> in order to enable or disable debugging output for
that part of &tde;.</para>

<para>The list of debugging areas is sorted numerically, not alphabetically,
so kio (127) comes before artskde (400). The numbers go up to 200000 or so,
so tdeio (127) comes before artskde (400). The numbers go up to 200000 or so,
but there are really only 400 areas. You don't have to scroll through the
entire list to find the area you need, though. There is a line edit <!--
text-entry ? --> box at the top of the dialog where you can enter a part of

+ 2
- 2
drkonqi/Makefile.am View File

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

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

# toplevel.cpp must be last in row due to X-headers being included. (--enable-final)
# Did I mention already that X header files really suck?

+ 3
- 3
kappfinder/Makefile.am View File

@@ -2,13 +2,13 @@ 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) -ltdetexteditor
kappfinder_LDADD = $(LIB_TDEUI) $(LIB_TDEIO)
kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

INCLUDES = $(all_includes)
METASOURCES = AUTO

+ 3
- 3
kate/ChangeLog View File

@@ -109,16 +109,16 @@
* myself back again ;)
* now kate is clean (only qt3), no backports ;)

2001-08-24 christian@tdevelop.org
2001-08-24 christian@kdevelop.org
* reimplement the commenting of selections on some languages

2001-08-19 christian@tdevelop.org
2001-08-19 christian@kdevelop.org
* added back Sather highlighting support
* improved Eiffel language syntax highlighting support
* added Eiffel language comment directive in eiffel.xml
* added Ada language comment directive in ada.xml

2001-08-15 christian@tdevelop.org
2001-08-15 christian@kdevelop.org
* committed Eiffel language syntax highlighting support

2001-08-08 rokrau@yahoo.com

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

@@ -12,7 +12,7 @@ libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugin
kateexternaltools.cpp katesavemodifieddialog.cpp kateviewspacecontainer.cpp \
katemwmodonhddialog.cpp katesession.cpp katemdi.cpp katetabwidget.cpp

libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la $(LIB_KUTILS) ../utils/libkateutils.la
libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la $(LIB_TDEUTILS) ../utils/libkateutils.la

libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined


+ 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) -ltdetexteditor
libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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/utils/Makefile.am View File

@@ -8,7 +8,7 @@ libkateutils_la_SOURCES = dockviewbase.cpp messageview.cpp listboxview.cpp

libkateutils_la_LDFLAGS = $(all_libraries) -no-undefined
libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)

libkateutils_la_METASOURCES = AUTO


+ 2
- 2
kcminit/Makefile.am View File

@@ -22,11 +22,11 @@ bin_PROGRAMS=
lib_LTLIBRARIES=

kcminit_la_SOURCES = main.cpp main.skel
kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version

kcminit_startup_la_SOURCES = main.cpp main.skel
kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
kcminit_startup_la_LDFLAGS = $(all_libraries) -module -avoid-version

AM_CPPFLAGS = $(all_includes)

+ 1
- 1
kcontrol/Makefile.am View File

@@ -33,7 +33,7 @@ endif

# 'colors' and 'fonts' should come after 'krdb'
SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo tdm\
kicker locale launch keys kio konq style kded \
kicker locale launch keys tdeio konq style kded \
konqhtml ebrowsing arts kcontrol knotify\
clock pics $(ACCESS_SUBDIR) colors energy fonts css \
icons screensaver taskbar crypto privacy smserver \

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

@@ -13,7 +13,7 @@ kaccess_la_LIBADD = $(LIB_TDEUI)

kcm_access_la_SOURCES = kcmaccess.cpp
kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_access_la_LIBADD = $(LIB_KIO)
kcm_access_la_LIBADD = $(LIB_TDEIO)

noinst_HEADERS = kcmaccess.h


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

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_accessibility.la

kcm_accessibility_la_SOURCES = accessibility.cpp accessibilityconfigwidget.ui
kcm_accessibility_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_accessibility_la_LIBADD = $(LIB_KIO)
kcm_accessibility_la_LIBADD = $(LIB_TDEIO)

noinst_HEADERS = accessibility.h


+ 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) -ltdemid
kcm_arts_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) -ltdemid

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


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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_clock.la
kcm_clock_la_SOURCES = dtime.cpp tzone.cpp main.cpp

kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_clock_la_LIBADD = $(LIB_KIO)
kcm_clock_la_LIBADD = $(LIB_TDEIO)

AM_CPPFLAGS = $(all_includes)

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

@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la

kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp
kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
METASOURCES = colorscm.moc widgetcanvas.moc

noinst_HEADERS = colorscm.h widgetcanvas.h

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

@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kcm_componentchooser.la

kcm_componentchooser_la_SOURCES = componentchooser_ui.ui componentconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
kcm_componentchooser_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_componentchooser_la_LIBADD = $(LIB_KIO)
kcm_componentchooser_la_LIBADD = $(LIB_TDEIO)

xdg_apps_DATA = componentchooser.desktop


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

@@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp
AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir)

kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL)
kcm_crypto_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSSL)

METASOURCES = AUTO


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

@@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss
kde_module_LTLIBRARIES = kcm_css.la
kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_css_la_LIBADD = -ltdeui $(LIB_KIO)
kcm_css_la_LIBADD = -ltdeui $(LIB_TDEIO)

METASOURCES = AUTO

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_display.la
kcm_display_la_SOURCES = display.cpp

kcm_display_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_display_la_LIBADD = $(LIB_KUTILS)
kcm_display_la_LIBADD = $(LIB_TDEUTILS)
AM_CPPFLAGS = $(all_includes)

METASOURCES = AUTO

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

@@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon

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

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

METASOURCES = AUTO


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

@@ -5,7 +5,7 @@ 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_tdednssd.desktop
kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
kcm_tdednssd_la_LIBADD = $(LIB_TDEDNSSD) $(LIB_TDEUI)

messages: rc.cpp
$(EXTRACTRC) *.ui *.rc >> rc.cpp

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

@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la
kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp

kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
kcm_kurifilt_la_LIBADD = $(LIB_TDESYCOCA)
# Don't link this lib to the plugins. They are dlopened and linking to them
# results in crashes when closing tdecmshell.
# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la

+ 2
- 2
kcontrol/ebrowsing/plugins/ikws/Makefile.am View File

@@ -9,10 +9,10 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la

libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
libkuriikwsfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)

libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
libkurisearchfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)

libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \
kuriikwsfilter.cpp searchprovider.cpp

+ 1
- 1
kcontrol/ebrowsing/plugins/localdomain/Makefile.am View File

@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
kde_module_LTLIBRARIES = liblocaldomainurifilter.la

liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE)
liblocaldomainurifilter_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE)

liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel


+ 1
- 1
kcontrol/ebrowsing/plugins/shorturi/Makefile.am View File

@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII
kde_module_LTLIBRARIES = libtdeshorturifilter.la

libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
libtdeshorturifilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)

libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel


+ 2
- 2
kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h View File

@@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

#ifndef _KSHORTURIFILTER_H_
#define _KSHORTURIFILTER_H_
#ifndef _TDESHORTURIFILTER_H_
#define _TDESHORTURIFILTER_H_

#include <dcopobject.h>
#include <kgenericfactory.h>

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

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la

kcm_energy_la_SOURCES = energy.cpp
kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_KIO)
kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_TDEIO)
METASOURCES = energy.moc

noinst_HEADERS = energy.h

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

@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(all_includes)

kcm_filetypes_la_LIBADD = libfiletypes.la $(LIB_KIO)
kcm_filetypes_la_LIBADD = libfiletypes.la $(LIB_TDEIO)
kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
METASOURCES = AUTO

@@ -20,8 +20,8 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
kserviceselectdlg.cpp

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) -ltdetexteditor
keditfiletype_LDADD = libfiletypes.la $(LIB_TDEIO)
keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

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

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

@@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel

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

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

METASOURCES = AUTO


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

@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_icons.la

kcm_icons_la_SOURCES = iconthemes.cpp icons.cpp main.cpp
kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_icons_la_LIBADD = $(LIB_KIO)
kcm_icons_la_LIBADD = $(LIB_TDEIO)

METASOURCES = AUTO


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

@@ -22,7 +22,7 @@ kde_module_LTLIBRARIES = kcm_input.la

kcm_input_la_SOURCES = mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp logitechmouse_base.ui
kcm_input_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_KIO) $(LIB_XCURSOR) $(USB_LIBS)
kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_TDEIO) $(LIB_XCURSOR) $(USB_LIBS)

METASOURCES = AUTO


+ 1
- 1
kcontrol/input/xcursor/themepage.cpp View File

@@ -269,7 +269,7 @@ void ThemePage::removeClicked()
// theme with the same name, we shouldn't remove the theme from the list if it's
// still available elsewhere. This could be solved by calling insertThemes() here,
// but since TDEIO::del() is an asynchronos operation, the theme we're deleting will
// be readded to the list again before KIO has removed it.
// be readded to the list again before TDEIO has removed it.
}



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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la
kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp

kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO)
kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_TDEIO)

AM_CPPFLAGS= $(all_includes)


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

@@ -97,7 +97,7 @@ Keywords[es]=Protocolo,Slaves de E/S,Slaves,Red,Información,Tiempo de expiraci
Keywords[et]=protokoll,IO moodulid,moodulid,võrk,info,taimaut,aegumine
Keywords[eu]=Protocol,IO morroiak,Morroiak,Sarea,Informazioa,Denbora-muga
Keywords[fa]=قرارداد، IO slaves، Slaves، شبکه، اطلاعات، اتمام وقت
Keywords[fi]=Protokolla,Yhteyskäytäntö,KIO,KIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
Keywords[fi]=Protokolla,Yhteyskäytäntö,TDEIO,TDEIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
Keywords[fr]=protocole,modules,entrées/sorties,réseau,informations,délai
Keywords[fy]=protocol,IO slaves,slaves,network,ynformaasje,timeout,netwurk,tiidslimyt
Keywords[gl]=Protocolo,escravos IO,Escravos,Rede,Información,Tempo de agarda,Timeout

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

@@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
moduleIface.cpp moduleIface.skel global.cpp modules.cpp \
proxywidget.cpp kcrootonly.cpp searchwidget.cpp

kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEHTML)
kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIB_TDEHTML)
kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version

rccontroldir = $(kde_datadir)/kcontrol

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kded.la
kcm_kded_la_SOURCES = kcmkded.cpp

kcm_kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kded_la_LIBADD = $(LIB_KIO)
kcm_kded_la_LIBADD = $(LIB_TDEIO)

AM_CPPFLAGS= $(all_includes)


+ 3
- 3
kcontrol/keys/tdeaccelaction.h View File

@@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA.
*/

#ifndef _KACCELACTION_H
#define _KACCELACTION_H
#ifndef _TDEACCELACTION_H
#define _TDEACCELACTION_H

#include <tqmap.h>
#include <tqptrvector.h>
@@ -202,4 +202,4 @@ class TDEAccelActions
friend class TDEAccelBase;
};

#endif // _KACCELACTION_H
#endif // _TDEACCELACTION_H

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

@@ -7,7 +7,7 @@ kcm_kicker_la_SOURCES = positiontab.ui hidingtab.ui lookandfeeltab.ui menutab.ui
positionconfig.cpp hidingconfig.cpp menuconfig.cpp lookandfeelconfig.cpp

kcm_kicker_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_KIO) $(LIB_KUTILS)
kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_TDEIO) $(LIB_TDEUTILS)
AM_CPPFLAGS = -I$(top_srcdir)/kicker/kicker/core -I$(top_srcdir)/kicker/libkicker \
-I$(top_builddir)/kicker/libkicker -I$(srcdir)/../background $(all_includes)


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

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_knotify.la
kcm_knotify_la_SOURCES = knotify.cpp playersettings.ui

kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_knotify_la_LIBADD = $(LIB_KIO)
kcm_knotify_la_LIBADD = $(LIB_TDEIO)
AM_CPPFLAGS = $(all_includes)
METASOURCES = AUTO

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

@@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desktop.cpp rootopts.cpp \
desktopbehavior.ui

kcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS)
kcm_konq_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEUTILS)

kcm_konq_la_DATA = overlapping.png onlyone.png
kcm_konq_ladir = $(kde_datadir)/kcontrol/pics

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

@@ -86,7 +86,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
grid->addWidget( javaSecurityManagerCB, 0, 0 );
connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );

useKioCB = new TQCheckBox( i18n("Use &KIO"), checkboxes );
useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes );
grid->addWidget( useKioCB, 0, 1 );
connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );

@@ -158,7 +158,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
"policytool utility to give code downloaded from certain sites more "
"permissions." ) );

TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") );
TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use TDEIO for network transport ") );

TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
"your path, simply leave it as 'java'. If you need to use a different jre, "

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

@@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES = schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \
schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui

kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO)
kcm_konsole_la_LIBADD = -ltdeui $(LIB_TDEIO)
AM_CPPFLAGS = $(all_includes)

METASOURCES = AUTO

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

@@ -4,7 +4,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kthememanager.la

kcm_kthememanager_la_SOURCES = kthemedlg.ui newthemewidget.ui knewthemedlg.cpp ktheme.cpp kthememanager.cpp
kcm_kthememanager_la_LIBADD = $(LIB_KIO)
kcm_kthememanager_la_LIBADD = $(LIB_TDEIO)
kcm_kthememanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module

noinst_HEADERS = kthememanager.h ktheme.h knewthemedlg.h kthemedlg.ui.h

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

@@ -10,7 +10,7 @@ METASOURCES = AUTO
noinst_HEADERS = toplevel.h kcmlocale.h klocalesample.h localenum.h localemon.h localetime.h localeother.h

kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_locale_la_LIBADD = $(LIB_KIO)
kcm_locale_la_LIBADD = $(LIB_TDEIO)

# Note: newer glibc (e.g. zonetab version 1.31 (cvs revision 1.22) have more/other data than older ones (e.g. zonetab version 1.28)


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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la
kcm_nic_la_SOURCES = nic.cpp

kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET)
kcm_nic_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSOCKET)

AM_CPPFLAGS= $(all_includes)


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

@@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray

tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR)
tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIB_XRANDR)

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

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_samba.la
kcm_samba_la_SOURCES = main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp

kcm_samba_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_samba_la_LIBADD = $(LIB_KIO)
kcm_samba_la_LIBADD = $(LIB_TDEIO)

AM_CPPFLAGS = $(all_includes)


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

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_screensaver.la
kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
saverconfig.cpp advanceddialog.cpp kswidget.cpp
kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
kcm_screensaver_la_LIBADD = $(LIB_TDESYCOCA) $(DPMSLIB) $(GLLIB)
METASOURCES = AUTO

noinst_HEADERS = scrnsave.h

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

@@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma

kcm_smartcard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined

kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO)
kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_TDEIO)

METASOURCES = AUTO


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

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_style.la

kcm_style_la_SOURCES = kcmstyle.cpp stylepreview.ui menupreview.cpp styleconfdialog.cpp
kcm_style_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
kcm_style_la_LIBADD = $(LIB_KIO) ../krdb/libkrdb.la
kcm_style_la_LIBADD = $(LIB_TDEIO) ../krdb/libkrdb.la
METASOURCES = AUTO

noinst_HEADERS = kcmstyle.h stylepreview.h menupreview.h

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

@@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
FONTINST_VP_SUBDIR=viewpart
endif

SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio
SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst tdeio

EXTRA_DIST = TODO


+ 3
- 3
kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp View File

@@ -146,7 +146,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)

TQString previousPath=itsConfig.readEntry(CFG_PATH);

itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER),
itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER),
fontsFrame);
itsDirOp->setViewConfig(&itsConfig, "ListView Settings");
itsDirOp->setMinimumSize(TQSize(96, 64));
@@ -439,7 +439,7 @@ void CKCmFontInst::removeFonts()
{
KURL url((*it)->url());

url.setQuery(KFI_KIO_NO_CLEAR);
url.setQuery(KFI_TDEIO_NO_CLEAR);
files.append((*it)->text());
urls.append(url);
}
@@ -596,7 +596,7 @@ void CKCmFontInst::delResult(TDEIO::Job *job)

stream << KFI::SPECIAL_RESCAN;

TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this);
jobResult(job);
}


+ 1
- 1
kcontrol/tdefontinst/kcmfontinst/Makefile.am View File

@@ -4,7 +4,7 @@ FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la
endif

kde_module_LTLIBRARIES = kcm_fontinst.la
kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
kcm_fontinst_la_LIBADD = $(LIB_TDEIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
METASOURCES = AUTO
kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)

+ 1
- 1
kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp View File

@@ -90,7 +90,7 @@ void CSettingsDialog::slotOk()

stream << KFI::SPECIAL_RECONFIG;

TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this);
}

hide();

+ 2
- 2
kcontrol/tdefontinst/lib/FcEngine.cpp View File

@@ -909,7 +909,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
// fonts:/System/times.ttf
// file:/home/wibble/hmm.ttf
//
if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol())
{
TDEIO::UDSEntry udsEntry;
TQString name;
@@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
TQTextStream stream(&file);

thumbUrl=stream.readLine();
isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
isThumbnailUrl=0==thumbUrl.find(KFI_TDEIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
file.close();
}


+ 4
- 4
kcontrol/tdefontinst/lib/KfiConstants.h View File

@@ -6,10 +6,10 @@
#define KFI_CATALOGUE "tdefontinst"

// io-slave
#define KFI_KIO_FONTS_PROTOCOL "fonts"
#define KFI_KIO_FONTS_USER I18N_NOOP("Personal")
#define KFI_KIO_FONTS_SYS I18N_NOOP("System")
#define KFI_KIO_NO_CLEAR "?noclear"
#define KFI_TDEIO_FONTS_PROTOCOL "fonts"
#define KFI_TDEIO_FONTS_USER I18N_NOOP("Personal")
#define KFI_TDEIO_FONTS_SYS I18N_NOOP("System")
#define KFI_TDEIO_NO_CLEAR "?noclear"

// Config
#define KFI_UI_CFG_FILE KFI_CATALOGUE"uirc"

+ 1
- 1
kcontrol/tdefontinst/lib/Makefile.am View File

@@ -9,6 +9,6 @@ Misc.h \
FcEngine.h \
KfiConstants.h

libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) $(LIBXFT_LIB)
libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE

+ 1
- 1
kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp View File

@@ -320,7 +320,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
slantAll;
KURL url(info.url());
TQString fName;
bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(),
bool fontsProt = KFI_TDEIO_FONTS_PROTOCOL == url.protocol(),
fileProt = "file" == url.protocol(),
downloaded = false,
status = false;

+ 1
- 1
kcontrol/tdefontinst/tdefile-plugin/Makefile.am View File

@@ -2,7 +2,7 @@ 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/libtdefontinst.la
tdefile_font_la_LIBADD = $(LIB_TDEIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la

kdelnkdir = $(kde_servicesdir)
kde_services_DATA = tdefile_font.desktop

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

@@ -11,6 +11,6 @@ FontEngine.h \
Fontmap.h \
XConfig.h

tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la
tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_TDEIO) ../lib/libtdefontinst.la
tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)

+ 41
- 41
kcontrol/tdefontinst/tdeio/KioFonts.cpp View File

@@ -104,13 +104,13 @@ int kdemain(int argc, char **argv)
{
if (argc != 4)
{
fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
fprintf(stderr, "Usage: tdeio_" KFI_TDEIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
exit(-1);
}

TDELocale::setMainCatalogue(KFI_CATALOGUE);

TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL);
TDEInstance instance("tdeio_" KFI_TDEIO_FONTS_PROTOCOL);
KFI::CKioFonts slave(argv[2], argv[3]);

slave.dispatchLoop();
@@ -123,12 +123,12 @@ namespace KFI

inline bool isSysFolder(const TQString &sect)
{
return i18n(KFI_KIO_FONTS_SYS)==sect || KFI_KIO_FONTS_SYS==sect;
return i18n(KFI_TDEIO_FONTS_SYS)==sect || KFI_TDEIO_FONTS_SYS==sect;
}

inline bool isUserFolder(const TQString &sect)
{
return i18n(KFI_KIO_FONTS_USER)==sect || KFI_KIO_FONTS_USER==sect;
return i18n(KFI_TDEIO_FONTS_USER)==sect || KFI_TDEIO_FONTS_USER==sect;
}

static TQString removeMultipleExtension(const KURL &url)
@@ -289,10 +289,10 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c

addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys
? KFI_KIO_FONTS_PROTOCOL"/system-folder"
: KFI_KIO_FONTS_PROTOCOL"/folder");
? KFI_TDEIO_FONTS_PROTOCOL"/system-folder"
: KFI_TDEIO_FONTS_PROTOCOL"/folder");
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
return true;
}
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
@@ -303,7 +303,7 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c
addAtom(entry, TDEIO::UDS_ACCESS, 0744);
addAtom(entry, TDEIO::UDS_USER, 0, "root");
addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_TDEIO_FONTS_PROTOCOL"/system-folder");
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");

return true;
@@ -393,11 +393,11 @@ static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQV
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");

TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));

if(!Misc::root())
{
url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
url+=sys ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER);
url+=TQString::fromLatin1("/");
}
if(multiple)
@@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
}

CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
: TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
: TDEIO::SlaveBase(KFI_TDEIO_FONTS_PROTOCOL, pool, app),
itsRoot(Misc::root()),
itsUsingFcFpe(false),
itsUsingXfsFpe(false),
@@ -855,9 +855,9 @@ void CKioFonts::listDir(const KURL &url)
{
size=2;
totalSize(size);
createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
listEntry(entry, false);
createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true);
createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true);
listEntry(entry, false);
}

@@ -896,13 +896,13 @@ void CKioFonts::stat(const KURL &url)
err=!createStatEntry(entry, url, FOLDER_SYS);
else
if(isUserFolder(pathList[0]))
err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
else if(isSysFolder(pathList[0]))
err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
else
{
error(TDEIO::ERR_SLAVE_DEFINED,
i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
break;
@@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(passwd.isEmpty())
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
}
else
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_USER)));
return;
}
}
@@ -1317,7 +1317,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
return;
}

bool fromFonts=KFI_KIO_FONTS_PROTOCOL==src.protocol();
bool fromFonts=KFI_TDEIO_FONTS_PROTOCOL==src.protocol();

if((!fromFonts || updateFontList()) // CPD: dont update font list upon a copy from file - is too slow. Just stat on filename!
&& checkUrl(src) && checkAllowed(src))
@@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
}
else
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
}
else
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
return;
}
}
@@ -1619,7 +1619,7 @@ void CKioFonts::del(const KURL &url, bool)
TQValueList<FcPattern *>::Iterator it,
end=entries->end();
CDirList modifiedDirs;
bool clearList=KFI_KIO_NO_CLEAR!=url.query();
bool clearList=KFI_TDEIO_NO_CLEAR!=url.query();

if(nonRootSys(url))
{
@@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool)
if(doRootCmd(cmd))
modified(FOLDER_SYS, clearList, modifiedDirs);
else
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
}
else
{
@@ -1905,7 +1905,7 @@ TQString CKioFonts::getRootPasswd(bool askPasswd)
int attempts=0;
TQString errorMsg;

authInfo.url=KURL(KFI_KIO_FONTS_PROTOCOL ":///");
authInfo.url=KURL(KFI_TDEIO_FONTS_PROTOCOL ":///");
authInfo.username=SYS_USER;
authInfo.keepPassword=true;

@@ -1964,19 +1964,19 @@ bool CKioFonts::confirmUrl(KURL &url)
"case the font will only be usable by you), or \"%2\" ("
"the font will be usable by all users - but you will "
"need to know the administrator's password)?")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)),
i18n("Where to Install"), i18n(KFI_KIO_FONTS_USER),
i18n(KFI_KIO_FONTS_SYS));
.arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)),
i18n("Where to Install"), i18n(KFI_TDEIO_FONTS_USER),
i18n(KFI_TDEIO_FONTS_SYS));

if(changeToSystem)
{
itsLastDest=DEST_SYS;
url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+url.fileName());
url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+url.fileName());
}
else
{
itsLastDest=DEST_USER;
url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+url.fileName());
url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+url.fileName());
}

KFI_DBUG << "Changed URL to:" << url.path() << endl;
@@ -2150,7 +2150,7 @@ bool CKioFonts::checkFile(const TQString &file)

bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
{
if(KFI_KIO_FONTS_PROTOCOL==src.protocol())
if(KFI_TDEIO_FONTS_PROTOCOL==src.protocol())
{
TQValueList<FcPattern *> *entries=getEntries(src);

@@ -2275,7 +2275,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
// (such as there would be for a TTC font), then ask the user for confirmation of the action.
bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op)
{
if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol())
return true;

TQStringList::ConstIterator it,
@@ -2330,7 +2330,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol

bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op)
{
if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol())
return true;

TQStringList files;
@@ -2349,7 +2349,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patte

bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
{
if(KFI_KIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
if(KFI_TDEIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
{
TQString sect(getSect(u.path()));

@@ -2369,7 +2369,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
if(!isSysFolder(sect) && !isUserFolder(sect))
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
.arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)));
return false;
}
}
@@ -2379,17 +2379,17 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)

bool CKioFonts::checkAllowed(const KURL &u)
{
if (KFI_KIO_FONTS_PROTOCOL==u.protocol())
if (KFI_TDEIO_FONTS_PROTOCOL==u.protocol())
{
TQString ds(Misc::dirSyntax(u.path()));

if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
if(ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_SYS)+TQChar('/')))
{
error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
.arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS))); \
return false;
}
}

+ 2
- 2
kcontrol/tdefontinst/tdeio/KioFonts.h View File

@@ -1,5 +1,5 @@
#ifndef __KIO_FONTS_H__
#define __KIO_FONTS_H__
#ifndef __TDEIO_FONTS_H__
#define __TDEIO_FONTS_H__

////////////////////////////////////////////////////////////////////////////////
//

+ 1
- 1
kcontrol/tdefontinst/tdeio/Makefile.am View File

@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la
tdeio_fonts_la_SOURCES = \
KioFonts.cpp

tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la
tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) -ltdesu ../lib/libtdefontinst.la
tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE


+ 1
- 1
kcontrol/tdefontinst/thumbnail/Makefile.am View File

@@ -1,7 +1,7 @@
kde_module_LTLIBRARIES = fontthumbnail.la

fontthumbnail_la_SOURCES = FontThumbnail.cpp
fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la
fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_TDEIO) ../lib/libtdefontinst.la
fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
METASOURCES = AUTO


+ 10
- 10
kcontrol/tdefontinst/viewpart/FontViewPart.cpp View File

@@ -59,7 +59,7 @@ static KURL getDest(const KURL &url, bool system)
{
return KURL(KFI::Misc::root()
? TQString("fonts:/") + url.fileName()
: TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER))
: TQString("fonts:/") + TQString(system ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER))
+ TQChar('/') + url.fileName());
}

@@ -122,7 +122,7 @@ bool CFontViewPart::openURL(const KURL &url)
if (!url.isValid() || !closeURL())
return false;

if(KFI_KIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
{
m_url=url;
emit started(0);
@@ -150,7 +150,7 @@ bool CFontViewPart::openFile()
void CFontViewPart::timeout()
{
bool showFs=false,
isFonts=KFI_KIO_FONTS_PROTOCOL==m_url.protocol();
isFonts=KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol();

itsShowInstallButton=false;

@@ -169,12 +169,12 @@ void CFontViewPart::timeout()
}
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
@@ -198,7 +198,7 @@ void CFontViewPart::previewStatus(bool st)
itsInstallButton->setShown(st && itsShowInstallButton);
itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
itsChangeTextAction->setEnabled(st);
itsPrintAction->setEnabled(st && KFI_KIO_FONTS_PROTOCOL==m_url.protocol());
itsPrintAction->setEnabled(st && KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol());
}

void CFontViewPart::install()
@@ -211,10 +211,10 @@ void CFontViewPart::install()
"password)")
.arg(itsPreview->engine().getName(m_url))
.arg(m_url.fileName())
.arg(i18n(KFI_KIO_FONTS_USER))
.arg(i18n(KFI_KIO_FONTS_SYS)),
i18n("Install"), i18n(KFI_KIO_FONTS_USER),
i18n(KFI_KIO_FONTS_SYS));
.arg(i18n(KFI_TDEIO_FONTS_USER))
.arg(i18n(KFI_TDEIO_FONTS_SYS)),
i18n("Install"), i18n(KFI_TDEIO_FONTS_USER),
i18n(KFI_TDEIO_FONTS_SYS));

if(KMessageBox::Cancel!=resp)
{

+ 3
- 3
kcontrol/tdefontinst/viewpart/Makefile.am View File

@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libtdefontviewpart.la

libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
libtdefontviewpart_la_LIBADD = $(LIB_TDEPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la

noinst_HEADERS = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h

@@ -16,8 +16,8 @@ kde_services_DATA = tdefontviewpart.desktop
AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
METASOURCES = AUTO

tdefontview_LDADD = $(LIB_KPARTS)
tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
tdefontview_LDADD = $(LIB_TDEPARTS)
tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

bin_PROGRAMS = tdefontview
xdg_apps_DATA = tdefontview.desktop

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

@@ -17,7 +17,7 @@ kcm_tdeio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui

kcm_tdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcm_tdeio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
kcm_tdeio_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS)

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

+ 2
- 2
kcontrol/tdeio/lanbrowser.desktop View File

@@ -104,10 +104,10 @@ Comment[de]=Einrichtung von LISa, resLISa und Ein-/Ausgabemodulen
Comment[el]=Ρύθμιση του lisa, reslisa και των ioslaves
Comment[eo]=Agordo de Lisa, Reslisa kaj la Enel-sklavoj
Comment[es]=Configuración de lisa, reslisa y los ioslaves
Comment[et]=Lisa, reslisa ja KIO moodulite seadistamine
Comment[et]=Lisa, reslisa ja TDEIO moodulite seadistamine
Comment[eu]=Konfiguratu lisa, reslisa eta ioslave-ak
Comment[fa]=برپایی lisa، reslisa و ioslaves
Comment[fi]=Lisan, Reslisan ja KIO-palveluiden asetukset
Comment[fi]=Lisan, Reslisan ja TDEIO-palveluiden asetukset
Comment[fr]=Configuration de LISa, ResLISa et des modules d'entrées-sorties
Comment[fy]=Lisa, reslisa en de ioslaves ynstelle
Comment[ga]=Socraigh lisa, reslisa agus ioslaves

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

@@ -5,7 +5,7 @@ kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp \
tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp

kcm_tdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF)
kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO) $(LIB_KNEWSTUFF)

AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \
-I$(top_srcdir)/kcontrol/background \

+ 1
- 1
kdcop/Makefile.am View File

@@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kdcop

kdcop_SOURCES = kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui
kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) -lDCOP $(LIB_QT)
kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP $(LIB_QT)

noinst_HEADERS = kdcopwindow.h
METASOURCES = AUTO

+ 2
- 2
kdebugdialog/tdelistdebugdialog.h View File

@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/

#ifndef KLISTDEBUGDIALOG__H
#define KLISTDEBUGDIALOG__H
#ifndef TDELISTDEBUGDIALOG__H
#define TDELISTDEBUGDIALOG__H

#include "kabstractdebugdialog.h"
#include <tqcheckbox.h>

+ 2
- 2
kdesktop/Makefile.am View File

@@ -2,7 +2,7 @@

INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/tdmlib $(all_includes)
kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR)
kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_TDEUTILS) $(LIB_XCURSOR)

SUBDIRS = . lock pics patterns programs init kwebdesktop

@@ -39,7 +39,7 @@ kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT)

kxdglauncher_SOURCES = kxdglauncher.cpp
kxdglauncher_LDFLAGS = $(all_libraries)
kxdglauncher_LDADD = $(LIB_KUTILS)
kxdglauncher_LDADD = $(LIB_TDEUTILS)

METASOURCES = AUTO


+ 1
- 1
kdesktop/kwebdesktop/Makefile.am View File

@@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop
METASOURCES = AUTO

kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc
kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs

+ 2
- 2
kdesktop/lock/Makefile.am View File

@@ -1,8 +1,8 @@
## Makefile.am of tdebase/kdesktop/lock

INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_TDEIO) $(LIB_XF86MISC) $(GLLIB)

####### Files


+ 2
- 2
kdialog/Makefile.am View File

@@ -4,8 +4,8 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kdialog

kdialog_SOURCES = kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
kdialog_LDADD = $(LIB_KIO)
kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdialog_LDADD = $(LIB_TDEIO)
kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

METASOURCES = AUTO


+ 2
- 2
kdialog/tdelistboxdialog.h View File

@@ -18,8 +18,8 @@
//


#ifndef _KLISTBOXDIALOG_H_
#define _KLISTBOXDIALOG_H_
#ifndef _TDELISTBOXDIALOG_H_
#define _TDELISTBOXDIALOG_H_

#include <kdialogbase.h>


+ 3
- 3
kfind/Makefile.am View File

@@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = libkfindpart.la

libkfindpart_la_SOURCES = kfindpart.cpp
libkfindpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkfindpart_la_LIBADD = libkfind_common.la $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la
libkfindpart_la_LIBADD = libkfind_common.la $(LIB_TDEPARTS) $(top_builddir)/libkonq/libkonq.la

noinst_HEADERS = kftabdlg.h kfind.h version.h kquery.h kdatecombo.h

@@ -30,7 +30,7 @@ messages:

bin_PROGRAMS = kfind
kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
kfind_LDADD = libkfind_common.la $(LIB_KPARTS)
kfind_LDADD = libkfind_common.la $(LIB_TDEPARTS)

# the library search path.
kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+ 1
- 1
kfind/kfinddlg.cpp View File

@@ -189,7 +189,7 @@ void KfindDlg::slotResult(int errorCode)
}
else
{
kdDebug()<<"KIO error code: "<<errorCode<<endl;
kdDebug()<<"TDEIO error code: "<<errorCode<<endl;
setStatusMsg(i18n("Error."));
};


+ 1
- 1
kfind/kquery.h View File

@@ -49,7 +49,7 @@ class KQuery : public TQObject
/* List of files found using slocate */
void slotListEntries(TQStringList);
protected slots:
/* List of files found using KIO */
/* List of files found using TDEIO */
void slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &);
void slotResult(TDEIO::Job *);
void slotCanceled(TDEIO::Job *);

+ 2
- 2
khelpcenter/DESIGN View File

@@ -219,7 +219,7 @@ regexp' or 'Search case sensitive'.
# We could show them in a listview on the Search tab, each found search engine
# being represented by a checkable listview item. So, we just let the user
# enter a term, replace the \{@} placeholder in the URIs specified in the
# selected .desktop files with that term, send out a request via KIO and show
# selected .desktop files with that term, send out a request via TDEIO and show
# the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A
# problem with this: How to display the multiple HTML pages returned by the
# selected search engines? Using a QSplitter to split multiple TDEHTMLParts?
@@ -237,7 +237,7 @@ regexp' or 'Search case sensitive'.
# In additionl there could be a X-KHelpCenter-XSLT key which defines which .xslt
# stylesheet to use for that particular search engine. We then query that search
# engine by replacing the placeholder in the URI with whatever the user entered
# and hand it to KIO. All the HTML returned by the various search engines gets
# and hand it to TDEIO. All the HTML returned by the various search engines gets
# then transformed into a custom, intermediate, XML dialect, using the XSLT
# stylesheets define in the .desktop files. Using that intermediate step we
# can nicely drop duplicate hits, for example, or create a list of hits in the

+ 3
- 3
khelpcenter/Makefile.am View File

@@ -6,7 +6,7 @@ METASOURCES = AUTO
bin_PROGRAMS = khc_indexbuilder
lib_LTLIBRARIES =

khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
khc_indexbuilder_LDADD = $(LIB_TDECORE)
khc_indexbuilder_SOURCES = khc_indexbuilder.cpp

@@ -27,14 +27,14 @@ khelpcenter_la_SOURCES = navigator.cpp \

#kcm_helpcenter_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version \
# $(all_libraries) -no-undefined
#kcm_helpcenter_la_LIBADD = $(LIB_KIO)
#kcm_helpcenter_la_LIBADD = $(LIB_TDEIO)
#kcm_helpcenter_la_SOURCES = kcmhelpcenter.cpp docmetainfo.cpp \
# docentrytraverser.cpp docentry.cpp htmlsearch.cpp \
# htmlsearchconfig.cpp

EXTRA_PROGRAMS = testmetainfo

testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \
docentrytraverser.lo htmlsearch.lo
testmetainfo_SOURCES = testmetainfo.cpp

+ 3
- 3
khelpcenter/htmlsearch/Makefile.am View File

@@ -11,11 +11,11 @@ lib_LTLIBRARIES = libhtmlsearch.la libkcm_htmlsearch.la

libhtmlsearch_la_SOURCES = htmlsearch.cpp progressdialog.cpp
libhtmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
libhtmlsearch_la_LIBADD = $(LIB_KIO)
libhtmlsearch_la_LIBADD = $(LIB_TDEIO)

libkcm_htmlsearch_la_SOURCES = kcmhtmlsearch.cpp klangcombo.cpp ktagcombobox.cpp
libkcm_htmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
libkcm_htmlsearch_la_LIBADD = $(LIB_KIO)
libkcm_htmlsearch_la_LIBADD = $(LIB_TDEIO)

noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h

@@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/
wrapper_SCRIPTS = meinproc_wrapper

tdehtmlindex_SOURCES = index.cpp
tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)

xpm_DATA = unchecked.xpm checked.xpm

+ 1
- 1
khotkeys/shared/Makefile.am View File

@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libkhotkeys_shared.la
libkhotkeys_shared_la_SOURCES = action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp \
settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp \
gestures.cpp voices.cpp voicesignature.cpp sound.cpp soundrecorder.cpp
libkhotkeys_shared_la_LIBADD = $(LIB_KIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
libkhotkeys_shared_la_LIBADD = $(LIB_TDEIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined

INCLUDES = $(all_includes)

+ 2
- 2
kicker/applets/launcher/Makefile.am View File

@@ -15,8 +15,8 @@ EXTRA_DIST = $(lnk_DATA)

launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined
launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \
../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \
$(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS)
../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_TDEIO) \
$(LIB_TDESYCOCA) $(LIB_TDEUI) $(LIB_TDEUTILS)

kde_kcfg_DATA = launcherapplet.kcfg


+ 1
- 1
kicker/applets/lockout/Makefile.am View File

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = lockout_panelapplet.la

lockout_panelapplet_la_SOURCES = lockout.cpp
lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KSYCOCA)
lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDESYCOCA)

noinst_HEADERS = lockout.h


+ 1
- 1
kicker/applets/media/Makefile.am View File

@@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop
EXTRA_DIST = $(lnk_DATA)

media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS)
media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEUTILS)

messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot

+ 1
- 1
kicker/applets/run/Makefile.am View File

@@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop
EXTRA_DIST = $(lnk_DATA)

run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
run_panelapplet_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)

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

+ 1
- 1
kicker/applets/swallow/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = swallow_panelapplet.la

swallow_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)

swallow_panelapplet_la_SOURCES = swallow.cpp prefwidgetbase.ui prefwidget.cpp


+ 1
- 1
kicker/applets/systemtray/Makefile.am View File

@@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop
EXTRA_DIST = $(lnk_DATA)

systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO)
systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO)


messages:

+ 0
- 0
kicker/applets/trash/Makefile.am View File


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

Loading…
Cancel
Save