TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/16/head
Timothy Pearson 12 years ago
parent 818e7abec3
commit 703fb0c89c
623 changed files with 6007 additions and 6007 deletions
Show Stats Download Patch File Download Diff File

20
KDE2PORTING.html
Unescape Escape View File

@ -31,7 +31,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#khtmlw">khtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
<LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
<LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI>
<LI><A HREF="#libkfm">libkfm</A></LI>
<LI><A HREF="#KDialog">KDialog</A></LI>
<LI><A HREF="#kcharsets">kcharsets</A></LI>
@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.<P>
<TD COLSPAN="2">
<PRE>
#include &lt;kglobal.h&gt;
#include &lt;kconfig.h&gt; // Needed to use KConfig
#include &lt;kconfig.h&gt; // Needed to use TDEConfig
#include &lt;klocale.h&gt; // Needed to use KLocale
#include &lt;kiconloader.h&gt; // Needed to use KIconLoader
</PRE>
@ -215,7 +215,7 @@ must have created a TDEApplication object before the methods can be used.<P>
<TD>
<PRE>
...
KConfig *appcfg = TDEGlobal::config();
TDEConfig *appcfg = TDEGlobal::config();
TQString mystr = i18n( "This is a string" );
@ -469,17 +469,17 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<H3><A NAME="KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></H3>
<H3><A NAME="TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></H3>
These classes have been largely re-implemented. The external API
remains mostly the same, with the single notable change that
the groupIterator and entryIterator methods have been removed and
instead replaced by groupList (which returns a TQStringList of groups)
and entryMap(const TQString &amp;group) (which returns a TQMap of entries
in the specified group). This is due to internal changes in KConfig
in the specified group). This is due to internal changes in TDEConfig
which would make providing iterators possibly rather difficult.<P>
Much more extensive documentation on the KConfig and friends API can
Much more extensive documentation on the TDEConfig and friends API can
be found in the kdoc generated documentation from the header files,
and in tdecore/KCONFIG_DESIGN.<P>
@ -505,16 +505,16 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<STRONG> Replacement table :</STRONG><P>
<TABLE BORDER="1">
<TR><TD>KFM::download </TD><TD>-&gt; KIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
<TR><TD>KFM::removeTempFile </TD><TD>-&gt; KIO::NetAccess::removeTempFile</TD></TR>
<TR><TD>KFM::download </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
<TR><TD>KFM::removeTempFile </TD><TD>-&gt; TDEIO::NetAccess::removeTempFile</TD></TR>
<TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR>
<TR><TD>KFM::configure </TD><TD>-&gt; see konqueror DCOP interface</TD></TR>
<TR><TD>KFM::openURL </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::refreshDirectory </TD><TD>-&gt; not needed anymore since konqy/kdesktop use KDirWatch</TD></TR>
<TR><TD>KFM::openProperties </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR>
<TR><TD>KFM::exec </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; TDEIO::Job (async, see kio/job.h)<BR>
or TDEIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
<TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
</TABLE>

10
KDE3PORTING.html
Unescape Escape View File

@ -391,7 +391,7 @@ TQString&) is not a slot anymore.
<li>setMaxCacheAge( int )
<li>setUseCache( bool )
<li>setMaxCacheSize( int )
<li>setCacheControl( KIO::CacheControl )
<li>setCacheControl( TDEIO::CacheControl )
<li>setUseProxy( bool )
<li>setUseReverseProxy( bool )
<li>setProxyType( ProxyType )
@ -406,7 +406,7 @@ TQString&) is not a slot anymore.
<li>In order to support files &gt; 4Gb, the file size / file-offset argument
in the signals totalSize, processedSize and canResume, which are used
by the io-slaves and passed along to jobs, has been changed from
<b>unsigned long</b> to <b>KIO::filesize_t</b>.
<b>unsigned long</b> to <b>TDEIO::filesize_t</b>.
Make sure to check if you use these signals since your compiler
will typically not generate a compile-time error for these changes,
instead you might get a run-time error when you try to connect to
@ -568,7 +568,7 @@ sorting is utilized by letting its view-items provide a TQString key() method. T
KFileView offers the two methods
<ul>
<li>TQString sortingKey( const TQString&amp; value, bool isDir, int sortSpec )</li>
<li>TQString sortingKey( KIO::filesize_t value, bool isDir, int sortSpec )</li>
<li>TQString sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec )</li>
</ul>
which the view-classes can use to generate the string for the key() method. The KFile::SortMode
enum has been removed, as TQDir::SortSpec is used entirely.
@ -577,8 +577,8 @@ enum has been removed, as TQDir::SortSpec is used entirely.
Further changes:
<table>
<tr><th>Old:</th><th>New:</th></tr>
<tr><td>not existant</td><td>virtual void readConfig( KConfig *, const TQString&amp; group = TQString::null )</td></tr>
<tr><td>not existant</td><td>void writeConfig( KConfig *, const TQString&amp; group = TQString::null)</td></tr>
<tr><td>not existant</td><td>virtual void readConfig( TDEConfig *, const TQString&amp; group = TQString::null )</td></tr>
<tr><td>not existant</td><td>void writeConfig( TDEConfig *, const TQString&amp; group = TQString::null)</td></tr>
<tr><td>virtual void setCurrentItem( const TQString&amp; filename, KFileViewItem * )</td><td>Replaced with the two methods below.</td></tr>
<tr><td>&nbsp;</td><td>void setCurrentItem( const TQString&amp; filename );</td></tr>
<tr><td>&nbsp;</td><td>virtual void setCurrentItem( const KFileViewItem * ) = 0;</td></tr>

12
TODO
Unescape Escape View File

@ -3,7 +3,7 @@ that we would like to make for the next binary incompatible release.
- Check for forked classes in kde pim and other modules
- There is no reason why KConfigBase should inherit from QObject, get rid of that.
- There is no reason why TDEConfigBase should inherit from QObject, get rid of that.
- Change all FooPrivate *d; -> Private * const d; and place initialization
in the constructor (for classes that would benefit from this). To help catch silly
@ -24,7 +24,7 @@ that we would like to make for the next binary incompatible release.
See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain
Also free the client from the requirement to inherit from KShared.
- Remove all KSocket, KServerSocket, KSocks and KExtendedSocket references
- Remove all TDESocket, TDEServerSocket, KSocks and KExtendedSocket references
throughout KDE in favor of KNetwork's socket implementations.
Also, revise the namespace usage.
thiago.macieira@kdemail.net
@ -88,7 +88,7 @@ that we would like to make for the next binary incompatible release.
- Other ideas in this thread: http://lists.kde.org/?l=kde-core-devel&m=107608067302571&w=2
(Contributors to that thread, please add specific items here.)
- KConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc.
- TDEConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc.
for the default value, add overloads that use a const reference, so that one can write
resize( config->readSizeEntry( "Bleh", size() ); for example. Constructing a null
QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) .
@ -110,7 +110,7 @@ that we would like to make for the next binary incompatible release.
calls (readBoolEntry()). Although not technicaly a binary incompatiblity...
just something to bring up for possible change (for the better)
Use KConfigXT instead! /FransE
Use TDEConfigXT instead! /FransE
- Is it really necessary to bother people using the KCM APIs with withFallback? I have
never heard of it failing and when would you not like to have that fallback? I think
@ -118,7 +118,7 @@ that we would like to make for the next binary incompatible release.
- Do we need to have factory arguments in the KCM API? (who would use it anyway?)
- KCModuleInfo should use d-pointer. Perhaps there is more classes.
- TDECModuleInfo should use d-pointer. Perhaps there is more classes.
- The config options in kdeglobals needs to be cleaned up a little. Perhaps I'm being picky..
* They should be named properly, for example "enableIcons" instead of "EnableIcons". Or atleast
@ -212,7 +212,7 @@ an alternative help->contents action)
- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
"dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
- Move KIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
- Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
to merge that code.
- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.

2
arts/kde/kartsserver.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
// aRts seems not to be running, let's try to run it
// First, let's read the configuration as in kcmarts
KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
TDEConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
TDEProcess proc;
config.setGroup("Arts");

42
arts/kde/kioinputstream_impl.cpp
Unescape Escape View File

@ -75,19 +75,19 @@ void KIOInputStream_impl::streamStart()
if(m_job != 0)
m_job->kill();
m_job = KIO::get(m_url, false, false);
m_job = TDEIO::get(m_url, false, false);
m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
TQObject::connect(m_job, TQT_SIGNAL(result(KIO::Job *)),
this, TQT_SLOT(slotResult(KIO::Job *)));
TQObject::connect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
TQObject::connect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
this, TQT_SLOT(slotResult(TDEIO::Job *)));
TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
m_streamStarted = true;
}
@ -98,14 +98,14 @@ void KIOInputStream_impl::streamEnd()
if(m_job != 0)
{
TQObject::disconnect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
TQObject::disconnect(m_job, TQT_SIGNAL(result(KIO::Job *)),
this, TQT_SLOT(slotResult(KIO::Job *)));
TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
this, TQT_SLOT(slotResult(TDEIO::Job *)));
TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
if ( m_streamPulled )
outdata.endPull();
@ -124,7 +124,7 @@ bool KIOInputStream_impl::openURL(const std::string& url)
return true;
}
void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data)
{
if(m_finished)
m_finished = false;
@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
processQueue();
}
void KIOInputStream_impl::slotResult(KIO::Job *job)
void KIOInputStream_impl::slotResult(TDEIO::Job *job)
{
// jobs delete themselves after emitting their result
m_finished = true;
@ -151,13 +151,13 @@ void KIOInputStream_impl::slotResult(KIO::Job *job)
}
}
void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const TQString &mimetype)
void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype)
{
kdDebug( 400 ) << "got mimetype: " << mimetype << endl;
emit mimeTypeFound(mimetype);
}
void KIOInputStream_impl::slotTotalSize(KIO::Job *, KIO::filesize_t size)
void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size)
{
m_size = size;
}

12
arts/kde/kioinputstream_impl.h
Unescape Escape View File

@ -62,14 +62,14 @@ signals:
void mimeTypeFound(const TQString & mimetype);
private slots:
void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
void slotScanMimeType(KIO::Job *, const TQString &mimetype);
void slotTotalSize(KIO::Job *, KIO::filesize_t size);
void slotData(TDEIO::Job *, const TQByteArray &);
void slotResult(TDEIO::Job *);
void slotScanMimeType(TDEIO::Job *, const TQString &mimetype);
void slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size);
private:
KURL m_url;
KIO::TransferJob *m_job;
TDEIO::TransferJob *m_job;
TQByteArray m_data;
bool m_finished;
bool m_firstBuffer;
@ -79,7 +79,7 @@ private:
unsigned int m_packetBuffer;
const unsigned int m_packetSize;
KIO::filesize_t m_size;
TDEIO::filesize_t m_size;
static const unsigned int PACKET_COUNT;
};

4
arts/kde/kplayobjectfactory.cc
Unescape Escape View File

