Browse Source

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

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
703fb0c89c
100 changed files with 648 additions and 648 deletions
  1. +10
    -10
      KDE2PORTING.html
  2. +5
    -5
      KDE3PORTING.html
  3. +6
    -6
      TODO
  4. +1
    -1
      arts/kde/kartsserver.cpp
  5. +21
    -21
      arts/kde/kioinputstream_impl.cpp
  6. +6
    -6
      arts/kde/kioinputstream_impl.h
  7. +2
    -2
      arts/kde/kplayobjectfactory.cc
  8. +16
    -16
      arts/knotify/knotify.cpp
  9. +2
    -2
      arts/knotify/knotify.h
  10. +2
    -2
      dcop/dcopidl/dcopidl_test.h
  11. +1
    -1
      dnssd/settings.kcfgc
  12. +1
    -1
      interfaces/kimproxy/library/kimproxy.cpp
  13. +1
    -1
      interfaces/kio/http.h
  14. +2
    -2
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  15. +5
    -5
      interfaces/ktexteditor/configinterface.h
  16. +7
    -7
      interfaces/ktexteditor/editorchooser.cpp
  17. +3
    -3
      interfaces/ktexteditor/editorchooser.h
  18. +3
    -3
      interfaces/ktexteditor/sessionconfiginterface.h
  19. +2
    -2
      kabc/addressbook.cpp
  20. +1
    -1
      kabc/addresseehelper.cpp
  21. +4
    -4
      kabc/addresslineedit.cpp
  22. +3
    -3
      kabc/addresslineedit.h
  23. +3
    -3
      kabc/field.h
  24. +2
    -2
      kabc/kab2kabc.cpp
  25. +11
    -11
      kabc/ldapclient.cpp
  26. +3
    -3
      kabc/ldapclient.h
  27. +8
    -8
      kabc/ldapconfigwidget.cpp
  28. +7
    -7
      kabc/ldapconfigwidget.h
  29. +2
    -2
      kabc/plugins/dir/resourcedir.cpp
  30. +2
    -2
      kabc/plugins/dir/resourcedir.h
  31. +2
    -2
      kabc/plugins/evolution/resourceevo.cpp
  32. +1
    -1
      kabc/plugins/evolution/resourceevo.h
  33. +2
    -2
      kabc/plugins/file/resourcefile.cpp
  34. +2
    -2
      kabc/plugins/file/resourcefile.h
  35. +122
    -122
      kabc/plugins/ldapkio/resourceldapkio.cpp
  36. +13
    -13
      kabc/plugins/ldapkio/resourceldapkio.h
  37. +1
    -1
      kabc/plugins/ldapkio/resourceldapkioconfig.cpp
  38. +18
    -18
      kabc/plugins/net/resourcenet.cpp
  39. +5
    -5
      kabc/plugins/net/resourcenet.h
  40. +1
    -1
      kabc/plugins/sql/resourcesql.cpp
  41. +1
    -1
      kabc/plugins/sql/resourcesql.h
  42. +2
    -2
      kabc/plugins/sql/resourcesqlconfig.cpp
  43. +2
    -2
      kabc/plugins/sql/resourcesqlconfig.h
  44. +2
    -2
      kabc/resource.cpp
  45. +2
    -2
      kabc/resource.h
  46. +6
    -6
      kabc/scripts/field.src.cpp
  47. +2
    -2
      kabc/sound.h
  48. +2
    -2
      kabc/stdaddressbook.cpp
  49. +5
    -5
      kate/interfaces/view.h
  50. +10
    -10
      kate/part/kateconfig.cpp
  51. +7
    -7
      kate/part/kateconfig.h
  52. +7
    -7
      kate/part/katedialogs.cpp
  53. +3
    -3
      kate/part/katedialogs.h
  54. +18
    -18
      kate/part/katedocument.cpp
  55. +9
    -9
      kate/part/katedocument.h
  56. +2
    -2
      kate/part/katefiletype.cpp
  57. +9
    -9
      kate/part/katehighlight.cpp
  58. +2
    -2
      kate/part/katehighlight.h
  59. +4
    -4
      kate/part/katejscript.cpp
  60. +1
    -1
      kate/part/kateluaindentscript.cpp
  61. +5
    -5
      kate/part/kateschema.cpp
  62. +3
    -3
      kate/part/kateschema.h
  63. +1
    -1
      kate/part/katesyntaxdocument.cpp
  64. +3
    -3
      kate/part/kateview.cpp
  65. +2
    -2
      kate/part/kateview.h
  66. +1
    -1
      kate/part/kateviewhelpers.cpp
  67. +3
    -3
      kate/part/test_regression.cpp
  68. +6
    -6
      kate/part/test_regression.h
  69. +2
    -2
      kate/plugins/autobookmarker/autobookmarker.cpp
  70. +3
    -3
      kate/plugins/insertfile/insertfileplugin.cpp
  71. +3
    -3
      kate/plugins/insertfile/insertfileplugin.h
  72. +2
    -2
      kate/plugins/isearch/ISearchPlugin.cpp
  73. +2
    -2
      kate/plugins/wordcompletion/docwordcompletion.cpp
  74. +1
    -1
      kcert/kcertpart.cc
  75. +4
    -4
      kcmshell/main.cpp
  76. +14
    -14
      kconf_update/kconf_update.cpp
  77. +3
    -3
      kded/kded.cpp
  78. +1
    -1
      kdewidgets/kde.widgets
  79. +9
    -9
      kdewidgets/makekdewidgets.cpp
  80. +1
    -1
      kdewidgets/tests/test.widgets
  81. +8
    -8
      kdoctools/kio_help.cpp
  82. +1
    -1
      kdoctools/kio_help.h
  83. +2
    -2
      khtml/css/cssstyleselector.cpp
  84. +2
    -2
      khtml/ecma/kjs_debugwin.cpp
  85. +1
    -1
      khtml/ecma/kjs_navigator.cpp
  86. +21
    -21
      khtml/ecma/xmlhttprequest.cpp
  87. +8
    -8
      khtml/ecma/xmlhttprequest.h
  88. +4
    -4
      khtml/html/html_formimpl.cpp
  89. +2
    -2
      khtml/java/kjavaappletserver.cpp
  90. +4
    -4
      khtml/java/kjavaappletviewer.cpp
  91. +2
    -2
      khtml/java/kjavaappletviewer.h
  92. +27
    -27
      khtml/java/kjavadownloader.cpp
  93. +8
    -8
      khtml/java/kjavadownloader.h
  94. +7
    -7
      khtml/khtml_ext.cpp
  95. +2
    -2
      khtml/khtml_ext.h
  96. +1
    -1
      khtml/khtml_factory.cpp
  97. +2
    -2
      khtml/khtml_iface.cc
  98. +60
    -60
      khtml/khtml_part.cpp
  99. +11
    -11
      khtml/khtml_part.h
  100. +1
    -1
      khtml/khtml_run.cpp

