summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
Diffstat (limited to 'kio')
-rw-r--r--kio/bookmarks/kbookmarkmanager.h2
-rw-r--r--kio/kfile/kdiskfreesp.h2
-rw-r--r--kio/kfile/kfile.h2
-rw-r--r--kio/kfile/kpreviewwidgetbase.h2
-rw-r--r--kio/kfile/krecentdirs.h2
-rw-r--r--kio/kfile/tests/kcustommenueditortest.cpp2
-rw-r--r--kio/kfile/tests/kfstest.cpp2
-rw-r--r--kio/kio/connection.h2
-rw-r--r--kio/kio/karchive.h2
-rw-r--r--kio/kio/kautomount.h2
-rw-r--r--kio/kio/kdatatool.cpp2
-rw-r--r--kio/kio/kdirwatch.h2
-rw-r--r--kio/kio/kemailsettings.h2
-rw-r--r--kio/kio/kfilefilter.h2
-rw-r--r--kio/kio/kfileshare.h2
-rw-r--r--kio/kio/kfilterbase.h2
-rw-r--r--kio/kio/kfilterdev.h2
-rw-r--r--kio/kio/kimageio.h2
-rw-r--r--kio/kio/kmimemagic.h2
-rw-r--r--kio/kio/kmimetypechooser.cpp2
-rw-r--r--kio/kio/knfsshare.h2
-rw-r--r--kio/kio/ksambashare.h2
-rw-r--r--kio/kio/kscan.h2
-rw-r--r--kio/kio/ktrader.h4
-rw-r--r--kio/kio/skipdlg.h2
-rw-r--r--kio/kio/thumbcreator.h2
-rw-r--r--kio/kpasswdserver/Makefile.am2
-rw-r--r--kio/kssl/kssl/HOWTO2
-rw-r--r--kio/kssl/ksslcertificate.h2
-rw-r--r--kio/kssl/ksslcertificatecache.h2
-rw-r--r--kio/kssl/ksslcertificatefactory.h2
-rw-r--r--kio/kssl/ksslcertificatehome.h2
-rw-r--r--kio/kssl/ksslconnectioninfo.h2
-rw-r--r--kio/kssl/ksslcsessioncache.h2
-rw-r--r--kio/kssl/ksslpemcallback.h2
-rw-r--r--kio/kssl/ksslsession.h2
-rw-r--r--kio/kssl/ksslsigners.h2
-rw-r--r--kio/kssl/ksslx509map.h2
-rw-r--r--kio/kssl/ksslx509v3.h2
-rw-r--r--kio/misc/kmailservice.cpp2
-rw-r--r--kio/misc/kntlm/kntlm.h2
-rw-r--r--kio/misc/ksendbugmail/main.cpp2
-rw-r--r--kio/misc/ktelnetservice.cpp2
-rw-r--r--kio/misc/tdesasl/tdesasl.h2
-rw-r--r--kio/misc/uiserver.cpp2
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kio/tests/kacltest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp4
48 files changed, 50 insertions, 50 deletions
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index 403a2e1b3..f2d4021f7 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/kio/bookmarks/kbookmarkmanager.h
@@ -44,7 +44,7 @@
* <title>My own bookmarks</title>
* <bookmark href="http://www.koffice.org"><title>KOffice Web Site</title></bookmark>
* <separator/>
- * <bookmark href="http://www.kdevelop.org"><title>KDevelop Web Site</title></bookmark>
+ * <bookmark href="http://www.tdevelop.org"><title>KDevelop Web Site</title></bookmark>
* </folder>
* </folder>
* </xbel>
diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h
index 5fccfe3b0..b7286f2df 100644
--- a/kio/kfile/kdiskfreesp.h
+++ b/kio/kfile/kdiskfreesp.h
@@ -29,7 +29,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KProcess;
diff --git a/kio/kfile/kfile.h b/kio/kfile/kfile.h
index 91f4f4599..8e6541cb3 100644
--- a/kio/kfile/kfile.h
+++ b/kio/kfile/kfile.h
@@ -20,7 +20,7 @@
#include <tqdir.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* KFile is a class which provides a namespace for some enumerated
diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h
index 05176964f..e4c77c600 100644
--- a/kio/kfile/kpreviewwidgetbase.h
+++ b/kio/kfile/kpreviewwidgetbase.h
@@ -24,7 +24,7 @@
#include <tqptrdict.h>
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KURL;
diff --git a/kio/kfile/krecentdirs.h b/kio/kfile/krecentdirs.h
index 439fb6fe0..e8c6c9419 100644
--- a/kio/kfile/krecentdirs.h
+++ b/kio/kfile/krecentdirs.h
@@ -30,7 +30,7 @@
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
index 532297d0c..859e75452 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/kio/kfile/tests/kcustommenueditortest.cpp
@@ -5,7 +5,7 @@
int main(int argc, char** argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KCustomMenuEditorTest");
KCustomMenuEditor editor(0);
KConfig *cfg = new KConfig("kdesktop_custom_menu2");
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index 48c8a1a2b..aad57b257 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
TQString::tqfromLatin1("*|All Files\n"
"*.lo *.o *.la|All libtool Files"),
0, 0, true);
-// dlg.setFilter( "*.kdevelop" );
+// dlg.setFilter( "*.tdevelop" );
dlg.setMode( (KFile::Mode) (KFile::Files |
KFile::Directory |
KFile::ExistingOnly |
diff --git a/kio/kio/connection.h b/kio/kio/connection.h
index 758202968..a30131af8 100644
--- a/kio/kio/connection.h
+++ b/kio/kio/connection.h
@@ -22,7 +22,7 @@
#ifndef __connection_h__
#define __connection_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <sys/types.h>
diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h
index ff1fe1f7c..6f0b57cbc 100644
--- a/kio/kio/karchive.h
+++ b/kio/kio/karchive.h
@@ -29,7 +29,7 @@
#include <tqstringlist.h>
#include <tqdict.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KArchiveDirectory;
class KArchiveFile;
diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h
index e73edec35..c5aa30583 100644
--- a/kio/kio/kautomount.h
+++ b/kio/kio/kautomount.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_MOC_RUN
#define Q_OS_UNIX
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index 339b95136..798a37d95 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -177,7 +177,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
else
constr = constr + " and " + tmp;
}
-/* Bug in KTrader ? Test with HEAD-kdelibs!
+/* Bug in KTrader ? Test with HEAD-tdelibs!
if ( instance )
{
TQString tmp = TQString::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h
index e04b0ad1e..ac33a6ed5 100644
--- a/kio/kio/kdirwatch.h
+++ b/kio/kio/kdirwatch.h
@@ -22,7 +22,7 @@
#include <tqdatetime.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#define kdirwatch KDirWatch::self()
diff --git a/kio/kio/kemailsettings.h b/kio/kio/kemailsettings.h
index f072fa7f9..9d35675c6 100644
--- a/kio/kio/kemailsettings.h
+++ b/kio/kio/kemailsettings.h
@@ -31,7 +31,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KEMailSettingsPrivate;
diff --git a/kio/kio/kfilefilter.h b/kio/kio/kfilefilter.h
index c2076f0e0..b17d2fe74 100644
--- a/kio/kio/kfilefilter.h
+++ b/kio/kio/kfilefilter.h
@@ -28,7 +28,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQRegExp;
class KFileItem;
diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h
index a7158bf71..e46d0903b 100644
--- a/kio/kio/kfileshare.h
+++ b/kio/kio/kfileshare.h
@@ -21,7 +21,7 @@
#define kfileshare_h
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KDirWatch;
diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h
index b46706241..a9d143b6c 100644
--- a/kio/kio/kfilterbase.h
+++ b/kio/kio/kfilterbase.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_WS_WIN
#undef ERROR //avoid conflicts
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index e5280542d..2df49f2cc 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -20,7 +20,7 @@
#include <tqiodevice.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQFile;
class KFilterBase;
diff --git a/kio/kio/kimageio.h b/kio/kio/kimageio.h
index dba18c8fd..3c14fb54d 100644
--- a/kio/kio/kimageio.h
+++ b/kio/kio/kimageio.h
@@ -10,7 +10,7 @@
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Interface to the KDE Image IO plugin architecture.
diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h
index d73dd306a..c54c94126 100644
--- a/kio/kio/kmimemagic.h
+++ b/kio/kio/kmimemagic.h
@@ -31,7 +31,7 @@
#define KMIMEMAGIC_H
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMimeMagic; // see below (read this one first)
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index c9cdf9a06..d4d7b620a 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -122,7 +122,7 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes )
d->lvMimeTypes->clear();
TQMap<TQString,TQListViewItem*> groups;
- // thanks to kdebase/kcontrol/filetypes/filetypesview
+ // thanks to tdebase/kcontrol/filetypes/filetypesview
KMimeType::List mimetypes = KMimeType::allMimeTypes();
TQValueListIterator<KMimeType::Ptr> it(mimetypes.begin());
diff --git a/kio/kio/knfsshare.h b/kio/kio/knfsshare.h
index d1852d0f2..fd6587600 100644
--- a/kio/kio/knfsshare.h
+++ b/kio/kio/knfsshare.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KNFSSharePrivate;
diff --git a/kio/kio/ksambashare.h b/kio/kio/ksambashare.h
index 383bd702f..ba922ecf5 100644
--- a/kio/kio/ksambashare.h
+++ b/kio/kio/ksambashare.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSambaSharePrivate;
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index c7b8d97f0..5306156ac 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -29,7 +29,7 @@ class TQImage;
/**
* This is a base class for scanning dialogs. You can derive from this class
* and implement your own dialog. An implementation is available in
- * kdegraphics/libkscan.
+ * tdegraphics/libkscan.
*
* Application developers that wish to add scanning support to their program
* can use the static method @p KScanDialog::getScanDialog() to get an instance
diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h
index 4b2690dc7..c1547a35c 100644
--- a/kio/kio/ktrader.h
+++ b/kio/kio/ktrader.h
@@ -124,7 +124,7 @@ public:
* a number
*
* @return A list of services that satisfy the query
- * @see http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/kio/kio/html/tradersyntax.html
+ * @see http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/kio/kio/html/tradersyntax.html
*/
virtual OfferList query( const TQString& servicetype,
const TQString& constraint = TQString::null,
@@ -288,7 +288,7 @@ protected:
* - <tt>('KParts/ReadOnlyPart' in ServiceTypes) and ('text/plain' in ServiceTypes)</tt>@n
* All read-only KParts that handle the mime type 'text/plain'.
*
- * @author Bernd Gehrmann <a href="mailto:bernd@kdevelop.org">bernd@kdevelop.org</a>
+ * @author Bernd Gehrmann <a href="mailto:bernd@tdevelop.org">bernd@tdevelop.org</a>
*/
diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h
index 87b8823ed..dbf583ef0 100644
--- a/kio/kio/skipdlg.h
+++ b/kio/kio/skipdlg.h
@@ -19,7 +19,7 @@
#ifndef __kio_skip_dlg__
#define __kio_skip_dlg__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <kdialog.h>
class TQPushButton;
diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h
index ce8696a19..17a7fac30 100644
--- a/kio/kio/thumbcreator.h
+++ b/kio/kio/thumbcreator.h
@@ -28,7 +28,7 @@ class TQImage;
* This is the baseclass for "thumbnail-plugins" in KDE. Using the class
* KIO::PreviewJob allows you to generate small images (thumbnails)
* for any kind of file, where a "ThumbCreator" is available. Have a look
- * at kdebase/kioslave/thumbnail/ for existing ThumbCreators.
+ * at tdebase/kioslave/thumbnail/ for existing ThumbCreators.
*
* What you need to do to create and register a ThumbCreator:
* @li Inherit from this class and reimplement the create() method to
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index 863055f61..694718de4 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -1,5 +1,5 @@
# $Id$
-# Makefile.am of kdebase/kioslave/http
+# Makefile.am of tdebase/kioslave/http
INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
diff --git a/kio/kssl/kssl/HOWTO b/kio/kssl/kssl/HOWTO
index b5d1a8a1a..9a74e418b 100644
--- a/kio/kssl/kssl/HOWTO
+++ b/kio/kssl/kssl/HOWTO
@@ -24,7 +24,7 @@ maintainer (currently bradh@kde.org) with full details.
To add local files:
-1) Create the .pem file and check it into cvs in kdelibs/kio/kssl/kssl.
+1) Create the .pem file and check it into cvs in tdelibs/kio/kssl/kssl.
2) List the pem file name as a single line in 'localcerts'.
diff --git a/kio/kssl/ksslcertificate.h b/kio/kssl/ksslcertificate.h
index 16dbb2082..a7906581a 100644
--- a/kio/kssl/ksslcertificate.h
+++ b/kio/kssl/ksslcertificate.h
@@ -47,7 +47,7 @@ class TQDateTime;
class KSSLCertChain;
class KSSLX509V3;
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_WS_WIN
#include "ksslconfig_win.h"
diff --git a/kio/kssl/ksslcertificatecache.h b/kio/kssl/ksslcertificatecache.h
index 03ee1edbc..486997265 100644
--- a/kio/kssl/ksslcertificatecache.h
+++ b/kio/kssl/ksslcertificatecache.h
@@ -26,7 +26,7 @@ class KSSLCertificate;
#include <tqstringlist.h>
#include <tqdatetime.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KIO_EXPORT KSSLCertificateCache {
public:
diff --git a/kio/kssl/ksslcertificatefactory.h b/kio/kssl/ksslcertificatefactory.h
index eb2807642..c259e60e8 100644
--- a/kio/kssl/ksslcertificatefactory.h
+++ b/kio/kssl/ksslcertificatefactory.h
@@ -23,7 +23,7 @@
#ifndef _KSSLCERTIFICATEFACTORY_H
#define _KSSLCERTIFICATEFACTORY_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSSLCertificate;
diff --git a/kio/kssl/ksslcertificatehome.h b/kio/kssl/ksslcertificatehome.h
index 1a77c1d26..549d7c168 100644
--- a/kio/kssl/ksslcertificatehome.h
+++ b/kio/kssl/ksslcertificatehome.h
@@ -26,7 +26,7 @@ class KSSLPKCS12;
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KIO_EXPORT KSSLCertificateHome {
diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h
index 4d82c6ce2..e9bbad831 100644
--- a/kio/kssl/ksslconnectioninfo.h
+++ b/kio/kssl/ksslconnectioninfo.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSSL;
diff --git a/kio/kssl/ksslcsessioncache.h b/kio/kssl/ksslcsessioncache.h
index 231b40643..4cfc77aaf 100644
--- a/kio/kssl/ksslcsessioncache.h
+++ b/kio/kssl/ksslcsessioncache.h
@@ -21,7 +21,7 @@
#ifndef __KSSLCSESSIONCACHE_H
#define __KSSLCSESSIONCACHE_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KURL;
class TQString;
diff --git a/kio/kssl/ksslpemcallback.h b/kio/kssl/ksslpemcallback.h
index a289da00e..0a8978b6e 100644
--- a/kio/kssl/ksslpemcallback.h
+++ b/kio/kssl/ksslpemcallback.h
@@ -21,7 +21,7 @@
#ifndef _kde_ksslpemcallback_h
#define _kde_ksslpemcallback_h
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h
index 202781418..d8689833f 100644
--- a/kio/kssl/ksslsession.h
+++ b/kio/kssl/ksslsession.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSSL;
diff --git a/kio/kssl/ksslsigners.h b/kio/kssl/ksslsigners.h
index 476c76530..21744f1de 100644
--- a/kio/kssl/ksslsigners.h
+++ b/kio/kssl/ksslsigners.h
@@ -27,7 +27,7 @@ class DCOPClient;
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
// ### KDE4 - Fix constness
/**
diff --git a/kio/kssl/ksslx509map.h b/kio/kssl/ksslx509map.h
index e0b37fb26..93c46aeec 100644
--- a/kio/kssl/ksslx509map.h
+++ b/kio/kssl/ksslx509map.h
@@ -24,7 +24,7 @@
#include <tqmap.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* X.509 Map Parsing Class
diff --git a/kio/kssl/ksslx509v3.h b/kio/kssl/ksslx509v3.h
index fb163de34..45c7d706e 100644
--- a/kio/kssl/ksslx509v3.h
+++ b/kio/kssl/ksslx509v3.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
// ### KDE4: fix constness of methods
/**
diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp
index 35d829515..4413911a8 100644
--- a/kio/misc/kmailservice.cpp
+++ b/kio/misc/kmailservice.cpp
@@ -28,7 +28,7 @@ static const KCmdLineOptions options[] =
int main( int argc, char **argv )
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
KCmdLineArgs::addCmdLineOptions( options );
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 8a89001ab..2be0a00af 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -24,7 +24,7 @@
#include <tqcstring.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short KNTLM class implements the NTLM authentication protocol.
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index d6c852f68..46475e9aa 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -58,7 +58,7 @@ void BugMailer::slotSend() {
int main(int argc, char **argv) {
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index aa7b3b226..4b21ef799 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -37,7 +37,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"),
I18N_NOOP("telnet protocol handler"), "unknown");
KCmdLineArgs::addCmdLineOptions(options);
diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h
index 824b49863..1f68ac688 100644
--- a/kio/misc/tdesasl/tdesasl.h
+++ b/kio/misc/tdesasl/tdesasl.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KURL;
class TQStrIList;
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 3dd862b54..87f95fb29 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -1377,7 +1377,7 @@ UIServer* UIServer::createInstance()
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
// GS 5/2001 - I changed the name to "TDE" to make it look better
// in the titles of dialogs which are displayed.
KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 3cd33a8f8..3b7a6c6d3 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -44,7 +44,7 @@
#include <time.h>
#include <utime.h>
-// The code comes partly from kdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
static bool check(const TQString& txt, TQString a, TQString b)
{
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index 372589dd9..348d35e34 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -34,7 +34,7 @@
#include <assert.h>
#include <tqdir.h>
-// The code comes partly from kdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
static bool check(const TQString& txt, TQString a, TQString b)
{
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index dca72c234..9f4477e5e 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -292,7 +292,7 @@ int main(int argc, char **argv)
TQCString home = getenv("HOME");
TQCString kdehome = getenv("KDEHOME");
- filter( "$SOMEVAR/kdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
+ filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
@@ -325,7 +325,7 @@ int main(int argc, char **argv)
KStandardDirs::makeDir( kdehome+"/share/Dir[Bracket" );
filter( "$KDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
- filter( "$HOME/$KDEDIR/kdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
+ filter( "$HOME/$KDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
filter( "$1/$2/$3", "http://www.google.com/search?q=$1/$2/$3&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // can be used as bogus or valid test. Currently triggers default search, i.e. google
filter( "$$$$", "http://www.google.com/search?q=$$$$&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // worst case scenarios.