@ -69,7 +69,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri
// I hate it
// It sucks
// kio_media please die
KURL url = KIO::NetAccess::mostLocalURL(_url, 0);
KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
if(!m_server.isNull())
{
@ -140,7 +140,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
// I hate it
// It sucks
// kio_media please die
KURL url = KIO::NetAccess::mostLocalURL(_url, 0);
KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
// return a NULL playobject if the server is NULL
if ( d->server.isNull() || url.isEmpty() )

32
arts/knotify/knotify.cpp
Unescape Escape View File

@ -73,10 +73,10 @@
class KNotifyPrivate
{
public:
KConfig* globalEvents;
KConfig* globalConfig;
TQMap<TQString, KConfig*> events;
TQMap<TQString, KConfig*> configs;
TDEConfig* globalEvents;
TDEConfig* globalConfig;
TQMap<TQString, TDEConfig*> events;
TQMap<TQString, TDEConfig*> configs;
TQString externalPlayer;
TDEProcess *externalPlayerProc;
@ -136,8 +136,8 @@ KDE_EXPORT int kdemain(int argc, char **argv)
// abort this.
#ifndef WITHOUT_ARTS
KConfigGroup config( TDEGlobal::config(), "StartProgress" );
KConfig artsKCMConfig( "kcmartsrc" );
TDEConfigGroup config( TDEGlobal::config(), "StartProgress" );
TDEConfig artsKCMConfig( "kcmartsrc" );
artsKCMConfig.setGroup( "Arts" );
bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true );
if (useArts)
@ -245,8 +245,8 @@ KNotify::KNotify( bool useArts )
: TQObject(), DCOPObject("Notify")
{
d = new KNotifyPrivate;
d->globalEvents = new KConfig("knotify/eventsrc", true, false, "data");
d->globalConfig = new KConfig("knotify.eventsrc", true, false);
d->globalEvents = new TDEConfig("knotify/eventsrc", true, false, "data");
d->globalConfig = new TDEConfig("knotify.eventsrc", true, false);
d->externalPlayerProc = 0;
d->useArts = useArts;
d->inStartup = true;
@ -285,7 +285,7 @@ KNotify::~KNotify()
void KNotify::loadConfig() {
// load external player settings
KConfig *kc = TDEGlobal::config();
TDEConfig *kc = TDEGlobal::config();
kc->setGroup("Misc");
d->useExternal = kc->readBoolEntry( "Use external player", false );
d->externalPlayer = kc->readPathEntry("External player");
@ -313,7 +313,7 @@ void KNotify::reconfigure()
// clear loaded config files
d->globalConfig->reparseConfiguration();
for ( TQMapIterator<TQString,KConfig*> it = d->configs.begin(); it != d->configs.end(); ++it )
for ( TQMapIterator<TQString,TDEConfig*> it = d->configs.begin(); it != d->configs.end(); ++it )
delete it.data();
d->configs.clear();
}
@ -344,8 +344,8 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
}
TQString commandline;
KConfig *eventsFile = NULL;
KConfig *configFile = NULL;
TDEConfig *eventsFile = NULL;
TDEConfig *configFile = NULL;
// check for valid events
if ( !event.isEmpty() ) {
@ -354,13 +354,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
if ( d->events.contains( fromApp ) ) {
eventsFile = d->events[fromApp];
} else {
eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
eventsFile=new TDEConfig(locate("data", fromApp+"/eventsrc"),true,false);
d->events.insert( fromApp, eventsFile );
}
if ( d->configs.contains( fromApp) ) {
configFile = d->configs[fromApp];
} else {
configFile=new KConfig(fromApp+".eventsrc",true,false);
configFile=new TDEConfig(fromApp+".eventsrc",true,false);
d->configs.insert( fromApp, configFile );
}
@ -588,12 +588,12 @@ bool KNotify::notifyByMessagebox(const TQString &text, int level, WId winId)
bool KNotify::notifyByPassivePopup( const TQString &text,
const TQString &appName,
KConfig* eventsFile,
TDEConfig* eventsFile,
WId senderWinId )
{
KIconLoader iconLoader( appName );
if ( eventsFile != NULL ) {
KConfigGroup config( eventsFile, "!Global!" );
TDEConfigGroup config( eventsFile, "!Global!" );
TQString iconName = config.readEntry( "IconName", appName );
TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
TQString title = config.readEntry( "Comment", appName );

4
arts/knotify/knotify.h
Unescape Escape View File

@ -26,7 +26,7 @@
class KNotifyPrivate;
class TDEProcess;
class KConfig;
class TDEConfig;
class KNotify : public TQObject, public DCOPObject
{
@ -75,7 +75,7 @@ private:
bool notifyByLogfile(const TQString &text, const TQString &file);
bool notifyByStderr(const TQString &text);
bool notifyByPassivePopup(const TQString &text, const TQString &appName,
KConfig* eventsFile, WId winId );
TDEConfig* eventsFile, WId winId );
bool notifyByExecute(const TQString &command,
const TQString& event,
const TQString& fromApp,

4
dcop/dcopidl/dcopidl_test.h
Unescape Escape View File

@ -14,7 +14,7 @@ class Test2;
// this has to work too
#include <tqstring.h>
typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
class Test3;
// Those namespaces are opened and closed, so they should be just ignored
@ -78,7 +78,7 @@ private:
Test3 *doc();
struct KIODownload;
typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
};
class Test2 : public DCOPObject

2
dnssd/settings.kcfgc
Unescape Escape View File

@ -1,7 +1,7 @@
ClassName=Configuration
File=kcm_kdnssd.kcfg
GlobalEnums=false
Inherits=KConfigSkeleton
Inherits=TDEConfigSkeleton
ItemAccessors=false
MemberVariables=private
Mutators=true

2
interfaces/kimproxy/library/kimproxy.cpp
Unescape Escape View File

@ -643,7 +643,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
TQString KIMProxy::preferredApp()
{
KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
store->setGroup( IM_CLIENT_PREFERENCES_SECTION );
TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY );
//kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl;

2
interfaces/kio/http.h
Unescape Escape View File

@ -21,7 +21,7 @@
#define KIOSLAVE_HTTP_H_
namespace KIO {
namespace TDEIO {
/** HTTP / DAV method **/
enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,

4
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
Unescape Escape View File

@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
}
m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
KConfigGroup config( TDEGlobal::config(), ConfigGroup );
TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
}
KFileAudioPreview::~KFileAudioPreview()
{
KConfigGroup config( TDEGlobal::config(), ConfigGroup );
TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
delete d;

10
interfaces/ktexteditor/configinterface.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tdelibs_export.h>
class TQCString;
class KConfig;
class TDEConfig;
namespace KTextEditor
{
@ -60,14 +60,14 @@ class KTEXTEDITOR_EXPORT ConfigInterface
Read/Write the config of the part to a given kconfig object
to store the settings in a different place than the standard
*/
virtual void readConfig (KConfig *) = 0;
virtual void writeConfig (KConfig *) = 0;
virtual void readConfig (TDEConfig *) = 0;
virtual void writeConfig (TDEConfig *) = 0;
/**
Read/Write session config of only this document/view/plugin
*/
virtual void readSessionConfig (KConfig *) = 0;
virtual void writeSessionConfig (KConfig *) = 0;
virtual void readSessionConfig (TDEConfig *) = 0;
virtual void writeSessionConfig (TDEConfig *) = 0;
/**
Shows a config dialog for the part, changes will be applied

14
interfaces/ktexteditor/editorchooser.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
KConfig *config=new KConfig("default_components");
TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
TQString editor = config->readPathEntry("embeddedEditor");
@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){
}
void EditorChooser::readAppSetting(const TQString& postfix){
KConfig *cfg=kapp->config();
TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
TQString editor=cfg->readPathEntry("editor");
@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
}
void EditorChooser::writeAppSetting(const TQString& postfix){
KConfig *cfg=kapp->config();
TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
@ -105,14 +105,14 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
KTextEditor::Document *tmpDoc=0;
KConfig *cfg=kapp->config();
TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
TQString editor=cfg->readPathEntry("editor");
cfg->setGroup(previousGroup);
if (editor.isEmpty())
{
KConfig *config=new KConfig("default_components");
TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
editor = config->readPathEntry("embeddedEditor", "katepart");
delete config;
@ -135,14 +135,14 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
KTextEditor::Editor *tmpEd=0;
KConfig *cfg=kapp->config();
TDEConfig *cfg=kapp->config();
TQString previousGroup=cfg->group();
cfg->setGroup("KTEXTEDITOR:"+postfix);
TQString editor=cfg->readPathEntry("editor");
cfg->setGroup(previousGroup);
if (editor.isEmpty())
{
KConfig *config=new KConfig("default_components");
TDEConfig *config=new TDEConfig("default_components");
config->setGroup("KTextEditor");
editor = config->readPathEntry("embeddedEditor", "katepart");
delete config;

6
interfaces/ktexteditor/editorchooser.h
Unescape Escape View File

@ -6,7 +6,7 @@
#include <tqwidget.h>
class KConfig;
class TDEConfig;
class TQString;
namespace KTextEditor
@ -45,8 +45,8 @@ public:
virtual const TQStringList &choices();
virtual void saveSettings();
void readAppSetting(KConfig *cfg,const TQString& postfix);
void writeAppSetting(KConfig *cfg,const TQString& postfix);
void readAppSetting(TDEConfig *cfg,const TQString& postfix);
void writeAppSetting(TDEConfig *cfg,const TQString& postfix);
public slots:
virtual void madeChoice(int pos,const TQString &choice);

6
interfaces/ktexteditor/sessionconfiginterface.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tdelibs_export.h>
class TQCString;
class KConfig;
class TDEConfig;
namespace KTextEditor
{
@ -53,8 +53,8 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface
* In case of the document, that means for example it should reload the file,
* restore all marks, ...
*/
virtual void readSessionConfig (KConfig *) = 0;
virtual void writeSessionConfig (KConfig *) = 0;
virtual void readSessionConfig (TDEConfig *) = 0;
virtual void writeSessionConfig (TDEConfig *) = 0;
private:
class PrivateSessionConfigInterface *d;

4
kabc/addressbook.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ struct AddressBook::AddressBookData
{
Field::List mAllFields;
ErrorHandler *mErrorHandler;
KConfig *mConfig;
TDEConfig *mConfig;
KRES::Manager<Resource> *mManager;
TQPtrList<Resource> mPendingLoadResources;
TQPtrList<Resource> mPendingSaveResources;
@ -318,7 +318,7 @@ AddressBook::AddressBook( const TQString &config )
if ( config.isEmpty() )
d->mConfig = 0;
else
d->mConfig = new KConfig( config );
d->mConfig = new TDEConfig( config );
d->mManager = new KRES::Manager<Resource>( "contact" );
d->mManager->readConfig( d->mConfig );
d->end.d->mResources = TQValueList<Resource*>();

2
kabc/addresseehelper.cpp
Unescape Escape View File

@ -81,7 +81,7 @@ void AddresseeHelper::initSettings()
mPrefixes.insert( "von" );
mPrefixes.insert( "de" );
KConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
TDEConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
config.setGroup( "General" );
addToSet( config.readListEntry( "Prefixes" ), mTitles );

8
kabc/addresslineedit.cpp
Unescape Escape View File

@ -61,13 +61,13 @@ TQTimer* AddressLineEdit::s_LDAPTimer = 0L;
LdapSearch* AddressLineEdit::s_LDAPSearch = 0L;
TQString* AddressLineEdit::s_LDAPText = 0L;
AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L;
KConfig *AddressLineEdit::s_config = 0L;
TDEConfig *AddressLineEdit::s_config = 0L;
static KStaticDeleter<KCompletion> completionDeleter;
static KStaticDeleter<TQTimer> ldapTimerDeleter;
static KStaticDeleter<LdapSearch> ldapSearchDeleter;
static KStaticDeleter<TQString> ldapTextDeleter;
static KStaticDeleter<KConfig> configDeleter;
static KStaticDeleter<TDEConfig> configDeleter;
AddressLineEdit::AddressLineEdit(TQWidget* parent,
bool useCompletion,
@ -136,10 +136,10 @@ AddressLineEdit::~AddressLineEdit()
//-----------------------------------------------------------------------------
KConfig* AddressLineEdit::config()
TDEConfig* AddressLineEdit::config()
{
if ( !s_config )
configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
return s_config;
}

6
kabc/addresslineedit.h
Unescape Escape View File

@ -30,7 +30,7 @@
#include "klineedit.h"
#include "kcompletion.h"
class KConfig;
class TDEConfig;
namespace KABC {
@ -61,7 +61,7 @@ public:
*/
virtual void setFont( const TQFont& );
static KConfig *config();
static TDEConfig *config();
public slots:
/**
@ -112,7 +112,7 @@ private:
static LdapSearch *s_LDAPSearch;
static TQString *s_LDAPText;
static AddressLineEdit *s_LDAPLineEdit;
static KConfig *s_config;
static TDEConfig *s_config;
private:
class AddressLineEditPrivate* d;

6
kabc/field.h
Unescape Escape View File

@ -26,7 +26,7 @@
#include "addressee.h"
class KConfig;
class TDEConfig;
namespace KABC {
@ -134,7 +134,7 @@ public:
* @param identifier The unique identifier
* @param fields The list of the fields
*/
static void saveFields( KConfig *cfg, const TQString &identifier,
static void saveFields( TDEConfig *cfg, const TQString &identifier,
const Field::List &fields );
/**
* This is the same as above, with the difference, that
@ -149,7 +149,7 @@ public:
* @param cfg The config file object
* @param identifier The unique identifier
*/
static Field::List restoreFields( KConfig *cfg, const TQString &identifier );
static Field::List restoreFields( TDEConfig *cfg, const TQString &identifier );
/**
* This is the same as above, with the difference, that

4
kabc/kab2kabc.cpp
Unescape Escape View File

@ -123,7 +123,7 @@ void importKMailAddressBook( KABC::AddressBook *ab )
TQString fileName = locateLocal( "data", "kmail/addressbook" );
TQString kmailConfigName = locate( "config", "kmailrc" );
if ( !kmailConfigName.isEmpty() ) {
KConfig cfg( kmailConfigName );
TDEConfig cfg( kmailConfigName );
cfg.setGroup( "Addressbook" );
fileName = cfg.readPathEntry( "default", fileName );
}
@ -458,7 +458,7 @@ int main( int argc, char **argv )
if ( args->isSet( "disable-autostart" ) ) {
kdDebug() << "Disable autostart." << endl;
KConfig *config = app.config();
TDEConfig *config = app.config();
config->setGroup( "Startup" );
config->writeEntry( "EnableAutostart", false );
}

22
kabc/ldapclient.cpp
Unescape Escape View File

@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter )
startParseLDIF();
mActive = true;
mJob = KIO::get( url, false, false );
connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
mJob = TDEIO::get( url, false, false );
connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotDone() ) );
}
@ -156,7 +156,7 @@ void LdapClient::cancelQuery()
mActive = false;
}
void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
{
#ifndef NDEBUG // don't create the QString
// TQString str( data );
@ -165,7 +165,7 @@ void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
parseLDIF( data );
}
void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & )
{
//tqDebug("Job said \"%s\"", info.latin1());
}
@ -180,8 +180,8 @@ void LdapClient::slotDone()
}
#endif
int err = mJob->error();
if ( err && err != KIO::ERR_USER_CANCELED ) {
emit error( KIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
if ( err && err != TDEIO::ERR_USER_CANCELED ) {
emit error( TDEIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
}
emit done();
}
@ -251,7 +251,7 @@ LdapSearch::LdapSearch()
}
// stolen from KAddressBook
KConfig config( "kabldaprc", true );
TDEConfig config( "kabldaprc", true );
config.setGroup( "LDAP" );
int numHosts = config.readUnsignedNumEntry( "NumSelectedHosts");
if ( !numHosts ) {

6
kabc/ldapclient.h
Unescape Escape View File

@ -157,8 +157,8 @@ class KABC_EXPORT LdapClient : public TQObject
void cancelQuery();
protected slots:
void slotData( KIO::Job*, const TQByteArray &data );
void slotInfoMessage( KIO::Job*, const TQString &info );
void slotData( TDEIO::Job*, const TQByteArray &data );
void slotInfoMessage( TDEIO::Job*, const TQString &info );
void slotDone();
protected:
@ -172,7 +172,7 @@ class KABC_EXPORT LdapClient : public TQObject
TQString mScope;
TQStringList mAttrs;
TQGuardedPtr<KIO::SimpleJob> mJob;
TQGuardedPtr<TDEIO::SimpleJob> mJob;
bool mActive;
LdapObject mCurrentObject;

16
kabc/ldapconfigwidget.cpp
Unescape Escape View File

@ -243,7 +243,7 @@ void LdapConfigWidget::initWidget()
}
void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
void LdapConfigWidget::loadData( TDEIO::Job*, const TQByteArray& d )
{
LDIF::ParseVal ret;
@ -261,10 +261,10 @@ void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
} while ( ret != LDIF::MoreData );
}
void LdapConfigWidget::loadResult( KIO::Job* job)
void LdapConfigWidget::loadResult( TDEIO::Job* job)
{
int error = job->error();
if ( error && error != KIO::ERR_USER_CANCELED )
if ( error && error != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";
@ -291,12 +291,12 @@ void LdapConfigWidget::sendQuery()
kdDebug(5700) << "sendQuery url: " << _url.prettyURL() << endl;
mLdif.startParsing();
KIO::Job *job = KIO::get( _url, true, false );
TDEIO::Job *job = TDEIO::get( _url, true, false );
job->addMetaData("no-auth-prompt","true");
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( loadResult( KIO::Job* ) ) );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
if ( mProg == NULL )
mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );

14
kabc/ldapconfigwidget.h
Unescape Escape View File

@ -44,7 +44,7 @@ namespace KABC {
@short LDAP Configuration widget
This class can be used to query the user for LDAP connection parameters.
It's KConfigXT compatible, using widget names starting with kcfg_
It's TDEConfigXT compatible, using widget names starting with kcfg_
*/
class KABC_EXPORT LdapConfigWidget : public TQWidget
@ -223,23 +223,23 @@ namespace KABC {
/**
* Sets the size limit.
* KConfig widget name: kcfg_ldapsizelimit
* TDEConfig widget name: kcfg_ldapsizelimit
*/
void setSizeLimit( int sizelimit );
/**
* Returns the size limit.
* KConfig widget name: kcfg_ldapsizelimit
* TDEConfig widget name: kcfg_ldapsizelimit
*/
int sizeLimit() const;
/**
* Sets the time limit.
* KConfig widget name: kcfg_ldaptimelimit
* TDEConfig widget name: kcfg_ldaptimelimit
*/
void setTimeLimit( int timelimit );
/**
* Returns the time limit.
* KConfig widget name: kcfg_ldaptimelimit
* TDEConfig widget name: kcfg_ldaptimelimit
*/
int timeLimit() const;
@ -262,8 +262,8 @@ namespace KABC {
void setSASL( int state );
void mQueryDNClicked();
void mQueryMechClicked();
void loadData( KIO::Job*, const TQByteArray& );
void loadResult( KIO::Job* );
void loadData( TDEIO::Job*, const TQByteArray& );
void loadResult( TDEIO::Job* );
private:
int mFlags;

4
kabc/plugins/dir/resourcedir.cpp
Unescape Escape View File

@ -56,7 +56,7 @@ extern "C"
}
ResourceDir::ResourceDir( const KConfig *config )
ResourceDir::ResourceDir( const TDEConfig *config )
: Resource( config ), mAsynchronous( false )
{
if ( config ) {
@ -100,7 +100,7 @@ ResourceDir::~ResourceDir()
mFormat = 0;
}
void ResourceDir::writeConfig( KConfig *config )
void ResourceDir::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );

4
kabc/plugins/dir/resourcedir.h
Unescape Escape View File

@ -43,11 +43,11 @@ class KABC_EXPORT ResourceDir : public Resource
Q_OBJECT
public:
ResourceDir( const KConfig* );
ResourceDir( const TDEConfig* );
ResourceDir( const TQString &path, const TQString &type = "vcard" );
~ResourceDir();
virtual void writeConfig( KConfig* );
virtual void writeConfig( TDEConfig* );
virtual bool doOpen();
virtual void doClose();

4
kabc/plugins/evolution/resourceevo.cpp
Unescape Escape View File

@ -17,7 +17,7 @@ using namespace KABC;
class EvolutionFactory : public KRES::PluginFactoryBase
{
public:
KRES::Resource *resource( const KConfig *config )
KRES::Resource *resource( const TDEConfig *config )
{
return new ResourceEvolution( config );
}
@ -36,7 +36,7 @@ extern "C"
}
}
ResourceEvolution::ResourceEvolution( const KConfig* conf )
ResourceEvolution::ResourceEvolution( const TDEConfig* conf )
: Resource( conf ), mWrap(0l)
{
m_isOpen = false;

2
kabc/plugins/evolution/resourceevo.h
Unescape Escape View File

@ -7,7 +7,7 @@ namespace Evolution {
namespace KABC {
class ResourceEvolution : public Resource {
public:
ResourceEvolution( const KConfig* config );
ResourceEvolution( const TDEConfig* config );
~ResourceEvolution();
bool doOpen();

4
kabc/plugins/file/resourcefile.cpp
Unescape Escape View File

@ -46,7 +46,7 @@
using namespace KABC;
ResourceFile::ResourceFile( const KConfig *config )
ResourceFile::ResourceFile( const TDEConfig *config )
: Resource( config ), mFormat( 0 ),
mAsynchronous( false )
{
@ -98,7 +98,7 @@ ResourceFile::~ResourceFile()
mFormat = 0;
}
void ResourceFile::writeConfig( KConfig *config )
void ResourceFile::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );

4
kabc/plugins/file/resourcefile.h
Unescape Escape View File

@ -47,7 +47,7 @@ class KABC_EXPORT ResourceFile : public Resource
@param cfg The config object where custom resource settings are stored.
*/
ResourceFile( const KConfig *cfg );
ResourceFile( const TDEConfig *cfg );
/**
Construct file resource on file @arg fileName using format @arg formatName.
@ -62,7 +62,7 @@ class KABC_EXPORT ResourceFile : public Resource
/**
Writes the config back.
*/
virtual void writeConfig( KConfig *cfg );
virtual void writeConfig( TDEConfig *cfg );
/**
Tries to open the file and checks for the proper format.

244
kabc/plugins/ldapkio/resourceldapkio.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ using namespace KABC;
void tqt_enter_modal( TQWidget *widget );
void tqt_leave_modal( TQWidget *widget );
class ResourceLDAPKIO::ResourceLDAPKIOPrivate
class ResourceLDAPTDEIO::ResourceLDAPKIOPrivate
{
public:
LDIF mLdif;
@ -69,7 +69,7 @@ class ResourceLDAPKIO::ResourceLDAPKIOPrivate
KTempFile *mTmp;
};
ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
ResourceLDAPTDEIO::ResourceLDAPKIO( const TDEConfig *config )
: Resource( config )
{
d = new ResourceLDAPKIOPrivate;
@ -115,12 +115,12 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
init();
}
ResourceLDAPKIO::~ResourceLDAPKIO()
ResourceLDAPTDEIO::~ResourceLDAPKIO()
{
delete d;
}
void ResourceLDAPKIO::enter_loop()
void ResourceLDAPTDEIO::enter_loop()
{
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus );
@ -129,14 +129,14 @@ void ResourceLDAPKIO::enter_loop()
tqt_leave_modal(&dummy);
}
void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
void ResourceLDAPTDEIO::entries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
{
KIO::UDSEntryListConstIterator it = list.begin();
KIO::UDSEntryListConstIterator end = list.end();
TDEIO::UDSEntryListConstIterator it = list.begin();
TDEIO::UDSEntryListConstIterator end = list.end();
for (; it != end; ++it) {
KIO::UDSEntry::ConstIterator it2 = (*it).begin();
TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
for( ; it2 != (*it).end(); it2++ ) {
if ( (*it2).m_uds == KIO::UDS_URL ) {
if ( (*it2).m_uds == TDEIO::UDS_URL ) {
KURL tmpurl( (*it2).m_str );
d->mResultDn = tmpurl.path();
kdDebug(7125) << "findUid(): " << d->mResultDn << endl;
@ -147,20 +147,20 @@ void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
}
}
void ResourceLDAPKIO::listResult( KIO::Job *job)
void ResourceLDAPTDEIO::listResult( TDEIO::Job *job)
{
d->mError = job->error();
if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";
tqApp->exit_loop();
}
TQString ResourceLDAPKIO::findUid( const TQString &uid )
TQString ResourceLDAPTDEIO::findUid( const TQString &uid )
{
LDAPUrl url( d->mLDAPUrl );
KIO::UDSEntry entry;
TDEIO::UDSEntry entry;
mErrorMsg = d->mResultDn = "";
@ -168,21 +168,21 @@ TQString ResourceLDAPKIO::findUid( const TQString &uid )
url.setFilter( "(" + mAttributes[ "uid" ] + "=" + uid + ")" + mFilter );
url.setExtension( "x-dir", "one" );
kdDebug(7125) << "ResourceLDAPKIO::findUid() uid: " << uid << " url " <<
kdDebug(7125) << "ResourceLDAPTDEIO::findUid() uid: " << uid << " url " <<
url.prettyURL() << endl;
KIO::ListJob * listJob = KIO::listDir( url, false /* no GUI */ );
TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ );
connect( listJob,
TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
connect( listJob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( listResult( KIO::Job* ) ) );
TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( listResult( TDEIO::Job* ) ) );
enter_loop();
return d->mResultDn;
}
TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value, bool mod )
TQCString ResourceLDAPTDEIO::addEntry( const TQString &attr, const TQString &value, bool mod )
{
TQCString tmp;
if ( !attr.isEmpty() ) {
@ -193,7 +193,7 @@ TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value
return ( tmp );
}
bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
bool ResourceLDAPTDEIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
const TQString &olddn )
{
TQCString tmp;
@ -313,14 +313,14 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
return true;
}
void ResourceLDAPKIO::setReadOnly( bool value )
void ResourceLDAPTDEIO::setReadOnly( bool value )
{
//save the original readonly flag, because offline using disables writing
d->mReadOnly = true;
Resource::setReadOnly( value );
}
void ResourceLDAPKIO::init()
void ResourceLDAPTDEIO::init()
{
if ( mPort == 0 ) mPort = 389;
@ -417,7 +417,7 @@ void ResourceLDAPKIO::init()
kdDebug(7125) << "resource_ldapkio url: " << d->mLDAPUrl.prettyURL() << endl;
}
void ResourceLDAPKIO::writeConfig( KConfig *config )
void ResourceLDAPTDEIO::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
@ -450,7 +450,7 @@ void ResourceLDAPKIO::writeConfig( KConfig *config )
config->writeEntry( "LdapAttributes", attributes );
}
Ticket *ResourceLDAPKIO::requestSaveTicket()
Ticket *ResourceLDAPTDEIO::requestSaveTicket()
{
if ( !addressBook() ) {
kdDebug(7125) << "no addressbook" << endl;
@ -460,21 +460,21 @@ Ticket *ResourceLDAPKIO::requestSaveTicket()
return createTicket( this );
}
void ResourceLDAPKIO::releaseSaveTicket( Ticket *ticket )
void ResourceLDAPTDEIO::releaseSaveTicket( Ticket *ticket )
{
delete ticket;
}
bool ResourceLDAPKIO::doOpen()
bool ResourceLDAPTDEIO::doOpen()
{
return true;
}
void ResourceLDAPKIO::doClose()
void ResourceLDAPTDEIO::doClose()
{
}
void ResourceLDAPKIO::createCache()
void ResourceLDAPTDEIO::createCache()
{
d->mTmp = NULL;
if ( d->mCachePolicy == Cache_NoConnection && d->mAutoCache ) {
@ -483,7 +483,7 @@ void ResourceLDAPKIO::createCache()
}
}
void ResourceLDAPKIO::activateCache()
void ResourceLDAPTDEIO::activateCache()
{
if ( d->mTmp && d->mError == 0 ) {
d->mTmp->close();
@ -495,12 +495,12 @@ void ResourceLDAPKIO::activateCache()
}
}
KIO::Job *ResourceLDAPKIO::loadFromCache()
TDEIO::Job *ResourceLDAPTDEIO::loadFromCache()
{
KIO::Job *job = NULL;
TDEIO::Job *job = NULL;
if ( d->mCachePolicy == Cache_Always ||
( d->mCachePolicy == Cache_NoConnection &&
d->mError == KIO::ERR_COULD_NOT_CONNECT ) ) {
d->mError == TDEIO::ERR_COULD_NOT_CONNECT ) ) {
d->mAddr = Addressee();
d->mAd = Address( Address::Home );
@ -510,17 +510,17 @@ KIO::Job *ResourceLDAPKIO::loadFromCache()
Resource::setReadOnly( true );
KURL url( d->mCacheDst );
job = KIO::get( url, true, false );
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
job = TDEIO::get( url, true, false );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
}
return job;
}
bool ResourceLDAPKIO::load()
bool ResourceLDAPTDEIO::load()
{
kdDebug(7125) << "ResourceLDAPKIO::load()" << endl;
KIO::Job *job;
kdDebug(7125) << "ResourceLDAPTDEIO::load()" << endl;
TDEIO::Job *job;
clear();
//clear the addressee
@ -534,18 +534,18 @@ bool ResourceLDAPKIO::load()
createCache();
if ( d->mCachePolicy != Cache_Always ) {
job = KIO::get( d->mLDAPUrl, true, false );
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
job = TDEIO::get( d->mLDAPUrl, true, false );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
enter_loop();
}
job = loadFromCache();
if ( job ) {
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
enter_loop();
}
if ( mErrorMsg.isEmpty() ) {
@ -558,7 +558,7 @@ bool ResourceLDAPKIO::load()
}
}
bool ResourceLDAPKIO::asyncLoad()
bool ResourceLDAPTDEIO::asyncLoad()
{
clear();
//clear the addressee
@ -571,18 +571,18 @@ bool ResourceLDAPKIO::asyncLoad()
createCache();
if ( d->mCachePolicy != Cache_Always ) {
KIO::Job *job = KIO::get( d->mLDAPUrl, true, false );
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( result( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( result( TDEIO::Job* ) ) );
} else {
result( NULL );
}
return true;
}
void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
void ResourceLDAPTDEIO::data( TDEIO::Job *, const TQByteArray &data )
{
if ( data.size() ) {
d->mLdif.setLDIF( data );
@ -685,11 +685,11 @@ void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
} while ( ret != LDIF::MoreData );
}
void ResourceLDAPKIO::loadCacheResult( KIO::Job *job )
void ResourceLDAPTDEIO::loadCacheResult( TDEIO::Job *job )
{
mErrorMsg = "";
d->mError = job->error();
if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) {
if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) {
mErrorMsg = job->errorString();
}
if ( !mErrorMsg.isEmpty() )
@ -698,12 +698,12 @@ void ResourceLDAPKIO::loadCacheResult( KIO::Job *job )
emit loadingFinished( this );
}
void ResourceLDAPKIO::result( KIO::Job *job )
void ResourceLDAPTDEIO::result( TDEIO::Job *job )
{
mErrorMsg = "";
if ( job ) {
d->mError = job->error();
if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) {
if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) {
mErrorMsg = job->errorString();
}
} else {
@ -711,11 +711,11 @@ void ResourceLDAPKIO::result( KIO::Job *job )
}
activateCache();
KIO::Job *cjob;
TDEIO::Job *cjob;
cjob = loadFromCache();
if ( cjob ) {
connect( cjob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( loadCacheResult( KIO::Job* ) ) );
connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) );
} else {
if ( !mErrorMsg.isEmpty() )
emit loadingError( this, mErrorMsg );
@ -724,16 +724,16 @@ void ResourceLDAPKIO::result( KIO::Job *job )
}
}
bool ResourceLDAPKIO::save( Ticket* )
bool ResourceLDAPTDEIO::save( Ticket* )
{
kdDebug(7125) << "ResourceLDAPKIO save" << endl;
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
enter_loop();
if ( mErrorMsg.isEmpty() ) {
kdDebug(7125) << "ResourceLDAPKIO save ok!" << endl;
@ -745,22 +745,22 @@ bool ResourceLDAPKIO::save( Ticket* )
}
}
bool ResourceLDAPKIO::asyncSave( Ticket* )
bool ResourceLDAPTDEIO::asyncSave( Ticket* )
{
kdDebug(7125) << "ResourceLDAPKIO asyncSave" << endl;
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( saveResult( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( saveResult( TDEIO::Job* ) ) );
return true;
}
void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
void ResourceLDAPTDEIO::syncLoadSaveResult( TDEIO::Job *job )
{
d->mError = job->error();
if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";
@ -769,16 +769,16 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
tqApp->exit_loop();
}
void ResourceLDAPKIO::saveResult( KIO::Job *job )
void ResourceLDAPTDEIO::saveResult( TDEIO::Job *job )
{
d->mError = job->error();
if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
emit savingError( this, job->errorString() );
else
emit savingFinished( this );
}
void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
void ResourceLDAPTDEIO::saveData( TDEIO::Job*, TQByteArray& data )
{
while ( d->mSaveIt != end() &&
!(*d->mSaveIt).changed() ) d->mSaveIt++;
@ -799,7 +799,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
d->mSaveIt++;
}
void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
void ResourceLDAPTDEIO::removeAddressee( const Addressee& addr )
{
TQString dn = findUid( addr.uid() );
@ -815,7 +815,7 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
url.setPath( "/" + dn );
url.setExtension( "x-dir", "base" );
url.setScope( LDAPUrl::Base );
if ( KIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() );
if ( TDEIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() );
} else {
//maybe it's not saved yet
mAddrMap.erase( addr.uid() );
@ -823,216 +823,216 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
}
void ResourceLDAPKIO::setUser( const TQString &user )
void ResourceLDAPTDEIO::setUser( const TQString &user )
{
mUser = user;
}
TQString ResourceLDAPKIO::user() const
TQString ResourceLDAPTDEIO::user() const
{
return mUser;
}
void ResourceLDAPKIO::setPassword( const TQString &password )
void ResourceLDAPTDEIO::setPassword( const TQString &password )
{
mPassword = password;
}
TQString ResourceLDAPKIO::password() const
TQString ResourceLDAPTDEIO::password() const
{
return mPassword;
}
void ResourceLDAPKIO::setDn( const TQString &dn )
void ResourceLDAPTDEIO::setDn( const TQString &dn )
{
mDn = dn;
}
TQString ResourceLDAPKIO::dn() const
TQString ResourceLDAPTDEIO::dn() const
{
return mDn;
}
void ResourceLDAPKIO::setHost( const TQString &host )
void ResourceLDAPTDEIO::setHost( const TQString &host )
{
mHost = host;
}
TQString ResourceLDAPKIO::host() const
TQString ResourceLDAPTDEIO::host() const
{
return mHost;
}
void ResourceLDAPKIO::setPort( int port )
void ResourceLDAPTDEIO::setPort( int port )
{
mPort = port;
}
int ResourceLDAPKIO::port() const
int ResourceLDAPTDEIO::port() const
{
return mPort;
}
void ResourceLDAPKIO::setVer( int ver )
void ResourceLDAPTDEIO::setVer( int ver )
{
d->mVer = ver;
}
int ResourceLDAPKIO::ver() const
int ResourceLDAPTDEIO::ver() const
{
return d->mVer;
}
void ResourceLDAPKIO::setSizeLimit( int sizelimit )
void ResourceLDAPTDEIO::setSizeLimit( int sizelimit )
{
d->mSizeLimit = sizelimit;
}
int ResourceLDAPKIO::sizeLimit()
int ResourceLDAPTDEIO::sizeLimit()
{
return d->mSizeLimit;
}
void ResourceLDAPKIO::setTimeLimit( int timelimit )
void ResourceLDAPTDEIO::setTimeLimit( int timelimit )
{
d->mTimeLimit = timelimit;
}
int ResourceLDAPKIO::timeLimit()
int ResourceLDAPTDEIO::timeLimit()
{
return d->mTimeLimit;
}
void ResourceLDAPKIO::setFilter( const TQString &filter )
void ResourceLDAPTDEIO::setFilter( const TQString &filter )
{
mFilter = filter;
}
TQString ResourceLDAPKIO::filter() const
TQString ResourceLDAPTDEIO::filter() const
{
return mFilter;
}
void ResourceLDAPKIO::setIsAnonymous( bool value )
void ResourceLDAPTDEIO::setIsAnonymous( bool value )
{
mAnonymous = value;
}
bool ResourceLDAPKIO::isAnonymous() const
bool ResourceLDAPTDEIO::isAnonymous() const
{
return mAnonymous;
}
void ResourceLDAPKIO::setIsTLS( bool value )
void ResourceLDAPTDEIO::setIsTLS( bool value )
{
d->mTLS = value;
}
bool ResourceLDAPKIO::isTLS() const
bool ResourceLDAPTDEIO::isTLS() const
{
return d->mTLS;
}
void ResourceLDAPKIO::setIsSSL( bool value )
void ResourceLDAPTDEIO::setIsSSL( bool value )
{
d->mSSL = value;
}
bool ResourceLDAPKIO::isSSL() const
bool ResourceLDAPTDEIO::isSSL() const
{
return d->mSSL;
}
void ResourceLDAPKIO::setIsSubTree( bool value )
void ResourceLDAPTDEIO::setIsSubTree( bool value )
{
d->mSubTree = value;
}
bool ResourceLDAPKIO::isSubTree() const
bool ResourceLDAPTDEIO::isSubTree() const
{
return d->mSubTree;
}
void ResourceLDAPKIO::setAttributes( const TQMap<TQString, TQString> &attributes )
void ResourceLDAPTDEIO::setAttributes( const TQMap<TQString, TQString> &attributes )
{
mAttributes = attributes;
}
TQMap<TQString, TQString> ResourceLDAPKIO::attributes() const
TQMap<TQString, TQString> ResourceLDAPTDEIO::attributes() const
{
return mAttributes;
}
void ResourceLDAPKIO::setRDNPrefix( int value )
void ResourceLDAPTDEIO::setRDNPrefix( int value )
{
d->mRDNPrefix = value;
}
int ResourceLDAPKIO::RDNPrefix() const
int ResourceLDAPTDEIO::RDNPrefix() const
{
return d->mRDNPrefix;
}
void ResourceLDAPKIO::setIsSASL( bool value )
void ResourceLDAPTDEIO::setIsSASL( bool value )
{
d->mSASL = value;
}
bool ResourceLDAPKIO::isSASL() const
bool ResourceLDAPTDEIO::isSASL() const
{
return d->mSASL;
}
void ResourceLDAPKIO::setMech( const TQString &mech )
void ResourceLDAPTDEIO::setMech( const TQString &mech )
{
d->mMech = mech;
}
TQString ResourceLDAPKIO::mech() const
TQString ResourceLDAPTDEIO::mech() const
{
return d->mMech;
}
void ResourceLDAPKIO::setRealm( const TQString &realm )
void ResourceLDAPTDEIO::setRealm( const TQString &realm )
{
d->mRealm = realm;
}
TQString ResourceLDAPKIO::realm() const
TQString ResourceLDAPTDEIO::realm() const
{
return d->mRealm;
}
void ResourceLDAPKIO::setBindDN( const TQString &binddn )
void ResourceLDAPTDEIO::setBindDN( const TQString &binddn )
{
d->mBindDN = binddn;
}
TQString ResourceLDAPKIO::bindDN() const
TQString ResourceLDAPTDEIO::bindDN() const
{
return d->mBindDN;
}
void ResourceLDAPKIO::setCachePolicy( int pol )
void ResourceLDAPTDEIO::setCachePolicy( int pol )
{
d->mCachePolicy = pol;
}
int ResourceLDAPKIO::cachePolicy() const
int ResourceLDAPTDEIO::cachePolicy() const
{
return d->mCachePolicy;
}
void ResourceLDAPKIO::setAutoCache( bool value )
void ResourceLDAPTDEIO::setAutoCache( bool value )
{
d->mAutoCache = value;
}
bool ResourceLDAPKIO::autoCache()
bool ResourceLDAPTDEIO::autoCache()
{
return d->mAutoCache;
}
TQString ResourceLDAPKIO::cacheDst() const
TQString ResourceLDAPTDEIO::cacheDst() const
{
return d->mCacheDst;
}

26
kabc/plugins/ldapkio/resourceldapkio.h
Unescape Escape View File

@ -26,7 +26,7 @@
#include <kabc/ldif.h>
#include <kio/job.h>
class KConfig;
class TDEConfig;
namespace KABC {
@ -37,14 +37,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
public:
enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always };
ResourceLDAPKIO( const KConfig* );
ResourceLDAPKIO( const TDEConfig* );
virtual ~ResourceLDAPKIO();
/**
* Call this after you used one of the set... methods
*/
virtual void init();
virtual void writeConfig( KConfig* );
virtual void writeConfig( TDEConfig* );
virtual bool doOpen();
virtual void doClose();
@ -128,14 +128,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
TQString cacheDst() const;
protected slots:
void entries( KIO::Job*, const KIO::UDSEntryList& );
void data( KIO::Job*, const TQByteArray& );
void result( KIO::Job* );
void listResult( KIO::Job* );
void syncLoadSaveResult( KIO::Job* );
void saveResult( KIO::Job* );
void saveData( KIO::Job*, TQByteArray& );
void loadCacheResult( KIO::Job* );
void entries( TDEIO::Job*, const TDEIO::UDSEntryList& );
void data( TDEIO::Job*, const TQByteArray& );
void result( TDEIO::Job* );
void listResult( TDEIO::Job* );
void syncLoadSaveResult( TDEIO::Job* );
void saveResult( TDEIO::Job* );
void saveData( TDEIO::Job*, TQByteArray& );
void loadCacheResult( TDEIO::Job* );
private:
TQString mUser;
@ -151,9 +151,9 @@ protected slots:
int mGetCounter; //KDE 4: remove
bool mErrorOccured; //KDE 4: remove
TQString mErrorMsg;
TQMap<KIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
TQMap<TDEIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
KIO::Job *loadFromCache();
TDEIO::Job *loadFromCache();
void createCache();
void activateCache();
void enter_loop();

2
kabc/plugins/ldapkio/resourceldapkioconfig.cpp
Unescape Escape View File

@ -378,7 +378,7 @@ int OfflineDialog::cachePolicy() const
void OfflineDialog::loadCache()
{
if ( KIO::NetAccess::download( mSrc, mDst, this ) ) {
if ( TDEIO::NetAccess::download( mSrc, mDst, this ) ) {
KMessageBox::information( this,
i18n("Successfully downloaded directory server contents!") );
} else {

36
kabc/plugins/net/resourcenet.cpp
Unescape Escape View File

@ -40,16 +40,16 @@ using namespace KABC;
class ResourceNet::ResourceNetPrivate
{
public:
KIO::Job *mLoadJob;
TDEIO::Job *mLoadJob;
bool mIsLoading;
KIO::Job *mSaveJob;
TDEIO::Job *mSaveJob;
bool mIsSaving;
TQString mLastErrorString;
};
ResourceNet::ResourceNet( const KConfig *config )
ResourceNet::ResourceNet( const TDEConfig *config )
: Resource( config ), mFormat( 0 ),
mTempFile( 0 ),
d( new ResourceNetPrivate )
@ -104,7 +104,7 @@ ResourceNet::~ResourceNet()
deleteLocalTempFile();
}
void ResourceNet::writeConfig( KConfig *config )
void ResourceNet::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
@ -137,7 +137,7 @@ bool ResourceNet::load()
{
TQString tempFile;
if ( !KIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
if ( !TDEIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
addressBook()->error( i18n( "Unable to download file '%1'." ).arg( mUrl.prettyURL() ) );
return false;
}
@ -145,7 +145,7 @@ bool ResourceNet::load()
TQFile file( tempFile );
if ( !file.open( IO_ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1'." ).arg( tempFile ) );
KIO::NetAccess::removeTempFile( tempFile );
TDEIO::NetAccess::removeTempFile( tempFile );
return false;
}
@ -153,7 +153,7 @@ bool ResourceNet::load()
if ( !result )
addressBook()->error( i18n( "Problems during parsing file '%1'." ).arg( tempFile ) );
KIO::NetAccess::removeTempFile( tempFile );
TDEIO::NetAccess::removeTempFile( tempFile );
return result;
}
@ -189,11 +189,11 @@ bool ResourceNet::asyncLoad()
KURL dest;
dest.setPath( mTempFile->name() );
KIO::Scheduler::checkSlaveOnHold( true );
d->mLoadJob = KIO::file_copy( mUrl, dest, -1, true, false, false );
TDEIO::Scheduler::checkSlaveOnHold( true );
d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false );
d->mIsLoading = true;
connect( d->mLoadJob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( downloadFinished( KIO::Job* ) ) );
connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) );
return true;
}
@ -247,7 +247,7 @@ bool ResourceNet::save( Ticket* )
return false;
}
ok = KIO::NetAccess::upload( tempFile.name(), mUrl, 0 );
ok = TDEIO::NetAccess::upload( tempFile.name(), mUrl, 0 );
if ( !ok )
addressBook()->error( i18n( "Unable to upload to '%1'." ).arg( mUrl.prettyURL() ) );
@ -283,11 +283,11 @@ bool ResourceNet::asyncSave( Ticket* )
KURL src;
src.setPath( mTempFile->name() );
KIO::Scheduler::checkSlaveOnHold( true );
TDEIO::Scheduler::checkSlaveOnHold( true );
d->mIsSaving = true;
d->mSaveJob = KIO::file_copy( src, mUrl, -1, true, false, false );
connect( d->mSaveJob, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( uploadFinished( KIO::Job* ) ) );
d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false );
connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) );
return true;
}
@ -344,7 +344,7 @@ TQString ResourceNet::format() const
return mFormatName;
}
void ResourceNet::downloadFinished( KIO::Job* )
void ResourceNet::downloadFinished( TDEIO::Job* )
{
kdDebug(5700) << "ResourceNet::downloadFinished()" << endl;
@ -370,7 +370,7 @@ void ResourceNet::downloadFinished( KIO::Job* )
deleteLocalTempFile();
}
void ResourceNet::uploadFinished( KIO::Job *job )
void ResourceNet::uploadFinished( TDEIO::Job *job )
{
kdDebug(5700) << "ResourceFile::uploadFinished()" << endl;

10
kabc/plugins/net/resourcenet.h
Unescape Escape View File

@ -31,7 +31,7 @@ class TQFile;
class TQTimer;
class KTempFile;
namespace KIO {
namespace TDEIO {
class Job;
}
@ -47,11 +47,11 @@ class KABC_EXPORT ResourceNet : public Resource
Q_OBJECT
public:
ResourceNet( const KConfig* );
ResourceNet( const TDEConfig* );
ResourceNet( const KURL &url, const TQString &format );
~ResourceNet();
virtual void writeConfig( KConfig* );
virtual void writeConfig( TDEConfig* );
virtual bool doOpen();
virtual void doClose();
@ -88,8 +88,8 @@ class KABC_EXPORT ResourceNet : public Resource
void init( const KURL &url, const TQString &format );
private slots:
void downloadFinished( KIO::Job* );
void uploadFinished( KIO::Job* );
void downloadFinished( TDEIO::Job* );
void uploadFinished( TDEIO::Job* );
void signalError();
private:

2
kabc/plugins/sql/resourcesql.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ extern "C"
}
}
ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config )
ResourceSql::ResourceSql( AddressBook *ab, const TDEConfig *config )
: Resource( ab ), mDb( 0 )
{
TQString user, password, db, host;

2
kabc/plugins/sql/resourcesql.h
Unescape Escape View File

@ -35,7 +35,7 @@ class ResourceSql : public Resource
public:
ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
const TQString &db, const TQString &host );
ResourceSql( AddressBook *ab, const KConfig * );
ResourceSql( AddressBook *ab, const TDEConfig * );
bool open();
void close();