+ 10
- 10
KDE2PORTING.html 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>



+ 5
- 5
KDE3PORTING.html 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>


+ 6
- 6
TODO 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.


+ 1
- 1
arts/kde/kartsserver.cpp 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");


+ 21
- 21
arts/kde/kioinputstream_impl.cpp 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;
}


+ 6
- 6
arts/kde/kioinputstream_impl.h 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;
};


+ 2
- 2
arts/kde/kplayobjectfactory.cc 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() )


+ 16
- 16
arts/knotify/knotify.cpp 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 );


+ 2
- 2
arts/knotify/knotify.h 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,


+ 2
- 2
dcop/dcopidl/dcopidl_test.h 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


+ 1
- 1
dnssd/settings.kcfgc View File

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


+ 1
- 1
interfaces/kimproxy/library/kimproxy.cpp 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;


+ 1
- 1
interfaces/kio/http.h 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,


+ 2
- 2
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp 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;


+ 5
- 5
interfaces/ktexteditor/configinterface.h 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


+ 7
- 7
interfaces/ktexteditor/editorchooser.cpp 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;


+ 3
- 3
interfaces/ktexteditor/editorchooser.h 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);


+ 3
- 3
interfaces/ktexteditor/sessionconfiginterface.h 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;


+ 2
- 2
kabc/addressbook.cpp 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*>();


+ 1
- 1
kabc/addresseehelper.cpp 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 );


+ 4
- 4
kabc/addresslineedit.cpp 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;
}


+ 3
- 3
kabc/addresslineedit.h 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;


+ 3
- 3
kabc/field.h 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


+ 2
- 2
kabc/kab2kabc.cpp 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 );
}


+ 11
- 11
kabc/ldapclient.cpp 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 ) {


+ 3
- 3
kabc/ldapclient.h 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;


+ 8
- 8
kabc/ldapconfigwidget.cpp 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 );


+ 7
- 7
kabc/ldapconfigwidget.h 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;


+ 2
- 2
kabc/plugins/dir/resourcedir.cpp 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 );



+ 2
- 2
kabc/plugins/dir/resourcedir.h 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();


+ 2
- 2
kabc/plugins/evolution/resourceevo.cpp 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;


+ 1
- 1
kabc/plugins/evolution/resourceevo.h 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();


+ 2
- 2
kabc/plugins/file/resourcefile.cpp 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 );



+ 2
- 2
kabc/plugins/file/resourcefile.h 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.


+ 122
- 122
kabc/plugins/ldapkio/resourceldapkio.cpp 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;
}


+ 13
- 13
kabc/plugins/ldapkio/resourceldapkio.h View File

@@ -26,7 +26,7 @@
#include <kabc/ldif.h>
#include <kio/job.h>

class KConfig;
class TDEConfig;