summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt6
-rw-r--r--doc/kcontrol/kcmktalkd/index.docbook2
-rw-r--r--doc/kdict/index.docbook4
-rw-r--r--doc/kget/index.docbook4
-rw-r--r--doc/knewsticker/index.docbook6
-rw-r--r--doc/kopete/index.docbook2
-rw-r--r--doc/kpf/index.docbook2
-rw-r--r--doc/kppp/index.docbook4
-rw-r--r--doc/krdc/index.docbook4
-rw-r--r--doc/krfb/index.docbook4
-rw-r--r--doc/ksirc/index.docbook4
-rw-r--r--doc/ktalkd/index.docbook2
-rw-r--r--doc/kwifimanager/index.docbook2
-rw-r--r--doc/lisa/index.docbook4
-rw-r--r--filesharing/simple/krichtextlabel.h2
-rw-r--r--kdenetwork.lsm2
-rw-r--r--kdict/ChangeLog2
-rw-r--r--kdict/main.cpp2
-rw-r--r--kopete/ChangeLog2
-rw-r--r--kopete/INSTALL2
-rw-r--r--kopete/configure.in.in4
-rw-r--r--kopete/kopete/addcontactwizard/addcontactwizard.cpp2
-rw-r--r--kopete/kopete/chatwindow/chatmessagepart.cpp4
-rw-r--r--kopete/kopete/chatwindow/kopetechatwindow.h2
-rw-r--r--kopete/kopete/chatwindow/kopeteemailwindow.cpp2
-rw-r--r--kopete/kopete/chatwindow/krichtexteditpart.cpp2
-rw-r--r--kopete/kopete/config/appearance/appearanceconfig.cpp2
-rw-r--r--kopete/kopete/config/plugins/kopetepluginconfig.h2
-rw-r--r--kopete/kopete/contactlist/configure.in.in2
-rw-r--r--kopete/kopete/contactlist/kopetecontactlistview.cpp2
-rw-r--r--kopete/kopete/contactlist/kopetelviprops.cpp2
-rw-r--r--kopete/kopete/contactlist/kopetemetacontactlvi.cpp2
-rw-r--r--kopete/kopete/kopeteballoon.cpp2
-rw-r--r--kopete/kopete/kopetewindow.cpp2
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.cpp2
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.h2
-rw-r--r--kopete/libkopete/kautoconfig.cpp4
-rw-r--r--kopete/libkopete/kautoconfig.h4
-rw-r--r--kopete/libkopete/kopete_export.h2
-rw-r--r--kopete/libkopete/kopeteaccount.cpp2
-rw-r--r--kopete/libkopete/kopeteawayaction.cpp2
-rw-r--r--kopete/libkopete/kopeteawayaction.h2
-rw-r--r--kopete/libkopete/kopetechatsession.cpp2
-rw-r--r--kopete/libkopete/kopetecommandhandler.cpp2
-rw-r--r--kopete/libkopete/kopetecontact.cpp2
-rw-r--r--kopete/libkopete/kopetemetacontact.cpp2
-rw-r--r--kopete/libkopete/kopeteplugin.h2
-rw-r--r--kopete/libkopete/kopeteprefs.h2
-rw-r--r--kopete/libkopete/private/kopeteemoticons.cpp2
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.cpp2
-rw-r--r--kopete/libkopete/ui/kopetestdaction.cpp2
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.cpp2
-rw-r--r--kopete/plugins/cryptography/cryptographyplugin.cpp2
-rw-r--r--kopete/plugins/cryptography/popuppublic.cpp2
-rw-r--r--kopete/plugins/highlight/highlightpreferences.cpp2
-rw-r--r--kopete/plugins/history/historyplugin.cpp2
-rw-r--r--kopete/plugins/netmeeting/netmeetingplugin.cpp2
-rw-r--r--kopete/plugins/statistics/statisticsdb.cpp2
-rw-r--r--kopete/plugins/statistics/statisticsplugin.cpp2
-rw-r--r--kopete/plugins/texteffect/texteffectpreferences.cpp2
-rw-r--r--kopete/plugins/translator/translatorplugin.cpp2
-rw-r--r--kopete/protocols/irc/ircguiclient.cpp2
-rw-r--r--kopete/protocols/irc/kcodecaction.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircentity.h2
-rw-r--r--kopete/protocols/jabber/libiris/002_offline_event.patch2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp2
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
-rw-r--r--kopete/protocols/oscar/oscarcontact.cpp2
-rw-r--r--kppp/ChangeLog2
-rw-r--r--kppp/README2
-rw-r--r--krdc/keycapturedialog.cpp2
-rw-r--r--ksirc/dockservercontroller.cpp2
-rw-r--r--ksirc/iocontroller.cpp2
-rw-r--r--ktalkd/ChangeLog6
-rw-r--r--ktalkd/ktalkd/announce.cpp2
-rw-r--r--ktalkd/ktalkd/announce.h2
-rw-r--r--ktalkd/ktalkd/defs.h2
-rw-r--r--ktalkd/ktalkd/find_user.cpp2
-rw-r--r--ktalkd/ktalkd/find_user.h2
-rw-r--r--ktalkd/ktalkd/includ.h2
-rw-r--r--ktalkd/ktalkd/machines/answmach.cpp2
-rw-r--r--ktalkd/ktalkd/machines/answmach.h2
-rw-r--r--ktalkd/ktalkd/machines/forwmach.cpp2
-rw-r--r--ktalkd/ktalkd/machines/forwmach.h2
-rw-r--r--ktalkd/ktalkd/machines/talkconn.cpp2
-rw-r--r--ktalkd/ktalkd/machines/talkconn.h2
-rw-r--r--ktalkd/ktalkd/options.cpp2
-rw-r--r--ktalkd/ktalkd/options.h2
-rw-r--r--ktalkd/ktalkd/otalkd.h2
-rw-r--r--ktalkd/ktalkd/print.c2
-rw-r--r--ktalkd/ktalkd/process.cpp2
-rw-r--r--ktalkd/ktalkd/process.h2
-rw-r--r--ktalkd/ktalkd/prot_talkd.h2
-rw-r--r--ktalkd/ktalkd/proto.h2
-rw-r--r--ktalkd/ktalkd/readcfg++.cpp2
-rw-r--r--ktalkd/ktalkd/readconf.cpp2
-rw-r--r--ktalkd/ktalkd/readconf.h2
-rw-r--r--ktalkd/ktalkd/table.cpp2
-rw-r--r--ktalkd/ktalkd/table.h2
-rw-r--r--ktalkd/ktalkd/talkd.cpp2
-rw-r--r--ktalkd/ktalkd/threads.cpp2
-rw-r--r--ktalkd/ktalkd/threads.h2
-rw-r--r--ktalkd/ktalkd/unixsock.cpp2
-rw-r--r--lanbrowsing/kio_lan/Makefile.am2
-rw-r--r--lanbrowsing/kio_lan/README6
-rw-r--r--wifi/kwifimanager.cpp2
-rw-r--r--wifi/pixmaps/README2
108 files changed, 127 insertions, 127 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7123909..606361fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,9 @@ cmake_minimum_required( VERSION 2.8 )
##### general package setup #####################
-project( kdenetwork )
+project( tdenetwork )
-set( PACKAGE kdenetwork )
+set( PACKAGE tdenetwork )
set( VERSION "3.5.13" )
@@ -128,7 +128,7 @@ set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
-##### kdenetwork directories ####################
+##### tdenetwork directories ####################
tde_conditional_add_subdirectory( BUILD_DCOPRSS dcoprss )
tde_conditional_add_subdirectory( BUILD_DOC doc )
diff --git a/doc/kcontrol/kcmktalkd/index.docbook b/doc/kcontrol/kcmktalkd/index.docbook
index 3d444f1d..6f341bb0 100644
--- a/doc/kcontrol/kcmktalkd/index.docbook
+++ b/doc/kcontrol/kcmktalkd/index.docbook
@@ -32,7 +32,7 @@
<title>Talk Configuration</title>
-<!-- FIXME: This module is installed with kdenetwork.. should it be
+<!-- FIXME: This module is installed with tdenetwork.. should it be
documented in the kcontrol manual, or should this information be added
to the ktalkd manual -->
diff --git a/doc/kdict/index.docbook b/doc/kdict/index.docbook
index b5454480..8a763a0a 100644
--- a/doc/kdict/index.docbook
+++ b/doc/kdict/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kdict;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -56,7 +56,7 @@ suitable definitions.</para></abstract>
<keywordset>
<keyword>KDE</keyword>
<keyword>kdict</keyword>
-<keyword>kdenetwork</keyword>
+<keyword>tdenetwork</keyword>
<keyword>dictionary</keyword>
<keyword>translation</keyword>
</keywordset>
diff --git a/doc/kget/index.docbook b/doc/kget/index.docbook
index eb8a2bab..22f29352 100644
--- a/doc/kget/index.docbook
+++ b/doc/kget/index.docbook
@@ -5,7 +5,7 @@
<!ENTITY kget "<application>KGet</application>">
<!ENTITY kappname "&kget;"><!-- replace kget here
do *not* replace kappname-->
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>
@@ -48,7 +48,7 @@ downloads even if you shutdown your computer before the downloads have completed
<keywordset>
<keyword>KDE</keyword>
-<keyword>kdeutils</keyword>
+<keyword>tdeutils</keyword>
<keyword>kget</keyword>
<keyword>kppp</keyword>
<keyword>download</keyword>
diff --git a/doc/knewsticker/index.docbook b/doc/knewsticker/index.docbook
index 1532f8b1..140652cd 100644
--- a/doc/knewsticker/index.docbook
+++ b/doc/knewsticker/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&knewsticker;">
-<!ENTITY package "kdenetwork">
+<!ENTITY package "tdenetwork">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
<!ENTITY RSS "<acronym>RSS</acronym>">
@@ -36,7 +36,7 @@
<keywordset>
<keyword>KDE</keyword>
<keyword>KNewsTicker</keyword>
- <keyword>kdenetwork</keyword>
+ <keyword>tdenetwork</keyword>
<keyword>news ticker</keyword>
<keyword>applet</keyword>
</keywordset>
@@ -469,7 +469,7 @@ site:</para>
producing &RSS; markup which is suitable for use with
&knewsticker;.</para>
<tip><para>You can find some scripts which &eg; download stock data in
- the kdeaddons module, in the
+ the tdeaddons module, in the
<filename class="directory">knewsticker-scripts</filename>
directory.</para></tip>
</listitem>
diff --git a/doc/kopete/index.docbook b/doc/kopete/index.docbook
index c6fba958..f78c9ab8 100644
--- a/doc/kopete/index.docbook
+++ b/doc/kopete/index.docbook
@@ -7,7 +7,7 @@
<!ENTITY Matt.Rogers.mail "<email>mattr@kde.org</email>">
<!ENTITY Michael.Larouche "<personname><firstname>Michaël</firstname><surname>Larouche</surname></personname>">
<!ENTITY Michael.Larouche.mail "<email>michael.larouche@kdemail.net</email>">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY kappname "&kopete;">
<!ENTITY im "<acronym>IM</acronym>">
<!ENTITY % addindex "IGNORE">
diff --git a/doc/kpf/index.docbook b/doc/kpf/index.docbook
index 5dff1c74..5e3d9fe4 100644
--- a/doc/kpf/index.docbook
+++ b/doc/kpf/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kpf;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
diff --git a/doc/kppp/index.docbook b/doc/kppp/index.docbook
index ea172828..4e8e904a 100644
--- a/doc/kppp/index.docbook
+++ b/doc/kppp/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kppp;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY getting-online SYSTEM "getting-online.docbook">
<!ENTITY wizard SYSTEM "wizard.docbook">
<!ENTITY dialog-setup SYSTEM "dialog-setup.docbook">
@@ -53,7 +53,7 @@ allowing for interactive script generation and network setup.</para>
<keywordset>
<keyword>KDE</keyword>
<keyword>kppp</keyword>
-<keyword>kdenetwork</keyword>
+<keyword>tdenetwork</keyword>
<keyword>dialer</keyword>
<keyword>internet</keyword>
<keyword>ppp</keyword>
diff --git a/doc/krdc/index.docbook b/doc/krdc/index.docbook
index 574bb326..3c5219d9 100644
--- a/doc/krdc/index.docbook
+++ b/doc/krdc/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&krdc;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English
original documentation, change
@@ -50,7 +50,7 @@ the desktop session on another machine that is running a compatible
<keywordset>
<keyword>KDE</keyword>
-<keyword>kdenetwork</keyword>
+<keyword>tdenetwork</keyword>
<keyword>krfb</keyword>
<keyword>VNC</keyword>
<keyword>RFB</keyword>
diff --git a/doc/krfb/index.docbook b/doc/krfb/index.docbook
index d8beeab3..d91a6399 100644
--- a/doc/krfb/index.docbook
+++ b/doc/krfb/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&krfb;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English
original documentation, change
@@ -63,7 +63,7 @@ Please at least include KDE, the KDE package it is in, the name
<keywordset>
<keyword>KDE</keyword>
-<keyword>kdenetwork</keyword>
+<keyword>tdenetwork</keyword>
<keyword>krfb</keyword>
<keyword>VNC</keyword>
<keyword>RFB</keyword>
diff --git a/doc/ksirc/index.docbook b/doc/ksirc/index.docbook
index abead63a..78b08656 100644
--- a/doc/ksirc/index.docbook
+++ b/doc/ksirc/index.docbook
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY mirc "<application>mIrc</application>">
<!ENTITY kappname "&ksirc;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY irc "<acronym>IRC</acronym>">
<!ENTITY CTCP "<acronym>CTCP</acronym>">
<!ENTITY % addindex "IGNORE">
@@ -1286,7 +1286,7 @@ community wiki</ulink>.
<entry>&kde; development</entry>
</row>
<row>
- <entry>#kdevelop</entry>
+ <entry>#tdevelop</entry>
<entry>KDevelop questions</entry>
</row>
<row>
diff --git a/doc/ktalkd/index.docbook b/doc/ktalkd/index.docbook
index 7cfbbb6f..cfb6f8e2 100644
--- a/doc/ktalkd/index.docbook
+++ b/doc/ktalkd/index.docbook
@@ -496,7 +496,7 @@ The original program was written by Robert Cimrman,
<para>
&ktalkd; is now a core application of the &kde; project <ulink
url="http://www.kde.org">http://www.kde.org</ulink>, part of the
-kdenetwork package.
+tdenetwork package.
</para>
<para>
diff --git a/doc/kwifimanager/index.docbook b/doc/kwifimanager/index.docbook
index fbf46cc0..e48d0a4a 100644
--- a/doc/kwifimanager/index.docbook
+++ b/doc/kwifimanager/index.docbook
@@ -3,7 +3,7 @@
<!ENTITY kwifimanager "<application>KWiFiManager</application>">
<!ENTITY LAN "<acronym>LAN</acronym>">
<!ENTITY kappname "&kwifimanager;">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY % English "INCLUDE"> <!-- change language only here -->
<!ENTITY % addindex "IGNORE">
]>
diff --git a/doc/lisa/index.docbook b/doc/lisa/index.docbook
index d93e31d5..758b51d2 100644
--- a/doc/lisa/index.docbook
+++ b/doc/lisa/index.docbook
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY lisa "<application>LISa</application>">
- <!ENTITY package "kdenetwork">
+ <!ENTITY package "tdenetwork">
<!ENTITY reslisa "<application>resLISa</application>">
<!ENTITY kappname "&lisa;"><!-- replace kapp here -->
<!ENTITY % addindex "IGNORE">
@@ -48,7 +48,7 @@ Information Server (&reslisa;)</para>
<keywordset>
<keyword>KDE</keyword>
-<keyword>kdenetwork</keyword>
+<keyword>tdenetwork</keyword>
<keyword>LAN</keyword>
<keyword>network</keyword>
<keyword>network neighborhood</keyword>
diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h
index 1a12793e..53a60cea 100644
--- a/filesharing/simple/krichtextlabel.h
+++ b/filesharing/simple/krichtextlabel.h
@@ -21,7 +21,7 @@
#include <tqlabel.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A replacement for TQLabel that supports richtext and proper tqlayout management
diff --git a/kdenetwork.lsm b/kdenetwork.lsm
index 0f60d3f2..8604d66e 100644
--- a/kdenetwork.lsm
+++ b/kdenetwork.lsm
@@ -1,5 +1,5 @@
Begin4
-Title: kdenetwork
+Title: tdenetwork
Version: 3.5.10
Entered-date: 2008-08-26
Description: Network related utilities for the K Desktop Environment (KDE)
diff --git a/kdict/ChangeLog b/kdict/ChangeLog
index d9513c75..9d829073 100644
--- a/kdict/ChangeLog
+++ b/kdict/ChangeLog
@@ -4,7 +4,7 @@
like <,>,& into &amp, etc.
0.5.2
- + Kdict is now part of the offical kdenetwork package
+ + Kdict is now part of the offical tdenetwork package
+ support for IPv6 and socks-proxies
+ up-to-date docbook-handbook
+ code cleanup
diff --git a/kdict/main.cpp b/kdict/main.cpp
index 235f9048..fac93b58 100644
--- a/kdict/main.cpp
+++ b/kdict/main.cpp
@@ -15,7 +15,7 @@
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <klocale.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "application.h"
#include "toplevel.h"
diff --git a/kopete/ChangeLog b/kopete/ChangeLog
index 53392915..7c922c9f 100644
--- a/kopete/ChangeLog
+++ b/kopete/ChangeLog
@@ -124,7 +124,7 @@
* Make the decodeMessage function more fast for empty CString. As
a side effect it fix possible attempt to decode null string using
- KStringHandler::isUtf8 wich make kopete crash with kdelibs prior
+ KStringHandler::isUtf8 wich make kopete crash with tdelibs prior
to 3.2.92.
2004-08-23 12:54 Gustavo P. Boiko <boiko@conectiva.com.br>
diff --git a/kopete/INSTALL b/kopete/INSTALL
index 0d901f47..1fc6e9d4 100644
--- a/kopete/INSTALL
+++ b/kopete/INSTALL
@@ -202,7 +202,7 @@ please read on.
KDE applications by default look in all directories listed in the
/etc/kderc file, the $KDEDIRS environment variable, in $KDEDIR if
this variable doesn't exist, and ultimately in the directory where
-kdelibs is installed. Unless you take special precautions applications
+tdelibs is installed. Unless you take special precautions applications
will _NOT_ look in other directories, even if you install additional
software (like Kopete) there.
diff --git a/kopete/configure.in.in b/kopete/configure.in.in
index 802dd84d..261f4f6f 100644
--- a/kopete/configure.in.in
+++ b/kopete/configure.in.in
@@ -16,7 +16,7 @@ KDE_CHECK_HEADERS(knotifydialog.h)
KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete -I$(top_builddir)/kopete/libkopete -I$(top_srcdir)/kopete/libkopete/avdevice -I$(top_srcdir)/kopete/libkopete/ui -I$(top_builddir)/kopete/libkopete/ui'
-AC_MSG_CHECKING([for kdelibs newer than 3.3.x])
+AC_MSG_CHECKING([for tdelibs newer than 3.3.x])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kcompat_save_CXXFLAGS="$CXXFLAGS"
@@ -25,7 +25,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
CXXFLAGS="$CXXFLAGS $all_includes"
AC_TRY_COMPILE([
-#include <kdeversion.h>
+#include <tdeversion.h>
#if !( KDE_IS_VERSION( 3, 3, 90 ) )
#error Kopete compatibility with KDE 3.3 needs to be enabled
#endif
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 9332204e..1a0f1a4f 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -50,7 +50,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kinputdialog.h>
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 6336185c..5bb4f204 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -49,7 +49,7 @@
// KDE includes
#include <kapplication.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kfiledialog.h>
#include <khtmlview.h>
#include <klocale.h>
@@ -86,7 +86,7 @@
#include "kopetechatwindowstylemanager.h"
#if !(KDE_IS_VERSION(3,3,90))
-//From kdelibs/khtml/misc/htmltags.h
+//From tdelibs/khtml/misc/htmltags.h
// used in ChatMessagePart::copy()
#define ID_BLOCKTQUOTE 12
#define ID_BR 14
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h
index f43fccdb..0e101fc3 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/kopete/chatwindow/kopetechatwindow.h
@@ -22,7 +22,7 @@
#include <kparts/mainwindow.h>
#include <tqmovie.h>
#include "kopetecontact.h"
-#include "kdeversion.h"
+#include "tdeversion.h"
class KAction;
class KToggleAction;
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 12772ddb..bd726cb8 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -37,7 +37,7 @@
#include <kconfig.h>
#include <kcursor.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kedittoolbar.h>
#include <kfontdialog.h>
#include <kglobalsettings.h>
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 08d19240..ff86940d 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -5,7 +5,7 @@
#include <kfontdialog.h>
#include <kdebug.h>
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqapplication.h>
#include <tqclipboard.h>
#include <tqevent.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index e415d349..ac6c4a27 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -37,7 +37,7 @@
#include <tqslider.h>
#include <tqlabel.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kapplication.h>
diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.h b/kopete/kopete/config/plugins/kopetepluginconfig.h
index dc5d1736..c235a699 100644
--- a/kopete/kopete/config/plugins/kopetepluginconfig.h
+++ b/kopete/kopete/config/plugins/kopetepluginconfig.h
@@ -23,7 +23,7 @@
class KopetePluginConfigPrivate;
/**
- * Plugin selector. See KPluginSelector in kdelibs for documentation.
+ * Plugin selector. See KPluginSelector in tdelibs for documentation.
*
* @author Martijn Klingens <klingens@kde.org>
*/
diff --git a/kopete/kopete/contactlist/configure.in.in b/kopete/kopete/contactlist/configure.in.in
index eeaa09b0..f95ae667 100644
--- a/kopete/kopete/contactlist/configure.in.in
+++ b/kopete/kopete/contactlist/configure.in.in
@@ -1,6 +1,6 @@
dnl -----------------------------------------------------
-dnl XRender check - stolen from kdelibs/tdefx
+dnl XRender check - stolen from tdelibs/tdefx
dnl -----------------------------------------------------
LIB_XRENDER=
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index d95e4cb1..d3459c07 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -46,7 +46,7 @@
#include <kabc/stdaddressbook.h>
#include <kabc/vcardconverter.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include "addcontactwizard.h"
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index 39b00849..b1047dff 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -521,7 +521,7 @@ void KopeteMetaLVIProps::slotFromKABCClicked()
void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester )
{
- // taken from kdelibs/kio/kfile/knotifydialog.cpp
+ // taken from tdelibs/kio/kfile/knotifydialog.cpp
// only need to init this once
requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * )));
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index a85a8aa8..2afe4fe9 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -40,7 +40,7 @@
#include <kabc/addressbook.h>
#include <kabc/addressee.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index a42a4e8e..decfb2cd 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tqtimer.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kglobalsettings.h>
#include <kapplication.h>
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 525744fa..619679d3 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -46,7 +46,7 @@
#include <kstatusbar.h>
#include <kglobalaccel.h>
#include <twin.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kplugininfo.h>
#include <ksqueezedtextlabel.h>
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index 453ca98b..25f99824 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -18,7 +18,7 @@
*/
/* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim
+ * One copy is in tdelibs/tdeui, and the other copy is in tdepim/libtdepim
* This is because tdepim has to remain backwards compatible. Any changes
* to either file should be made to the other.
*/
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
index 5cbb067c..5a9ec050 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
@@ -34,7 +34,7 @@ class KPopupMenu;
* user with a friendly way to select a rectangular subregion of the pixmap.
*
* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim
+ * One copy is in tdelibs/tdeui, and the other copy is in tdepim/libtdepim
* This is because tdepim has to remain backwards compatible. Any changes
* to either file should be made to the other.
*
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 6dbc1bac..bb28bb0e 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net)
+ * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
#include <tqobjectlist.h>
#include <kconfig.h>
#include <kapplication.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
/**
* Macro function to warn developers when they are making calls
diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h
index ea781976..6be452b0 100644
--- a/kopete/libkopete/kautoconfig.h
+++ b/kopete/libkopete/kautoconfig.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net)
+ * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -83,7 +83,7 @@ class TQWidget;
*
* @see KAutoConfigDialog
* @since 3.2
- * @author Benjamin C Meyer <ben+kdelibs at meyerhome dot net>
+ * @author Benjamin C Meyer <ben+tdelibs at meyerhome dot net>
*/
class KOPETE_EXPORT KAutoConfig : public TQObject {
diff --git a/kopete/libkopete/kopete_export.h b/kopete/libkopete/kopete_export.h
index df184b57..2c1e35cf 100644
--- a/kopete/libkopete/kopete_export.h
+++ b/kopete/libkopete/kopete_export.h
@@ -19,7 +19,7 @@
#define KOPETE_EXPORT_H
#include <kdemacros.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#if KDE_IS_VERSION(3,3,2)
#define KOPETE_EXPORT KDE_EXPORT
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 9f7b2516..ab9d7624 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -21,7 +21,7 @@
#include <kconfig.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kdialogbase.h>
#include <klocale.h>
#include <kiconloader.h>
diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp
index ac656fbb..537b01fd 100644
--- a/kopete/libkopete/kopeteawayaction.cpp
+++ b/kopete/libkopete/kopeteawayaction.cpp
@@ -16,7 +16,7 @@
*/
#include <klocale.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kstringhandler.h>
diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h
index 707750f6..25121850 100644
--- a/kopete/libkopete/kopeteawayaction.h
+++ b/kopete/libkopete/kopeteawayaction.h
@@ -18,7 +18,7 @@
#ifndef KOPETEAWAYACTION_H
#define KOPETEAWAYACTION_H
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kactionclasses.h>
#include <kaction.h>
diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp
index 9c19ebb5..d49e135c 100644
--- a/kopete/libkopete/kopetechatsession.cpp
+++ b/kopete/libkopete/kopetechatsession.cpp
@@ -26,7 +26,7 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kglobal.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index 04153e86..ec2618bc 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kprocess.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kxmlguiclient.h>
#include <kaction.h>
#include <tqdom.h>
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index 66ecf11f..44eb7c4b 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kabcpersistence.h>
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index 1db7b1e5..9ec2704c 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "kabcpersistence.h"
#include "kopetecontactlist.h"
diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h
index e22e1b37..cae084ee 100644
--- a/kopete/libkopete/kopeteplugin.h
+++ b/kopete/libkopete/kopeteplugin.h
@@ -177,7 +177,7 @@ public:
signals:
/**
* Notify that the settings of a plugin were changed.
- * These changes are passed on from the new KCDialog code in kdelibs/kutils.
+ * These changes are passed on from the new KCDialog code in tdelibs/kutils.
*/
void settingsChanged();
diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h
index c2d6e291..e27eff55 100644
--- a/kopete/libkopete/kopeteprefs.h
+++ b/kopete/libkopete/kopeteprefs.h
@@ -18,7 +18,7 @@
#define __KOPETEPREFS_H__
#include <tqobject.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqcolor.h>
#include <tqfont.h>
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 26375517..502504f2 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -30,7 +30,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <set>
#include <algorithm>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index ec9604a8..710d56f1 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -31,7 +31,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kpushbutton.h>
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index b1283a79..e09cdeb4 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -21,7 +21,7 @@
#include <tqapplication.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kguiitem.h>
#include <klocale.h>
#include <ksettings/dialog.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 425b1be8..0fa64a4e 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -31,7 +31,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kinputdialog.h>
#include <kpushbutton.h>
#include <kactivelabel.h>
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 4605391f..135cf636 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -23,7 +23,7 @@
#include <kaction.h>
#include <kconfig.h>
#include <kgenericfactory.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kaboutdata.h>
#include "kopetemetacontact.h"
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 493f3575..5e990386 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -31,7 +31,7 @@
#include <tqapplication.h>
#include <tqlabel.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <klistview.h>
#include <kprocess.h>
#include <kprocio.h>
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index 5e8da39c..eead8241 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -245,7 +245,7 @@ void HighlightPreferences::slotEditRegExp()
TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
if ( editorDialog )
{
- // kdeutils was installed, so the dialog was found fetch the editor interface
+ // tdeutils was installed, so the dialog was found fetch the editor interface
KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) );
Q_ASSERT( editor ); // This should not fail!
// now use the editor.
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index f1401c85..8cd76682 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -21,7 +21,7 @@
#include <kmessagebox.h>
//#include <kconfig.h>
#include <kplugininfo.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "kopetechatsessionmanager.h"
#include "kopetemetacontact.h"
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 2d71c257..075fd04f 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -18,7 +18,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kaction.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kaboutdata.h>
#include "kopetepluginmanager.h"
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 8f25623e..0862d22b 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "statisticsdb.h"
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 79135598..b28ce8ce 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -23,7 +23,7 @@
#include <kaction.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "kopetechatsessionmanager.h"
#include "kopetemetacontact.h"
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index d2584328..e567f1a8 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -26,7 +26,7 @@
#include <kautoconfig.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "texteffectprefs.h"
#include "texteffectpreferences.h"
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 751b8294..64f2e8e7 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -30,7 +30,7 @@
#include <kgenericfactory.h>
#include <kglobal.h>
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kaboutdata.h>
#include "kopetemetacontact.h"
diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp
index d9d5f8e2..43febda9 100644
--- a/kopete/protocols/irc/ircguiclient.cpp
+++ b/kopete/protocols/irc/ircguiclient.cpp
@@ -16,7 +16,7 @@
#include <klocale.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#if KDE_IS_VERSION( 3, 1, 90 )
#include <kactioncollection.h>
#else
diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h
index b2e4dd55..d0c07594 100644
--- a/kopete/protocols/irc/kcodecaction.h
+++ b/kopete/protocols/irc/kcodecaction.h
@@ -17,7 +17,7 @@
#ifndef KCODECACTION_H
#define KCODECACTION_H
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqintdict.h>
#if KDE_IS_VERSION( 3, 1, 90 )
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index 872c6bc1..1be8651c 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -25,7 +25,7 @@
#include "kircmessageredirector.h"
#include "kirctransfer.h"
-#include <kdeversion.h>
+#include <tdeversion.h>
// FIXME: Move the following kdedebug class to the *.cpp.
#include <kdebug.h>
diff --git a/kopete/protocols/irc/libkirc/kircentity.h b/kopete/protocols/irc/libkirc/kircentity.h
index a8dc8fff..37a5b986 100644
--- a/kopete/protocols/irc/libkirc/kircentity.h
+++ b/kopete/protocols/irc/libkirc/kircentity.h
@@ -18,7 +18,7 @@
#ifndef KIRCENTITY_H
#define KIRCENTITY_H
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kresolver.h>
#include <ksharedptr.h>
diff --git a/kopete/protocols/jabber/libiris/002_offline_event.patch b/kopete/protocols/jabber/libiris/002_offline_event.patch
index dfaa1f8e..a97400e1 100644
--- a/kopete/protocols/jabber/libiris/002_offline_event.patch
+++ b/kopete/protocols/jabber/libiris/002_offline_event.patch
@@ -1,7 +1,7 @@
? 002_offline_event.patch
Index: iris/xmpp-im/types.cpp
===================================================================
-RCS file: /home/kde/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp,v
+RCS file: /home/kde/tdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp,v
retrieving revision 1.3
diff -u -p -r1.3 types.cpp
--- iris/xmpp-im/types.cpp 21 May 2004 14:35:44 -0000 1.3
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 88ad1528..93dc2f0e 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -33,7 +33,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <klocale.h>
#include <kmdcodec.h>
#include <kmessagebox.h>
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index 407550f3..a3ab2532 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kaboutdata.h>
#include "kopeteaccountmanager.h"
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index 3ee9ffed..ada01291 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -26,7 +26,7 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "kopeteaccount.h"
#include "kopetechatsessionmanager.h"
diff --git a/kppp/ChangeLog b/kppp/ChangeLog
index ed067258..e3657e16 100644
--- a/kppp/ChangeLog
+++ b/kppp/ChangeLog
@@ -331,7 +331,7 @@
1999-03-03 Harri Porten <porten@kde.org>
- * kdelibs have been switched to Qt 2.0. Replaced a lot of const char *
+ * tdelibs have been switched to Qt 2.0. Replaced a lot of const char *
with QString (or QString&) and removed ~100 .data() calls.
1999-02-16 Harri Porten <porten@kde.org>
diff --git a/kppp/README b/kppp/README
index c6c28d18..e177de5d 100644
--- a/kppp/README
+++ b/kppp/README
@@ -31,7 +31,7 @@ o new copy function on the account dialog
New in Verions 0.5.4
o nothing new, sorry. Just bug fixes and work to get kppp to compile
- with the new kdelibs and Qt 1.3
+ with the new tdelibs and Qt 1.3
New in Verions 0.5.3
diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp
index abdfed2e..087f7bd7 100644
--- a/krdc/keycapturedialog.cpp
+++ b/krdc/keycapturedialog.cpp
@@ -18,7 +18,7 @@
***************************************************************************/
//
-// based on key capture code from kdelibs/tdeui/kshortcutdialog.cpp
+// based on key capture code from tdelibs/tdeui/kshortcutdialog.cpp
//
#include "keycapturedialog.h"
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index 3fe84aa8..bd669edb 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -26,7 +26,7 @@
#include <kmessagebox.h>
#include <kglobalaccel.h>
#include <kkeydialog.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "KSPrefs/ksprefs.h"
diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp
index d63fba7b..d16f798a 100644
--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@@ -81,7 +81,7 @@
#include <tqpopupmenu.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog
index 089230f3..de5efc5d 100644
--- a/ktalkd/ChangeLog
+++ b/ktalkd/ChangeLog
@@ -315,7 +315,7 @@
user is found. It works !
* readcfg++.cpp (init_user_config):
- Added setenv("HOME",...) because the kdelibs rely on that to find
+ Added setenv("HOME",...) because the tdelibs rely on that to find
the user config file.
1998-05-15 David Faure <faure@kde.org> (0.5.5)
@@ -450,14 +450,14 @@
Added internationalization to atdlg.cpp. Had to change atdlg params.
User must set language in ktalkdrc.
Added more user options to ktalkdrc_user: Sound, SoundPlayer, SoundFile.
- Updated configure.in and acinclude.m4 to stick to kdenetwork as much
+ Updated configure.in and acinclude.m4 to stick to tdenetwork as much
as possible.
1998-01-14 David Faure <faure@kde.org> (0.2.5)
Moved -DHAVE_KDE from config.h (was a bad hack) to Makefile.am
Added AC_CHECK_GETDOMAINNAME and AC_CHECK_GETHOSTNAME...
and some other little changes to get closer to autoconf stuff from
- kdenetwork, for future integration. Worked on BSD portability.
+ tdenetwork, for future integration. Worked on BSD portability.
1998-01-12 David Faure <faure@kde.org> (0.2.4)
Changed acinclude.m4, to remove NULL, and to make check for osockaddr
diff --git a/ktalkd/ktalkd/announce.cpp b/ktalkd/ktalkd/announce.cpp
index 4606058f..73b72f30 100644
--- a/ktalkd/ktalkd/announce.cpp
+++ b/ktalkd/ktalkd/announce.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/* Autoconf: */
diff --git a/ktalkd/ktalkd/announce.h b/ktalkd/ktalkd/announce.h
index 7411cdb4..3dd08e02 100644
--- a/ktalkd/ktalkd/announce.h
+++ b/ktalkd/ktalkd/announce.h
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifndef ANNOUNCE_H
#define ANNOUNCE_H
diff --git a/ktalkd/ktalkd/defs.h b/ktalkd/ktalkd/defs.h
index a8de9ad3..31e58b32 100644
--- a/ktalkd/ktalkd/defs.h
+++ b/ktalkd/ktalkd/defs.h
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifndef __DEFS_H
diff --git a/ktalkd/ktalkd/find_user.cpp b/ktalkd/ktalkd/find_user.cpp
index 948a4dba..3791d354 100644
--- a/ktalkd/ktalkd/find_user.cpp
+++ b/ktalkd/ktalkd/find_user.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#include "includ.h"
diff --git a/ktalkd/ktalkd/find_user.h b/ktalkd/ktalkd/find_user.h
index bb9394a2..c7dcf6f2 100644
--- a/ktalkd/ktalkd/find_user.h
+++ b/ktalkd/ktalkd/find_user.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
diff --git a/ktalkd/ktalkd/includ.h b/ktalkd/ktalkd/includ.h
index 34971c51..41f36fbd 100644
--- a/ktalkd/ktalkd/includ.h
+++ b/ktalkd/ktalkd/includ.h
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifndef __INCLUD_H
diff --git a/ktalkd/ktalkd/machines/answmach.cpp b/ktalkd/ktalkd/machines/answmach.cpp
index 9dfaba19..8119a1dd 100644
--- a/ktalkd/ktalkd/machines/answmach.cpp
+++ b/ktalkd/ktalkd/machines/answmach.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
diff --git a/ktalkd/ktalkd/machines/answmach.h b/ktalkd/ktalkd/machines/answmach.h
index 7bae8d17..a07dd7fb 100644
--- a/ktalkd/ktalkd/machines/answmach.h
+++ b/ktalkd/ktalkd/machines/answmach.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
#include "../includ.h"
diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp
index 402e4f01..bbd491eb 100644
--- a/ktalkd/ktalkd/machines/forwmach.cpp
+++ b/ktalkd/ktalkd/machines/forwmach.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#include "../includ.h"
diff --git a/ktalkd/ktalkd/machines/forwmach.h b/ktalkd/ktalkd/machines/forwmach.h
index 8ad067f9..18b6a917 100644
--- a/ktalkd/ktalkd/machines/forwmach.h
+++ b/ktalkd/ktalkd/machines/forwmach.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
#ifndef FORWMACH_H
diff --git a/ktalkd/ktalkd/machines/talkconn.cpp b/ktalkd/ktalkd/machines/talkconn.cpp
index b2e5710a..a7ae93aa 100644
--- a/ktalkd/ktalkd/machines/talkconn.cpp
+++ b/ktalkd/ktalkd/machines/talkconn.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/*
diff --git a/ktalkd/ktalkd/machines/talkconn.h b/ktalkd/ktalkd/machines/talkconn.h
index dd08e10a..0a4d1b70 100644
--- a/ktalkd/ktalkd/machines/talkconn.h
+++ b/ktalkd/ktalkd/machines/talkconn.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifndef TALKCONNECTION_H
#define TALKCONNECTION_H
diff --git a/ktalkd/ktalkd/options.cpp b/ktalkd/ktalkd/options.cpp
index 5596f8ef..39aafa99 100644
--- a/ktalkd/ktalkd/options.cpp
+++ b/ktalkd/ktalkd/options.cpp
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#include "defs.h"
diff --git a/ktalkd/ktalkd/options.h b/ktalkd/ktalkd/options.h
index 42b72350..6ffe4610 100644
--- a/ktalkd/ktalkd/options.h
+++ b/ktalkd/ktalkd/options.h
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifndef OPTIONS_H
diff --git a/ktalkd/ktalkd/otalkd.h b/ktalkd/ktalkd/otalkd.h
index cacb17ca..24b1efc9 100644
--- a/ktalkd/ktalkd/otalkd.h
+++ b/ktalkd/ktalkd/otalkd.h
@@ -27,7 +27,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifndef OTALKD_H
diff --git a/ktalkd/ktalkd/print.c b/ktalkd/ktalkd/print.c
index ea8fe95c..9ebfb230 100644
--- a/ktalkd/ktalkd/print.c
+++ b/ktalkd/ktalkd/print.c
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/* debug print routines */
diff --git a/ktalkd/ktalkd/process.cpp b/ktalkd/ktalkd/process.cpp
index ce67a2b4..436c9dba 100644
--- a/ktalkd/ktalkd/process.cpp
+++ b/ktalkd/ktalkd/process.cpp
@@ -29,7 +29,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/*
diff --git a/ktalkd/ktalkd/process.h b/ktalkd/ktalkd/process.h
index 090824ff..7a682c94 100644
--- a/ktalkd/ktalkd/process.h
+++ b/ktalkd/ktalkd/process.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
diff --git a/ktalkd/ktalkd/prot_talkd.h b/ktalkd/ktalkd/prot_talkd.h
index eca1e64b..6c8725c6 100644
--- a/ktalkd/ktalkd/prot_talkd.h
+++ b/ktalkd/ktalkd/prot_talkd.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
* @(#)talkd.h 8.1 (Berkeley) 6/2/93
*/
diff --git a/ktalkd/ktalkd/proto.h b/ktalkd/ktalkd/proto.h
index ca74416c..c9285ebb 100644
--- a/ktalkd/ktalkd/proto.h
+++ b/ktalkd/ktalkd/proto.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#ifdef __cplusplus
diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp
index 53090af0..974d7ea8 100644
--- a/ktalkd/ktalkd/readcfg++.cpp
+++ b/ktalkd/ktalkd/readcfg++.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
diff --git a/ktalkd/ktalkd/readconf.cpp b/ktalkd/ktalkd/readconf.cpp
index 7b48b0c1..e450903b 100644
--- a/ktalkd/ktalkd/readconf.cpp
+++ b/ktalkd/ktalkd/readconf.cpp
@@ -31,7 +31,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
diff --git a/ktalkd/ktalkd/readconf.h b/ktalkd/ktalkd/readconf.h
index b80b6a02..dd9ab97e 100644
--- a/ktalkd/ktalkd/readconf.h
+++ b/ktalkd/ktalkd/readconf.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/** Warning to ktalkd hackers : this file is the definition of a
diff --git a/ktalkd/ktalkd/table.cpp b/ktalkd/ktalkd/table.cpp
index 1a3713e3..476267e8 100644
--- a/ktalkd/ktalkd/table.cpp
+++ b/ktalkd/ktalkd/table.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/*
diff --git a/ktalkd/ktalkd/table.h b/ktalkd/ktalkd/table.h
index edeba232..3ead7200 100644
--- a/ktalkd/ktalkd/table.h
+++ b/ktalkd/ktalkd/table.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*
*/
#ifndef TABLE_H
diff --git a/ktalkd/ktalkd/talkd.cpp b/ktalkd/ktalkd/talkd.cpp
index 3914ada2..0bd156f4 100644
--- a/ktalkd/ktalkd/talkd.cpp
+++ b/ktalkd/ktalkd/talkd.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
char copyright[] =
diff --git a/ktalkd/ktalkd/threads.cpp b/ktalkd/ktalkd/threads.cpp
index c0c7b5d8..2cee3338 100644
--- a/ktalkd/ktalkd/threads.cpp
+++ b/ktalkd/ktalkd/threads.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#include <stdlib.h>
diff --git a/ktalkd/ktalkd/threads.h b/ktalkd/ktalkd/threads.h
index 280262da..600ae53b 100644
--- a/ktalkd/ktalkd/threads.h
+++ b/ktalkd/ktalkd/threads.h
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
/** Register a new process (by just increasing the number of tqchildren */
diff --git a/ktalkd/ktalkd/unixsock.cpp b/ktalkd/ktalkd/unixsock.cpp
index 9547ccf5..93b939ec 100644
--- a/ktalkd/ktalkd/unixsock.cpp
+++ b/ktalkd/ktalkd/unixsock.cpp
@@ -28,7 +28,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * (BSD License, from kdelibs/doc/common/bsd-license.html)
+ * (BSD License, from tdelibs/doc/common/bsd-license.html)
*/
#include <config.h>
diff --git a/lanbrowsing/kio_lan/Makefile.am b/lanbrowsing/kio_lan/Makefile.am
index e0f76e4b..c7a22ed6 100644
--- a/lanbrowsing/kio_lan/Makefile.am
+++ b/lanbrowsing/kio_lan/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of kdebase/kioslave/man
+## Makefile.am of tdebase/kioslave/man
INCLUDES= $(all_includes)
diff --git a/lanbrowsing/kio_lan/README b/lanbrowsing/kio_lan/README
index 0a49f83c..08b6278a 100644
--- a/lanbrowsing/kio_lan/README
+++ b/lanbrowsing/kio_lan/README
@@ -8,9 +8,9 @@ use the automake/configure stuff.
On some systems (e.g. Solaris) you will have to add some libraries, like
-lnsl, I think.
-Copy this directory e.g. under kdebase/kioslave and enter it in
-kdebase/kioslave/Makefile.am in the SUBDIR line. The rerun make in
-kdebase/kioslave.
+Copy this directory e.g. under tdebase/kioslave and enter it in
+tdebase/kioslave/Makefile.am in the SUBDIR line. The rerun make in
+tdebase/kioslave.
Alexander Neundorf
<neundorf@kde.org>
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 7fe46f95..f67ffccc 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -612,7 +612,7 @@ TQStringList usedInterfacesList()
client->registerAs( "kwifimanager" );
client->setDefaultObject( "dcop_interface" );
- // shamelessly stolen from kdelibs/kio/booksmarks/kbookmarkimporter_crash.cc
+ // shamelessly stolen from tdelibs/kio/booksmarks/kbookmarkimporter_crash.cc
TQStringList ignoreInterfaces;
QCStringList apps = client->registeredApplications();
for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
diff --git a/wifi/pixmaps/README b/wifi/pixmaps/README
index 0464e53e..2d24676b 100644
--- a/wifi/pixmaps/README
+++ b/wifi/pixmaps/README
@@ -1,2 +1,2 @@
Connection type SVG files and their accompanying PNG files Copyright Jonathan Riddell jr_AT_jriddell.org 2004.
-They may be copied under the LGPL with add-on as found in kdelibs/pics/LICENSE.crystalsvg
+They may be copied under the LGPL with add-on as found in tdelibs/pics/LICENSE.crystalsvg