4
kabc/plugins/sql/resourcesqlconfig.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name )
mainLayout->addWidget( mDbName, 4, 1 );
}
void ResourceSqlConfig::loadSettings( KConfig *config )
void ResourceSqlConfig::loadSettings( TDEConfig *config )
{
mUser->setText( config->readEntry( "SqlUser" ) );
mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
@ -83,7 +83,7 @@ void ResourceSqlConfig::loadSettings( KConfig *config )
mPort->setValue( config->readNumEntry( "SqlPort" ) );
}
void ResourceSqlConfig::saveSettings( KConfig *config )
void ResourceSqlConfig::saveSettings( TDEConfig *config )
{
config->writeEntry( "SqlUser", mUser->text() );
config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) );

4
kabc/plugins/sql/resourcesqlconfig.h
Unescape Escape View File

@ -36,8 +36,8 @@ public:
ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KConfig *config );
void saveSettings( KConfig *config );
void loadSettings( TDEConfig *config );
void saveSettings( TDEConfig *config );
private:
KLineEdit* mUser;

4
kabc/resource.cpp
Unescape Escape View File

@ -197,7 +197,7 @@ bool Resource::ConstIterator::operator!=( const ConstIterator &it )
}
Resource::Resource( const KConfig *config )
Resource::Resource( const TDEConfig *config )
: KRES::Resource( config ), mAddressBook( 0 )
{
}
@ -236,7 +236,7 @@ Resource::ConstIterator Resource::end() const
return it;
}
void Resource::writeConfig( KConfig *config )
void Resource::writeConfig( TDEConfig *config )
{
KRES::Resource::writeConfig( config );
}

4
kabc/resource.h
Unescape Escape View File

@ -118,7 +118,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param config The config object where the derived classes can
read out their settings.
*/
Resource( const KConfig *config );
Resource( const TDEConfig *config );
/**
Destructor.
@ -157,7 +157,7 @@ class KABC_EXPORT Resource : public KRES::Resource
/**
Writes the resource specific config to file.
*/
virtual void writeConfig( KConfig *config );
virtual void writeConfig( TDEConfig *config );
/**
Request a ticket, you have to pass through save() to

12
kabc/scripts/field.src.cpp
Unescape Escape View File

@ -428,13 +428,13 @@ void Field::deleteFields()
void Field::saveFields( const TQString &identifier,
const Field::List &fields )
{
KConfig *cfg = TDEGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );
TDEConfig *cfg = TDEGlobal::config();
TDEConfigGroupSaver( cfg, "KABCFields" );
saveFields( cfg, identifier, fields );
}
void Field::saveFields( KConfig *cfg, const TQString &identifier,
void Field::saveFields( TDEConfig *cfg, const TQString &identifier,
const Field::List &fields )
{
TQValueList<int> fieldIds;
@ -458,13 +458,13 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier,
Field::List Field::restoreFields( const TQString &identifier )
{
KConfig *cfg = TDEGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );
TDEConfig *cfg = TDEGlobal::config();
TDEConfigGroupSaver( cfg, "KABCFields" );
return restoreFields( cfg, identifier );
}
Field::List Field::restoreFields( KConfig *cfg, const TQString &identifier )
Field::List Field::restoreFields( TDEConfig *cfg, const TQString &identifier )
{
const TQValueList<int> fieldIds = cfg->readIntListEntry( identifier );

4
kabc/sound.h
Unescape Escape View File

@ -40,10 +40,10 @@ namespace KABC {
* KAudioPlayer::play( tmp.name() );
* } else if(!sound.url().isEmpty()) {
* TQString tmpFile;
* if(!KIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
* if(!TDEIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
* {
* KMessageBox::error(0L,
* KIO::NetAccess::lastErrorString(),
* TDEIO::NetAccess::lastErrorString(),
* i18n("Failed to download sound file"),
* KMessageBox::Notify
* );

4
kabc/stdaddressbook.cpp
Unescape Escape View File

@ -188,7 +188,7 @@ bool StdAddressBook::automaticSave()
// should get const for 4.X
Addressee StdAddressBook::whoAmI()
{
KConfig config( "kabcrc" );
TDEConfig config( "kabcrc" );
config.setGroup( "General" );
return findByUid( config.readEntry( "WhoAmI" ) );
@ -196,7 +196,7 @@ Addressee StdAddressBook::whoAmI()
void StdAddressBook::setWhoAmI( const Addressee &addr )
{
KConfig config( "kabcrc" );
TDEConfig config( "kabcrc" );
config.setGroup( "General" );
config.writeEntry( "WhoAmI", addr.uid() );

10
kate/interfaces/view.h
Unescape Escape View File

@ -28,7 +28,7 @@
#include <ktexteditor/codecompletioninterface.h>
#include <ktexteditor/dynwordwrapinterface.h>
class KConfig;
class TDEConfig;
namespace Kate
{
@ -189,14 +189,14 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
public:
/**
Reads session config out of the KConfig object. This also includes
Reads session config out of the TDEConfig object. This also includes
the actual cursor position and the bookmarks.
*/
virtual void readSessionConfig(KConfig *) { ; };
virtual void readSessionConfig(TDEConfig *) { ; };
/**
Writes session config into the KConfig object.
Writes session config into the TDEConfig object.
*/
virtual void writeSessionConfig(KConfig *) { ; };
virtual void writeSessionConfig(TDEConfig *) { ; };
public slots:
/**

20
kate/part/kateconfig.cpp
Unescape Escape View File

@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig ()
m_pluginsSet.fill (true);
// init with defaults from config or really hardcoded ones
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kate Document Defaults");
readConfig (config);
}
@ -149,7 +149,7 @@ KateDocumentConfig::~KateDocumentConfig ()
{
}
void KateDocumentConfig::readConfig (KConfig *config)
void KateDocumentConfig::readConfig (TDEConfig *config)
{
configStart ();
@ -191,7 +191,7 @@ void KateDocumentConfig::readConfig (KConfig *config)
configEnd ();
}
void KateDocumentConfig::writeConfig (KConfig *config)
void KateDocumentConfig::writeConfig (TDEConfig *config)
{
config->writeEntry("Tab Width", tabWidth());
@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig ()
s_global = this;
// init with defaults from config or really hardcoded ones
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kate View Defaults");
readConfig (config);
}
@ -660,7 +660,7 @@ KateViewConfig::~KateViewConfig ()
{
}
void KateViewConfig::readConfig (KConfig *config)
void KateViewConfig::readConfig (TDEConfig *config)
{
configStart ();
@ -693,7 +693,7 @@ void KateViewConfig::readConfig (KConfig *config)
configEnd ();
}
void KateViewConfig::writeConfig (KConfig *config)
void KateViewConfig::writeConfig (TDEConfig *config)
{
config->writeEntry( "Dynamic Word Wrap", dynWordWrap() );
config->writeEntry( "Dynamic Word Wrap Indicators", dynWordWrapIndicators() );
@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig ()
s_global = this;
// init with defaults from config or really hardcoded ones
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kate Renderer Defaults");
readConfig (config);
}
@ -1054,7 +1054,7 @@ KateRendererConfig::~KateRendererConfig ()
delete m_font;
}
void KateRendererConfig::readConfig (KConfig *config)
void KateRendererConfig::readConfig (TDEConfig *config)
{
configStart ();
@ -1067,7 +1067,7 @@ void KateRendererConfig::readConfig (KConfig *config)
configEnd ();
}
void KateRendererConfig::writeConfig (KConfig *config)
void KateRendererConfig::writeConfig (TDEConfig *config)
{
config->writeEntry ("Schema", KateFactory::self()->schemaManager()->name(schema()));
@ -1125,7 +1125,7 @@ void KateRendererConfig::setSchemaInternal( int schema )
m_schemaSet = true;
m_schema = schema;
KConfig *config (KateFactory::self()->schemaManager()->schema(schema));
TDEConfig *config (KateFactory::self()->schemaManager()->schema(schema));
TQColor tmp0 (TDEGlobalSettings::baseColor());
TQColor tmp1 (TDEGlobalSettings::highlightColor());

14
kate/part/kateconfig.h
Unescape Escape View File

@ -32,7 +32,7 @@ class KateRenderer;
class KateFontStruct;
class KateFontMetrics;
class KConfig;
class TDEConfig;
class TQFont;
class TQTextCodec;
@ -115,12 +115,12 @@ class KateDocumentConfig : public KateConfig
/**
* Read config from object
*/
void readConfig (KConfig *config);
void readConfig (TDEConfig *config);
/**
* Write config to object
*/
void writeConfig (KConfig *config);
void writeConfig (TDEConfig *config);
protected:
void updateConfig ();
@ -304,12 +304,12 @@ class KateViewConfig : public KateConfig
/**
* Read config from object
*/
void readConfig (KConfig *config);
void readConfig (TDEConfig *config);
/**
* Write config to object
*/
void writeConfig (KConfig *config);
void writeConfig (TDEConfig *config);
protected:
void updateConfig ();
@ -432,12 +432,12 @@ class KateRendererConfig : public KateConfig
/**
* Read config from object
*/
void readConfig (KConfig *config);
void readConfig (TDEConfig *config);
/**
* Write config to object
*/
void writeConfig (KConfig *config);
void writeConfig (TDEConfig *config);
protected:
void updateConfig ();

14
kate/part/katedialogs.cpp
Unescape Escape View File

@ -1369,7 +1369,7 @@ void KateHlConfigPage::apply ()
for ( TQIntDictIterator<KateHlData> it( hlDataDict ); it.current(); ++it )
KateHlManager::self()->getHl( it.currentKey() )->setData( it.current() );
KateHlManager::self()->getKConfig()->sync ();
KateHlManager::self()->getTDEConfig()->sync ();
}
void KateHlConfigPage::reload ()
@ -1453,20 +1453,20 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b
new TQLabel(i18n("<b>Note:</b> New versions are selected automatically."), vbox);
actionButton (User1)->setIconSet(SmallIconSet("ok"));
transferJob = KIO::get(
transferJob = TDEIO::get(
KURL(TQString(HLDOWNLOADPATH)
+ TQString("update-")
+ TQString(KATEPART_VERSION)
+ TQString(".xml")), true, true );
connect(transferJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(listDataReceived(KIO::Job *, const TQByteArray &)));
// void data( KIO::Job *, const TQByteArray &data);
connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
// void data( TDEIO::Job *, const TQByteArray &data);
resize(450, 400);
}
KateHlDownloadDialog::~KateHlDownloadDialog(){}
void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
void KateHlDownloadDialog::listDataReceived(TDEIO::Job *, const TQByteArray &data)
{
if (!transferJob || transferJob->isErrorPage())
{
@ -1538,7 +1538,7 @@ void KateHlDownloadDialog::slotUser1()
TQString filename=src.fileName(false);
TQString dest = destdir+filename;
KIO::NetAccess::download(src,dest, this);
TDEIO::NetAccess::download(src,dest, this);
}
}

6
kate/part/katedialogs.h
Unescape Escape View File

@ -46,7 +46,7 @@ struct syntaxContextData;
class KateDocument;
class KateView;
namespace KIO
namespace TDEIO
{
class Job;
class TransferJob;
@ -350,10 +350,10 @@ class KateHlDownloadDialog: public KDialogBase
private:
class TQListView *list;
class TQString listData;
KIO::TransferJob *transferJob;
TDEIO::TransferJob *transferJob;
private slots:
void listDataReceived(KIO::Job *, const TQByteArray &data);
void listDataReceived(TDEIO::Job *, const TQByteArray &data);
public slots:
void slotUser1();

36
kate/part/katedocument.cpp
Unescape Escape View File

@ -1879,7 +1879,7 @@ void KateDocument::setDontChangeHlOnSave()
//END
//BEGIN KTextEditor::ConfigInterface stuff
void KateDocument::readConfig(KConfig *config)
void KateDocument::readConfig(TDEConfig *config)
{
config->setGroup("Kate Document Defaults");
@ -1895,7 +1895,7 @@ void KateDocument::readConfig(KConfig *config)
KateRendererConfig::global()->readConfig (config);
}
void KateDocument::writeConfig(KConfig *config)
void KateDocument::writeConfig(TDEConfig *config)
{
config->setGroup("Kate Document Defaults");
@ -1913,18 +1913,18 @@ void KateDocument::writeConfig(KConfig *config)
void KateDocument::readConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
readConfig (config);
}
void KateDocument::writeConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
writeConfig (config);
config->sync();
}
void KateDocument::readSessionConfig(KConfig *kconfig)
void KateDocument::readSessionConfig(TDEConfig *kconfig)
{
// restore the url
KURL url (kconfig->readEntry("URL"));
@ -1953,7 +1953,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig)
addMark( marks[i], KateDocument::markType01 );
}
void KateDocument::writeSessionConfig(KConfig *kconfig)
void KateDocument::writeSessionConfig(TDEConfig *kconfig)
{
if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
return;
@ -2302,14 +2302,14 @@ bool KateDocument::openURL( const KURL &url )
m_tempFile = new KTempFile ();
m_file = m_tempFile->name();
m_job = KIO::get ( url, false, isProgressInfoEnabled() );
m_job = TDEIO::get ( url, false, isProgressInfoEnabled() );
// connect to slots
connect( m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotDataKate( KIO::Job*, const TQByteArray& ) ) );
connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ),
TQT_SLOT( slotFinishedKate( KIO::Job* ) ) );
connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
TQWidget *w = widget ();
if (!w && !m_views.isEmpty ())
@ -2324,7 +2324,7 @@ bool KateDocument::openURL( const KURL &url )
}
}
void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
void KateDocument::slotDataKate ( TDEIO::Job *, const TQByteArray &data )
{
// kdDebug(13020) << "KateDocument::slotData" << endl;
@ -2334,7 +2334,7 @@ void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
m_tempFile->file()->writeBlock (data);
}
void KateDocument::slotFinishedKate ( KIO::Job * job )
void KateDocument::slotFinishedKate ( TDEIO::Job * job )
{
// kdDebug(13020) << "KateDocument::slotJobFinished" << endl;
@ -2373,7 +2373,7 @@ bool KateDocument::openFile()
return openFile (0);
}
bool KateDocument::openFile(KIO::Job * job)
bool KateDocument::openFile(TDEIO::Job * job)
{
m_loading = true;
// add new m_file to dirwatch
@ -2520,8 +2520,8 @@ bool KateDocument::save()
// get the right permissions, start with safe default
mode_t perms = 0600;
KIO::UDSEntry fentry;
if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
TDEIO::UDSEntry fentry;
if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
{
kdDebug () << "stating succesfull: " << url() << endl;
KFileItem item (fentry, url());
@ -2530,8 +2530,8 @@ bool KateDocument::save()
// first del existing file if any, than copy over the file we have
// failure if a: the existing file could not be deleted, b: the file could not be copied
if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() ))
&& KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() ))
&& TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
{
kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
}

18
kate/part/katedocument.h
Unescape Escape View File

@ -46,7 +46,7 @@
namespace KTextEditor { class Plugin; }
namespace KIO { class TransferJob; }
namespace TDEIO { class TransferJob; }
class KateUndoGroup;
class KateCmd;
@ -439,10 +439,10 @@ class KateDocument : public Kate::Document,
public slots:
void readConfig ();
void writeConfig ();
void readConfig (KConfig *);
void writeConfig (KConfig *);
void readSessionConfig (KConfig *);
void writeSessionConfig (KConfig *);
void readConfig (TDEConfig *);
void writeConfig (TDEConfig *);
void readSessionConfig (TDEConfig *);
void writeSessionConfig (TDEConfig *);
void configDialog ();
//
@ -555,7 +555,7 @@ class KateDocument : public Kate::Document,
/* Anders: Reimplemented to do kate specific stuff */
bool saveAs( const KURL &url );
bool openFile (KIO::Job * job);
bool openFile (TDEIO::Job * job);
bool openFile ();
bool saveFile ();
@ -565,8 +565,8 @@ class KateDocument : public Kate::Document,
void setModified( bool m );
private slots:
void slotDataKate ( KIO::Job* kio_job, const TQByteArray &data );
void slotFinishedKate ( KIO::Job * job );
void slotDataKate ( TDEIO::Job* kio_job, const TQByteArray &data );
void slotFinishedKate ( TDEIO::Job * job );
private:
void abortLoadKate();
@ -1004,7 +1004,7 @@ class KateDocument : public Kate::Document,
static TQRegExp kvLineMime;
static TQRegExp kvVar;
KIO::TransferJob *m_job;
TDEIO::TransferJob *m_job;
KTempFile *m_tempFile;
// TemplateInterface

4
kate/part/katefiletype.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ KateFileTypeManager::~KateFileTypeManager ()
//
void KateFileTypeManager::update ()
{
KConfig config ("katefiletyperc", false, false);
TDEConfig config ("katefiletyperc", false, false);
TQStringList g (config.groupList());
g.sort ();
@ -101,7 +101,7 @@ void KateFileTypeManager::update ()
//
void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
{
KConfig config ("katefiletyperc", false, false);
TDEConfig config ("katefiletyperc", false, false);
TQStringList newg;
for (uint z=0; z < v->count(); z++)

18
kate/part/katehighlight.cpp
Unescape Escape View File

@ -1599,7 +1599,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine,
void KateHighlighting::loadWildcards()
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
TQString extensionString = config->readEntry("Wildcards", iWildcards);
@ -1636,7 +1636,7 @@ TQStringList& KateHighlighting::getPlainExtensions()
TQString KateHighlighting::getMimetypes()
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
return config->readEntry("Mimetypes", iMimetypes);
@ -1644,7 +1644,7 @@ TQString KateHighlighting::getMimetypes()
int KateHighlighting::priority()
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
return config->readNumEntry("Priority", m_priority);
@ -1652,7 +1652,7 @@ int KateHighlighting::priority()
KateHlData *KateHighlighting::getData()
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
KateHlData *hlData = new KateHlData(
@ -1666,7 +1666,7 @@ KateHlData *KateHighlighting::getData()
void KateHighlighting::setData(KateHlData *hlData)
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName);
config->writeEntry("Wildcards",hlData->wildcards);
@ -1676,7 +1676,7 @@ void KateHighlighting::setData(KateHlData *hlData)
void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &list)
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema));
list.clear();
@ -1729,7 +1729,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l
*/
void KateHighlighting::setKateHlItemDataList(uint schema, KateHlItemDataList &list)
{
KConfig *config = KateHlManager::self()->getKConfig();
TDEConfig *config = KateHlManager::self()->getTDEConfig();
config->setGroup("Highlighting " + iName + " - Schema "
+ KateFactory::self()->schemaManager()->name(schema));
@ -3264,7 +3264,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
error->setSelectedTextColor(Qt::red);
list.append(error);
KConfig *config = KateHlManager::self()->self()->getKConfig();
TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
for (uint z = 0; z < defaultStyles(); z++)
@ -3317,7 +3317,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
void KateHlManager::setDefaults(uint schema, KateAttributeList &list)
{
KConfig *config = KateHlManager::self()->self()->getKConfig();
TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
for (uint z = 0; z < defaultStyles(); z++)

4
kate/part/katehighlight.h
Unescape Escape View File

@ -350,7 +350,7 @@ class KateHlManager : public TQObject
static KateHlManager *self();
inline KConfig *getKConfig() { return &m_config; };
inline TDEConfig *getTDEConfig() { return &m_config; };
KateHighlighting *getHl(int n);
int nameFind(const TQString &name);
@ -396,7 +396,7 @@ class KateHlManager : public TQObject
static KateHlManager *s_self;
KConfig m_config;
TDEConfig m_config;
TQStringList commonSuffixes;
KateSyntaxDocument *syntax;

8
kate/part/katejscript.cpp
Unescape Escape View File

@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force)
return;
// We'll store the scripts list in this config
KConfig config("katepartjscriptrc", false, false);
TDEConfig config("katepartjscriptrc", false, false);
// figure out if the kate install is too new
config.setGroup ("General");
@ -685,7 +685,7 @@ void KateJScriptManager::collectScripts (bool force)
if (dfi.exists())
{
KConfig df (desktopFile, true, false);
TDEConfig df (desktopFile, true, false);
df.setDesktopGroup ();
// get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback
@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg
if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists)
return false;
KConfig df (m_scripts[cmd]->desktopFilename(), true, false);
TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false);
df.setDesktopGroup ();
msg = df.readEntry ("X-Kate-Help");
@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
// We'll store the scripts list in this config
KConfig config("katepartindentjscriptrc", false, false);
TDEConfig config("katepartindentjscriptrc", false, false);
#if 0
// figure out if the kate install is too new
config.setGroup ("General");

2
kate/part/kateluaindentscript.cpp
Unescape Escape View File

@ -371,7 +371,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
<<"================================================="<<endl;
// We'll store the scripts list in this config
KConfig config("katepartluaindentscriptrc", false, false);
TDEConfig config("katepartluaindentscriptrc", false, false);
#if 0
// figure out if the kate install is too new
config.setGroup ("General");

10
kate/part/kateschema.cpp
Unescape Escape View File

@ -194,7 +194,7 @@ void KateSchemaManager::update (bool readfromfile)
// get the right group
// special handling of the default schemas ;)
//
KConfig *KateSchemaManager::schema (uint number)
TDEConfig *KateSchemaManager::schema (uint number)
{
if ((number>1) && (number < m_schemas.count()))
m_config.setGroup (m_schemas[number]);
@ -440,7 +440,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
mark[6] = Qt::red;
SchemaColors c;
KConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
c.back= config->readColorEntry("Color Background", &tmp0);
c.selected = config->readColorEntry("Color Selection", &tmp1);
@ -493,7 +493,7 @@ void KateSchemaConfigColorTab::apply ()
for ( it = m_schemas.begin(); it != m_schemas.end(); ++it )
{
kdDebug(13030)<<"APPLY scheme = "<<it.key()<<endl;
KConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
TDEConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
kdDebug(13030)<<"Using config group "<<config->group()<<endl;
SchemaColors c = it.data();
@ -759,7 +759,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
// Set listview colors
// We do that now, because we can now get the "normal text" color.
// TODO this reads of the KConfig object, which should be changed when
// TODO this reads of the TDEConfig object, which should be changed when
// the color tab is fixed.
TQPalette p ( m_styles->palette() );
TQColor _c ( TDEGlobalSettings::baseColor() );
@ -905,7 +905,7 @@ void KateSchemaConfigPage::apply()
KateRendererConfig::global()->reloadSchema();
// sync the hl config for real
KateHlManager::self()->getKConfig()->sync ();
KateHlManager::self()->getTDEConfig()->sync ();
}
void KateSchemaConfigPage::reload()

6
kate/part/kateschema.h
Unescape Escape View File

@ -55,7 +55,7 @@ class KateSchemaManager
/**
* return kconfig with right group set or set to Normal if not there
*/
KConfig *schema (uint number);
TDEConfig *schema (uint number);
void addSchema (const TQString &t);
@ -85,7 +85,7 @@ class KateSchemaManager
static TQString printingSchema ();
private:
KConfig m_config;
TDEConfig m_config;
TQStringList m_schemas;
};
@ -216,7 +216,7 @@ class KateSchemaConfigFontTab : public TQWidget
~KateSchemaConfigFontTab();
public:
void readConfig (KConfig *config);
void readConfig (TDEConfig *config);
public slots:
void apply();

2
kate/part/katesyntaxdocument.cpp
Unescape Escape View File

@ -335,7 +335,7 @@ void KateSyntaxDocument::setupModeList (bool force)
return;
// We'll store the ModeList in katesyntaxhighlightingrc
KConfig config("katesyntaxhighlightingrc", false, false);
TDEConfig config("katesyntaxhighlightingrc", false, false);
// figure our if the kate install is too new
config.setGroup ("General");

6
kate/part/kateview.cpp
Unescape Escape View File

@ -930,12 +930,12 @@ void KateView::joinLines()
m_doc->joinLines( first, last );
}
void KateView::readSessionConfig(KConfig *config)
void KateView::readSessionConfig(TDEConfig *config)
{
setCursorPositionInternal (config->readNumEntry("CursorLine"), config->readNumEntry("CursorColumn"), 1);
}
void KateView::writeSessionConfig(KConfig *config)
void KateView::writeSessionConfig(TDEConfig *config)
{
config->writeEntry("CursorLine",m_viewInternal->cursor.line());
config->writeEntry("CursorColumn",m_viewInternal->cursor.col());
@ -1839,7 +1839,7 @@ void KateView::exportAsHTML ()
if ( url.isLocalFile() )
return;
KIO::NetAccess::upload( filename, url, 0 );
TDEIO::NetAccess::upload( filename, url, 0 );
}
//END

4
kate/part/kateview.h
Unescape Escape View File

@ -370,8 +370,8 @@ class KateView : public Kate::View,
// config file / session management functions
public:
void readSessionConfig(KConfig *);
void writeSessionConfig(KConfig *);
void readSessionConfig(TDEConfig *);
void writeSessionConfig(TDEConfig *);
public slots:
int getEol();

2
kate/part/kateviewhelpers.cpp
Unescape Escape View File

@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
{
KateViewConfig::global()->setDefaultMarkType (vec[result-100]);
// flush config, otherwise it isn't nessecarily done
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kate View Defaults");
KateViewConfig::global()->writeConfig( config );
}

6
kate/part/test_regression.cpp
Unescape Escape View File

@ -650,7 +650,7 @@ int main(int argc, char *argv[])
RegressionTest *RegressionTest::curr = 0;
RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig,
RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
const TQString &baseDir,
const TQString &outputDir, bool _genOutput)
: TQObject(part)
@ -723,14 +723,14 @@ RegressionTest::~RegressionTest()
delete m_failureSave;
}
void RegressionTest::setFailureSnapshotConfig(KConfig *cfg, const TQString &sname)
void RegressionTest::setFailureSnapshotConfig(TDEConfig *cfg, const TQString &sname)
{
Q_ASSERT(cfg);
m_failureComp = cfg;
m_failureComp->setGroup(sname);
}
void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname)
void RegressionTest::setFailureSnapshotSaver(TDEConfig *cfg, const TQString &sname)
{
Q_ASSERT(cfg);
m_failureSave = cfg;

12
kate/part/test_regression.h
Unescape Escape View File

@ -165,7 +165,7 @@ class RegressionTest : public TQObject
Q_OBJECT
public:
RegressionTest(KateDocument *part, KConfig *baseConfig,
RegressionTest(KateDocument *part, TDEConfig *baseConfig,
const TQString &baseDir, const TQString &outputDir,
bool _genOutput);
~RegressionTest();
@ -181,21 +181,21 @@ public:
void rereadConfig();
static void createMissingDirs(const TQString &path);
void setFailureSnapshotConfig(KConfig *cfg, const TQString &snapshotname);
void setFailureSnapshotSaver(KConfig *cfg, const TQString &snapshotname);
void setFailureSnapshotConfig(TDEConfig *cfg, const TQString &snapshotname);
void setFailureSnapshotSaver(TDEConfig *cfg, const TQString &snapshotname);
void createLink( const TQString& test, int failures );
void doFailureReport( const TQString& test, int failures );
KateDocument *m_part;
KateView *m_view;
KConfig *m_baseConfig;
TDEConfig *m_baseConfig;
TQString m_baseDir;
TQString m_outputDir;
bool m_genOutput;
TQString m_currentBase;
KConfig *m_failureComp;
KConfig *m_failureSave;
TDEConfig *m_failureComp;
TDEConfig *m_failureSave;
TQString m_currentOutput;
TQString m_currentCategory;

4
kate/plugins/autobookmarker/autobookmarker.cpp
Unescape Escape View File

@ -199,7 +199,7 @@ void ABGlobal::readConfig()
m_ents = new ABEntityList;
else
m_ents->clear();
KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
uint n( 0 );
while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@ -225,7 +225,7 @@ void ABGlobal::readConfig()
void ABGlobal::writeConfig()
{
KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
// clean the config object
TQStringList l = config->groupList();

6
kate/plugins/insertfile/insertfileplugin.cpp
Unescape Escape View File

@ -103,12 +103,12 @@ void InsertFilePluginView::slotInsertFile()
KURL destURL;
destURL.setPath( _tmpfile );
_job = KIO::file_copy( _file, destURL, 0600, true, false, true );
connect( _job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished ( KIO::Job * ) ) );
_job = TDEIO::file_copy( _file, destURL, 0600, true, false, true );
connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) );
}
}
void InsertFilePluginView::slotFinished( KIO::Job *job )
void InsertFilePluginView::slotFinished( TDEIO::Job *job )
{
assert( job == _job );
_job = 0;

6
kate/plugins/insertfile/insertfileplugin.h
Unescape Escape View File

@ -58,13 +58,13 @@ class InsertFilePluginView : public TQObject, public KXMLGUIClient
/* display a file dialog, and insert the chosen file */
void slotInsertFile();
private slots:
void slotFinished( KIO::Job *job );
//slotAborted( KIO::Job *job );
void slotFinished( TDEIO::Job *job );
//slotAborted( TDEIO::Job *job );
private:
void insertFile();
KURL _file;
TQString _tmpfile;
KIO::FileCopyJob *_job;
TDEIO::FileCopyJob *_job;
};
#endif // _INSERT_FILE_PLUGIN_H_

4
kate/plugins/isearch/ISearchPlugin.cpp
Unescape Escape View File

@ -170,12 +170,12 @@ void ISearchPluginView::setView( KTextEditor::View* view )
void ISearchPluginView::readConfig()
{
// KConfig* config = instance()->config();
// TDEConfig* config = instance()->config();
}
void ISearchPluginView::writeConfig()
{
// KConfig* config = instance()->config();
// TDEConfig* config = instance()->config();
}
void ISearchPluginView::setCaseSensitive( bool caseSensitive )

4
kate/plugins/wordcompletion/docwordcompletion.cpp
Unescape Escape View File

@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
void DocWordCompletionPlugin::readConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "DocWordCompletion Plugin" );
m_treshold = config->readNumEntry( "treshold", 3 );
m_autopopup = config->readBoolEntry( "autopopup", true );
@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig()
void DocWordCompletionPlugin::writeConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("DocWordCompletion Plugin");
config->writeEntry("autopopup", m_autopopup );
config->writeEntry("treshold", m_treshold );

2
kcert/kcertpart.cc
Unescape Escape View File

@ -740,7 +740,7 @@ void KCertPart::slotImport() {
if (!_silentImport)
KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import"));
} else if (_ca) {
KConfig cfg("ksslcalist", true, false);
TDEConfig cfg("ksslcalist", true, false);
if (cfg.hasGroup(_ca->getSubject())) {
TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?");
int rc= KMessageBox::warningContinueCancel(_frame, msg, i18n("Certificate Import"),i18n("Replace"));

8
kcmshell/main.cpp
Unescape Escape View File

@ -106,7 +106,7 @@ static KService::Ptr locateModule(const TQCString& module)
if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
return locateModule( "kde-" + module );
if(!KCModuleLoader::testModule( module ))
if(!TDECModuleLoader::testModule( module ))
{
kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl;
return 0;
@ -301,7 +301,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
id = args->getOption( "embed-proxy" ).toInt(&idValid);
if( idValid )
{
KCModuleProxy *module = new KCModuleProxy( modules.first()->desktopEntryName() );
TDECModuleProxy *module = new TDECModuleProxy( modules.first()->desktopEntryName() );
module->realModule();
QXEmbed::embedClientIntoWindow( module, id);
app.exec();
@ -318,7 +318,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
i18n("Configure - %1").arg(kapp->caption()), 0, "", true );
for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it)
dlg->addModule(KCModuleInfo(*it));
dlg->addModule(TDECModuleInfo(*it));
if ( args->isSet( "embed" ))
{
@ -339,7 +339,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
if (kapp->iconName() != kapp->name())
setIcon(dlg, kapp->iconName());
else if ( modules.count() == 1 )
setIcon(dlg, KCModuleInfo( modules.first()).icon());
setIcon(dlg, TDECModuleInfo( modules.first()).icon());
dlg->exec();
delete dlg;

28
kconf_update/kconf_update.cpp
Unescape Escape View File

@ -73,11 +73,11 @@ public:
void gotScriptArguments(const TQString &_arguments);
void resetOptions();
void copyGroup(KConfigBase *cfg1, const TQString &grp1,
KConfigBase *cfg2, const TQString &grp2);
void copyGroup(TDEConfigBase *cfg1, const TQString &grp1,
TDEConfigBase *cfg2, const TQString &grp2);
protected:
KConfig *config;
TDEConfig *config;
TQString currentFilename;
bool skip;
bool debug;
@ -86,9 +86,9 @@ protected:
TQString oldFile;
TQString newFile;
TQString newFileName;
KConfig *oldConfig1; // Config to read keys from.
KConfig *oldConfig2; // Config to delete keys from.
KConfig *newConfig;
TDEConfig *oldConfig1; // Config to read keys from.
TDEConfig *oldConfig2; // Config to delete keys from.
TDEConfig *newConfig;
TQString oldGroup;
TQString newGroup;
@ -113,7 +113,7 @@ KonfUpdate::KonfUpdate()
oldConfig2 = 0;
newConfig = 0;
config = new KConfig("kconf_updaterc");
config = new TDEConfig("kconf_updaterc");
TQStringList updateFiles;
TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs();
@ -501,7 +501,7 @@ void KonfUpdate::gotFile(const TQString &_file)
if (!oldFile.isEmpty())
{
oldConfig2 = new KConfig(oldFile, false, false);
oldConfig2 = new TDEConfig(oldFile, false, false);
TQString cfg_id = currentFilename + ":" + id;
oldConfig2->setGroup("$Version");
TQStringList ids = oldConfig2->readListEntry("update_info");
@ -514,7 +514,7 @@ void KonfUpdate::gotFile(const TQString &_file)
if (!newFile.isEmpty())
{
newConfig = new KConfig(newFile, false, false);
newConfig = new TDEConfig(newFile, false, false);
newConfig->setGroup("$Version");
ids = newConfig->readListEntry("update_info");
if (ids.contains(cfg_id))
@ -528,7 +528,7 @@ void KonfUpdate::gotFile(const TQString &_file)
newConfig = oldConfig2;
}
oldConfig1 = new KConfig(oldFile, true, false);
oldConfig1 = new TDEConfig(oldFile, true, false);
}
else
{
@ -703,8 +703,8 @@ void KonfUpdate::gotOptions(const TQString &_options)
}
}
void KonfUpdate::copyGroup(KConfigBase *cfg1, const TQString &grp1,
KConfigBase *cfg2, const TQString &grp2)
void KonfUpdate::copyGroup(TDEConfigBase *cfg1, const TQString &grp1,
TDEConfigBase *cfg2, const TQString &grp2)
{
cfg1->setGroup(grp1);
cfg2->setGroup(grp2);
@ -905,10 +905,10 @@ void KonfUpdate::gotScript(const TQString &_script)
// Merging in new entries.
m_bCopy = true;
{
KConfig *saveOldConfig1 = oldConfig1;
TDEConfig *saveOldConfig1 = oldConfig1;
TQString saveOldGroup = oldGroup;
TQString saveNewGroup = newGroup;
oldConfig1 = new KConfig(tmp2.name(), true, false);
oldConfig1 = new TDEConfig(tmp2.name(), true, false);
// For all groups...
TQStringList grpList = oldConfig1->groupList();

6
kded/kded.cpp
Unescape Escape View File

@ -155,7 +155,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
void Kded::initModules()
{
m_dontLoad.clear();
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
// not the same user like the one running the session (most likely we're run via sudo or something)
if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@ -225,7 +225,7 @@ void Kded::initModules()
void Kded::loadSecondPhase()
{
kdDebug(7020) << "Loading second phase autoload" << endl;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
KService::List kdedModules = KServiceType::offers("KDEDModule");
for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
{
@ -905,7 +905,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
}
TDEInstance *instance = new TDEInstance(&aboutData);
KConfig *config = instance->config(); // Enable translations.
TDEConfig *config = instance->config(); // Enable translations.
if (args->isSet("check"))
{

2
kdewidgets/kde.widgets
Unescape Escape View File

@ -26,7 +26,7 @@ Group=Graphics (KDE)
ToolTip=Combo Box (KDE)
Group=Input (KDE)
[KCModule]
[TDECModule]
ToolTip=KControl Center Module (KDE)
IsContainer=true
Group=Container (KDE)

18
kdewidgets/makekdewidgets.cpp
Unescape Escape View File

@ -117,11 +117,11 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
static TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group );
static TQString buildWidgetCreate( const TQString &name, KConfig &input );
static TQString buildWidgetInclude( const TQString &name, KConfig &input );
static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group );
static TQString buildWidgetCreate( const TQString &name, TDEConfig &input );
static TQString buildWidgetInclude( const TQString &name, TDEConfig &input );
static void buildFile( TQTextStream &stream, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath );
static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
static TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath );
int main( int argc, char **argv ) {
new TDEInstance( "makekdewidgets" );
@ -160,7 +160,7 @@ int main( int argc, char **argv ) {
}
void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath ) {
KConfig input( fileName, true, false );
TDEConfig input( fileName, true, false );
input.setGroup( "Global" );
TQMap<TQString, TQString> MainMap;
MainMap.insert( "PluginName", input.readEntry( "PluginName", pluginName ) );
@ -195,7 +195,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
}
TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) {
TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ) {
input.setGroup( name );
TQMap<TQString, TQString> defMap;
defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) );
@ -209,7 +209,7 @@ TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &g
return KMacroExpander::expandMacros( widgetDef, defMap );
}
TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
TQString buildWidgetCreate( const TQString &name, TDEConfig &input ) {
input.setGroup( name );
TQMap<TQString, TQString> createMap;
createMap.insert( "ImplClass", input.readEntry( "ImplClass", name ) );
@ -218,12 +218,12 @@ TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
return KMacroExpander::expandMacros( widgetCreate, createMap );
}
TQString buildWidgetInclude( const TQString &name, KConfig &input ) {
TQString buildWidgetInclude( const TQString &name, TDEConfig &input ) {
input.setGroup( name );
return "#include <" + input.readEntry( "IncludeFile", name.lower() + ".h" ) + ">";
}
TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) {
TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath ) {
input.setGroup( name );
TQString cleanName = name.lower().replace( ":", "_" );
TQString iconName = input.readEntry( "IconSet", cleanName + ".png" );

2
kdewidgets/tests/test.widgets
Unescape Escape View File

@ -26,7 +26,7 @@ Group=Graphics (KDE)
ToolTip=Combo Box (KDE)
Group=Input (KDE)
[KCModule]
[TDECModule]
ToolTip=KControl Center Module (KDE)
IsContainer=true
Group=Container (KDE)

16
kdoctools/kio_help.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
#include <libxslt/transform.h>
#include "xslt.h"
using namespace KIO;
using namespace TDEIO;
TQString HelpProtocol::langLookup(const TQString& fname)
{
@ -169,7 +169,7 @@ void HelpProtocol::get( const KURL& url )
if (doc.isEmpty())
{
error( KIO::ERR_DOES_NOT_EXIST, url.url() );
error( TDEIO::ERR_DOES_NOT_EXIST, url.url() );
return;
}
@ -345,24 +345,24 @@ void HelpProtocol::get_file( const KURL& url )
struct stat buff;
if ( ::stat( _path.data(), &buff ) == -1 ) {
if ( errno == EACCES )
error( KIO::ERR_ACCESS_DENIED, url.path() );
error( TDEIO::ERR_ACCESS_DENIED, url.path() );
else
error( KIO::ERR_DOES_NOT_EXIST, url.path() );
error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
return;
}
if ( S_ISDIR( buff.st_mode ) ) {
error( KIO::ERR_IS_DIRECTORY, url.path() );
error( TDEIO::ERR_IS_DIRECTORY, url.path() );
return;
}
if ( S_ISFIFO( buff.st_mode ) || S_ISSOCK ( buff.st_mode ) ) {
error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
return;
}
int fd = open( _path.data(), O_RDONLY);
if ( fd < 0 ) {
error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
return;
}
@ -379,7 +379,7 @@ void HelpProtocol::get_file( const KURL& url )
{
if (errno == EINTR)
continue;
error( KIO::ERR_COULD_NOT_READ, url.path());
error( TDEIO::ERR_COULD_NOT_READ, url.path());
close(fd);
return;
}

2
kdoctools/kio_help.h
Unescape Escape View File

@ -18,7 +18,7 @@
#include <kio/global.h>
#include <kio/slavebase.h>
class HelpProtocol : public KIO::SlaveBase
class HelpProtocol : public TDEIO::SlaveBase
{
public:

4
khtml/css/cssstyleselector.cpp
Unescape Escape View File

@ -2076,7 +2076,7 @@ static TQColor colorForCSSValue( int css_value )
else if ( css_value == CSS_VAL_INFOTEXT )
return TQToolTip::palette().inactive().foreground();
else if ( css_value == CSS_VAL_BACKGROUND ) {
KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
TDEConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
TQColor c = pal.color( uicol->group, uicol->role );
#ifndef APPLE_CHANGES
if ( uicol->configEntry ) {
KConfig *globalConfig = TDEGlobal::config();
TDEConfig *globalConfig = TDEGlobal::config();
globalConfig->setGroup( uicol->configGroup );
c = globalConfig->readColorEntry( uicol->configEntry, &c );
}

4
khtml/ecma/kjs_debugwin.cpp
Unescape Escape View File

@ -860,8 +860,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
}
if (dontShowAgain) {
KConfig *config = kapp->config();
KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
TDEConfig *config = kapp->config();
TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
config->sync();
TQByteArray data;

2
khtml/ecma/kjs_navigator.cpp
Unescape Escape View File

@ -306,7 +306,7 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
continue;
}
// read configuration
KConfig kc( locate ("data", pluginsinfo.toString()) );
TDEConfig kc( locate ("data", pluginsinfo.toString()) );
unsigned num = (unsigned int) kc.readNumEntry("number");
for ( unsigned n = 0; n < num; n++ ) {
kc.setGroup( TQString::number(n) );

42
khtml/ecma/xmlhttprequest.cpp
Unescape Escape View File

@ -42,7 +42,7 @@
#include "KWQLoader.h"
#else
#include <kio/netaccess.h>
using KIO::NetAccess;
using TDEIO::NetAccess;
#endif
#define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\
@ -81,23 +81,23 @@ XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
}
#ifdef APPLE_CHANGES
void XMLHttpRequestQObject::slotData( KIO::Job* job, const char *data, int size )
void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const char *data, int size )
{
jsObject->slotData(job, data, size);
}
#else
void XMLHttpRequestQObject::slotData( KIO::Job* job, const TQByteArray &data )
void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const TQByteArray &data )
{
jsObject->slotData(job, data);
}
#endif
void XMLHttpRequestQObject::slotFinished( KIO::Job* job )
void XMLHttpRequestQObject::slotFinished( TDEIO::Job* job )
{
jsObject->slotFinished(job);
}
void XMLHttpRequestQObject::slotRedirection( KIO::Job* job, const KURL& url)
void XMLHttpRequestQObject::slotRedirection( TDEIO::Job* job, const KURL& url)
{
jsObject->slotRedirection( job, url );
}
@ -344,7 +344,7 @@ void XMLHttpRequest::send(const TQString& _body)
const TQString protocol = url.protocol().lower();
// Abandon the request when the protocol is other than "http",
// instead of blindly doing a KIO::get on other protocols like file:/.
// instead of blindly doing a TDEIO::get on other protocols like file:/.
if (!protocol.startsWith("http") && !protocol.startsWith("webdav"))
{
abort();
@ -359,14 +359,14 @@ void XMLHttpRequest::send(const TQString& _body)
TQCString str = _body.utf8();
buf.duplicate(str.data(), str.size() - 1);
job = KIO::http_post( url, buf, false );
job = TDEIO::http_post( url, buf, false );
if(contentType.isNull())
job->addMetaData( "content-type", "Content-type: text/plain" );
else
job->addMetaData( "content-type", contentType );
}
else {
job = KIO::get( url, false, false );
job = TDEIO::get( url, false, false );
}
if (!requestHeaders.isEmpty()) {
@ -421,22 +421,22 @@ void XMLHttpRequest::send(const TQString& _body)
return;
}
qObject->connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
TQT_SLOT( slotFinished( KIO::Job* ) ) );
qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
#ifdef APPLE_CHANGES
qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const char*, int ) ),
TQT_SLOT( slotData( KIO::Job*, const char*, int ) ) );
qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
#else
qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
#endif
qObject->connect( job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
#ifdef APPLE_CHANGES
KWQServeRequest(khtml::Cache::loader(), doc->docLoader(), job);
#else
KIO::Scheduler::scheduleJob( job );
TDEIO::Scheduler::scheduleJob( job );
#endif
}
@ -610,7 +610,7 @@ void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL
slotFinished(0);
}
void XMLHttpRequest::slotFinished(KIO::Job *)
void XMLHttpRequest::slotFinished(TDEIO::Job *)
{
if (decoder) {
response += decoder->flush();
@ -625,7 +625,7 @@ void XMLHttpRequest::slotFinished(KIO::Job *)
decoder = 0;
}
void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
void XMLHttpRequest::slotRedirection(TDEIO::Job*, const KURL& url)
{
if (!urlMatchesDocumentDomain(url)) {
abort();
@ -633,9 +633,9 @@ void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
}
#ifdef APPLE_CHANGES
void XMLHttpRequest::slotData( KIO::Job*, const char *data, int len )
void XMLHttpRequest::slotData( TDEIO::Job*, const char *data, int len )
#else
void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
void XMLHttpRequest::slotData(TDEIO::Job*, const TQByteArray &_data)
#endif
{
if (state < Loaded ) {

16
khtml/ecma/xmlhttprequest.h
Unescape Escape View File

@ -75,12 +75,12 @@ namespace KJS {
XMLHttpRequestQObject *qObject;
#ifdef APPLE_CHANGES
void slotData( KIO::Job* job, const char *data, int size );
void slotData( TDEIO::Job* job, const char *data, int size );
#else
void slotData( KIO::Job* job, const TQByteArray &data );
void slotData( TDEIO::Job* job, const TQByteArray &data );
#endif
void slotFinished( KIO::Job* );
void slotRedirection( KIO::Job*, const KURL& );
void slotFinished( TDEIO::Job* );
void slotRedirection( TDEIO::Job*, const KURL& );
void processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers);
@ -103,7 +103,7 @@ namespace KJS {
TQString m_mimeTypeOverride;
TQString contentType;
KIO::TransferJob * job;
TDEIO::TransferJob * job;
XMLHttpRequestState state;
JSEventListener *onReadyStateChangeListener;
@ -129,9 +129,9 @@ namespace KJS {
XMLHttpRequestQObject(XMLHttpRequest *_jsObject);
public slots:
void slotData( KIO::Job* job, const TQByteArray &data );
void slotFinished( KIO::Job* job );
void slotRedirection( KIO::Job* job, const KURL& url);
void slotData( TDEIO::Job* job, const TQByteArray &data );
void slotFinished( TDEIO::Job* job );
void slotRedirection( TDEIO::Job* job, const KURL& url);
private:
XMLHttpRequest *jsObject;

8
khtml/html/html_formimpl.cpp
Unescape Escape View File

@ -1615,16 +1615,16 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
fileurl = KURL::fromPathOrURL(val);
}
KIO::UDSEntry filestat;
TDEIO::UDSEntry filestat;
// can't submit file in www-url-form encoded
TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
if (multipart) {
TQCString filearray( "" );
if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
if ( TDEIO::NetAccess::stat(fileurl, filestat, toplevel)) {
const KFileItem fileitem(filestat, fileurl, true, false);
if ( fileitem.isFile() &&
KIO::NetAccess::download(fileurl, local, toplevel) ) {
TDEIO::NetAccess::download(fileurl, local, toplevel) ) {
TQFile file(local);
filearray.resize(file.size()+1);
if ( file.open( IO_ReadOnly ) ) {
@ -1633,7 +1633,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
filearray[readbytes] = '\0';
file.close();
}
KIO::NetAccess::removeTempFile( local );
TDEIO::NetAccess::removeTempFile( local );
}
}
encoding += filearray;

4
khtml/java/kjavaappletserver.cpp
Unescape Escape View File

@ -193,7 +193,7 @@ void KJavaAppletServer::freeJavaServer()
//instead of immediately quitting here, set a timer to kill us
//if there are still no servers- give us one minute
//this is to prevent repeated loading and unloading of the jvm
KConfig config( "konquerorrc", true );
TDEConfig config( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
if( config.readBoolEntry( "ShutdownAppletServer", true ) )
{
@ -214,7 +214,7 @@ void KJavaAppletServer::checkShutdown()
void KJavaAppletServer::setupJava( KJavaProcess *p )
{
KConfig config ( "konquerorrc", true );
TDEConfig config ( "konquerorrc", true );
config.setGroup( "Java/JavaScript Settings" );
TQString jvm_path = "java";

8
khtml/java/kjavaappletviewer.cpp
Unescape Escape View File

@ -315,12 +315,12 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
if (!server->usingKIO ()) {
/* if this page needs authentication */
KIO::AuthInfo info;
TDEIO::AuthInfo info;
TQString errorMsg;
TQCString replyType;
TQByteArray params;
TQByteArray reply;
KIO::AuthInfo authResult;
TDEIO::AuthInfo authResult;
//(void) dcopClient(); // Make sure to have a dcop client.
info.url = baseurl;
@ -329,9 +329,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
TQDataStream stream(params, IO_WriteOnly);
stream << info << m_view->topLevelWidget()->winId();
if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
} else if ( replyType == "KIO::AuthInfo" ) {
} else if ( replyType == "TDEIO::AuthInfo" ) {
TQDataStream stream2( reply, IO_ReadOnly );
stream2 >> authResult;
applet->setUser (authResult.username);

4
khtml/java/kjavaappletviewer.h
Unescape Escape View File

@ -41,7 +41,7 @@ class KJavaProcess;
class KJavaAppletViewer;
class TDEAboutData;
class TDEInstance;
class KConfig;
class TDEConfig;
class CoverWidget;
class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
@ -107,7 +107,7 @@ private slots:
void delayedCreateTimeOut ();
private:
TQGuardedPtr <CoverWidget> m_view;
KConfig * m_config;
TDEConfig * m_config;
KJavaProcess * process;
KJavaAppletViewerBrowserExtension * m_browserextension;
KJavaAppletViewerLiveConnectExtension * m_liveconnect;

54
khtml/java/kjavadownloader.cpp
Unescape Escape View File

@ -58,13 +58,13 @@ public:
~KJavaDownloaderPrivate()
{
delete url;
if (job) job->kill(); // KIO::Job::kill deletes itself
if (job) job->kill(); // TDEIO::Job::kill deletes itself
}
private:
int loaderID;
KURL* url;
TQByteArray file;
KIO::TransferJob* job;
TDEIO::TransferJob* job;
int responseCode;
bool isfirstdata;
};
@ -79,16 +79,16 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
d->loaderID = ID;
d->url = new KURL( url );
d->job = KIO::get( *d->url, false, false );
d->job = TDEIO::get( *d->url, false, false );
d->job->addMetaData("PropagateHttpHeader", "true");
connect( d->job, TQT_SIGNAL(data( KIO::Job*, const TQByteArray& )),
this, TQT_SLOT(slotData( KIO::Job*, const TQByteArray& )) );
connect( d->job, TQT_SIGNAL(connected(KIO::Job*)),
this, TQT_SLOT(slotConnected(KIO::Job*)));
connect( d->job, TQT_SIGNAL(mimetype(KIO::Job*, const TQString&)),
this, TQT_SLOT(slotMimetype(KIO::Job*, const TQString&)));
connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(slotResult(KIO::Job*)) );
connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
this, TQT_SLOT(slotConnected(TDEIO::Job*)));
connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(slotResult(TDEIO::Job*)) );
}
KJavaDownloader::~KJavaDownloader()
@ -96,7 +96,7 @@ KJavaDownloader::~KJavaDownloader()
delete d;
}
void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
void KJavaDownloader::slotData( TDEIO::Job*, const TQByteArray& qb )
{
//kdDebug(6100) << "slotData(" << d->loaderID << ")" << endl;
@ -116,17 +116,17 @@ void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
KJavaAppletServer::freeJavaServer();
}
void KJavaDownloader::slotConnected(KIO::Job*)
void KJavaDownloader::slotConnected(TDEIO::Job*)
{
kdDebug(6100) << "slave connected" << endl;
d->responseCode = d->job->error();
}
void KJavaDownloader::slotMimetype(KIO::Job*, const TQString & type) {
void KJavaDownloader::slotMimetype(TDEIO::Job*, const TQString & type) {
kdDebug(6100) << "slave mimetype " << type << endl;
}
void KJavaDownloader::slotResult( KIO::Job* )
void KJavaDownloader::slotResult( TDEIO::Job* )
{
kdDebug(6100) << "slotResult(" << d->loaderID << ")" << endl;
@ -149,7 +149,7 @@ void KJavaDownloader::slotResult( KIO::Job* )
{
server->sendURLData( d->loaderID, FINISHED, d->file );
}
d->job = 0L; // signal KIO::Job::result deletes itself
d->job = 0L; // signal TDEIO::Job::result deletes itself
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
}
@ -161,7 +161,7 @@ void KJavaDownloader::jobCommand( int cmd )
case KJAS_STOP: {
kdDebug(6100) << "jobCommand(" << d->loaderID << ") stop" << endl;
d->job->kill();
d->job = 0L; // KIO::Job::kill deletes itself
d->job = 0L; // TDEIO::Job::kill deletes itself
KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
@ -187,12 +187,12 @@ public:
~KJavaUploaderPrivate()
{
delete url;
if (job) job->kill(); // KIO::Job::kill deletes itself
if (job) job->kill(); // TDEIO::Job::kill deletes itself
}
int loaderID;
KURL* url;
TQByteArray file;
KIO::TransferJob* job;
TDEIO::TransferJob* job;
bool finished;
};
@ -213,12 +213,12 @@ void KJavaUploader::start()
kdDebug(6100) << "KJavaUploader::start(" << d->loaderID << ")" << endl;
KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
// create a suspended job
d->job = KIO::put( *d->url, -1, false, false, false );
d->job = TDEIO::put( *d->url, -1, false, false, false );
d->job->suspend();
connect( d->job, TQT_SIGNAL(dataReq( KIO::Job*, TQByteArray& )),
this, TQT_SLOT(slotDataRequest( KIO::Job*, TQByteArray& )) );
connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(slotResult(KIO::Job*)) );
connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(slotResult(TDEIO::Job*)) );
server->sendURLData( d->loaderID, CONNECTED, d->file );
KJavaAppletServer::freeJavaServer();
}
@ -228,7 +228,7 @@ KJavaUploader::~KJavaUploader()
delete d;
}
void KJavaUploader::slotDataRequest( KIO::Job*, TQByteArray& qb )
void KJavaUploader::slotDataRequest( TDEIO::Job*, TQByteArray& qb )
{
// send our data and suspend
kdDebug(6100) << "slotDataRequest(" << d->loaderID << ") finished:" << d->finished << endl;
@ -256,7 +256,7 @@ void KJavaUploader::data( const TQByteArray& qb )
d->job->resume();
}
void KJavaUploader::slotResult( KIO::Job* )
void KJavaUploader::slotResult( TDEIO::Job* )
{
kdDebug(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
@ -276,7 +276,7 @@ void KJavaUploader::slotResult( KIO::Job* )
}
else // shouldn't come here
kdError(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
d->job = 0L; // signal KIO::Job::result deletes itself
d->job = 0L; // signal TDEIO::Job::result deletes itself
server->removeDataJob( d->loaderID ); // will delete this
KJavaAppletServer::freeJavaServer();
}

16
khtml/java/kjavadownloader.h
Unescape Escape View File

@ -27,13 +27,13 @@
/**
* @short A class for handling downloads from KIO
*
* This class handles a KIO::get job and passes the data
* This class handles a TDEIO::get job and passes the data
* back to the AppletServer.
*
* @author Wynn Wilkes, wynnw@calderasystems.com
*/
namespace KIO {
namespace TDEIO {
class Job;
}
@ -59,10 +59,10 @@ public:
virtual void jobCommand( int cmd );
protected slots:
void slotData( KIO::Job*, const TQByteArray& );
void slotConnected( KIO::Job* );
void slotMimetype( KIO::Job*, const TQString& );
void slotResult( KIO::Job* );
void slotData( TDEIO::Job*, const TQByteArray& );
void slotConnected( TDEIO::Job* );
void slotMimetype( TDEIO::Job*, const TQString& );
void slotResult( TDEIO::Job* );
private:
KJavaDownloaderPrivate* d;
@ -81,8 +81,8 @@ public:
virtual void data( const TQByteArray& qb );
void start();
protected slots:
void slotDataRequest( KIO::Job*, TQByteArray& );
void slotResult( KIO::Job* );
void slotDataRequest( TDEIO::Job*, TQByteArray& );
void slotResult( TDEIO::Job* );
private:
KJavaUploaderPrivate* d;

14
khtml/khtml_ext.cpp
Unescape Escape View File

@ -437,7 +437,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
// Fill search provider entries
KConfig config("kuriikwsfilterrc");
TDEConfig config("kuriikwsfilterrc");
config.setGroup("General");
const TQString defaultEngine = config.readEntry("DefaultSearchEngine", "google");
const char keywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');
@ -648,7 +648,7 @@ KHTMLPopupGUIClient::~KHTMLPopupGUIClient()
void KHTMLPopupGUIClient::slotSaveLinkAs()
{
KIO::MetaData metaData;
TDEIO::MetaData metaData;
metaData["referrer"] = d->m_khtml->referrer();
saveURL( d->m_khtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
}
@ -668,7 +668,7 @@ void KHTMLPopupGUIClient::slotSendImage()
void KHTMLPopupGUIClient::slotSaveImageAs()
{
KIO::MetaData metaData;
TDEIO::MetaData metaData;
metaData["referrer"] = d->m_khtml->referrer();
saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
}
@ -824,7 +824,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
{
TQFileInfo info( destURL.path() );
if( info.exists() ) {
// TODO: use KIO::RenameDlg (shows more information)
// TODO: use TDEIO::RenameDlg (shows more information)
query = KMessageBox::warningContinueCancel( parent, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) );
}
}
@ -862,7 +862,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
destFile.close();
KURL url2 = KURL();
url2.setPath(destFile.name());
KIO::file_move(url2, destURL, -1, true /*overwrite*/);
TDEIO::file_move(url2, destURL, -1, true /*overwrite*/);
saved = true;
}
}
@ -876,7 +876,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
bool downloadViaKIO = true;
if ( !url.isLocalFile() )
{
KConfig cfg("konquerorrc", false, false);
TDEConfig cfg("konquerorrc", false, false);
cfg.setGroup("HTML Settings");
TQString downloadManger = cfg.readPathEntry("DownloadManager");
if (!downloadManger.isEmpty())
@ -907,7 +907,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
if ( downloadViaKIO )
{
KIO::Job *job = KIO::file_copy( url, destURL, -1, true /*overwrite*/ );
TDEIO::Job *job = TDEIO::file_copy( url, destURL, -1, true /*overwrite*/ );
job->setMetaData(metadata);
job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache.
job->addMetaData("cache", "cache"); // Use entry from cache if available.

4
khtml/khtml_ext.h
Unescape Escape View File

@ -120,12 +120,12 @@ public:
virtual ~KHTMLPopupGUIClient();
static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url,
const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
const TQString &filter = TQString::null, long cacheId = 0,
const TQString &suggestedFilename = TQString::null );
static void saveURL( const KURL &url, const KURL &destination,
const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
long cacheId = 0 );
private slots:
void slotSaveLinkAs();

2
khtml/khtml_factory.cpp
Unescape Escape View File

@ -120,7 +120,7 @@ void KHTMLFactory::ref()
// that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because
// we want to destruct a TDEInstance object, which involves destructing
// a KConfig object, which might call TDEGlobal::dirs() (in sync()) which
// a TDEConfig object, which might call TDEGlobal::dirs() (in sync()) which
// probably is not going to work ;-)
// well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
// safe side ;-) -> let's use a simple reference counting scheme

4
khtml/khtml_iface.cc
Unescape Escape View File

@ -191,7 +191,7 @@ void KHTMLPartIface::saveBackground(const TQString &destination)
if (back.isEmpty())
return;
KIO::MetaData metaData;
TDEIO::MetaData metaData;
metaData["referrer"] = part->referrer();
KHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData );
}
@ -203,7 +203,7 @@ void KHTMLPartIface::saveDocument(const TQString &destination)
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index.html" );
KIO::MetaData metaData;
TDEIO::MetaData metaData;
// Referrer unknown?
KHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() );
}

120
khtml/khtml_part.cpp
Unescape Escape View File

@ -306,7 +306,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_paSetEncoding->insert( d->m_manualDetection );
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
if ( config->hasGroup( "HTML Settings" ) ) {
config->setGroup( "HTML Settings" );
khtml::Decoder::AutoDetectLanguage language;
@ -434,7 +434,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
this, TQT_SLOT( updateActions() ) );
connect( this, TQT_SIGNAL( completed( bool ) ),
this, TQT_SLOT( updateActions() ) );
connect( this, TQT_SIGNAL( started( KIO::Job * ) ),
connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
this, TQT_SLOT( updateActions() ) );
d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) );
@ -469,7 +469,7 @@ KHTMLPart::~KHTMLPart()
{
//kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "HTML Settings" );
config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage );
@ -590,7 +590,7 @@ bool KHTMLPart::openURL( const KURL &url )
KURL mainURL = urls.first();
int error = mainURL.queryItem( "error" ).toInt();
// error=0 isn't a valid error code, so 0 means it's missing from the URL
if ( error == 0 ) error = KIO::ERR_UNKNOWN;
if ( error == 0 ) error = TDEIO::ERR_UNKNOWN;
TQString errorText = mainURL.queryItem( "errText", HINT_UTF8 );
urls.pop_front();
d->m_workingURL = KURL::join( urls );
@ -698,36 +698,36 @@ bool KHTMLPart::openURL( const KURL &url )
if (d->m_restored)
{
args.metaData().insert("referrer", d->m_pageReferrer);
d->m_cachePolicy = KIO::CC_Cache;
d->m_cachePolicy = TDEIO::CC_Cache;
}
else if (args.reload)
d->m_cachePolicy = KIO::CC_Reload;
d->m_cachePolicy = TDEIO::CC_Reload;
else
d->m_cachePolicy = KProtocolManager::cacheControl();
if ( args.doPost() && (m_url.protocol().startsWith("http")) )
{
d->m_job = KIO::http_post( m_url, args.postData, false );
d->m_job = TDEIO::http_post( m_url, args.postData, false );
d->m_job->addMetaData("content-type", args.contentType() );
}
else
{
d->m_job = KIO::get( m_url, false, false );
d->m_job->addMetaData("cache", KIO::getCacheControlString(d->m_cachePolicy));
d->m_job = TDEIO::get( m_url, false, false );
d->m_job->addMetaData("cache", TDEIO::getCacheControlString(d->m_cachePolicy));
}
if (widget())
d->m_job->setWindow(widget()->topLevelWidget());
d->m_job->addMetaData(args.metaData());
connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
TQT_SLOT( slotFinished( KIO::Job* ) ) );
connect( d->m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
connect ( d->m_job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
connect( d->m_job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
@ -743,14 +743,14 @@ bool KHTMLPart::openURL( const KURL &url )
d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
connect( d->m_job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
this, TQT_SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) );
connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
connect( d->m_job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
this, TQT_SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) );
connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( slotJobDone( KIO::Job* ) ) );
connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) );
d->m_jobspeed = 0;
@ -758,9 +758,9 @@ bool KHTMLPart::openURL( const KURL &url )
// do a stat to see whether the stylesheet was changed in the meanwhile.
if ( args.reload && !settings()->userStyleSheet().isEmpty() ) {
KURL url( settings()->userStyleSheet() );
KIO::StatJob *job = KIO::stat( url, false /* don't show progress */ );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
this, TQT_SLOT( slotUserSheetStatDone( KIO::Job * ) ) );
TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
}
emit started( 0L );
@ -876,7 +876,7 @@ TQString KHTMLPart::documentSource() const
} else
{
TQString tmpFile;
if( KIO::NetAccess::download( m_url, tmpFile, NULL ) )
if( TDEIO::NetAccess::download( m_url, tmpFile, NULL ) )
{
TQFile f( tmpFile );
if ( f.open( IO_ReadOnly ) )
@ -886,7 +886,7 @@ TQString KHTMLPart::documentSource() const
sourceStr = stream.read();
f.close();
}
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}
}
@ -1511,7 +1511,7 @@ DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
return 0;
}
void KHTMLPart::slotInfoMessage(KIO::Job* kio_job, const TQString& msg)
void KHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg)
{
assert(d->m_job == kio_job);
@ -1562,7 +1562,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec )
d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) );
}
void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data )
{
assert ( d->m_job == kio_job );
@ -1579,8 +1579,8 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
begin( d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset );
d->m_job->resume();
if (d->m_cachePolicy == KIO::CC_Refresh)
d->m_doc->docLoader()->setCachePolicy(KIO::CC_Verify);
if (d->m_cachePolicy == TDEIO::CC_Refresh)
d->m_doc->docLoader()->setCachePolicy(TDEIO::CC_Verify);
else
d->m_doc->docLoader()->setCachePolicy(d->m_cachePolicy);
@ -1696,12 +1696,12 @@ void KHTMLPart::slotRestoreData(const TQByteArray &data )
}
}
void KHTMLPart::showError( KIO::Job* job )
void KHTMLPart::showError( TDEIO::Job* job )
{
kdDebug(6050) << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete
<< " d->m_bCleared=" << d->m_bCleared << endl;
if (job->error() == KIO::ERR_NO_CONTENT)
if (job->error() == TDEIO::ERR_NO_CONTENT)
return;
if ( (d->m_doc && d->m_doc->parsing()) || d->m_workingURL.isEmpty() ) // if we got any data already
@ -1728,7 +1728,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
errText += TQString::fromLatin1( "</P>" );
errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
errText += TQStyleSheet::convertFromPlainText( TDEIO::buildErrorString( errorCode, text ) );
errText += TQString::fromLatin1( "</BODY></HTML>" );
write(errText);
end();
@ -1749,7 +1749,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
TQString errorName, techName, description;
TQStringList causes, solutions;
TQByteArray raw = KIO::rawErrorDetail( errorCode, text, &reqUrl );
TQByteArray raw = TDEIO::rawErrorDetail( errorCode, text, &reqUrl );
TQDataStream stream(raw, IO_ReadOnly);
stream >> errorName >> techName >> description >> causes >> solutions;
@ -1812,7 +1812,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
end();
}
void KHTMLPart::slotFinished( KIO::Job * job )
void KHTMLPart::slotFinished( TDEIO::Job * job )
{
d->m_job = 0L;
d->m_jobspeed = 0L;
@ -1826,7 +1826,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
// KIO cannot change a redirection request from GET to LISTDIR,
// we have to take care of it here once we know for sure it is
// a directory...
if (job->error() == KIO::ERR_IS_DIRECTORY)
if (job->error() == TDEIO::ERR_IS_DIRECTORY)
{
KParts::URLArgs args;
emit d->m_extension->openURLRequest( d->m_workingURL, args );
@ -1841,7 +1841,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
return;
}
KIO::TransferJob *tjob = ::tqqt_cast<KIO::TransferJob*>(job);
TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job);
if (tjob && tjob->isErrorPage()) {
khtml::RenderPart *renderPart = d->m_frame ? static_cast<khtml::RenderPart *>(d->m_frame->m_frame) : 0;
if (renderPart) {
@ -1861,7 +1861,7 @@ void KHTMLPart::slotFinished( KIO::Job * job )
d->m_frame->m_jscript->dataReceived();
if ( d->m_doc && d->m_doc->docLoader()->expireDate() && m_url.protocol().lower().startsWith("http"))
KIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
TDEIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
d->m_workingURL = KURL();
@ -2140,14 +2140,14 @@ void KHTMLPart::slotProgressUpdate()
emit d->m_extension->loadingProgress( percent );
}
void KHTMLPart::slotJobSpeed( KIO::Job* /*job*/, unsigned long speed )
void KHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed )
{
d->m_jobspeed = speed;
if (!parentPart())
setStatusBarText(jsStatusBarText(), BarOverrideText);
}
void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
void KHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent )
{
d->m_jobPercent = percent;
@ -2155,7 +2155,7 @@ void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
d->m_progressUpdateTimer.start( 0, true );
}
void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
void KHTMLPart::slotJobDone( TDEIO::Job* /*job*/ )
{
d->m_jobPercent = 100;
@ -2163,16 +2163,16 @@ void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
d->m_progressUpdateTimer.start( 0, true );
}
void KHTMLPart::slotUserSheetStatDone( KIO::Job *_job )
void KHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job )
{
using namespace KIO;
using namespace TDEIO;
if ( _job->error() ) {
showError( _job );
return;
}
const UDSEntry entry = dynamic_cast<KIO::StatJob *>( _job )->statResult();
const UDSEntry entry = dynamic_cast<TDEIO::StatJob *>( _job )->statResult();
UDSEntry::ConstIterator it = entry.begin();
const UDSEntry::ConstIterator end = entry.end();
for ( ; it != end; ++it ) {
@ -2453,7 +2453,7 @@ void KHTMLPart::slotRedirect()
emit completed();
}
void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url)
void KHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url)
{
// the slave told us that we got redirected
//kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
@ -3757,7 +3757,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
if ( u.isLocalFile() )
{
// TODO : use KIO::stat() and create a KFileItem out of its result,
// TODO : use TDEIO::stat() and create a KFileItem out of its result,
// to use KFileItem::statusBarText()
TQCString path = TQFile::encodeName( u.path() );
@ -3932,7 +3932,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
if ( button == Qt::LeftButton && ( state & ShiftButton ) )
{
KIO::MetaData metaData;
TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData );
return false;
@ -4124,7 +4124,7 @@ KURL KHTMLPart::backgroundURL() const
void KHTMLPart::slotSaveBackground()
{
KIO::MetaData metaData;
TDEIO::MetaData metaData;
metaData["referrer"] = d->m_referrer;
KHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData );
}
@ -4136,7 +4136,7 @@ void KHTMLPart::slotSaveDocument()
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index" + defaultExtension() );
KIO::MetaData metaData;
TDEIO::MetaData metaData;
// Referre unknown?
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId );
}
@ -4211,7 +4211,7 @@ void KHTMLPart::slotSaveFrame()
if ( srcURL.fileName(false).isEmpty() )
srcURL.setFileName( "index" + defaultExtension() );
KIO::MetaData metaData;
TDEIO::MetaData metaData;
// Referrer unknown?
KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" );
}
@ -4391,7 +4391,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
args.serviceType = child->m_serviceType;
child->m_args = args;
child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
child->m_serviceName = TQString();
if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" ))
child->m_args.metaData()["referrer"] = d->m_referrer;
@ -4518,8 +4518,8 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
if (sb)
sb->setStatusBar( d->m_statusBarExtension->statusBar() );
connect( part, TQT_SIGNAL( started( KIO::Job *) ),
this, TQT_SLOT( slotChildStarted( KIO::Job *) ) );
connect( part, TQT_SIGNAL( started( TDEIO::Job *) ),
this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) );
connect( part, TQT_SIGNAL( completed() ),
this, TQT_SLOT( slotChildCompleted() ) );
connect( part, TQT_SIGNAL( completed(bool) ),
@ -4594,7 +4594,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
return true;
}
child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
// make sure the part has a way to find out about the mimetype.
// we actually set it in child->m_args in requestObject already,
@ -4776,9 +4776,9 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
KGuiItem(i18n("&Send Unencrypted")),
"WarnOnUnencryptedForm");
// Move this setting into KSSL instead
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfigGroupSaver saver( config, grpNotifMsgs );
TDEConfigGroupSaver saver( config, grpNotifMsgs );
if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) {
config->deleteEntry("WarnOnUnencryptedForm");
@ -5028,7 +5028,7 @@ void KHTMLPart::slotParentCompleted()
}
}
void KHTMLPart::slotChildStarted( KIO::Job *job )
void KHTMLPart::slotChildStarted( TDEIO::Job *job )
{
khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
@ -5773,7 +5773,7 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
if (!tobe.isEmpty() && d->m_jobspeed)
tobe += " ";
if (d->m_jobspeed)
tobe += i18n( "(%1/s)" ).arg( KIO::convertSize( d->m_jobspeed ) );
tobe += i18n( "(%1/s)" ).arg( TDEIO::convertSize( d->m_jobspeed ) );
}
tobe = "<qt>"+tobe;

22
khtml/khtml_part.h
Unescape Escape View File

@ -274,7 +274,7 @@ public:
* verbose error description a as page, depending on the users configuration.
* @p job is the job that signaled the error situation
*/
virtual void showError( KIO::Job* job );
virtual void showError( TDEIO::Job* job );
/**
* Returns a reference to the DOM HTML document (for non-HTML documents, returns null)
@ -1118,7 +1118,7 @@ protected:
/**
* presents a detailed error message to the user.
* @p errorCode kio error code, eg KIO::ERR_SERVER_TIMEOUT.
* @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
* @p text kio additional information text.
* @p url the url that triggered the error.
*/
@ -1288,11 +1288,11 @@ private slots:
/**
* @internal
*/
void slotData( KIO::Job*, const TQByteArray &data );
void slotData( TDEIO::Job*, const TQByteArray &data );
/**
* @internal
*/
void slotInfoMessage( KIO::Job*, const TQString& msg );
void slotInfoMessage( TDEIO::Job*, const TQString& msg );
/**
* @internal
*/
@ -1300,7 +1300,7 @@ private slots:
/**
* @internal
*/
void slotFinished( KIO::Job* );
void slotFinished( TDEIO::Job* );
/**
* @internal
*/
@ -1312,7 +1312,7 @@ private slots:
/**
* @internal
*/
void slotRedirection( KIO::Job*, const KURL& );
void slotRedirection( TDEIO::Job*, const KURL& );
/**
* @internal
*/
@ -1405,7 +1405,7 @@ private slots:
/**
* @internal
*/
void slotChildStarted( KIO::Job *job );
void slotChildStarted( TDEIO::Job *job );
/**
* @internal
*/
@ -1451,22 +1451,22 @@ private slots:
/*
* @internal
*/
void slotJobPercent( KIO::Job*, unsigned long );
void slotJobPercent( TDEIO::Job*, unsigned long );
/*
* @internal
*/
void slotJobDone( KIO::Job* );
void slotJobDone( TDEIO::Job* );
/*
* @internal
*/
void slotUserSheetStatDone( KIO::Job* );
void slotUserSheetStatDone( TDEIO::Job* );
/*
* @internal
*/
void slotJobSpeed( KIO::Job*, unsigned long );
void slotJobSpeed( TDEIO::Job*, unsigned long );
/**
* @internal

2
khtml/khtml_run.cpp
Unescape Escape View File

@ -84,7 +84,7 @@ void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename )
}
// KDE4: remove
void KHTMLRun::handleError( KIO::Job *job )
void KHTMLRun::handleError( TDEIO::Job *job )
{
KParts::BrowserRun::handleError( job );
}

2
khtml/khtml_run.h
Unescape Escape View File

@ -47,7 +47,7 @@ public:
//KHTMLPart *htmlPart() const;
protected:
virtual void handleError( KIO::Job * job );
virtual void handleError( TDEIO::Job * job );
virtual void save( const KURL & url, const TQString & suggestedFilename );
bool askSave( const KURL & url, KService::Ptr offer, const TQString & mimeType, const TQString & suggestedFilename );

14
khtml/khtml_settings.cc
Unescape Escape View File

@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
}
}
void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings) {
TQString jsPrefix = global ? TQString::null
: TQString::fromLatin1("javascript.");
@ -289,17 +289,17 @@ bool KHTMLSettings::hoverLink() const
void KHTMLSettings::init()
{
KConfig global( "khtmlrc", true, false );
TDEConfig global( "khtmlrc", true, false );
init( &global, true );
KConfig *local = TDEGlobal::config();
TDEConfig *local = TDEGlobal::config();
if ( !local )
return;
init( local, false );
}
void KHTMLSettings::init( KConfig * config, bool reset )
void KHTMLSettings::init( TDEConfig * config, bool reset )
{
TQString group_save = config->group();
if (reset || config->hasGroup("MainView Settings"))
@ -741,7 +741,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const
void KHTMLSettings::addAdFilter( const TQString &url )
{
KConfig config( "khtmlrc", false, false );
TDEConfig config( "khtmlrc", false, false );
config.setGroup( "Filter Settings" );
TQRegExp rx;
@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled)
{
d->m_jsErrorsEnabled = enabled;
// save it
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("HTML Settings");
config->writeEntry("ReportJSErrors", enabled);
config->sync();
@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
{
d->m_jsPopupBlockerPassivePopup = enabled;
// save it
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Java/JavaScript Settings");
config->writeEntry("PopupBlockerPassivePopup", enabled);
config->sync();

10
khtml/khtml_settings.h
Unescape Escape View File

@ -20,7 +20,7 @@
#ifndef __konq_htmlsettings_h__
#define __konq_htmlsettings_h__
class KConfig;
class TDEConfig;
#include <tqcolor.h>
#include <tqstring.h>
#include <tqstringlist.h>
@ -108,11 +108,11 @@ public:
void init();
/** Read settings from @p config.
* @param config is a pointer to KConfig object.
* @param config is a pointer to TDEConfig object.
* @param reset if true, settings are always set; if false,
* settings are only set if the config file has a corresponding key.
*/
void init( KConfig * config, bool reset = true );
void init( TDEConfig * config, bool reset = true );
/**
* Destructor. Don't delete any instance by yourself.
@ -193,13 +193,13 @@ public:
/** reads from @p config's current group, forcing initialization
* if @p reset is true.
* @param config is a pointer to KConfig object.
* @param config is a pointer to TDEConfig object.
* @param reset true if initialization is to be forced.
* @param global true if the global domain is to be read.
* @param pd_settings will be initialised with the computed (inherited)
* settings.
*/
void readDomainSettings(KConfig *config, bool reset,
void readDomainSettings(TDEConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings);
TQString settingsToCSS() const;

4
khtml/khtmlimage.cpp
Unescape Escape View File

@ -158,7 +158,7 @@ bool KHTMLImage::openURL( const KURL &url )
DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_khtml->document().handle() ); // ### hack ;-)
if (!impl) return false;
if ( m_ext->urlArgs().reload )
impl->docLoader()->setCachePolicy( KIO::CC_Reload );
impl->docLoader()->setCachePolicy( TDEIO::CC_Reload );
khtml::DocLoader *dl = impl->docLoader();
m_image = dl->requestImage( m_url.url() );
@ -232,7 +232,7 @@ void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e )
}
/*
void KHTMLImage::slotImageJobFinished( KIO::Job *job )
void KHTMLImage::slotImageJobFinished( TDEIO::Job *job )
{
if ( job->error() )
{

2
khtml/khtmlimage.h
Unescape Escape View File

@ -81,7 +81,7 @@ protected:
private slots:
void restoreScrollPosition();
// void slotImageJobFinished( KIO::Job *job );
// void slotImageJobFinished( TDEIO::Job *job );
// void updateWindowCaption();

8
khtml/khtmlpart_p.h
Unescape Escape View File

@ -60,7 +60,7 @@ class KURLLabel;
class KJavaAppletContext;
class KJSErrorDlg;
namespace KIO
namespace TDEIO
{
class Job;
class TransferJob;
@ -198,7 +198,7 @@ public:
m_job = 0L;
m_bComplete = true;
m_bLoadEventEmitted = true;
m_cachePolicy = KIO::CC_Verify;
m_cachePolicy = TDEIO::CC_Verify;
m_manager = 0L;
m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
m_bClearing = false;
@ -356,7 +356,7 @@ public:
KHTMLSettings *m_settings;
KIO::TransferJob * m_job;
TDEIO::TransferJob * m_job;
TQString m_statusBarText[3];
unsigned long m_jobspeed;
@ -387,7 +387,7 @@ public:
KURL m_workingURL;
KIO::CacheControl m_cachePolicy;
TDEIO::CacheControl m_cachePolicy;
TQTimer m_redirectionTimer;
TQTime m_parsetime;
int m_delayRedirect;

6
khtml/khtmlview.cpp
Unescape Escape View File

@ -994,8 +994,8 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
bool hasHorBar = visibleWidth() < contentsWidth();
bool hasVerBar = visibleHeight() < contentsHeight();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver( config, "HTML Settings" );
TDEConfig *config = TDEGlobal::config();
TDEConfigGroupSaver saver( config, "HTML Settings" );
if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) {
d->m_mouseScrollIndicator->show();
d->m_mouseScrollIndicator->unsetCursor();
@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20;
void KHTMLView::scrollBy(int dx, int dy)
{
KConfigGroup cfg( TDEGlobal::config(), "KDE" );
TDEConfigGroup cfg( TDEGlobal::config(), "KDE" );
if( !cfg.readBoolEntry( "SmoothScrolling", false )) {
TQScrollView::scrollBy( dx, dy );
return;

14
khtml/kmultipart/kmultipart.cpp
Unescape Escape View File

@ -163,14 +163,14 @@ bool KMultiPart::openURL( const KURL &url )
// Hmm, args.reload is set to true when reloading, but this doesn't seem to be enough...
// I get "HOLD: Reusing held slave for <url>", and the old data
m_job = KIO::get( url, args.reload, false );
m_job = TDEIO::get( url, args.reload, false );
emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage
connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ),
this, TQT_SLOT( slotJobFinished( KIO::Job * ) ) );
connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) );
connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
m_numberOfFrames = 0;
m_numberOfFramesSkipped = 0;
@ -184,7 +184,7 @@ bool KMultiPart::openURL( const KURL &url )
// Yes, libtdenetwork's has such a parser already (MultiPart),
// but it works on the complete string, expecting the whole data to be available....
// The version here is asynchronous.
void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
{
if (m_boundary.isNull())
{
@ -533,7 +533,7 @@ void KMultiPart::guiActivateEvent( KParts::GUIActivateEvent * )
// m_part->guiActivateEvent( e );
}
void KMultiPart::slotJobFinished( KIO::Job *job )
void KMultiPart::slotJobFinished( TDEIO::Job *job )
{
if ( job->error() )
{

6
khtml/kmultipart/kmultipart.h
Unescape Escape View File

@ -62,8 +62,8 @@ protected:
private slots:
void reallySendData( const TQByteArray& line );
//void slotPopupMenu( KXMLGUIClient *cl, const TQPoint &pos, const KURL &u, const TQString &mime, mode_t mode );
void slotJobFinished( KIO::Job *job );
void slotData( KIO::Job *, const TQByteArray & );
void slotJobFinished( TDEIO::Job *job );
void slotData( TDEIO::Job *, const TQByteArray & );
//void updateWindowCaption();
void slotPartCompleted();
@ -77,7 +77,7 @@ private:
TQGuardedPtr<KParts::ReadOnlyPart> m_part;
bool m_isHTMLPart;
bool m_partIsLoading;
KIO::Job* m_job;
TDEIO::Job* m_job;
TQCString m_boundary;
int m_boundaryLength;
TQString m_mimeType; // the one handled by m_part - store the kservice instead?

32
khtml/misc/knsplugininstaller.cpp
Unescape Escape View File

@ -102,7 +102,7 @@ bool KNSPluginInstallEngine::isActive()
{
// check if we have a configuration key in the kde registry
TQString pluginsListFile;
KConfig cfg("kcmnspluginrc", true);
TDEConfig cfg("kcmnspluginrc", true);
cfg.setGroup("Misc");
pluginsListFile = cfg.readPathEntry("PluginsListFile");
return !pluginsListFile.isEmpty();
@ -117,7 +117,7 @@ const TQValueList<KNSPluginInfo>& KNSPluginInstallEngine::pluginList() const
bool KNSPluginInstallEngine::loadConfig()
{
TQString pluginsListFile;
KConfig cfg("kcmnspluginrc", true);
TDEConfig cfg("kcmnspluginrc", true);
cfg.setGroup("Misc");
pluginsListFile = cfg.readPathEntry("PluginsListFile");
if(!pluginsListFile.isEmpty())
@ -136,7 +136,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
if(m_pluginsXmlConfig.isEmpty())
{
TQString tmpFile;
if(KIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
if(TDEIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
TQFile f(tmpFile);
if(!f.open(IO_ReadOnly))
return false;
@ -144,7 +144,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
stream.setEncoding(TQTextStream::UnicodeUTF8);
m_pluginsXmlConfig = stream.read();
f.close();
KIO::NetAccess::removeTempFile(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);
} else
return false;
}
@ -232,20 +232,20 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
tempFile.unlink();
tempFile.close();
// start the download job
m_downloadJob = KIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
// connect signals
connect(m_downloadJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(KIO::Job *, unsigned long)));
connect(m_downloadJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDownloadResult(KIO::Job *)) );
connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) );
kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
}
void KNSPluginInstallEngine::slotDownLoadProgress(KIO::Job *, unsigned long percent)
void KNSPluginInstallEngine::slotDownLoadProgress(TDEIO::Job *, unsigned long percent)
{
// propagate the download progression
emit installProgress( ((int)percent)/3 );
}
void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job)
{
// test if the download job suceed
if(job->error()) {
@ -279,9 +279,9 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
for( it = pluginFileList.begin(); it != pluginFileList.end(); ++it ) {
urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
}
m_installFileJob = KIO::copy(urlList , destURL, false );
connect(m_installFileJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(KIO::Job *, unsigned long)));
connect(m_installFileJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotCopyResult(KIO::Job *)) );
m_installFileJob = TDEIO::copy(urlList , destURL, false );
connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) );
}
kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
@ -289,13 +289,13 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
m_downloadJob = NULL;
}
void KNSPluginInstallEngine::slotCopyProgress(KIO::Job *, unsigned long percent)
void KNSPluginInstallEngine::slotCopyProgress(TDEIO::Job *, unsigned long percent)
{
// propagate the download progression
emit installProgress( ((int)percent)/3 + 33 );
}
void KNSPluginInstallEngine::slotCopyResult(KIO::Job *job)
void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job)
{
// test if the download job suceed
if(job->error()) {
@ -501,14 +501,14 @@ void KNSPluginWizard::showPage(TQWidget *page)
TQString tmpFile;
if(info.licenceURL().isValid())
// retrieve the licence if we have an url
if(KIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
if(TDEIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
TQFile f(tmpFile);
if(f.open(IO_ReadOnly)) {
TQTextStream stream(&f);
stream.setEncoding(TQTextStream::UnicodeUTF8);
licence = stream.read();
f.close();
KIO::NetAccess::removeTempFile(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);
}
}
// else display the licence found in the xml config

12
khtml/misc/knsplugininstaller.h
Unescape Escape View File

@ -138,8 +138,8 @@ private:
KMimeType::Ptr m_mime;
KURL m_pluginsListFileURL;
TQString m_tmpPluginFileName;
KIO::CopyJob *m_downloadJob;
KIO::CopyJob *m_installFileJob;
TDEIO::CopyJob *m_downloadJob;
TDEIO::CopyJob *m_installFileJob;
KNSPluginInfo m_toInstallPluginInfo;
TQProcess *m_scanProc;
@ -151,12 +151,12 @@ signals:
private slots:
// Used to monitor the plugin downloading
void slotDownLoadProgress(KIO::Job *job, unsigned long percent);
void slotDownloadResult(KIO::Job *job);
void slotDownLoadProgress(TDEIO::Job *job, unsigned long percent);
void slotDownloadResult(TDEIO::Job *job);
// Used to monitor the plugin installation
void slotCopyProgress(KIO::Job *job, unsigned long percent);
void slotCopyResult(KIO::Job *job);
void slotCopyProgress(TDEIO::Job *job, unsigned long percent);
void slotCopyResult(TDEIO::Job *job);
// Used to monitor the plugins scan
void readScanProcFromStdout();

42
khtml/misc/loader.cpp
Unescape Escape View File

@ -208,7 +208,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
// -------------------------------------------------------------------------------------------
CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy,
CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy,
const char *accept)
: CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
{
@ -227,7 +227,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
}
CachedCSSStyleSheet::CachedCSSStyleSheet(const DOMString &url, const TQString &stylesheet_data)
: CachedObject(url, CSSStyleSheet, KIO::CC_Verify, stylesheet_data.length())
: CachedObject(url, CSSStyleSheet, TDEIO::CC_Verify, stylesheet_data.length())
{
m_loading = false;
m_status = Persistent;
@ -321,7 +321,7 @@ TQString CachedCSSStyleSheet::checkCharset(const TQByteArray& buffer ) const
// -------------------------------------------------------------------------------------------
CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
CachedScript::CachedScript(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
: CachedObject(url, Script, _cachePolicy, 0)
{
// It's javascript we want.
@ -334,7 +334,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
}
CachedScript::CachedScript(const DOMString &url, const TQString &script_data)
: CachedObject(url, Script, KIO::CC_Verify, script_data.length())
: CachedObject(url, Script, TDEIO::CC_Verify, script_data.length())
{
m_loading = false;
m_status = Persistent;
@ -466,7 +466,7 @@ static TQString buildAcceptHeader()
// -------------------------------------------------------------------------------------
CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
: TQObject(), CachedObject(url, Image, _cachePolicy, 0)
{
static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() );
@ -943,7 +943,7 @@ Request::~Request()
DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
{
m_cachePolicy = KIO::CC_Verify;
m_cachePolicy = TDEIO::CC_Verify;
m_expireDate = 0;
m_creationDate = time(0);
m_bautoloadImages = true;
@ -991,7 +991,7 @@ void DocLoader::insertCachedObject( CachedObject* o ) const
bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
{
bool reload = false;
if (m_cachePolicy == KIO::CC_Verify)
if (m_cachePolicy == TDEIO::CC_Verify)
{
if (!m_reloadedURLs.contains(fullURL))
{
@ -1003,7 +1003,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
}
}
}
else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
else if ((m_cachePolicy == TDEIO::CC_Reload) || (m_cachePolicy == TDEIO::CC_Refresh))
{
if (!m_reloadedURLs.contains(fullURL))
{
@ -1153,9 +1153,9 @@ void Loader::servePendingRequests()
#endif
KURL u(req->object->url().string());
KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/);
TDEIO::TransferJob* job = TDEIO::get( u, false, false /*no GUI*/);
job->addMetaData("cache", KIO::getCacheControlString(req->object->cachePolicy()));
job->addMetaData("cache", TDEIO::getCacheControlString(req->object->cachePolicy()));
if (!req->object->accept().isEmpty())
job->addMetaData("accept", req->object->accept());
if ( req->m_docLoader )
@ -1171,21 +1171,21 @@ void Loader::servePendingRequests()
}
}
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished( KIO::Job * ) ) );
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
if ( req->object->schedule() )
KIO::Scheduler::scheduleJob( job );
TDEIO::Scheduler::scheduleJob( job );
m_requestsLoading.insert(job, req);
}
}
void Loader::slotFinished( KIO::Job* job )
void Loader::slotFinished( TDEIO::Job* job )
{
Request *r = m_requestsLoading.take( job );
KIO::TransferJob* j = static_cast<KIO::TransferJob*>(job);
TDEIO::TransferJob* j = static_cast<TDEIO::TransferJob*>(job);
if ( !r )
return;
@ -1247,7 +1247,7 @@ void Loader::slotFinished( KIO::Job* job )
m_timer.start(0, true);
}
void Loader::slotData( KIO::Job*job, const TQByteArray &data )
void Loader::slotData( TDEIO::Job*job, const TQByteArray &data )
{
Request *r = m_requestsLoading[job];
if(!r) {
@ -1303,7 +1303,7 @@ void Loader::cancelRequests( DocLoader* dl )
if ( lIt.current()->m_docLoader == dl )
{
//kdDebug( 6060 ) << "canceling loading request for " << lIt.current()->object->url().string() << endl;
KIO::Job *job = static_cast<KIO::Job *>( lIt.currentKey() );
TDEIO::Job *job = static_cast<TDEIO::Job *>( lIt.currentKey() );
Cache::removeCacheEntry( lIt.current()->object );
m_requestsLoading.remove( lIt.currentKey() );
job->kill();
@ -1314,7 +1314,7 @@ void Loader::cancelRequests( DocLoader* dl )
}
}
KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
TDEIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
{
TQPtrDictIterator<Request> it( m_requestsLoading );
@ -1323,7 +1323,7 @@ KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
CachedObject *obj = it.current()->object;
if ( obj && obj->url() == url )
return static_cast<KIO::Job *>( it.currentKey() );
return static_cast<TDEIO::Job *>( it.currentKey() );
}
return 0;
@ -1424,7 +1424,7 @@ void Cache::clear()
template<typename CachedObjectType, enum CachedObject::Type CachedType>
CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const char* accept )
{
KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
TDEIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : TDEIO::CC_Verify;
TQString url = kurl.url();
CachedObject* o = cache->find(url);

26
khtml/misc/loader.h
Unescape Escape View File

@ -57,7 +57,7 @@
class TQMovie;
class KHTMLPart;
namespace KIO {
namespace TDEIO {
class Job;
class TransferJob;
}
@ -99,7 +99,7 @@ namespace khtml
Cached // regular case
};
CachedObject(const DOM::DOMString &url, Type type, KIO::CacheControl _cachePolicy, int size)
CachedObject(const DOM::DOMString &url, Type type, TDEIO::CacheControl _cachePolicy, int size)
: m_url(url), m_type(type), m_cachePolicy(_cachePolicy),
m_expireDate(0), m_size(size)
{
@ -140,7 +140,7 @@ namespace khtml
bool free() const { return m_free; }
KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
void setRequest(Request *_request);
@ -169,7 +169,7 @@ namespace khtml
Type m_type;
Status m_status;
int m_accessCount;
KIO::CacheControl m_cachePolicy;
TDEIO::CacheControl m_cachePolicy;
time_t m_expireDate;
int m_size;
bool m_deleted : 1;
@ -195,7 +195,7 @@ namespace khtml
class CachedCSSStyleSheet : public CachedObject
{
public:
CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy,
CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy,
const char *accept);
CachedCSSStyleSheet(const DOM::DOMString &url, const TQString &stylesheet_data);
@ -226,7 +226,7 @@ namespace khtml
class CachedScript : public CachedObject
{
public:
CachedScript(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept );
CachedScript(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept );
CachedScript(const DOM::DOMString &url, const TQString &script_data);
const DOM::DOMString &script() const { return m_script; }
@ -257,7 +257,7 @@ namespace khtml
{
Q_OBJECT
public:
CachedImage(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept);
CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept);
virtual ~CachedImage();
const TQPixmap &pixmap() const;
@ -354,7 +354,7 @@ namespace khtml
CachedScript *requestScript( const DOM::DOMString &url, const TQString& charset);
bool autoloadImages() const { return m_bautoloadImages; }
KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
time_t expireDate() const { return m_expireDate; }
KHTMLPart* part() const { return m_part; }
@ -363,7 +363,7 @@ namespace khtml
void setCacheCreationDate( time_t );
void setExpireDate( time_t, bool relative );
void setAutoloadImages( bool );
void setCachePolicy( KIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
void setShowAnimations( KHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
@ -381,7 +381,7 @@ namespace khtml
mutable TQPtrDict<CachedObject> m_docObjects;
time_t m_expireDate;
time_t m_creationDate;
KIO::CacheControl m_cachePolicy;
TDEIO::CacheControl m_cachePolicy;
bool m_bautoloadImages : 1;
KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
KHTMLPart* m_part;
@ -418,7 +418,7 @@ namespace khtml
void cancelRequests( DocLoader* dl );
// may return 0L
KIO::Job *jobForRequest( const DOM::DOMString &url ) const;
TDEIO::Job *jobForRequest( const DOM::DOMString &url ) const;
signals:
void requestStarted( khtml::DocLoader* dl, khtml::CachedObject* obj );
@ -426,8 +426,8 @@ namespace khtml
void requestFailed( khtml::DocLoader* dl, khtml::CachedObject *obj );
protected slots:
void slotFinished( KIO::Job * );
void slotData( KIO::Job *, const TQByteArray & );
void slotFinished( TDEIO::Job * );
void slotData( TDEIO::Job *, const TQByteArray & );
void servePendingRequests();
protected:

2
khtml/test_regression.cpp
Unescape Escape View File

@ -521,7 +521,7 @@ int main(int argc, char *argv[])
a.config()->writeEntry( "kjscupguard_alarmhandler", true );
a.config()->setGroup("HTML Settings");
a.config()->writeEntry("ReportJSErrors", false);
KConfig cfg( "khtmlrc" );
TDEConfig cfg( "khtmlrc" );
cfg.setGroup("HTML Settings");
cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT );

2
khtml/testkhtml.cpp
Unescape Escape View File

@ -138,7 +138,7 @@ int main(int argc, char *argv[])
void Dummy::doBenchmark()
{
KConfigGroup settings(TDEGlobal::config(), "bench");
TDEConfigGroup settings(TDEGlobal::config(), "bench");
results.clear();
TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(),

4
khtml/xml/dom_docimpl.cpp
Unescape Escape View File

@ -1718,7 +1718,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
KURL url = v->part()->url();
if ((str == "no-cache") && url.protocol().startsWith("http"))
{
KIO::http_update_cache(url, true, 0);
TDEIO::http_update_cache(url, true, 0);
}
}
else if( (strcasecmp(equiv, "set-cookie") == 0))
@ -2491,7 +2491,7 @@ void DocumentImpl::error(int err, const TQString &text)
int exceptioncode = 0;
EventImpl *evt = new EventImpl(EventImpl::ERROR_EVENT,false,false);
if (err != 0)
evt->setMessage(KIO::buildErrorString(err,text));
evt->setMessage(TDEIO::buildErrorString(err,text));
else
evt->setMessage(text);
evt->ref();

2
kinit/autostart.cpp
Unescape Escape View File

@ -102,7 +102,7 @@ static bool startCondition(const TQString &condition)
if (list[0].isEmpty() || list[2].isEmpty())
return true;
KConfig config(list[0], true, false);
TDEConfig config(list[0], true, false);
if (!list[1].isEmpty())
config.setGroup(list[1]);

4
kinit/kdostartupconfig.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ int main()
return 6;
if( group.left( 1 ) == "[" && group.right( 1 ) == "]" )
{ // whole config group
KConfig cfg( file );
TDEConfig cfg( file );
group = group.mid( 1, group.length() - 2 );
TQMap< TQString, TQString > entries = cfg.entryMap( group );
startupconfig << "# " << line << "\n";
@ -115,7 +115,7 @@ int main()
{ // a single key
if( key.isEmpty())
return 7;
KConfig cfg( file );
TDEConfig cfg( file );
cfg.setGroup( group );
TQString value = cfg.readEntry( key, def );
startupconfig << "# " << line << "\n";

4
kinit/kinit.cpp
Unescape Escape View File

@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); }
/* These are to link libkio even if 'smart' linker is used */
#include <kio/authinfo.h>
extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
/*
* Close fd's which are only useful for the parent process.
@ -1758,7 +1758,7 @@ int main(int argc, char **argv, char **envp)
tdeinit_initsetproctitle(argc, argv, envp);
tdeinit_library_path();
// Don't make our instance the global instance
// (do it only after tdeinit_library_path, that one indirectly uses KConfig,
// (do it only after tdeinit_library_path, that one indirectly uses TDEConfig,
// which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance)
TDEGlobal::_instance = 0L;
// don't change envvars before tdeinit_initsetproctitle()

2
kinit/kioslave.cpp
Unescape Escape View File

@ -49,7 +49,7 @@
/* These are to link libkio even if 'smart' linker is used */
#include <kio/authinfo.h>
extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
int main(int argc, char **argv)
{

12
kinit/klauncher.cpp
Unescape Escape View File

@ -61,12 +61,12 @@
// Dispose slaves after being idle for SLAVE_MAX_IDLE seconds
#define SLAVE_MAX_IDLE 30
using namespace KIO;
using namespace TDEIO;
template class TQPtrList<KLaunchRequest>;
template class TQPtrList<IdleSlave>;
IdleSlave::IdleSlave(KSocket *socket)
IdleSlave::IdleSlave(TDESocket *socket)
{
mConn.init(socket);
mConn.connect(this, TQT_SLOT(gotInput()));
@ -194,9 +194,9 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
domainname.close();
domainname.unlink();
#endif
mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
TQT_SLOT(acceptSlave(KSocket *)));
mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
TQT_SLOT(acceptSlave(TDESocket *)));
connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid)
}
void
KLauncher::acceptSlave(KSocket *slaveSocket)
KLauncher::acceptSlave(TDESocket *slaveSocket)
{
IdleSlave *slave = new IdleSlave(slaveSocket);
// Send it a SLAVE_STATUS command.

8
kinit/klauncher.h
Unescape Escape View File

@ -43,7 +43,7 @@ class IdleSlave : public TQObject
{
Q_OBJECT
public:
IdleSlave(KSocket *socket);
IdleSlave(TDESocket *socket);
bool match( const TQString &protocol, const TQString &host, bool connected);
void connect( const TQString &app_socket);
pid_t pid() const { return mPid;}
@ -59,7 +59,7 @@ protected slots:
void gotInput();
protected:
KIO::Connection mConn;
TDEIO::Connection mConn;
TQString mProtocol;
TQString mHost;
bool mConnected;
@ -169,7 +169,7 @@ public slots:
void slotKDEInitData(int);
void slotAppRegistered(const TQCString &appId);
void slotSlaveStatus(IdleSlave *);
void acceptSlave( KSocket *);
void acceptSlave( TDESocket *);
void slotSlaveGone();
void idleTimeout();
@ -182,7 +182,7 @@ protected:
KLaunchRequest *lastRequest;
TQPtrList<SlaveWaitRequest> mSlaveWaitRequest;
TQString mPoolSocketName;
KServerSocket *mPoolSocket;
TDEServerSocket *mPoolSocket;
TQPtrList<IdleSlave> mSlaveList;
TQTimer mTimer;
TQTimer mAutoTimer;

2
kio/DESIGN
Unescape Escape View File

@ -190,7 +190,7 @@ B. customized progress dialogs
This will be similar to what we had before.
- ProgressBase class that all other dialogs will inherit.
will contain an initialization method setJob( KIO::Job*) for apps of the
will contain an initialization method setJob( TDEIO::Job*) for apps of the
second class (see A.2 above), that will connect job's signals to dialog's
slots

4
kio/DESIGN.metadata
Unescape Escape View File

@ -132,11 +132,11 @@ DefaultRemoteProtocol string Protocol to redirect file://<hostname>/ URLs to, de
Examples:
E.g. the following disables cookies:
job = KIO::get( KURL("http://www.kde.org"), false, false);
job = TDEIO::get( KURL("http://www.kde.org"), false, false);
job->addMetaData("cookies", "none");
If you want to handle cookies yourself, you can do:
job = KIO::get( KURL("http://www.kde.org"), false, false);
job = TDEIO::get( KURL("http://www.kde.org"), false, false);
job->addMetaData("cookies", "manual");
job->addMetaData("setcookies", "Cookie: foo=bar; gnat=gnork");

6
kio/Mainpage.dox
Unescape Escape View File

@ -6,8 +6,8 @@
* this to provide its network-enabled file management.
*
* The easiest way to use this library from a %Trinity application is via the
* KIO::NetAccess class (for easy synchronous access) or via the
* KIO::Job class (for more complex asynchronous jobs).
* TDEIO::NetAccess class (for easy synchronous access) or via the
* TDEIO::Job class (for more complex asynchronous jobs).
*
* This library also implements the System Configuration Cache (KSycoca).
*
@ -44,7 +44,7 @@
* view based on KIconView. Additionally, there are some compound views,
* like a view using the icon-view for files on the right side and another
* view for directories on the left. A view, that shows a preview for the
* currently selected file (using KIO::PreviewJob to generate previews)
* currently selected file (using TDEIO::PreviewJob to generate previews)
* and any other view to show the files is also available.
*
* All those views share a common baseclass, named KFileView, which

6
kio/bookmarks/kbookmarkimporter_kde1.cc
Unescape Escape View File

@ -81,8 +81,8 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString &
parentElem.appendChild( groupElem );
TQDomElement textElem = m_pDoc->createElement( "title" );
groupElem.appendChild( textElem );
textElem.appendChild( m_pDoc->createTextNode( KIO::decodeFileName( ep->d_name ) ) );
if ( KIO::decodeFileName( ep->d_name ) == "Toolbar" )
textElem.appendChild( m_pDoc->createTextNode( TDEIO::decodeFileName( ep->d_name ) ) );
if ( TDEIO::decodeFileName( ep->d_name ) == "Toolbar" )
groupElem.setAttribute("toolbar","yes");
scanIntern( groupElem, file.path() );
}
@ -136,7 +136,7 @@ void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _tex
if (icon.right( 4 ) == ".xpm" ) // prevent warnings
icon.truncate( icon.length() - 4 );
TQString text = KIO::decodeFileName( TQString::fromLocal8Bit(_text) );
TQString text = TDEIO::decodeFileName( TQString::fromLocal8Bit(_text) );
if ( text.length() > 8 && text.right( 8 ) == ".desktop" )
text.truncate( text.length() - 8 );
if ( text.length() > 7 && text.right( 7 ) == ".kdelnk" )

2
kio/bookmarks/kbookmarkmanager.cc
Unescape Escape View File

@ -702,7 +702,7 @@ KBookmarkSettings* KBookmarkSettings::s_self = 0;
void KBookmarkSettings::readSettings()
{
KConfig config("kbookmarkrc", false, false);
TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
// add bookmark dialog usage - no reparse

6
kio/bookmarks/kbookmarkmenu.cc
Unescape Escape View File

@ -1099,7 +1099,7 @@ void KBookmarkMenuNSImporter::endFolder()
KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &id )
{
KConfig config("kbookmarkrc", false, false);
TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
DynMenuInfo info;
@ -1131,7 +1131,7 @@ KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &
TQStringList KBookmarkMenu::dynamicBookmarksList()
{
KConfig config("kbookmarkrc", false, false);
TDEConfig config("kbookmarkrc", false, false);
config.setGroup("Bookmarks");
TQStringList mlist;
@ -1145,7 +1145,7 @@ TQStringList KBookmarkMenu::dynamicBookmarksList()
void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &newMenu)
{
KConfig config("kbookmarkrc", false, false);
TDEConfig config("kbookmarkrc", false, false);
// add group unconditionally
config.setGroup("DynamicMenu-" + id);

2
kio/bookmarks/kbookmarkmenu.h
Unescape Escape View File

@ -50,7 +50,7 @@ class KBookmarkOwner;
class KBookmarkMenu;
class KPopupMenu;
namespace KIO { class Job; }
namespace TDEIO { class Job; }
/**
* This class provides a bookmark menu. It is typically used in

4
kio/httpfilter/httpfilter.cc
Unescape Escape View File

@ -275,7 +275,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
}
}
if (!bHasFinished)
emit error( KIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
return;
}
if (bHasFinished)
@ -332,7 +332,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
int result = inflate( &zstr, Z_NO_FLUSH );
if ((result != Z_OK) && (result != Z_STREAM_END))
{
emit error( KIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
break;
}
int bytesOut = 8192 - zstr.avail_out;

2
kio/kcmodule.desktop
Unescape Escape View File

@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-TDE-ServiceType=KCModule
X-TDE-ServiceType=TDECModule
Name=TDE Control Module
Name[af]=TDE Beheer Module
Name[ar]=وحدة تحكم كيدي

4
kio/kfile/kcombiview.cpp
Unescape Escape View File

@ -305,14 +305,14 @@ KFileView *KCombiView::focusView( KFileView *preferred ) const
return (preferred && w == preferred->widget()) ? preferred : other;
}
void KCombiView::readConfig( KConfig *config, const TQString& group )
void KCombiView::readConfig( TDEConfig *config, const TQString& group )
{
left->readConfig( config, group );
if ( right )
right->readConfig( config, group );
}
void KCombiView::writeConfig( KConfig *config, const TQString& group )
void KCombiView::writeConfig( TDEConfig *config, const TQString& group )
{
left->writeConfig( config, group );
if ( right )

4
kio/kfile/kcombiview.h
Unescape Escape View File

@ -93,8 +93,8 @@ public:
virtual void setSorting( TQDir::SortSpec sort );
virtual void readConfig( KConfig *, const TQString& group = TQString::null );
virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
void ensureItemVisible( const KFileItem * );

4
kio/kfile/kcustommenueditor.cpp
Unescape Escape View File

@ -119,7 +119,7 @@ void KCustomMenuEditor::refreshButton()
}
void
KCustomMenuEditor::load(KConfigBase *cfg)
KCustomMenuEditor::load(TDEConfigBase *cfg)
{
cfg->setGroup(TQString::null);
int count = cfg->readNumEntry("NrOfItems");
@ -147,7 +147,7 @@ KCustomMenuEditor::load(KConfigBase *cfg)
}
void
KCustomMenuEditor::save(KConfigBase *cfg)
KCustomMenuEditor::save(TDEConfigBase *cfg)
{
// First clear the whole config file.
TQStringList groups = cfg->groupList();

6
kio/kfile/kcustommenueditor.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <kdialogbase.h>
class KListView;
class KConfigBase;
class TDEConfigBase;
/*
* Dialog for editing custom menus.
@ -42,12 +42,12 @@ public:
/**
* load the custom menu
*/
void load(KConfigBase *);
void load(TDEConfigBase *);
/**
* save the custom menu
*/
void save(KConfigBase *);
void save(TDEConfigBase *);
public slots:
void slotNewItem();

40
kio/kfile/kdiroperator.cpp
Unescape Escape View File

@ -90,7 +90,7 @@ public:
KActionSeparator *viewActionSeparator;
int dropOptions;
KConfig *config;
TDEConfig *config;
TQString configGroup;
};
@ -388,13 +388,13 @@ void KDirOperator::mkdir()
TQString where = url().pathOrURL();
TQString name = i18n( "New Folder" );
if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
name = KIO::RenameDlg::suggestName( url(), name );
name = TDEIO::RenameDlg::suggestName( url(), name );
TQString dir = KInputDialog::getText( i18n( "New Folder" ),
i18n( "Create new folder in:\n%1" ).arg( where ),
name, &ok, this);
if (ok)
mkdir( KIO::encodeFileName( dir ), true );
mkdir( TDEIO::encodeFileName( dir ), true );
}
bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
@ -413,8 +413,8 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
for ( ; it != dirs.end(); ++it )
{
url.addPath( *it );
exists = KIO::NetAccess::exists( url, false, 0 );
writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
exists = TDEIO::NetAccess::exists( url, false, 0 );
writeOk = !exists && TDEIO::NetAccess::mkdir( url, topLevelWidget() );
}
if ( exists ) // url was already existant
@ -433,13 +433,13 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
return writeOk;
}
KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
bool ask, bool showProgress )
{
return del( items, this, ask, showProgress );
}
KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
TQWidget *parent,
bool ask, bool showProgress )
{
@ -483,7 +483,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
}
if ( doIt ) {
KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
TDEIO::DeleteJob *job = TDEIO::del( urls, false, showProgress );
job->setWindow (topLevelWidget());
job->setAutoErrorHandlingEnabled( true, parent );
return job;
@ -502,7 +502,7 @@ void KDirOperator::deleteSelected()
del( *list );
}
KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
TQWidget *parent,
bool ask, bool showProgress )
{
@ -546,7 +546,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
}
if ( doIt ) {
KIO::CopyJob *job = KIO::trash( urls, showProgress );
TDEIO::CopyJob *job = TDEIO::trash( urls, showProgress );
job->setWindow (topLevelWidget());
job->setAutoErrorHandlingEnabled( true, parent );
return job;
@ -718,7 +718,7 @@ void KDirOperator::pathChanged()
// it may be, that we weren't ready at this time
TQApplication::restoreOverrideCursor();
// when KIO::Job emits finished, the slot will restore the cursor
// when TDEIO::Job emits finished, the slot will restore the cursor
TQApplication::setOverrideCursor( tqwaitCursor );
if ( !isReadable( currUrl )) {
@ -812,8 +812,8 @@ bool KDirOperator::checkPreviewSupport()
KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" ));
bool hasPreviewSupport = false;
KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, ConfigGroup );
TDEConfig *kc = TDEGlobal::config();
TDEConfigGroupSaver cs( kc, ConfigGroup );
if ( kc->readBoolEntry( "Show Default Preview", true ) )
hasPreviewSupport = checkPreviewInternal();
@ -823,7 +823,7 @@ bool KDirOperator::checkPreviewSupport()
bool KDirOperator::checkPreviewInternal() const
{
TQStringList supported = KIO::PreviewJob::supportedMimeTypes();
TQStringList supported = TDEIO::PreviewJob::supportedMimeTypes();
// no preview support for directories?
if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 )
return false;
@ -1385,8 +1385,8 @@ void KDirOperator::setupMenu(int whichActions)
actionMenu->insert( mkdirAction );
if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
actionMenu->insert( myActionCollection->action( "trash" ) );
KConfig *globalconfig = TDEGlobal::config();
KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
TDEConfig *globalconfig = TDEGlobal::config();
TDEConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
globalconfig->readBoolEntry("ShowDeleteCommand", false))
actionMenu->insert( myActionCollection->action( "delete" ) );
@ -1439,7 +1439,7 @@ void KDirOperator::updateViewActions()
detailedAction->setChecked( KFile::isDetailView( fv ));
}
void KDirOperator::readConfig( KConfig *kc, const TQString& group )
void KDirOperator::readConfig( TDEConfig *kc, const TQString& group )
{
if ( !kc )
return;
@ -1495,7 +1495,7 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
kc->setGroup( oldGroup );
}
void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group )
{
if ( !kc )
return;
@ -1718,13 +1718,13 @@ void KDirOperator::slotRefreshItems( const KFileItemList& items )
m_fileView->updateView( it.current() );
}
void KDirOperator::setViewConfig( KConfig *config, const TQString& group )
void KDirOperator::setViewConfig( TDEConfig *config, const TQString& group )
{
d->config = config;
d->configGroup = group;
}
KConfig * KDirOperator::viewConfig()
TDEConfig * KDirOperator::viewConfig()
{
return d->config;
}

30
kio/kfile/kdiroperator.h
Unescape Escape View File

@ -41,7 +41,7 @@ class KActionSeparator;
class KActionMenu;
class TQWidgetStack;
class KProgress;
namespace KIO {
namespace TDEIO {
class CopyJob;
class DeleteJob;
}
@ -60,7 +60,7 @@ namespace KIO {
* show either a simple or detailed view and additionally a preview widget
* (see setPreviewWidget()). KImageFilePreview is one implementation
* of a preview widget, that displays previews for all supported filetypes
* utilizing KIO::PreviewJob.
* utilizing TDEIO::PreviewJob.
*
* Currently, those classes don't support Drag&Drop out of the box -- there
* you have to use your own view-classes. You can use some DnD-aware views
@ -407,16 +407,16 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @since 3.1
*/
// ### KDE4: make virtual
void setViewConfig( KConfig *config, const TQString& group );
void setViewConfig( TDEConfig *config, const TQString& group );
/**
* Returns the KConfig object used for saving and restoring view's
* Returns the TDEConfig object used for saving and restoring view's
* configuration.
* @returns the KConfig object used for saving and restoring view's
* @returns the TDEConfig object used for saving and restoring view's
* configuration.
* @since 3.1
*/
KConfig *viewConfig();
TDEConfig *viewConfig();
/**
* Returns the group name used for saving and restoring view's
@ -440,7 +440,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
* @see setViewConfig
* @see writeConfig
*/
virtual void readConfig( KConfig *, const TQString& group = TQString::null );
virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
/**
* Saves the current settings like sorting, simple or detailed view.
@ -448,7 +448,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
</