From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kio/kfile/kfiledetailview.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kio/kfile/kfiledetailview.h') diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 937c8f56c..9c41cfb91 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -149,8 +149,8 @@ public: void determineIcon( KFileListViewItem *item ); TQScrollView *scrollWidget() const { return (TQScrollView*) this; } - 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); signals: /** -- cgit v1.2.3 From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- arts/kde/artskde.idl | 2 +- arts/kde/kaudioconverter.cc | 6 +-- arts/kde/kioinputstream_impl.cpp | 34 ++++++------ arts/kde/kioinputstream_impl.h | 6 +-- arts/kde/kiotest.cc | 2 +- arts/kde/kiotestslow.cc | 2 +- arts/kde/kplayobject.h | 2 +- arts/kde/kplayobjectcreator.cc | 4 +- arts/kde/kplayobjectcreator.h | 2 +- arts/kde/kplayobjectfactory.cc | 2 +- kabc/plugins/ldapkio/resourceldapkioconfig.cpp | 14 ++--- kabc/plugins/ldapkio/resourceldapkioconfig.h | 4 +- kabc/plugins/ldapkio/resourceldapkioplugin.cpp | 2 +- khtml/java/kjavaappletserver.cpp | 10 ++-- khtml/java/kjavadownloader.cpp | 4 +- khtml/java/kjavadownloader.h | 8 +-- kio/bookmarks/kbookmark.h | 6 +-- kio/bookmarks/kbookmarkbar.h | 2 +- kio/bookmarks/kbookmarkdombuilder.h | 2 +- kio/bookmarks/kbookmarkdrag.h | 2 +- kio/bookmarks/kbookmarkexporter.h | 2 +- kio/bookmarks/kbookmarkimporter.h | 4 +- kio/bookmarks/kbookmarkimporter_crash.h | 4 +- kio/bookmarks/kbookmarkimporter_ie.h | 6 +-- kio/bookmarks/kbookmarkimporter_kde1.h | 2 +- kio/bookmarks/kbookmarkimporter_ns.h | 10 ++-- kio/bookmarks/kbookmarkimporter_opera.h | 6 +-- kio/bookmarks/kbookmarkmanager.h | 6 +-- kio/bookmarks/kbookmarkmenu.h | 4 +- kio/bookmarks/kbookmarknotifier.h | 2 +- kio/kfile/kcombiview.h | 2 +- kio/kfile/kcustommenueditor.h | 2 +- kio/kfile/kdiroperator.h | 2 +- kio/kfile/kdirselectdialog.h | 2 +- kio/kfile/kdirsize.h | 2 +- kio/kfile/kdiskfreesp.h | 2 +- kio/kfile/kencodingfiledialog.h | 2 +- kio/kfile/kfile.h | 2 +- kio/kfile/kfilebookmarkhandler.h | 2 +- kio/kfile/kfiledetailview.h | 4 +- kio/kfile/kfiledialog.h | 2 +- kio/kfile/kfilefiltercombo.h | 2 +- kio/kfile/kfileiconview.h | 4 +- kio/kfile/kfilemetainfowidget.h | 2 +- kio/kfile/kfilemetapreview.h | 2 +- kio/kfile/kfilepreview.h | 2 +- kio/kfile/kfilesharedlg.h | 2 +- kio/kfile/kfilespeedbar.h | 2 +- kio/kfile/kfiletreebranch.h | 2 +- kio/kfile/kfiletreeview.h | 4 +- kio/kfile/kfiletreeviewitem.h | 2 +- kio/kfile/kfileview.h | 4 +- kio/kfile/kicondialog.h | 6 +-- kio/kfile/kimagefilepreview.h | 2 +- kio/kfile/kmetaprops.h | 2 +- kio/kfile/knotifydialog.h | 8 +-- kio/kfile/kopenwith.h | 4 +- kio/kfile/kpreviewprops.h | 2 +- kio/kfile/kpreviewwidgetbase.h | 2 +- kio/kfile/kpropertiesdialog.h | 20 +++---- kio/kfile/krecentdirs.h | 2 +- kio/kfile/krecentdocument.h | 2 +- kio/kfile/kurlbar.h | 8 +-- kio/kfile/kurlcombobox.h | 2 +- kio/kfile/kurlrequester.h | 4 +- kio/kfile/kurlrequesterdlg.h | 2 +- kio/kio/authinfo.h | 12 ++--- kio/kio/chmodjob.cpp | 2 +- kio/kio/chmodjob.h | 4 +- kio/kio/connection.h | 4 +- kio/kio/davjob.h | 8 +-- kio/kio/defaultprogress.h | 2 +- kio/kio/forwardingslavebase.h | 2 +- kio/kio/global.cpp | 30 +++++------ kio/kio/global.h | 46 ++++++++-------- kio/kio/job.cpp | 2 +- kio/kio/job.h | 74 +++++++++++++------------- kio/kio/jobclasses.h | 30 +++++------ kio/kio/kacl.h | 10 ++-- kio/kio/kar.h | 2 +- kio/kio/karchive.h | 8 +-- kio/kio/kautomount.h | 4 +- kio/kio/kdatatool.h | 6 +-- kio/kio/kdcopservicestarter.h | 2 +- kio/kio/kdirlister.h | 2 +- kio/kio/kdirnotify.h | 2 +- kio/kio/kdirnotify_stub.h | 2 +- kio/kio/kdirwatch.h | 2 +- kio/kio/kemailsettings.h | 2 +- kio/kio/kfilefilter.h | 4 +- kio/kio/kfileitem.h | 10 ++-- kio/kio/kfilemetainfo.cpp | 12 ++--- kio/kio/kfilemetainfo.h | 42 +++++++-------- kio/kio/kfileshare.h | 2 +- kio/kio/kfilterbase.h | 2 +- kio/kio/kfilterdev.h | 2 +- kio/kio/kimageio.h | 2 +- kio/kio/kimageiofactory.h | 6 +-- kio/kio/klimitediodevice.h | 2 +- kio/kio/kmessageboxwrapper.h | 2 +- kio/kio/kmimemagic.h | 4 +- kio/kio/kmimetype.h | 8 +-- kio/kio/kmimetypechooser.h | 4 +- kio/kio/kmimetyperesolver.h | 4 +- kio/kio/knfsshare.h | 2 +- kio/kio/kprotocolinfo.cpp | 4 +- kio/kio/kprotocolinfo.h | 6 +-- kio/kio/kprotocolmanager.h | 2 +- kio/kio/kremoteencoding.h | 2 +- kio/kio/krun.h | 6 +-- kio/kio/ksambashare.h | 2 +- kio/kio/kscan.h | 8 +-- kio/kio/kservice.h | 2 +- kio/kio/kservicefactory.h | 2 +- kio/kio/kservicegroup.h | 4 +- kio/kio/kservicegroupfactory.h | 2 +- kio/kio/kservicetype.h | 2 +- kio/kio/kservicetypefactory.h | 2 +- kio/kio/kshellcompletion.h | 2 +- kio/kio/kshred.h | 2 +- kio/kio/ktar.h | 2 +- kio/kio/ktrader.h | 2 +- kio/kio/ktraderparsetree.h | 48 ++++++++--------- kio/kio/kurifilter.h | 8 +-- kio/kio/kurlcompletion.h | 2 +- kio/kio/kurlpixmapprovider.h | 2 +- kio/kio/kuserprofile.h | 4 +- kio/kio/kzip.h | 4 +- kio/kio/metainfojob.cpp | 4 +- kio/kio/metainfojob.h | 6 +-- kio/kio/netaccess.h | 2 +- kio/kio/observer.h | 2 +- kio/kio/passdlg.h | 2 +- kio/kio/paste.cpp | 12 ++--- kio/kio/paste.h | 14 ++--- kio/kio/previewjob.h | 6 +-- kio/kio/progressbase.h | 2 +- kio/kio/renamedlg.h | 4 +- kio/kio/renamedlgplugin.h | 2 +- kio/kio/scheduler.h | 2 +- kio/kio/sessiondata.h | 2 +- kio/kio/skipdlg.h | 4 +- kio/kio/slave.h | 2 +- kio/kio/slavebase.h | 2 +- kio/kio/slaveconfig.h | 2 +- kio/kio/slaveinterface.h | 6 +-- kio/kio/statusbarprogress.h | 2 +- kio/kio/tcpslavebase.h | 2 +- kio/kssl/kopenssl.h | 2 +- kio/kssl/ksmimecrypto.h | 2 +- kio/kssl/kssl.h | 2 +- kio/kssl/ksslcertchain.h | 2 +- kio/kssl/ksslcertdlg.h | 8 +-- kio/kssl/ksslcertificate.h | 14 ++--- kio/kssl/ksslcertificatecache.h | 6 +-- kio/kssl/ksslcertificatefactory.h | 2 +- kio/kssl/ksslcertificatehome.h | 2 +- kio/kssl/ksslconnectioninfo.h | 2 +- kio/kssl/ksslcsessioncache.h | 2 +- kio/kssl/ksslinfodlg.h | 4 +- kio/kssl/ksslkeygen.h | 2 +- kio/kssl/ksslpeerinfo.h | 2 +- kio/kssl/ksslpemcallback.h | 2 +- kio/kssl/ksslpkcs12.h | 2 +- kio/kssl/ksslpkcs7.h | 2 +- kio/kssl/ksslsession.h | 2 +- kio/kssl/ksslsettings.h | 2 +- kio/kssl/ksslsigners.h | 2 +- kio/kssl/ksslx509map.h | 2 +- kio/kssl/ksslx509v3.h | 2 +- kio/misc/kntlm/kntlm.h | 2 +- kio/misc/tdesasl/tdesasl.h | 2 +- kio/misc/uiserver.h | 6 +-- kio/tests/jobtest.cpp | 2 +- kioslave/http/http.cc | 4 +- kparts/COMMENTS | 2 +- kwallet/client/kwallet.h | 2 +- tdecore/kbufferedio.cpp | 44 +++++++-------- tdecore/kbufferedio.h | 12 ++--- tdecore/kdebug.areas | 2 +- tdecore/kextsock.cpp | 4 +- tdecore/kextsock.h | 4 +- tdecore/kprotocolinfo_tdecore.cpp | 4 +- tdecore/ksimpledirwatch.h | 2 +- tdecore/network/kbufferedsocket.cpp | 64 +++++++++++----------- tdecore/network/kbufferedsocket.h | 24 ++++----- tdecore/network/kclientsocketbase.h | 2 +- tdecore/network/kiobuffer.h | 14 ++--- tdecore/network/kserversocket.cpp | 10 ++-- tdecore/network/kserversocket.h | 8 +-- tdecore/network/kstreamsocket.h | 8 +-- tdecore/network/tdesocketbuffer.cpp | 4 +- tdecore/network/tdesocketbuffer_p.h | 4 +- tdecore/tdelibs_export.h | 6 +-- tdeprint/cups/kmcupsmanager.cpp | 2 +- win/tdelibs_export_win.h | 6 +-- 196 files changed, 579 insertions(+), 579 deletions(-) (limited to 'kio/kfile/kfiledetailview.h') diff --git a/arts/kde/artskde.idl b/arts/kde/artskde.idl index f31b49ed4..f1de50924 100644 --- a/arts/kde/artskde.idl +++ b/arts/kde/artskde.idl @@ -12,7 +12,7 @@ interface KFloatWatchProxy { /* * used for deliviering MCOP data to the playobjects */ -interface KIOInputStream : InputStream { +interface TDEIOInputStream : InputStream { boolean openURL(string url); attribute long bufferPackets; diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cc index adda3033a..c5a526db6 100644 --- a/arts/kde/kaudioconverter.cc +++ b/arts/kde/kaudioconverter.cc @@ -81,12 +81,12 @@ void KAudioConverter::requestPlayObject(const KURL &url) { string queryInterface = "Arts::PlayObject"; - Arts::KIOInputStream inputStream; + Arts::TDEIOInputStream inputStream; if(!url.isLocalFile()) { - Arts::KIOInputStream_impl *inputStreamImpl = new Arts::KIOInputStream_impl(); - inputStream = Arts::KIOInputStream::_from_base(inputStreamImpl); + Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); + inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index ab215a585..4ff509980 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -41,9 +41,9 @@ using namespace Arts; -const unsigned int KIOInputStream_impl::PACKET_COUNT = 10; +const unsigned int TDEIOInputStream_impl::PACKET_COUNT = 10; -KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048) +TDEIOInputStream_impl::TDEIOInputStream_impl() : m_packetSize(2048) { m_job = 0; m_finished = false; @@ -55,13 +55,13 @@ KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048) m_size = 0; } -KIOInputStream_impl::~KIOInputStream_impl() +TDEIOInputStream_impl::~TDEIOInputStream_impl() { if(m_job != 0) m_job->kill(); } -void KIOInputStream_impl::streamStart() +void TDEIOInputStream_impl::streamStart() { // prevent kill/reconnect if (m_streamStarted) { @@ -92,7 +92,7 @@ void KIOInputStream_impl::streamStart() m_streamStarted = true; } -void KIOInputStream_impl::streamEnd() +void TDEIOInputStream_impl::streamEnd() { kdDebug( 400 ) << "streamEnd()\n"; @@ -117,14 +117,14 @@ void KIOInputStream_impl::streamEnd() m_streamStarted = false; } -bool KIOInputStream_impl::openURL(const std::string& url) +bool TDEIOInputStream_impl::openURL(const std::string& url) { m_url = KURL(url.c_str()); m_size = 0; return true; } -void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) +void TDEIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) { if(m_finished) m_finished = false; @@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) processQueue(); } -void KIOInputStream_impl::slotResult(TDEIO::Job *job) +void TDEIOInputStream_impl::slotResult(TDEIO::Job *job) { // jobs delete themselves after emitting their result m_finished = true; @@ -151,38 +151,38 @@ void KIOInputStream_impl::slotResult(TDEIO::Job *job) } } -void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) +void TDEIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) { kdDebug( 400 ) << "got mimetype: " << mimetype << endl; emit mimeTypeFound(mimetype); } -void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) +void TDEIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) { m_size = size; } -bool KIOInputStream_impl::eof() +bool TDEIOInputStream_impl::eof() { return (m_finished && m_data.size() == 0); } -bool KIOInputStream_impl::seekOk() +bool TDEIOInputStream_impl::seekOk() { return false; } -long KIOInputStream_impl::size() +long TDEIOInputStream_impl::size() { return m_size ? m_size : m_data.size(); } -long KIOInputStream_impl::seek(long) +long TDEIOInputStream_impl::seek(long) { return -1; } -void KIOInputStream_impl::processQueue() +void TDEIOInputStream_impl::processQueue() { if(m_job != 0) { @@ -210,7 +210,7 @@ void KIOInputStream_impl::processQueue() } } -void KIOInputStream_impl::request_outdata(DataPacket *packet) +void TDEIOInputStream_impl::request_outdata(DataPacket *packet) { processQueue(); packet->size = std::min(m_packetSize, (unsigned int)m_data.size()); @@ -233,4 +233,4 @@ void KIOInputStream_impl::request_outdata(DataPacket *packet) packet->send(); } -REGISTER_IMPLEMENTATION(KIOInputStream_impl); +REGISTER_IMPLEMENTATION(TDEIOInputStream_impl); diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 06052e04b..d0a872881 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -31,14 +31,14 @@ namespace Arts { -class KIOInputStream_impl : public TQObject, virtual public KIOInputStream_skel, +class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_skel, virtual public InputStream_skel, virtual public StdSynthModule { Q_OBJECT public: - KIOInputStream_impl(); - ~KIOInputStream_impl(); + TDEIOInputStream_impl(); + ~TDEIOInputStream_impl(); void streamStart(); void streamEnd(); diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc index 826a3b165..f838c4f77 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cc @@ -27,7 +27,7 @@ int main(int argc, char **argv) TDEApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); - KIOInputStream stream; + TDEIOInputStream stream; StdoutWriter writer; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index e367ea924..ffb71d8b1 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -96,7 +96,7 @@ int main(int argc, char **argv) QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); #ifndef USE_FILEINPUTSTREAM - KIOInputStream stream; + TDEIOInputStream stream; #else FileInputStream stream; #endif diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index 4aafe0b58..f5bd849be 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -126,7 +126,7 @@ class PlayObjectFactory; * This class acts as a general interface to the KDE multimedia framework. * You basically point the Playobject to an URL and say "play", and it will * automatically decode and play and / or display the file or stream. - * For non-local media, it will make extensive use of KIOInputStream to + * For non-local media, it will make extensive use of TDEIOInputStream to * directly play the content from the remote location without having to * download it to a temporary local file first. * diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc index b1969718e..2e8187e67 100644 --- a/arts/kde/kplayobjectcreator.cc +++ b/arts/kde/kplayobjectcreator.cc @@ -53,8 +53,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_createBUS = createBUS; // This is the RightWay(tm) according to stw - Arts::KIOInputStream_impl* instream_impl = new Arts::KIOInputStream_impl(); - m_instream = Arts::KIOInputStream::_from_base(instream_impl); + Arts::TDEIOInputStream_impl* instream_impl = new Arts::TDEIOInputStream_impl(); + m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index d52e18a1e..74e571c8e 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -46,7 +46,7 @@ private slots: private: Arts::SoundServerV2 m_server; - Arts::KIOInputStream m_instream; + Arts::TDEIOInputStream m_instream; Arts::PlayObject playObject; bool m_createBUS; }; diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index c09692946..db4110792 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -75,7 +75,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri { if(mimetype == "application/octet-stream" && m_allowStreaming) { - Arts::KIOInputStream instream; + Arts::TDEIOInputStream instream; instream.openURL(url.url().latin1()); m_stream = true; diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp index 7ecd14554..85b9b12b0 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp @@ -45,7 +45,7 @@ using namespace KABC; -ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent, const char* name ) +ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) { TQBoxLayout *mainLayout = new TQVBoxLayout( this ); @@ -62,12 +62,12 @@ ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent, const char* nam connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) ); } -void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res ) +void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res ) { ResourceLDAPKIO *resource = dynamic_cast( res ); if ( !resource ) { - kdDebug(5700) << "ResourceLDAPKIOConfig::loadSettings(): cast failed" << endl; + kdDebug(5700) << "ResourceLDAPTDEIOConfig::loadSettings(): cast failed" << endl; return; } @@ -98,12 +98,12 @@ void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res ) mAutoCache = resource->autoCache(); } -void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res ) +void ResourceLDAPTDEIOConfig::saveSettings( KRES::Resource *res ) { ResourceLDAPKIO *resource = dynamic_cast( res ); if ( !resource ) { - kdDebug(5700) << "ResourceLDAPKIOConfig::saveSettings(): cast failed" << endl; + kdDebug(5700) << "ResourceLDAPTDEIOConfig::saveSettings(): cast failed" << endl; return; } @@ -131,7 +131,7 @@ void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res ) } -void ResourceLDAPKIOConfig::editAttributes() +void ResourceLDAPTDEIOConfig::editAttributes() { AttributesDialog dlg( mAttributes, mRDNPrefix, this ); if ( dlg.exec() ) { @@ -140,7 +140,7 @@ void ResourceLDAPKIOConfig::editAttributes() } } -void ResourceLDAPKIOConfig::editCache() +void ResourceLDAPTDEIOConfig::editCache() { LDAPUrl src; TQStringList attr; diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h index f8e0003ec..e14c7c428 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.h +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h @@ -42,12 +42,12 @@ class KLineEdit; namespace KABC { -class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget +class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget { Q_OBJECT public: - ResourceLDAPKIOConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp index 975837bf8..7edb90e22 100644 --- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp @@ -31,6 +31,6 @@ extern "C" KDE_EXPORT void *init_kabc_ldapkio() { TDEGlobal::locale()->insertCatalogue("kabc_ldapkio"); - return new KRES::PluginFactory(); + return new KRES::PluginFactory(); } } diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index a82a80a0e..9d8b0ac4f 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -87,7 +87,7 @@ class JSStackFrame; -typedef TQMap< int, KJavaKIOJob* > KIOJobMap; +typedef TQMap< int, KJavaTDEIOJob* > TDEIOJobMap; typedef TQMap< int, JSStackFrame* > JSStack; class JSStackFrame { @@ -121,7 +121,7 @@ private: TQMap< int, TQGuardedPtr > contexts; TQString appletLabel; JSStack jsstack; - KIOJobMap kiojobs; + TDEIOJobMap kiojobs; bool javaProcessFailed; bool useKIO; KSSL * kssl; @@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray& void KJavaAppletServer::removeDataJob( int loaderID ) { - const KIOJobMap::iterator it = d->kiojobs.find( loaderID ); + const TDEIOJobMap::iterator it = d->kiojobs.find( loaderID ); if (it != d->kiojobs.end()) { it.data()->deleteLater(); d->kiojobs.erase( it ); @@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) if (cmd_code == KJAS_PUT_DATA) { // rest of the data is for kio put if (ok) { - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + TDEIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) { TQByteArray qba; qba.setRawData(qb.data() + index, qb.size() - index - 1); @@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_DATA_COMMAND: if (ok && !args.empty()) { const int cmd = args.first().toInt( &ok ); - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + TDEIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) it.data()->jobCommand( cmd ); kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl; diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp index a12b585b7..a0a8abdd2 100644 --- a/khtml/java/kjavadownloader.cpp +++ b/khtml/java/kjavadownloader.cpp @@ -41,9 +41,9 @@ static const int KJAS_STOP = 0; static const int KJAS_HOLD = 1; static const int KJAS_RESUME = 2; -KJavaKIOJob::~KJavaKIOJob() {} +KJavaTDEIOJob::~KJavaTDEIOJob() {} -void KJavaKIOJob::data( const TQByteArray& ) +void KJavaTDEIOJob::data( const TQByteArray& ) { kdError(6100) << "Job id mixup" << endl; } diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h index ab6553398..22690824c 100644 --- a/khtml/java/kjavadownloader.h +++ b/khtml/java/kjavadownloader.h @@ -40,16 +40,16 @@ namespace TDEIO { class KJavaDownloaderPrivate; class KJavaUploaderPrivate; -class KJavaKIOJob : public TQObject +class KJavaTDEIOJob : public TQObject { Q_OBJECT public: - virtual ~KJavaKIOJob(); + virtual ~KJavaTDEIOJob(); virtual void jobCommand( int cmd ) = 0; virtual void data( const TQByteArray& qb ); }; -class KJavaDownloader : public KJavaKIOJob +class KJavaDownloader : public KJavaTDEIOJob { Q_OBJECT @@ -69,7 +69,7 @@ private: }; -class KJavaUploader : public KJavaKIOJob +class KJavaUploader : public KJavaTDEIOJob { Q_OBJECT diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 84f177522..4e5dc9149 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -28,7 +28,7 @@ class KBookmarkManager; class KBookmarkGroup; -class KIO_EXPORT KBookmark +class TDEIO_EXPORT KBookmark { friend class KBookmarkGroup; public: @@ -196,7 +196,7 @@ private: /** * A group of bookmarks */ -class KIO_EXPORT KBookmarkGroup : public KBookmark +class TDEIO_EXPORT KBookmarkGroup : public KBookmark { public: /** @@ -315,7 +315,7 @@ private: /** * @since 3.2 */ -class KIO_EXPORT KBookmarkGroupTraverser { +class TDEIO_EXPORT KBookmarkGroupTraverser { protected: virtual ~KBookmarkGroupTraverser() { ; } void traverse(const KBookmarkGroup &); diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index 310c1933d..1f100d183 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,7 +39,7 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public TQObject +class TDEIO_EXPORT KBookmarkBar : public TQObject { Q_OBJECT diff --git a/kio/bookmarks/kbookmarkdombuilder.h b/kio/bookmarks/kbookmarkdombuilder.h index f1f712531..44fe7b170 100644 --- a/kio/bookmarks/kbookmarkdombuilder.h +++ b/kio/bookmarks/kbookmarkdombuilder.h @@ -27,7 +27,7 @@ /** * @since 3.2 */ -class KIO_EXPORT KBookmarkDomBuilder : public TQObject { +class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject { Q_OBJECT public: KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *); diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h index c213f2d93..016bd6849 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -25,7 +25,7 @@ #include // Clipboard/dnd data : URLs + XML for bookmarks -class KIO_EXPORT KBookmarkDrag : public TQUriDrag +class TDEIO_EXPORT KBookmarkDrag : public TQUriDrag { public: static KBookmarkDrag * newDrag( const TQValueList & bookmarks, diff --git a/kio/bookmarks/kbookmarkexporter.h b/kio/bookmarks/kbookmarkexporter.h index 0943d6cbe..68e8f475a 100644 --- a/kio/bookmarks/kbookmarkexporter.h +++ b/kio/bookmarks/kbookmarkexporter.h @@ -29,7 +29,7 @@ /** * @since 3.2 */ -class KIO_EXPORT KBookmarkExporterBase +class TDEIO_EXPORT KBookmarkExporterBase { public: KBookmarkExporterBase(KBookmarkManager* mgr, const TQString & fileName) diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index 8fb684c7e..cc87b2004 100644 --- a/kio/bookmarks/kbookmarkimporter.h +++ b/kio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ * and KActionMenu uses it to create actions directly. * @since 3.2 */ -class KIO_EXPORT KBookmarkImporterBase : public TQObject +class TDEIO_EXPORT KBookmarkImporterBase : public TQObject { Q_OBJECT public: @@ -84,7 +84,7 @@ private: /** * A class for importing XBEL files */ -class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser +class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index a5ae08d96..f4fc9af32 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.h +++ b/kio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ * A class for importing all crash sessions as bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject { Q_OBJECT public: @@ -57,7 +57,7 @@ protected: * A class for importing all crash sessions as bookmarks * @since 3.2 */ -class KIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase { public: KCrashBookmarkImporterImpl() : m_shouldDelete(false) { } diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index eddf20f41..b1b7c651c 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.h +++ b/kio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ * A class for importing IE bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { Q_OBJECT public: @@ -62,7 +62,7 @@ protected: * A class for importing IE bookmarks * @since 3.2 */ -class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase { public: KIEBookmarkImporterImpl() { } @@ -75,7 +75,7 @@ private: /* * @since 3.2 */ -class KIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase { public: KIEBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & path) diff --git a/kio/bookmarks/kbookmarkimporter_kde1.h b/kio/bookmarks/kbookmarkimporter_kde1.h index 7e6ad2395..5af4f04e9 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.h +++ b/kio/bookmarks/kbookmarkimporter_kde1.h @@ -31,7 +31,7 @@ * Separated from KBookmarkManager to save memory (we throw this one * out once the import is done) */ -class KIO_EXPORT KBookmarkImporter +class TDEIO_EXPORT KBookmarkImporter { public: KBookmarkImporter( TQDomDocument * doc ) : m_pDoc(doc) {} diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h index fdf79a3b9..10844fc63 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.h +++ b/kio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ * A class for importing NS bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { Q_OBJECT public: @@ -64,7 +64,7 @@ protected: * utf8 defaults to off * @since 3.2 */ -class KIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase { public: KNSBookmarkImporterImpl() : m_utf8(false) { } @@ -81,7 +81,7 @@ private: * utf8 defaults to on * @since 3.2 */ -class KIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl +class TDEIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl { public: KMozillaBookmarkImporterImpl() { setUtf8(true); } @@ -94,7 +94,7 @@ private: * Warning, it overwrites the existing bookmarks.html file ! * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkExporter +class TDEIO_EXPORT_DEPRECATED KNSBookmarkExporter { public: KNSBookmarkExporter(KBookmarkManager* mgr, const TQString & fileName) @@ -113,7 +113,7 @@ protected: /** * @since 3.2 */ -class KIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase { public: KNSBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & fileName) diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index 0f9a3ba00..f6f1028b1 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.h +++ b/kio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ * A class for importing Opera bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { Q_OBJECT public: @@ -58,7 +58,7 @@ protected: * A class for importing Opera bookmarks * @since 3.2 */ -class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase { public: KOperaBookmarkImporterImpl() { } @@ -71,7 +71,7 @@ private: /** * @since 3.2 */ -class KIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase { public: KOperaBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & filename) diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index d076eefc7..4a129704a 100644 --- a/kio/bookmarks/kbookmarkmanager.h +++ b/kio/bookmarks/kbookmarkmanager.h @@ -50,7 +50,7 @@ * * \endcode */ -class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject +class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -314,7 +314,7 @@ private: * If you wish to use your own editor or allow the user to add * bookmarks, you must overload this class. */ -class KIO_EXPORT KBookmarkOwner +class TDEIO_EXPORT KBookmarkOwner { public: /** @@ -350,7 +350,7 @@ protected: /** * @since 3.2 */ -class KIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner +class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index b54398a02..35e6191e3 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace TDEIO { class Job; } * 1a) Reimplement your own KBookmarkOwner * 1b) Reimplement and instantiate your own KBookmarkManager */ -class KIO_EXPORT KBookmarkMenu : public TQObject +class TDEIO_EXPORT KBookmarkMenu : public TQObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject +class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarknotifier.h b/kio/bookmarks/kbookmarknotifier.h index 3982f984f..f99e570bc 100644 --- a/kio/bookmarks/kbookmarknotifier.h +++ b/kio/bookmarks/kbookmarknotifier.h @@ -28,7 +28,7 @@ * DCOP interface for a bookmark notifier (an object which emits signals * upon changes to the bookmarks) */ -class KIO_EXPORT KBookmarkNotifier : virtual public DCOPObject +class TDEIO_EXPORT KBookmarkNotifier : virtual public DCOPObject { K_DCOP diff --git a/kio/kfile/kcombiview.h b/kio/kfile/kcombiview.h index 2747c51ad..5d56b8257 100644 --- a/kio/kfile/kcombiview.h +++ b/kio/kfile/kcombiview.h @@ -51,7 +51,7 @@ class TQIconViewItem; * @see KFileDetailView * @see KDirOperator */ -class KIO_EXPORT KCombiView : public TQSplitter, +class TDEIO_EXPORT KCombiView : public TQSplitter, public KFileView { Q_OBJECT diff --git a/kio/kfile/kcustommenueditor.h b/kio/kfile/kcustommenueditor.h index 9112780b0..108e9c477 100644 --- a/kio/kfile/kcustommenueditor.h +++ b/kio/kfile/kcustommenueditor.h @@ -30,7 +30,7 @@ class TDEConfigBase; * @author Waldo Bastian (bastian@kde.org) * @since 3.1 */ -class KIO_EXPORT KCustomMenuEditor : public KDialogBase +class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase { Q_OBJECT public: diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index 73798b92c..3dbd42759 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -94,7 +94,7 @@ namespace TDEIO { * @short A widget for displaying files and browsing directories. * @author Stephan Kulow , Carsten Pfeiffer */ -class KIO_EXPORT KDirOperator : public TQWidget +class TDEIO_EXPORT KDirOperator : public TQWidget { Q_OBJECT diff --git a/kio/kfile/kdirselectdialog.h b/kio/kfile/kdirselectdialog.h index 106fe77fc..746064c68 100644 --- a/kio/kfile/kdirselectdialog.h +++ b/kio/kfile/kdirselectdialog.h @@ -36,7 +36,7 @@ class KToggleAction; * @author Michael Jarrett * @see KFileDialog */ -class KIO_EXPORT KDirSelectDialog : public KDialogBase +class TDEIO_EXPORT KDirSelectDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kfile/kdirsize.h b/kio/kfile/kdirsize.h index 41fe87eb6..b0f2c8fc2 100644 --- a/kio/kfile/kdirsize.h +++ b/kio/kfile/kdirsize.h @@ -27,7 +27,7 @@ * Computes a directory size (similar to "du", but doesn't give the same results * since we simply sum up the dir and file sizes, whereas du speaks disk blocks) */ -class KIO_EXPORT KDirSize : public TDEIO::Job +class TDEIO_EXPORT KDirSize : public TDEIO::Job { Q_OBJECT protected: diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index 7b9fc6238..5ffa47d9a 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -37,7 +37,7 @@ class TDEProcess; * This class parses the output of "df" to find the disk usage * information for a given partition (mount point). */ -class KIO_EXPORT KDiskFreeSp : public TQObject +class TDEIO_EXPORT KDiskFreeSp : public TQObject { Q_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); diff --git a/kio/kfile/kencodingfiledialog.h b/kio/kfile/kencodingfiledialog.h index 15b44f9c3..95daca6ce 100644 --- a/kio/kfile/kencodingfiledialog.h +++ b/kio/kfile/kencodingfiledialog.h @@ -36,7 +36,7 @@ struct KEncodingFileDialogPrivate; * can easily add children that will be incorporated into the layout. */ -class KIO_EXPORT KEncodingFileDialog : public KFileDialog +class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog { Q_OBJECT diff --git a/kio/kfile/kfile.h b/kio/kfile/kfile.h index 8e6541cb3..7209a1d25 100644 --- a/kio/kfile/kfile.h +++ b/kio/kfile/kfile.h @@ -28,7 +28,7 @@ * construct a KFile object itself. */ -class KIO_EXPORT KFile +class TDEIO_EXPORT KFile { public: /** diff --git a/kio/kfile/kfilebookmarkhandler.h b/kio/kfile/kfilebookmarkhandler.h index 7db71548b..9b615c87e 100644 --- a/kio/kfile/kfilebookmarkhandler.h +++ b/kio/kfile/kfilebookmarkhandler.h @@ -26,7 +26,7 @@ class TQTextStream; class KPopupMenu; -class KIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner +class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 9c41cfb91..37e71720f 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -34,7 +34,7 @@ class TQKeyEvent; * An item for the listiew, that has a reference to its corresponding * KFileItem. */ -class KIO_EXPORT KFileListViewItem : public KListViewItem +class TDEIO_EXPORT KFileListViewItem : public KListViewItem { public: KFileListViewItem( TQListView *parent, const TQString &text, @@ -106,7 +106,7 @@ private: * @see KCombiView * @see KFileIconView */ -class KIO_EXPORT KFileDetailView : public KListView, public KFileView +class TDEIO_EXPORT KFileDetailView : public KListView, public KFileView { Q_OBJECT diff --git a/kio/kfile/kfiledialog.h b/kio/kfile/kfiledialog.h index 51d817b2f..2f986d351 100644 --- a/kio/kfile/kfiledialog.h +++ b/kio/kfile/kfiledialog.h @@ -74,7 +74,7 @@ struct KFileDialogPrivate; * * @author Richard J. Moore , Carsten Pfeiffer */ -class KIO_EXPORT KFileDialog : public KDialogBase +class TDEIO_EXPORT KFileDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kfile/kfilefiltercombo.h b/kio/kfile/kfilefiltercombo.h index d1f9cbf62..589376d0c 100644 --- a/kio/kfile/kfilefiltercombo.h +++ b/kio/kfile/kfilefiltercombo.h @@ -28,7 +28,7 @@ class KFileFilterComboPrivate; -class KIO_EXPORT KFileFilterCombo : public KComboBox +class TDEIO_EXPORT KFileFilterCombo : public KComboBox { Q_OBJECT diff --git a/kio/kfile/kfileiconview.h b/kio/kfile/kfileiconview.h index 209e4828a..98afc0a6e 100644 --- a/kio/kfile/kfileiconview.h +++ b/kio/kfile/kfileiconview.h @@ -37,7 +37,7 @@ class TQLabel; * An item for the iconview, that has a reference to its corresponding * KFileItem. */ -class KIO_EXPORT KFileIconViewItem : public KIconViewItem +class TDEIO_EXPORT KFileIconViewItem : public KIconViewItem { public: KFileIconViewItem( TQIconView *parent, const TQString &text, @@ -80,7 +80,7 @@ namespace TDEIO { * @see KCombiView * @see KFileDetailView */ -class KIO_EXPORT KFileIconView : public KIconView, public KFileView +class TDEIO_EXPORT KFileIconView : public KIconView, public KFileView { Q_OBJECT diff --git a/kio/kfile/kfilemetainfowidget.h b/kio/kfile/kfilemetainfowidget.h index 96614950b..a42846bea 100644 --- a/kio/kfile/kfilemetainfowidget.h +++ b/kio/kfile/kfilemetainfowidget.h @@ -27,7 +27,7 @@ /*! * A widget to display file meta infos (like id3 for mp3) */ -class KIO_EXPORT KFileMetaInfoWidget: public TQWidget +class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget { Q_OBJECT public: diff --git a/kio/kfile/kfilemetapreview.h b/kio/kfile/kfilemetapreview.h index 19b7901a1..f26cd29b5 100644 --- a/kio/kfile/kfilemetapreview.h +++ b/kio/kfile/kfilemetapreview.h @@ -15,7 +15,7 @@ #include #include -class KIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase +class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase { Q_OBJECT diff --git a/kio/kfile/kfilepreview.h b/kio/kfile/kfilepreview.h index 79dda2984..af6fe13d2 100644 --- a/kio/kfile/kfilepreview.h +++ b/kio/kfile/kfilepreview.h @@ -36,7 +36,7 @@ /*! * This KFileView is an empbedded preview for some file types. */ -class KIO_EXPORT KFilePreview : public TQSplitter, public KFileView +class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView { Q_OBJECT diff --git a/kio/kfile/kfilesharedlg.h b/kio/kfile/kfilesharedlg.h index 54876f12a..e7998ad66 100644 --- a/kio/kfile/kfilesharedlg.h +++ b/kio/kfile/kfilesharedlg.h @@ -30,7 +30,7 @@ class TQPushButton; * @author David Faure * @since 3.1 */ -class KIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index f7a27131b..d1c2a689e 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -23,7 +23,7 @@ class TDEConfig; -class KIO_EXPORT KFileSpeedBar : public KURLBar +class TDEIO_EXPORT KFileSpeedBar : public KURLBar { Q_OBJECT public: diff --git a/kio/kfile/kfiletreebranch.h b/kio/kfile/kfiletreebranch.h index 30f5cf47c..31e6dcfc0 100644 --- a/kio/kfile/kfiletreebranch.h +++ b/kio/kfile/kfiletreebranch.h @@ -45,7 +45,7 @@ class KFileTreeView; * */ -class KIO_EXPORT KFileTreeBranch : public KDirLister +class TDEIO_EXPORT KFileTreeBranch : public KDirLister { Q_OBJECT public: diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h index fb242b2c6..f28f0f01e 100644 --- a/kio/kfile/kfiletreeview.h +++ b/kio/kfile/kfiletreeview.h @@ -37,7 +37,7 @@ class TQTimer; -class KIO_EXPORT KFileTreeViewToolTip : public TQToolTip +class TDEIO_EXPORT KFileTreeViewToolTip : public TQToolTip { public: KFileTreeViewToolTip( TQListView *view ) : TQToolTip( view ), m_view( view ) {} @@ -63,7 +63,7 @@ private: * 3. retrieve the root item with KFileTreeBranch::root() and set it open * if desired. That starts the listing. */ -class KIO_EXPORT KFileTreeView : public KListView +class TDEIO_EXPORT KFileTreeView : public KListView { Q_OBJECT public: diff --git a/kio/kfile/kfiletreeviewitem.h b/kio/kfile/kfiletreeviewitem.h index fe338df3b..0fefc5dc1 100644 --- a/kio/kfile/kfiletreeviewitem.h +++ b/kio/kfile/kfiletreeviewitem.h @@ -37,7 +37,7 @@ class KFileTreeItem; /** * An item for a KFileTreeView that knows about its own KFileItem. */ -class KIO_EXPORT KFileTreeViewItem : public KListViewItem +class TDEIO_EXPORT KFileTreeViewItem : public KListViewItem { public: KFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch * ); diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 5a6bfd002..7e88fc9d8 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -34,7 +34,7 @@ class KActionCollection; * internal class to make easier to use signals possible * @internal **/ -class KIO_EXPORT KFileViewSignaler : public TQObject +class TDEIO_EXPORT KFileViewSignaler : public TQObject { Q_OBJECT @@ -95,7 +95,7 @@ signals: * @short A base class for views of the KDE file selector * @author Stephan Kulow **/ -class KIO_EXPORT KFileView { +class TDEIO_EXPORT KFileView { public: KFileView(); diff --git a/kio/kfile/kicondialog.h b/kio/kfile/kicondialog.h index e533f6800..30d9f1579 100644 --- a/kio/kfile/kicondialog.h +++ b/kio/kfile/kicondialog.h @@ -32,7 +32,7 @@ class KIconLoader; /** * Icon canvas for KIconDialog. */ -class KIO_EXPORT KIconCanvas: public KIconView +class TDEIO_EXPORT KIconCanvas: public KIconView { Q_OBJECT @@ -88,7 +88,7 @@ private: * * @short An icon selection dialog. */ -class KIO_EXPORT KIconDialog: public KDialogBase +class TDEIO_EXPORT KIconDialog: public KDialogBase { Q_OBJECT @@ -254,7 +254,7 @@ private: * @see KIconDialog * @short A push button that allows selection of an icon. */ -class KIO_EXPORT KIconButton: public TQPushButton +class TDEIO_EXPORT KIconButton: public TQPushButton { Q_OBJECT TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon ) diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index a86f4f923..0604e08f0 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -28,7 +28,7 @@ namespace TDEIO { class Job; class PreviewJob; } /** * Image preview widget for the file dialog. */ -class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase +class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase { Q_OBJECT diff --git a/kio/kfile/kmetaprops.h b/kio/kfile/kmetaprops.h index 8bd83a3b3..c842499dd 100644 --- a/kio/kfile/kmetaprops.h +++ b/kio/kfile/kmetaprops.h @@ -28,7 +28,7 @@ class KFileMetaInfoItem; * 'MetaProps plugin * In this plugin you can modify meta information like id3 tags of mp3 files */ -class KIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index acab7e23f..9bb3210ea 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -49,7 +49,7 @@ namespace KNotify * @since 3.1 * @author Carsten Pfeiffer */ -class KIO_EXPORT KNotifyDialog : public KDialogBase +class TDEIO_EXPORT KNotifyDialog : public KDialogBase { Q_OBJECT @@ -148,7 +148,7 @@ namespace KNotify /** * @internal */ - class KIO_EXPORT Application + class TDEIO_EXPORT Application { public: Application( const TQString &path ); @@ -173,7 +173,7 @@ namespace KNotify }; - class KIO_EXPORT ApplicationList : public TQPtrList + class TDEIO_EXPORT ApplicationList : public TQPtrList { virtual int compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) @@ -186,7 +186,7 @@ namespace KNotify /** * @internal */ - class KIO_EXPORT KNotifyWidget : public KNotifyWidgetBase + class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase { Q_OBJECT diff --git a/kio/kfile/kopenwith.h b/kio/kfile/kopenwith.h index a6c570172..90c43ceb1 100644 --- a/kio/kfile/kopenwith.h +++ b/kio/kfile/kopenwith.h @@ -43,7 +43,7 @@ class KOpenWithDlgPrivate; * * @author David Faure */ -class KIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4 +class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4 { Q_OBJECT public: @@ -189,7 +189,7 @@ protected: * * */ -class KIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler +class TDEIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler { public: KFileOpenWithHandler() : KOpenWithHandler() {} diff --git a/kio/kfile/kpreviewprops.h b/kio/kfile/kpreviewprops.h index c34e70763..d934af22a 100644 --- a/kio/kfile/kpreviewprops.h +++ b/kio/kfile/kpreviewprops.h @@ -29,7 +29,7 @@ class KFileMetaPreview; * This plugin displays a preview of the given file * @since 3.5 */ -class KIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin { Q_OBJECT diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index e4c77c600..3597070ee 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -41,7 +41,7 @@ class KURL; * @short Abstract baseclass for all preview widgets. * @author Frerich Raabe */ -class KIO_EXPORT KPreviewWidgetBase : public TQWidget +class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget { Q_OBJECT diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index df814f7d4..3f6d48c6a 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -67,7 +67,7 @@ namespace TDEIO { class Job; } * If you are looking for more flexibility, see KFileMetaInfo and * KFileMetaInfoWidget. */ -class KIO_EXPORT KPropertiesDialog : public KDialogBase +class TDEIO_EXPORT KPropertiesDialog : public KDialogBase { Q_OBJECT @@ -434,7 +434,7 @@ private: * You can also include X-TDE-Protocol=file if you want that plugin * to be loaded only for local files, for instance. */ -class KIO_EXPORT KPropsDlgPlugin : public TQObject +class TDEIO_EXPORT KPropsDlgPlugin : public TQObject { Q_OBJECT public: @@ -492,7 +492,7 @@ private: * This plugin displays the name of the file, its size and access times. * @internal */ -class KIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -568,7 +568,7 @@ private: * the owner of a file. * @internal */ -class KIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -654,7 +654,7 @@ private: * Such files are used to represent a program in kicker and konqueror. * @internal */ -class KIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -689,7 +689,7 @@ private: * Type=MimeType * @internal */ -class KIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -719,7 +719,7 @@ private: * Properties plugin for device .desktop files * @internal */ -class KIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -771,7 +771,7 @@ class KPropertiesDesktopBase; * Such files are used to represent a program in kicker and konqueror. * @internal */ -class KIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -822,7 +822,7 @@ private: * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 -class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: @@ -878,7 +878,7 @@ private: * @deprecated replaced with KDesktopPropsPlugin */ /// Remove in KDE4 -class KIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin +class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin { Q_OBJECT public: diff --git a/kio/kfile/krecentdirs.h b/kio/kfile/krecentdirs.h index e8c6c9419..774655e51 100644 --- a/kio/kfile/krecentdirs.h +++ b/kio/kfile/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/kio/kfile/krecentdocument.h b/kio/kfile/krecentdocument.h index 6bbd3f654..968559968 100644 --- a/kio/kfile/krecentdocument.h +++ b/kio/kfile/krecentdocument.h @@ -47,7 +47,7 @@ * * @author Daniel M. Duley */ -class KIO_EXPORT KRecentDocument +class TDEIO_EXPORT KRecentDocument { public: diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index df9d15790..32c05ec58 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -39,7 +39,7 @@ class KURLBar; * @see KURLBar * @see KURLBarListBox */ -class KIO_EXPORT KURLBarItem : public TQListBoxPixmap +class TDEIO_EXPORT KURLBarItem : public TQListBoxPixmap { public: /** @@ -227,7 +227,7 @@ class KURLBarListBox; * @author Carsten Pfeiffer * @short A URL-bar widget, as used in the KFileDialog */ -class KIO_EXPORT KURLBar : public TQFrame +class TDEIO_EXPORT KURLBar : public TQFrame { Q_OBJECT @@ -490,7 +490,7 @@ class KURLBarToolTip; * * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLBarListBox : public KListBox +class TDEIO_EXPORT KURLBarListBox : public KListBox { Q_OBJECT @@ -564,7 +564,7 @@ class KURLRequester; * * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLBarItemDialog : public KDialogBase +class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kfile/kurlcombobox.h b/kio/kfile/kurlcombobox.h index 0a9451075..a1fd9182d 100644 --- a/kio/kfile/kurlcombobox.h +++ b/kio/kfile/kurlcombobox.h @@ -38,7 +38,7 @@ * @short A combo box showing a number of recent URLs/directories * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLComboBox : public KComboBox +class TDEIO_EXPORT KURLComboBox : public KComboBox { Q_OBJECT TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true) diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h index f5402788a..aa2f6894b 100644 --- a/kio/kfile/kurlrequester.h +++ b/kio/kfile/kurlrequester.h @@ -53,7 +53,7 @@ class TQTimer; * @short A widget to request a filename/url from the user * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLRequester : public TQHBox +class TDEIO_EXPORT KURLRequester : public TQHBox { Q_OBJECT TQ_PROPERTY( TQString url READ url WRITE setURL ) @@ -287,7 +287,7 @@ private: /** * URL requester with a combo box, for use in Designer */ -class KIO_EXPORT KURLComboRequester : public KURLRequester +class TDEIO_EXPORT KURLComboRequester : public KURLRequester { Q_OBJECT public: diff --git a/kio/kfile/kurlrequesterdlg.h b/kio/kfile/kurlrequesterdlg.h index 3f13a844d..07b70d745 100644 --- a/kio/kfile/kurlrequesterdlg.h +++ b/kio/kfile/kurlrequesterdlg.h @@ -35,7 +35,7 @@ class KFileDialog; * @short Simple dialog to enter a filename/url. * @author Wilco Greven */ -class KIO_EXPORT KURLRequesterDlg : public KDialogBase +class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase { Q_OBJECT diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h index 130db0857..019311ef8 100644 --- a/kio/kio/authinfo.h +++ b/kio/kio/authinfo.h @@ -48,10 +48,10 @@ namespace TDEIO { * @short A two way messaging class for passing authentication information. * @author Dawit Alemayehu */ -class KIO_EXPORT AuthInfo +class TDEIO_EXPORT AuthInfo { - KIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); - KIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); + TDEIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); + TDEIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); public: /** @@ -225,8 +225,8 @@ private: class AuthInfoPrivate* d; }; -KIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); -KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); +TDEIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a); +TDEIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); /** * A Singleton class that provides access to passwords @@ -237,7 +237,7 @@ KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a); * @short An interface to the ftp .netrc files * @author Dawit Alemayehu */ -class KIO_EXPORT NetRC +class TDEIO_EXPORT NetRC { public: diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index e1c8a64e4..f589da957 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -227,7 +227,7 @@ void ChmodJob::slotResult( TDEIO::Job * job ) } // antlarr: KDE 4: Make owner and group be const TQString & -KIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask, +TDEIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask, TQString owner, TQString group, bool recursive, bool showProgressInfo ) { diff --git a/kio/kio/chmodjob.h b/kio/kio/chmodjob.h index c501add6a..81b614562 100644 --- a/kio/kio/chmodjob.h +++ b/kio/kio/chmodjob.h @@ -35,7 +35,7 @@ namespace TDEIO { * optionally in a recursive manner. * @see TDEIO::chmod() */ - class KIO_EXPORT ChmodJob : public TDEIO::Job + class TDEIO_EXPORT ChmodJob : public TDEIO::Job { Q_OBJECT public: @@ -100,7 +100,7 @@ namespace TDEIO { * @param showProgressInfo true to show progess information * @return The job handling the operation. */ - KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask, + TDEIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask, TQString newOwner, TQString newGroup, bool recursive, bool showProgressInfo = true ); diff --git a/kio/kio/connection.h b/kio/kio/connection.h index 720e4e935..fb0b50e15 100644 --- a/kio/kio/connection.h +++ b/kio/kio/connection.h @@ -35,7 +35,7 @@ class TQSocketNotifier; namespace TDEIO { - struct KIO_EXPORT Task { + struct TDEIO_EXPORT Task { int cmd; TQByteArray data; }; @@ -46,7 +46,7 @@ namespace TDEIO { * It handles a queue of commands to be sent which makes it possible to * queue data before an actual connection has been established. */ - class KIO_EXPORT Connection : public TQObject + class TDEIO_EXPORT Connection : public TQObject { Q_OBJECT public: diff --git a/kio/kio/davjob.h b/kio/kio/davjob.h index 3232f9e00..02eaa6a78 100644 --- a/kio/kio/davjob.h +++ b/kio/kio/davjob.h @@ -54,7 +54,7 @@ namespace TDEIO { * @see TDEIO::davSearch() * @since 3.1 */ - class KIO_EXPORT DavJob : public TransferJob { + class TDEIO_EXPORT DavJob : public TransferJob { Q_OBJECT public: @@ -95,7 +95,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the new DavJob */ - KIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true ); + TDEIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true ); /** * Creates a new DavJob that issues a PROPPATCH command. PROPPATCH sets @@ -107,7 +107,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the new DavJob */ - KIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true ); + TDEIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true ); /** * Creates a new DavJob that issues a SEARCH command. @@ -119,7 +119,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the new DavJob */ - KIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); + TDEIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); } diff --git a/kio/kio/defaultprogress.h b/kio/kio/defaultprogress.h index 68d405b24..44ffff6c4 100644 --- a/kio/kio/defaultprogress.h +++ b/kio/kio/defaultprogress.h @@ -34,7 +34,7 @@ namespace TDEIO { * A default implementation of the progress dialog ProgressBase. * ProgressBase */ -class KIO_EXPORT DefaultProgress : public ProgressBase { +class TDEIO_EXPORT DefaultProgress : public ProgressBase { Q_OBJECT diff --git a/kio/kio/forwardingslavebase.h b/kio/kio/forwardingslavebase.h index 49d01f4e2..f765e38a6 100644 --- a/kio/kio/forwardingslavebase.h +++ b/kio/kio/forwardingslavebase.h @@ -85,7 +85,7 @@ class ForwardingSlaveBasePrivate; * @since 3.4 * @author Kevin Ottens */ -class KIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase +class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase { Q_OBJECT public: diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 36706a6cf..3a7cadb8f 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -42,7 +42,7 @@ #include #endif -KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) +TDEIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) { if ( size >= 1024 ) return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")"; @@ -50,7 +50,7 @@ KIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size ) return convertSize( size ); } -KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) +TDEIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) { double fsize = size; TQString s; @@ -88,19 +88,19 @@ KIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size ) return s; } -KIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize ) +TDEIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize ) { return convertSize(kbSize * 1024); } -KIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size ) +TDEIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size ) { char charbuf[256]; sprintf(charbuf, "%lld", size); return TQString::fromLatin1(charbuf); } -KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize, +TDEIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) { if ( (speed != 0) && (totalSize != 0) ) @@ -109,7 +109,7 @@ KIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t tota return 0; } -KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) +TDEIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) { unsigned int days = seconds / 86400; unsigned int hours = (seconds - (days * 86400)) / 3600; @@ -124,7 +124,7 @@ KIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds ) return timeStr; } -KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) +TDEIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) { TQTime remainingTime; @@ -147,7 +147,7 @@ KIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO: return remainingTime; } -KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize) +TDEIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize) { TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items ); text += " - "; @@ -162,7 +162,7 @@ KIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, return text; } -KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) +TDEIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) { TQString str( _str ); @@ -177,7 +177,7 @@ KIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str ) return str; } -KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) +TDEIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) { TQString str; @@ -205,12 +205,12 @@ KIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str ) return str; } -KIO_EXPORT TQString TDEIO::Job::errorString() const +TDEIO_EXPORT TQString TDEIO::Job::errorString() const { return TDEIO::buildErrorString(m_error, m_errorText); } -KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText) +TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText) { TQString result; @@ -419,7 +419,7 @@ KIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &error return result; } -KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) { +TDEIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) { switch (cmd) { case CMD_CONNECT: return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol); @@ -458,7 +458,7 @@ KIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol }/*end switch*/ } -KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/, +TDEIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/, int method /*= -1*/ ) const { TQString errorName, techName, description, ret2; @@ -508,7 +508,7 @@ KIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= return ret; } -KIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText, +TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText, const KURL *reqUrl /*= 0L*/, int /*method = -1*/ ) { TQString url, host, protocol, datetime, domain, path, dir, filename; diff --git a/kio/kio/global.h b/kio/kio/global.h index 0091c4801..44b9df616 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -44,7 +44,7 @@ namespace TDEIO * @param size size in bytes * @return converted size as a string - e.g. 123.4 kB , 12.0 MB */ - KIO_EXPORT TQString convertSize( TDEIO::filesize_t size ); + TDEIO_EXPORT TQString convertSize( TDEIO::filesize_t size ); /** * Converts @p size from bytes to a string representation with includes @@ -53,7 +53,7 @@ namespace TDEIO * @param size size in bytes * @return converted size as a string - e.g. 1.4 KB (1495 B), 45 B */ - KIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size ); + TDEIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size ); /** * Converts a size to a string representation * Not unlike TQString::number(...) @@ -61,7 +61,7 @@ namespace TDEIO * @param size size in bytes * @return converted size as a string - e.g. 123456789 */ - KIO_EXPORT TQString number( TDEIO::filesize_t size ); + TDEIO_EXPORT TQString number( TDEIO::filesize_t size ); /** * Converts size from kilo-bytes to the string representation. @@ -69,7 +69,7 @@ namespace TDEIO * @param kbSize size in kilo-bytes * @return converted size as a string - e.g. 123.4 kB , 12.0 MB */ - KIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize ); + TDEIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize ); /** * Calculates remaining time in seconds from total size, processed size and speed. @@ -81,7 +81,7 @@ namespace TDEIO * * @since 3.4 */ - KIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize, + TDEIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ); /** @@ -92,7 +92,7 @@ namespace TDEIO * * @since 3.4 */ - KIO_EXPORT TQString convertSeconds( unsigned int seconds ); + TDEIO_EXPORT TQString convertSeconds( unsigned int seconds ); /** * Calculates remaining time from total size, processed size and speed. @@ -103,7 +103,7 @@ namespace TDEIO * @param speed speed in bytes per second * @return calculated remaining time */ - KIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED; + TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED; /** * Helper for showing information about a set of files and directories @@ -114,7 +114,7 @@ namespace TDEIO * @param showSize whether to show the size in the result * @return the summary string */ - KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize); + TDEIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize); /** * Encodes (from the text displayed to the real filename) @@ -123,14 +123,14 @@ namespace TDEIO * @param str the file name to encode * @return the encoded file name */ - KIO_EXPORT TQString encodeFileName( const TQString & str ); + TDEIO_EXPORT TQString encodeFileName( const TQString & str ); /** * Decodes (from the filename to the text displayed) * This translates %2[fF] into / and %% into % * @param str the file name to decode * @return the decoded file name */ - KIO_EXPORT TQString decodeFileName( const TQString & str ); + TDEIO_EXPORT TQString decodeFileName( const TQString & str ); /** * Commands that can be invoked by a job. @@ -258,7 +258,7 @@ namespace TDEIO * @param errorText the additional error text * @return the created error string */ - KIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText); + TDEIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText); /** * Returns a translated html error message for @p errorCode using the @@ -270,7 +270,7 @@ namespace TDEIO * @param method the ioslave method * @return the created error string */ - KIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText, + TDEIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText, const KURL *reqUrl = 0L, int method = -1 ); /** @@ -289,7 +289,7 @@ namespace TDEIO * @li TQStringList causes - a list of possible causes of the error * @li TQStringList solutions - a liso of solutions for the error */ - KIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText, + TDEIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText, const KURL *reqUrl = 0L, int method = -1 ); /** @@ -300,7 +300,7 @@ namespace TDEIO * @see enum Command * @since 3.2 */ - KIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd); + TDEIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd); /** * Constants used to specify the type of a KUDSAtom. @@ -401,7 +401,7 @@ namespace TDEIO * @return the cache control value * @see getCacheControlString() */ - KIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl); + TDEIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl); /** * Returns a string representation of the given cache control method. @@ -410,14 +410,14 @@ namespace TDEIO * @return the string representation * @see parseCacheControl() */ - KIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl); + TDEIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl); /** * Returns the mount point where @p device is mounted * right now. This means, it has to be mounted, not just * defined in fstab. */ - KIO_EXPORT TQString findDeviceMountPoint( const TQString& device ); + TDEIO_EXPORT TQString findDeviceMountPoint( const TQString& device ); /** * Returns the mount point on which resides @p filename. @@ -426,7 +426,7 @@ namespace TDEIO * @param filename the file name to check * @return the mount point of the given @p filename */ - KIO_EXPORT TQString findPathMountPoint( const TQString & filename ); + TDEIO_EXPORT TQString findPathMountPoint( const TQString & filename ); /** * Checks if the path belongs to a filesystem that is probably @@ -435,7 +435,7 @@ namespace TDEIO * @param filename the file name to check * @return true if the filesystem is probably slow */ - KIO_EXPORT bool probably_slow_mounted(const TQString& filename); + TDEIO_EXPORT bool probably_slow_mounted(const TQString& filename); /** * Checks if the path belongs to a filesystem that is manually @@ -443,7 +443,7 @@ namespace TDEIO * @param filename the file name to check * @return true if the filesystem is manually mounted */ - KIO_EXPORT bool manually_mounted(const TQString& filename); + TDEIO_EXPORT bool manually_mounted(const TQString& filename); enum FileSystemFlag { SupportsChmod, SupportsChown, SupportsUTime, SupportsSymlinks, CaseInsensitive }; @@ -467,7 +467,7 @@ namespace TDEIO * "foo" and "FOO" as being the same file (true for msdos systems) * */ - KIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag); + TDEIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag); /************ @@ -483,7 +483,7 @@ namespace TDEIO * * Each atom contains a specific bit of information for the file */ -class KIO_EXPORT UDSAtom +class TDEIO_EXPORT UDSAtom { public: /** @@ -512,7 +512,7 @@ typedef TQValueListConstIterator UDSEntryListConstIterator; /** * MetaData is a simple map of key/value strings. */ -class KIO_EXPORT MetaData : public TQMap +class TDEIO_EXPORT MetaData : public TQMap { public: /** diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 01bb2c60d..d72eae574 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -2307,7 +2307,7 @@ void CopyJob::slotStart() } // For unit test purposes -KIO_EXPORT bool kio_resolve_local_urls = true; +TDEIO_EXPORT bool kio_resolve_local_urls = true; void CopyJob::slotResultStating( Job *job ) { diff --git a/kio/kio/job.h b/kio/kio/job.h index 03985b637..f5254df39 100644 --- a/kio/kio/job.h +++ b/kio/kio/job.h @@ -38,7 +38,7 @@ namespace TDEIO { * directory (unix-style), -1 for default permissions. * @return A pointer to the job handling the operation. */ - KIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 ); + TDEIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 ); /** * Removes a single directory. @@ -50,7 +50,7 @@ namespace TDEIO { * @param url The URL of the directory to remove. * @return A pointer to the job handling the operation. */ - KIO_EXPORT SimpleJob * rmdir( const KURL& url ); + TDEIO_EXPORT SimpleJob * rmdir( const KURL& url ); /** * Changes permissions on a file or directory. @@ -61,7 +61,7 @@ namespace TDEIO { * @param permissions The permissions to set. * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions ); + TDEIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions ); /** * Rename a file or directory. @@ -74,7 +74,7 @@ namespace TDEIO { * @param overwrite whether to automatically overwrite if the dest exists * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite ); + TDEIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite ); /** * Create or move a symlink. @@ -87,7 +87,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true ); /** * Execute any command that is specific to one slave (protocol). @@ -101,7 +101,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true ); /** * Mount filesystem. @@ -115,7 +115,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true ); /** * Unmount filesystem. @@ -126,7 +126,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true ); + TDEIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true ); /** * Retrieve local URL if available @@ -134,7 +134,7 @@ namespace TDEIO { * @param remoteURL the remote URL to get the local URL for * @return the job handling the operation. */ - KIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl ); + TDEIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl ); /** * HTTP cache update @@ -145,7 +145,7 @@ namespace TDEIO { * supposed to expire. * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate); + TDEIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate); /** * Find all details for one file or directory. @@ -154,7 +154,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true ); + TDEIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true ); /** * Find all details for one file or directory. * This version of the call includes two additional booleans, @p sideIsSource and @p details. @@ -182,7 +182,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true ); + TDEIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true ); /** * Get (a.k.a. read). @@ -193,7 +193,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true ); + TDEIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true ); /** * Put (a.k.a. write) @@ -207,7 +207,7 @@ namespace TDEIO { * @return the job handling the operation. * @see multi_get() */ - KIO_EXPORT TransferJob *put( const KURL& url, int permissions, + TDEIO_EXPORT TransferJob *put( const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo = true ); /** @@ -238,7 +238,7 @@ namespace TDEIO { * @param showProgressInfo true to display * @return the job handling the operation. */ - KIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData, + TDEIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo = true ); /** @@ -251,7 +251,7 @@ namespace TDEIO { * @return the job handling the operation. * @since 3.3 */ - KIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true ); + TDEIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true ); /** * Put (a.k.a. write) data from a single TQByteArray. @@ -267,7 +267,7 @@ namespace TDEIO { * @return the job handling the operation. * @since 3.3 */ - KIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions, + TDEIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo = true ); /** @@ -280,7 +280,7 @@ namespace TDEIO { * @return the job handling the operation. * @see get() */ - KIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData); + TDEIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData); /** * Find mimetype for one file or directory. @@ -289,7 +289,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT MimetypeJob * mimetype( const KURL& url, + TDEIO_EXPORT MimetypeJob * mimetype( const KURL& url, bool showProgressInfo = true ); /** @@ -308,7 +308,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1, + TDEIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1, bool overwrite=false, bool resume=false, bool showProgressInfo = true); @@ -327,7 +327,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1, + TDEIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1, bool overwrite=false, bool resume=false, bool showProgressInfo = true); @@ -338,7 +338,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation. */ - KIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true); + TDEIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true); /** * List the contents of @p url, which is assumed to be a directory. @@ -352,7 +352,7 @@ namespace TDEIO { * files/dirs (whose names start with dot) * @return the job handling the operation. */ - KIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true, + TDEIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true, bool includeHidden = true ); /** @@ -368,7 +368,7 @@ namespace TDEIO { * files/dirs (whose names start with dot) * @return the job handling the operation. */ - KIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true, + TDEIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true, bool includeHidden = true ); /** @@ -384,7 +384,7 @@ namespace TDEIO { * @return the job handling the operation * @see copyAs() */ - KIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Copy a file or directory @p src into the destination @p dest, @@ -399,7 +399,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Copy a list of file/dirs @p src into a destination directory @p dest. @@ -409,7 +409,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); /** * Moves a file or directory @p src to the given destination @p dest. @@ -421,7 +421,7 @@ namespace TDEIO { * @see copy() * @see moveAs() */ - KIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Moves a file or directory @p src to the given destination @p dest. Unlike move() * this operation will fail when the directory already exists. @@ -432,7 +432,7 @@ namespace TDEIO { * @return the job handling the operation * @see copyAs() */ - KIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Moves a list of files or directories @p src to the given destination @p dest. * @@ -442,7 +442,7 @@ namespace TDEIO { * @return the job handling the operation * @see copy() */ - KIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true ); /** * Create a link. @@ -454,7 +454,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true ); /** * Create several links @@ -467,7 +467,7 @@ namespace TDEIO { * @return the job handling the operation * @see link() */ - KIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true ); /** * Create a link. Unlike link() this operation will fail when the directory already @@ -482,7 +482,7 @@ namespace TDEIO { * @see link () * @see copyAs() */ - KIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true ); /** * Trash a file or directory. @@ -494,7 +494,7 @@ namespace TDEIO { * @return the job handling the operation * @since 3.4 */ - KIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true ); /** * Trash a list of files or directories. @@ -505,7 +505,7 @@ namespace TDEIO { * @return the job handling the operation * @since 3.4 */ - KIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true ); + TDEIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true ); /** * Delete a file or directory. @@ -515,7 +515,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true ); + TDEIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true ); /** * Deletes a list of files or directories. @@ -525,7 +525,7 @@ namespace TDEIO { * @param showProgressInfo true to show progress information * @return the job handling the operation */ - KIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true ); + TDEIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true ); } #endif diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 9858b1ce1..3438406fa 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -65,7 +65,7 @@ namespace TDEIO { * @see TDEIO::Scheduler * @see TDEIO::Slave */ - class KIO_EXPORT Job : public TQObject { + class TDEIO_EXPORT Job : public TQObject { Q_OBJECT protected: @@ -525,7 +525,7 @@ namespace TDEIO { * Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...) * that manage subjobs but aren't scheduled directly. */ - class KIO_EXPORT SimpleJob : public TDEIO::Job { + class TDEIO_EXPORT SimpleJob : public TDEIO::Job { Q_OBJECT public: @@ -685,7 +685,7 @@ namespace TDEIO { * A KIO job that retrieves information about a file or directory. * @see TDEIO::stat() */ - class KIO_EXPORT StatJob : public SimpleJob { + class TDEIO_EXPORT StatJob : public SimpleJob { Q_OBJECT @@ -777,7 +777,7 @@ namespace TDEIO { * @see TDEIO::mkdir() * @since 3.3 */ - class KIO_EXPORT MkdirJob : public SimpleJob { + class TDEIO_EXPORT MkdirJob : public SimpleJob { Q_OBJECT @@ -836,7 +836,7 @@ namespace TDEIO { * @internal * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy()) */ - class KIO_EXPORT DirectCopyJob : public SimpleJob { + class TDEIO_EXPORT DirectCopyJob : public SimpleJob { Q_OBJECT public: @@ -872,7 +872,7 @@ namespace TDEIO { * If data coming from the slave can not be handled, the * reading of data from the slave should be suspended. */ - class KIO_EXPORT TransferJob : public SimpleJob { + class TDEIO_EXPORT TransferJob : public SimpleJob { Q_OBJECT public: @@ -1072,7 +1072,7 @@ namespace TDEIO { * * @since 3.3 */ - class KIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { + class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { Q_OBJECT public: @@ -1117,7 +1117,7 @@ namespace TDEIO { * but use TDEIO::multi_get() instead. * @see TDEIO::multi_get() */ - class KIO_EXPORT MultiGetJob : public TransferJob { + class TDEIO_EXPORT MultiGetJob : public TransferJob { Q_OBJECT public: @@ -1205,7 +1205,7 @@ namespace TDEIO { * but use TDEIO::mimetype() instead. * @see TDEIO::mimetype() */ - class KIO_EXPORT MimetypeJob : public TransferJob { + class TDEIO_EXPORT MimetypeJob : public TransferJob { Q_OBJECT public: @@ -1247,7 +1247,7 @@ namespace TDEIO { * @see TDEIO::file_copy() * @see TDEIO::file_move() */ - class KIO_EXPORT FileCopyJob : public Job { + class TDEIO_EXPORT FileCopyJob : public Job { Q_OBJECT public: @@ -1389,7 +1389,7 @@ namespace TDEIO { * @see TDEIO::listRecursive() * @see TDEIO::listDir() */ - class KIO_EXPORT ListJob : public SimpleJob { + class TDEIO_EXPORT ListJob : public SimpleJob { Q_OBJECT public: @@ -1481,7 +1481,7 @@ namespace TDEIO { }; /// @internal - struct KIO_EXPORT CopyInfo + struct TDEIO_EXPORT CopyInfo { KURL uSource; KURL uDest; @@ -1505,7 +1505,7 @@ namespace TDEIO { * @see TDEIO::link() * @see TDEIO::linkAs() */ - class KIO_EXPORT CopyJob : public Job { + class TDEIO_EXPORT CopyJob : public Job { Q_OBJECT public: @@ -1760,7 +1760,7 @@ namespace TDEIO { * * @see TDEIO::del() */ - class KIO_EXPORT DeleteJob : public Job { + class TDEIO_EXPORT DeleteJob : public Job { Q_OBJECT public: @@ -1863,7 +1863,7 @@ namespace TDEIO { * @see TDEIO::localURL() * @since R14.0.0 */ - class KIO_EXPORT LocalURLJob : public SimpleJob { + class TDEIO_EXPORT LocalURLJob : public SimpleJob { Q_OBJECT diff --git a/kio/kio/kacl.h b/kio/kio/kacl.h index 53bc762b0..1f60fde60 100644 --- a/kio/kio/kacl.h +++ b/kio/kio/kacl.h @@ -39,7 +39,7 @@ typedef TQValueListConstIterator ACLGroupPermissionsConstIt * @short a POSIX ACL encapsulation * @author Till Adam */ -class KIO_EXPORT KACL +class TDEIO_EXPORT KACL { public: /** @@ -197,11 +197,11 @@ protected: private: class KACLPrivate; KACLPrivate * d; - KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); - KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a ); + TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); + TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a ); }; -KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); -KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a ); +TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a ); +TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a ); #endif diff --git a/kio/kio/kar.h b/kio/kio/kar.h index 1b8f2cef2..83d94e75c 100644 --- a/kio/kio/kar.h +++ b/kio/kio/kar.h @@ -35,7 +35,7 @@ * @author Laurence Anderson * @since 3.1 */ -class KIO_EXPORT KAr : public KArchive +class TDEIO_EXPORT KAr : public KArchive { public: /** diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h index 6f0b57cbc..840c560b7 100644 --- a/kio/kio/karchive.h +++ b/kio/kio/karchive.h @@ -39,7 +39,7 @@ class KArchiveFile; * @short generic class for reading/writing archives * @author David Faure */ -class KIO_EXPORT KArchive +class TDEIO_EXPORT KArchive { protected: /** @@ -392,7 +392,7 @@ private: * @see KArchiveFile * @see KArchiveDirectory */ -class KIO_EXPORT KArchiveEntry +class TDEIO_EXPORT KArchiveEntry { public: /** @@ -487,7 +487,7 @@ private: * @see KArchive * @see KArchiveDirectory */ -class KIO_EXPORT KArchiveFile : public KArchiveEntry +class TDEIO_EXPORT KArchiveFile : public KArchiveEntry { public: /** @@ -570,7 +570,7 @@ private: * @see KArchive * @see KArchiveFile */ -class KIO_EXPORT KArchiveDirectory : public KArchiveEntry +class TDEIO_EXPORT KArchiveDirectory : public KArchiveEntry { public: /** diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h index 68eecdbbd..203c037d9 100644 --- a/kio/kio/kautomount.h +++ b/kio/kio/kautomount.h @@ -42,7 +42,7 @@ class Job; * * @short This class implements synchronous mounting of devices. */ -class KIO_EXPORT KAutoMount : public TQObject +class TDEIO_EXPORT KAutoMount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; @@ -87,7 +87,7 @@ private: * * @short This class implements synchronous unmounting of devices, */ -class KIO_EXPORT KAutoUnmount : public TQObject +class TDEIO_EXPORT KAutoUnmount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h index 46005ada3..1258767fc 100644 --- a/kio/kio/kdatatool.h +++ b/kio/kio/kdatatool.h @@ -44,7 +44,7 @@ class TDEInstance; * described by the service. * @see KDataTool */ -class KIO_EXPORT KDataToolInfo +class TDEIO_EXPORT KDataToolInfo { public: /** @@ -191,7 +191,7 @@ private: * The slot defined for step 2 is called when the action is activated, and * that's where the tool should be created and run. */ -class KIO_EXPORT KDataToolAction : public KAction +class TDEIO_EXPORT KDataToolAction : public KAction { Q_OBJECT @@ -251,7 +251,7 @@ private: * @see KDataToolAction, and for activating a tool, passing it the data * (and possibly getting modified data from it). */ -class KIO_EXPORT KDataTool : public TQObject +class TDEIO_EXPORT KDataTool : public TQObject { Q_OBJECT diff --git a/kio/kio/kdcopservicestarter.h b/kio/kio/kdcopservicestarter.h index b267476e7..f70f0173e 100644 --- a/kio/kio/kdcopservicestarter.h +++ b/kio/kio/kdcopservicestarter.h @@ -31,7 +31,7 @@ class TQCString; * also be reimplemented by specific applications to provide dlopened in-process DCOP objects. * @author David Faure */ -class KIO_EXPORT KDCOPServiceStarter { +class TDEIO_EXPORT KDCOPServiceStarter { friend class KStaticDeleter; public: diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h index 87aa6c694..2688fcd9c 100644 --- a/kio/kio/kdirlister.h +++ b/kio/kio/kdirlister.h @@ -52,7 +52,7 @@ namespace TDEIO { class Job; class ListJob; } * @short Helper class for the kiojob used to list and update a directory. * @author Michael Brade */ -class KIO_EXPORT KDirLister : public TQObject +class TDEIO_EXPORT KDirLister : public TQObject { class KDirListerPrivate; friend class KDirListerPrivate; diff --git a/kio/kio/kdirnotify.h b/kio/kio/kdirnotify.h index 2082569a1..14d864609 100644 --- a/kio/kio/kdirnotify.h +++ b/kio/kio/kdirnotify.h @@ -29,7 +29,7 @@ * The information comes from the konqueror/kdesktop instance where the * operation was done, and can interest KDirListers, bookmark handlers, etc. */ -class KIO_EXPORT KDirNotify : public DCOPObject +class TDEIO_EXPORT KDirNotify : public DCOPObject { K_DCOP protected: diff --git a/kio/kio/kdirnotify_stub.h b/kio/kio/kdirnotify_stub.h index a807ecf82..56ab168c4 100644 --- a/kio/kio/kdirnotify_stub.h +++ b/kio/kio/kdirnotify_stub.h @@ -14,7 +14,7 @@ #include -class KIO_EXPORT KDirNotify_stub : virtual public DCOPStub +class TDEIO_EXPORT KDirNotify_stub : virtual public DCOPStub { public: KDirNotify_stub( const TQCString& app, const TQCString& id ); diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h index ac33a6ed5..4abaa302e 100644 --- a/kio/kio/kdirwatch.h +++ b/kio/kio/kdirwatch.h @@ -60,7 +60,7 @@ class KDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej */ -class KIO_EXPORT KDirWatch : public TQObject +class TDEIO_EXPORT KDirWatch : public TQObject { Q_OBJECT diff --git a/kio/kio/kemailsettings.h b/kio/kio/kemailsettings.h index 9d35675c6..0ade4520e 100644 --- a/kio/kio/kemailsettings.h +++ b/kio/kio/kemailsettings.h @@ -43,7 +43,7 @@ class KEMailSettingsPrivate; * * @author Alex Zepeda zipzippy@sonic.net **/ -class KIO_EXPORT KEMailSettings { +class TDEIO_EXPORT KEMailSettings { public: /** * The list of settings that I thought of when I wrote this diff --git a/kio/kio/kfilefilter.h b/kio/kio/kfilefilter.h index b17d2fe74..2891e800e 100644 --- a/kio/kio/kfilefilter.h +++ b/kio/kio/kfilefilter.h @@ -38,7 +38,7 @@ class KFileItem; * reimplement passesFilter(). * @short Base class for file filters. */ -class KIO_EXPORT KFileFilter +class TDEIO_EXPORT KFileFilter { public: /** @@ -56,7 +56,7 @@ protected: * by mime type and by mode. * @short A simple file filter. */ -class KIO_EXPORT KSimpleFileFilter : public KFileFilter +class TDEIO_EXPORT KSimpleFileFilter : public KFileFilter { public: /** diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h index 5e75ac16f..0fcba9f4a 100644 --- a/kio/kio/kfileitem.h +++ b/kio/kio/kfileitem.h @@ -38,7 +38,7 @@ * (UDSEntry isn't very friendly to use). * It includes many file attributes such as mimetype, icon, text, mode, link... */ -class KIO_EXPORT KFileItem +class TDEIO_EXPORT KFileItem { public: enum { Unknown = (mode_t) - 1 }; @@ -650,8 +650,8 @@ protected: private: class KFileItemPrivate; KFileItemPrivate * d; - KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); - KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); + TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); + TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); }; /** @@ -664,8 +664,8 @@ typedef TQPtrList KFileItemList; */ typedef TQPtrListIterator KFileItemListIterator; -KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); -KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); +TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ); +TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a ); #endif diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index 0ccbb577b..85fb1a37f 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -1705,7 +1705,7 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle first a bool that says if the items is valid, and if yes, all the elements of the Data */ -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item ) +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item ) { KFileMetaInfoItem::Data* d = item.d; @@ -1725,7 +1725,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& i } -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item ) +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item ) { bool isValid; s >> isValid; @@ -1758,7 +1758,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item ) // serialization of a KFileMetaInfoGroup // we serialize the name of the mimetype here instead of the mimetype info // on the other side, we can simply use this to ask the provider for the info -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group ) +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group ) { KFileMetaInfoGroup::Data* d = group.d; @@ -1775,7 +1775,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& return s; } -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group ) +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group ) { TQString mimeType; bool isValid; @@ -1812,7 +1812,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group // serialization of a KFileMetaInfo object // we serialize the name of the mimetype here instead of the mimetype info // on the other side, we can simply use this to ask the provider for the info -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info ) +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info ) { KFileMetaInfo::Data* d = info.d; @@ -1830,7 +1830,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info return s; } -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info ) +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info ) { TQString mimeType; bool isValid; diff --git a/kio/kio/kfilemetainfo.h b/kio/kio/kfilemetainfo.h index 63a08c277..ea843a5f3 100644 --- a/kio/kio/kfilemetainfo.h +++ b/kio/kio/kfilemetainfo.h @@ -47,7 +47,7 @@ class KFileMetaInfoGroup; * @author Rolf Magnus * @author Carsten Pfeiffer */ -class KIO_EXPORT KFileMimeTypeInfo +class TDEIO_EXPORT KFileMimeTypeInfo { // the plugin needs to be a friend because it puts the data into the object, // and it should be the only one allowed to do this. @@ -135,7 +135,7 @@ public: * It contains, among other things, the information about the group's name * and a list of supported items. */ - class KIO_EXPORT GroupInfo + class TDEIO_EXPORT GroupInfo { friend class KFilePlugin; @@ -247,7 +247,7 @@ public: * It contains every information about a KFileMetaInfoItem that this * item has in common for each file of a specific mimetype. **/ - class KIO_EXPORT ItemInfo + class TDEIO_EXPORT ItemInfo { friend class KFilePlugin; friend class GroupInfo; @@ -493,7 +493,7 @@ protected: * This is one item of the meta information about a file (see * KFileMetaInfo). */ -class KIO_EXPORT KFileMetaInfoItem +class TDEIO_EXPORT KFileMetaInfoItem { public: class Data; @@ -660,9 +660,9 @@ public: */ bool isValid() const; - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); - KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); + TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); friend class KFileMetaInfoGroup; protected: @@ -681,12 +681,12 @@ protected: * This is one group of meta information items about a file (see * KFileMetaInfo). */ -class KIO_EXPORT KFileMetaInfoGroup +class TDEIO_EXPORT KFileMetaInfoGroup { friend class KFilePlugin; friend class KFileMetaInfo; - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); - KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); + TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); public: class Data; @@ -923,7 +923,7 @@ protected: * The groups and the What enum are not yet supported, but already added to * the interface so that adding support doesn't break compatibility. */ -class KIO_EXPORT KFileMetaInfo +class TDEIO_EXPORT KFileMetaInfo { public: typedef KFileMimeTypeInfo::Hint Hint; @@ -1223,8 +1223,8 @@ public: */ KURL url() const; - KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); - KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); + TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); + TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); friend class KFilePlugin; protected: @@ -1391,7 +1391,7 @@ private: * PreferredItems=Items,Size * @endcode **/ -class KIO_EXPORT KFilePlugin : public TQObject +class TDEIO_EXPORT KFilePlugin : public TQObject { Q_OBJECT @@ -1643,7 +1643,7 @@ private: * supported and which groups and items are provided for it, you can ask * the KFileMetainfoProvider for it. **/ -class KIO_EXPORT KFileMetaInfoProvider: private QObject +class TDEIO_EXPORT KFileMetaInfoProvider: private QObject { friend class KFilePlugin; @@ -1725,14 +1725,14 @@ private: }; -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& ); +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& ); -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& ); +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& ); -KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); -KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); +TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& ); +TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& ); #endif // KILEMETAINFO_H diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h index e46d0903b..ff473c122 100644 --- a/kio/kio/kfileshare.h +++ b/kio/kio/kfileshare.h @@ -48,7 +48,7 @@ protected slots: // this is why this class needs to be in the .h * (communication with the backend) * @since 3.1 */ -class KIO_EXPORT KFileShare +class TDEIO_EXPORT KFileShare { diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h index a9d143b6c..25613c101 100644 --- a/kio/kio/kfilterbase.h +++ b/kio/kio/kfilterbase.h @@ -35,7 +35,7 @@ class TQIODevice; * such as gzip and bzip2. It's pretty much internal. * Don't use directly, use KFilterDev instead. */ -class KIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create +class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create { Q_OBJECT public: diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index 2df49f2cc..8dd0999a9 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -33,7 +33,7 @@ class KFilterBase; * * @author David Faure */ -class KIO_EXPORT KFilterDev : public TQIODevice +class TDEIO_EXPORT KFilterDev : public TQIODevice { public: /** diff --git a/kio/kio/kimageio.h b/kio/kio/kimageio.h index 3c14fb54d..671fb5f61 100644 --- a/kio/kio/kimageio.h +++ b/kio/kio/kimageio.h @@ -66,7 +66,7 @@ * @see KImageIO, TQPixmap, TQImage, QImageIO * @author Sirtaj Singh Kang */ -class KIO_EXPORT KImageIO +class TDEIO_EXPORT KImageIO { public: /** diff --git a/kio/kio/kimageiofactory.h b/kio/kio/kimageiofactory.h index 2ffe58e60..603ef2c0e 100644 --- a/kio/kio/kimageiofactory.h +++ b/kio/kio/kimageiofactory.h @@ -15,7 +15,7 @@ class KImageIOFormat; class KImageIOFormatList; /** \internal */ -class KIO_EXPORT KImageIOFormat : public KSycocaEntry +class TDEIO_EXPORT KImageIOFormat : public KSycocaEntry { K_SYCOCATYPE( KST_KImageIOFormat, KSycocaEntry ) @@ -76,7 +76,7 @@ protected: }; /** \internal */ -class KIO_EXPORT KImageIOFormatList : public KImageIOFormat::List +class TDEIO_EXPORT KImageIOFormatList : public KImageIOFormat::List { public: KImageIOFormatList() { } @@ -84,7 +84,7 @@ public: /** \internal */ -class KIO_EXPORT KImageIOFactory : public KSycocaFactory +class TDEIO_EXPORT KImageIOFactory : public KSycocaFactory { friend class KImageIO; K_SYCOCAFACTORY( KST_KImageIO ) diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index e2946d37a..602ba45a0 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -28,7 +28,7 @@ * @author David Faure * @since 3.1 */ -class KIO_EXPORT KLimitedIODevice : public TQIODevice +class TDEIO_EXPORT KLimitedIODevice : public TQIODevice { public: /** diff --git a/kio/kio/kmessageboxwrapper.h b/kio/kio/kmessageboxwrapper.h index 356d98042..3590b5e89 100644 --- a/kio/kio/kmessageboxwrapper.h +++ b/kio/kio/kmessageboxwrapper.h @@ -27,7 +27,7 @@ * Allows KIO classes to display dialog boxes with the correct * theme/style even in non-GUI apps like kded and kfmclient */ -class KIO_EXPORT KMessageBoxWrapper : public KMessageBox +class TDEIO_EXPORT KMessageBoxWrapper : public KMessageBox { public: static void error(TQWidget *parent, diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h index 49fb300ad..f5430a219 100644 --- a/kio/kio/kmimemagic.h +++ b/kio/kio/kmimemagic.h @@ -43,7 +43,7 @@ class KMimeMagic; // see below (read this one first) * It contains the mimetype and the encoding of * the file or buffer read. */ -class KIO_EXPORT_DEPRECATED KMimeMagicResult +class TDEIO_EXPORT_DEPRECATED KMimeMagicResult { public: KMimeMagicResult() { m_iAccuracy = 100; } @@ -98,7 +98,7 @@ protected: * * The result is contained in the class KMimeMagicResult. */ -class KIO_EXPORT_DEPRECATED KMimeMagic +class TDEIO_EXPORT_DEPRECATED KMimeMagic { public: /** diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h index 1d53f3713..8302fa8da 100644 --- a/kio/kio/kmimetype.h +++ b/kio/kio/kmimetype.h @@ -44,7 +44,7 @@ class KSimpleConfig; * * @see KServiceType */ -class KIO_EXPORT KMimeType : public KServiceType +class TDEIO_EXPORT KMimeType : public KServiceType { K_SYCOCATYPE( KST_KMimeType, KServiceType ) @@ -474,7 +474,7 @@ protected: * Folder mime type. Handles locked folders, for instance. * @short Mimetype for a folder (inode/directory) */ -class KIO_EXPORT KFolderType : public KMimeType +class TDEIO_EXPORT KFolderType : public KMimeType { K_SYCOCATYPE( KST_KFolderType, KMimeType ) @@ -503,7 +503,7 @@ protected: * Handles mount/umount icon, and user-defined properties. * @short Mimetype for a .desktop file */ -class KIO_EXPORT KDEDesktopMimeType : public KMimeType +class TDEIO_EXPORT KDEDesktopMimeType : public KMimeType { K_SYCOCATYPE( KST_KDEDesktopMimeType, KMimeType ) @@ -619,7 +619,7 @@ protected: * The mime type for executable files. * @short MimeType for any executable, like /bin/ls */ -class KIO_EXPORT KExecMimeType : public KMimeType +class TDEIO_EXPORT KExecMimeType : public KMimeType { K_SYCOCATYPE( KST_KExecMimeType, KMimeType ) diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h index 355eeb707..16ec052f5 100644 --- a/kio/kio/kmimetypechooser.h +++ b/kio/kio/kmimetypechooser.h @@ -31,7 +31,7 @@ * * @author Anders Lund (anders at alweb dk), jan 23, 2002 */ -class KIO_EXPORT KMimeTypeChooser : public TQVBox +class TDEIO_EXPORT KMimeTypeChooser : public TQVBox { Q_OBJECT @@ -128,7 +128,7 @@ class KIO_EXPORT KMimeTypeChooser : public TQVBox * * @author Anders Lund (anders at alweb dk) dec 19, 2001 */ -class KIO_EXPORT KMimeTypeChooserDialog : public KDialogBase +class TDEIO_EXPORT KMimeTypeChooserDialog : public KDialogBase { public: /** diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h index fdbbb1e5b..c8828a0da 100644 --- a/kio/kio/kmimetyperesolver.h +++ b/kio/kio/kmimetyperesolver.h @@ -31,7 +31,7 @@ * A baseclass for KMimeTypeResolver, with the interface, * KMimeTypeResolverHelper uses. */ -class KIO_EXPORT KMimeTypeResolverBase +class TDEIO_EXPORT KMimeTypeResolverBase { public: virtual void slotViewportAdjusted() = 0; @@ -46,7 +46,7 @@ protected: * itself. So an object of this class is used to handle signals, slots etc. * and forwards them to the KMimeTypeResolver instance. */ -class KIO_EXPORT KMimeTypeResolverHelper : public TQObject +class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject { Q_OBJECT diff --git a/kio/kio/knfsshare.h b/kio/kio/knfsshare.h index fd6587600..64cd28dcf 100644 --- a/kio/kio/knfsshare.h +++ b/kio/kio/knfsshare.h @@ -32,7 +32,7 @@ class KNFSSharePrivate; * It parses the /etc/exports file to get its information. * Singleton class, call instance() to get an instance. */ -class KIO_EXPORT KNFSShare : public TQObject +class TDEIO_EXPORT KNFSShare : public TQObject { Q_OBJECT public: diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp index f297907e0..9523b70cb 100644 --- a/kio/kio/kprotocolinfo.cpp +++ b/kio/kio/kprotocolinfo.cpp @@ -18,8 +18,8 @@ */ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) -#undef KIO_EXPORT -#define KIO_EXPORT KDE_EXPORT +#undef TDEIO_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #endif #include "kprotocolinfo.h" diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h index a3c579034..8ce7ce500 100644 --- a/kio/kio/kprotocolinfo.h +++ b/kio/kio/kprotocolinfo.h @@ -41,7 +41,7 @@ * * @author Torben Weis */ -class KIO_EXPORT KProtocolInfo : public KSycocaEntry +class TDEIO_EXPORT KProtocolInfo : public KSycocaEntry { friend class KProtocolInfoFactory; K_SYCOCATYPE( KST_KProtocolInfo, KSycocaEntry ) @@ -682,7 +682,7 @@ private: KProtocolInfoPrivate* d; }; -KIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field ); -KIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field ); +TDEIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field ); +TDEIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field ); #endif diff --git a/kio/kio/kprotocolmanager.h b/kio/kio/kprotocolmanager.h index e1d425ebd..f7e27164b 100644 --- a/kio/kio/kprotocolmanager.h +++ b/kio/kio/kprotocolmanager.h @@ -51,7 +51,7 @@ class TDEConfig; * @author Dawit Alemayehu * @see KPAC */ -class KIO_EXPORT KProtocolManager +class TDEIO_EXPORT KProtocolManager { public: diff --git a/kio/kio/kremoteencoding.h b/kio/kio/kremoteencoding.h index 6f5eea5fd..18dfe1fdb 100644 --- a/kio/kio/kremoteencoding.h +++ b/kio/kio/kremoteencoding.h @@ -41,7 +41,7 @@ class KRemoteEncodingPrivate; * @author Thiago Macieira * @since 3.3 */ -class KIO_EXPORT KRemoteEncoding +class TDEIO_EXPORT KRemoteEncoding { public: /** diff --git a/kio/kio/krun.h b/kio/kio/krun.h index 44bff6dee..03186af85 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -55,7 +55,7 @@ namespace TDEIO { * * @short Opens files with their associated applications in KDE */ -class KIO_EXPORT KRun : public TQObject +class TDEIO_EXPORT KRun : public TQObject { Q_OBJECT public: @@ -461,7 +461,7 @@ private: * KRun can open the openwith dialog directly now. * Use KRun::displayOpenWithDialog() if you were using KOpenWithHandler directly. */ -class KIO_EXPORT_DEPRECATED KOpenWithHandler +class TDEIO_EXPORT_DEPRECATED KOpenWithHandler { public: KOpenWithHandler() {} @@ -475,7 +475,7 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT TDEProcessRunner : public TQObject +class TDEIO_EXPORT TDEProcessRunner : public TQObject { Q_OBJECT diff --git a/kio/kio/ksambashare.h b/kio/kio/ksambashare.h index ba922ecf5..ffd298588 100644 --- a/kio/kio/ksambashare.h +++ b/kio/kio/ksambashare.h @@ -31,7 +31,7 @@ class KSambaSharePrivate; * any suid script. * Singleton class, call instance() to get an instance. */ -class KIO_EXPORT KSambaShare : public TQObject +class TDEIO_EXPORT KSambaShare : public TQObject { Q_OBJECT public: diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h index 755d4972a..940b8ceaa 100644 --- a/kio/kio/kscan.h +++ b/kio/kio/kscan.h @@ -60,7 +60,7 @@ class TQImage; * @short A baseclass and accessor for Scanning Dialogs * @author Carsten Pfeiffer */ -class KIO_EXPORT KScanDialog : public KDialogBase +class TDEIO_EXPORT KScanDialog : public KDialogBase { Q_OBJECT @@ -179,7 +179,7 @@ private: * createDialog(). * @short Factory for creating KScanDialogs */ -class KIO_EXPORT KScanDialogFactory : public KLibFactory +class TDEIO_EXPORT KScanDialogFactory : public KLibFactory { public: virtual ~KScanDialogFactory(); @@ -233,7 +233,7 @@ private: /** * Base class for OCR Dialogs. */ -class KIO_EXPORT KOCRDialog : public KDialogBase +class TDEIO_EXPORT KOCRDialog : public KDialogBase { Q_OBJECT @@ -315,7 +315,7 @@ private: * createDialog(). * @short Factory for creating KScanDialogs */ -class KIO_EXPORT KOCRDialogFactory : public KLibFactory +class TDEIO_EXPORT KOCRDialogFactory : public KLibFactory { public: virtual ~KOCRDialogFactory(); diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h index 37f0e0f25..800bacf11 100644 --- a/kio/kio/kservice.h +++ b/kio/kio/kservice.h @@ -45,7 +45,7 @@ class TQWidget; * @see KServiceGroup * @author Torben Weis */ -class KIO_EXPORT KService : public KSycocaEntry +class TDEIO_EXPORT KService : public KSycocaEntry { K_SYCOCATYPE( KST_KService, KSycocaEntry ) diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h index 8e86f8cbc..2fd9dd822 100644 --- a/kio/kio/kservicefactory.h +++ b/kio/kio/kservicefactory.h @@ -35,7 +35,7 @@ class KSycocaDict; * It loads the services from parsing directories (e.g. applnk/) * but can also create service from data streams or single config files */ -class KIO_EXPORT KServiceFactory : public KSycocaFactory +class TDEIO_EXPORT KServiceFactory : public KSycocaFactory { K_SYCOCAFACTORY( KST_KServiceFactory ) public: diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h index afc043adf..8e2fa42e6 100644 --- a/kio/kio/kservicegroup.h +++ b/kio/kio/kservicegroup.h @@ -65,7 +65,7 @@ class KBuildServiceGroupFactory; * \endcode * @short Represents a group of services */ -class KIO_EXPORT KServiceGroup : public KSycocaEntry +class TDEIO_EXPORT KServiceGroup : public KSycocaEntry { friend class KBuildServiceGroupFactory; K_SYCOCATYPE( KST_KServiceGroup, KSycocaEntry ) @@ -327,7 +327,7 @@ private: Private* d; }; -class KIO_EXPORT KServiceSeparator : public KSycocaEntry +class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry { K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry ) diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h index b1131b398..5fad77ce6 100644 --- a/kio/kio/kservicegroupfactory.h +++ b/kio/kio/kservicegroupfactory.h @@ -33,7 +33,7 @@ class KSycocaDict; * A sycoca factory for service groups (e.g. list of applications) * It loads the services from parsing directories (e.g. applnk/) */ -class KIO_EXPORT KServiceGroupFactory : public KSycocaFactory +class TDEIO_EXPORT KServiceGroupFactory : public KSycocaFactory { K_SYCOCAFACTORY( KST_KServiceGroupFactory ) public: diff --git a/kio/kio/kservicetype.h b/kio/kio/kservicetype.h index b96984d43..f17eb0394 100644 --- a/kio/kio/kservicetype.h +++ b/kio/kio/kservicetype.h @@ -42,7 +42,7 @@ * Service types are stored as desktop files in $TDEHOME/share/servicetypes. * @see KService */ -class KIO_EXPORT KServiceType : public KSycocaEntry +class TDEIO_EXPORT KServiceType : public KSycocaEntry { K_SYCOCATYPE( KST_KServiceType, KSycocaEntry ) diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h index fd3c96a1a..b1a3c5dab 100644 --- a/kio/kio/kservicetypefactory.h +++ b/kio/kio/kservicetypefactory.h @@ -42,7 +42,7 @@ class KExecMimeType; * It loads the service types from parsing directories (e.g. mimelnk/) * but can also create service types from data streams or single config files */ -class KIO_EXPORT KServiceTypeFactory : public KSycocaFactory +class TDEIO_EXPORT KServiceTypeFactory : public KSycocaFactory { K_SYCOCAFACTORY( KST_KServiceTypeFactory ) public: diff --git a/kio/kio/kshellcompletion.h b/kio/kio/kshellcompletion.h index acfa638cf..fa90c509e 100644 --- a/kio/kio/kshellcompletion.h +++ b/kio/kio/kshellcompletion.h @@ -37,7 +37,7 @@ class KShellCompletionPrivate; * @short Shell-like completion of file names * @author David Smith */ -class KIO_EXPORT KShellCompletion : public KURLCompletion +class TDEIO_EXPORT KShellCompletion : public KURLCompletion { Q_OBJECT diff --git a/kio/kio/kshred.h b/kio/kio/kshred.h index c7669122a..7f817c1ea 100644 --- a/kio/kio/kshred.h +++ b/kio/kio/kshred.h @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * @author Andreas F. Pour * @author David Faure (integration into KDE and progress signal) */ -class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove +class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove Q_OBJECT diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h index 67f004a39..fc238073c 100644 --- a/kio/kio/ktar.h +++ b/kio/kio/ktar.h @@ -37,7 +37,7 @@ * * @author Torben Weis , David Faure */ -class KIO_EXPORT KTar : public KArchive +class TDEIO_EXPORT KTar : public KArchive { public: /** diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h index 8abf09870..772f0be3a 100644 --- a/kio/kio/ktrader.h +++ b/kio/kio/ktrader.h @@ -82,7 +82,7 @@ * applications or components. * @author Torben Weis */ -class KIO_EXPORT KTrader : public TQObject +class TDEIO_EXPORT KTrader : public TQObject { Q_OBJECT public: diff --git a/kio/kio/ktraderparsetree.h b/kio/kio/ktraderparsetree.h index 8cc466abd..a08b61a5a 100644 --- a/kio/kio/ktraderparsetree.h +++ b/kio/kio/ktraderparsetree.h @@ -36,7 +36,7 @@ namespace TDEIO { class ParseTreeBase; /** \internal */ -struct KIO_EXPORT PreferencesReturn +struct TDEIO_EXPORT PreferencesReturn { enum Type { PRT_DOUBLE, PRT_ERROR }; @@ -59,20 +59,20 @@ struct KIO_EXPORT PreferencesReturn * 1 => Does match * <0 => Error */ -KIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &, +TDEIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &, const KServiceTypeProfile::OfferList& ); /** * @internal * @return 1 on success or <0 on Error */ -KIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &, +TDEIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &, const KServiceTypeProfile::OfferList& ); /** * @internal */ -struct KIO_EXPORT PreferencesMaxima +struct TDEIO_EXPORT PreferencesMaxima { enum Type { PM_ERROR, PM_INVALID_INT, PM_INVALID_DOUBLE, PM_DOUBLE, PM_INT }; @@ -86,7 +86,7 @@ struct KIO_EXPORT PreferencesMaxima /** * @internal */ -class KIO_EXPORT ParseContext +class TDEIO_EXPORT ParseContext { public: /** @@ -120,7 +120,7 @@ public: /** * @internal */ -class KIO_EXPORT ParseTreeBase : public KShared +class TDEIO_EXPORT ParseTreeBase : public KShared { public: typedef KSharedPtr Ptr; @@ -131,13 +131,13 @@ protected: virtual ~ParseTreeBase() { }; }; -KIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr ); -KIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs ); +TDEIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr ); +TDEIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs ); /** * @internal */ -class KIO_EXPORT ParseTreeOR : public ParseTreeBase +class TDEIO_EXPORT ParseTreeOR : public ParseTreeBase { public: ParseTreeOR( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -152,7 +152,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeAND : public ParseTreeBase +class TDEIO_EXPORT ParseTreeAND : public ParseTreeBase { public: ParseTreeAND( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -167,7 +167,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeCMP : public ParseTreeBase +class TDEIO_EXPORT ParseTreeCMP : public ParseTreeBase { public: ParseTreeCMP( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; } @@ -183,7 +183,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeIN : public ParseTreeBase +class TDEIO_EXPORT ParseTreeIN : public ParseTreeBase { public: ParseTreeIN( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -198,7 +198,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeMATCH : public ParseTreeBase +class TDEIO_EXPORT ParseTreeMATCH : public ParseTreeBase { public: ParseTreeMATCH( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; } @@ -213,7 +213,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeCALC : public ParseTreeBase +class TDEIO_EXPORT ParseTreeCALC : public ParseTreeBase { public: ParseTreeCALC( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; } @@ -229,7 +229,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase +class TDEIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase { public: ParseTreeBRACKETS( ParseTreeBase *_ptr ) { m_pLeft = _ptr; } @@ -243,7 +243,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeNOT : public ParseTreeBase +class TDEIO_EXPORT ParseTreeNOT : public ParseTreeBase { public: ParseTreeNOT( ParseTreeBase *_ptr ) { m_pLeft = _ptr; } @@ -257,7 +257,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeEXIST : public ParseTreeBase +class TDEIO_EXPORT ParseTreeEXIST : public ParseTreeBase { public: ParseTreeEXIST( const char *_id ) { m_id = _id; } @@ -271,7 +271,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeID : public ParseTreeBase +class TDEIO_EXPORT ParseTreeID : public ParseTreeBase { public: ParseTreeID( const char *arg ) { m_str = arg; } @@ -285,7 +285,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeSTRING : public ParseTreeBase +class TDEIO_EXPORT ParseTreeSTRING : public ParseTreeBase { public: ParseTreeSTRING( const char *arg ) { m_str = arg; } @@ -299,7 +299,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeNUM : public ParseTreeBase +class TDEIO_EXPORT ParseTreeNUM : public ParseTreeBase { public: ParseTreeNUM( int arg ) { m_int = arg; } @@ -313,7 +313,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase +class TDEIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase { public: ParseTreeDOUBLE( double arg ) { m_double = arg; } @@ -327,7 +327,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeBOOL : public ParseTreeBase +class TDEIO_EXPORT ParseTreeBOOL : public ParseTreeBase { public: ParseTreeBOOL( bool arg ) { m_bool = arg; } @@ -341,7 +341,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeMAX2 : public ParseTreeBase +class TDEIO_EXPORT ParseTreeMAX2 : public ParseTreeBase { public: ParseTreeMAX2( const char *_id ) { m_strId = _id; } @@ -355,7 +355,7 @@ protected: /** * @internal */ -class KIO_EXPORT ParseTreeMIN2 : public ParseTreeBase +class TDEIO_EXPORT ParseTreeMIN2 : public ParseTreeBase { public: ParseTreeMIN2( const char *_id ) { m_strId = _id; } diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h index 0084129bf..fd7cb9b3c 100644 --- a/kio/kio/kurifilter.h +++ b/kio/kio/kurifilter.h @@ -76,7 +76,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -360,7 +360,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -460,7 +460,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -545,7 +545,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h index 62eda9f8d..f785696b4 100644 --- a/kio/kio/kurlcompletion.h +++ b/kio/kio/kurlcompletion.h @@ -38,7 +38,7 @@ class KURLCompletionPrivate; * @short Completion of a single URL * @author David Smith */ -class KIO_EXPORT KURLCompletion : public KCompletion +class TDEIO_EXPORT KURLCompletion : public KCompletion { Q_OBJECT diff --git a/kio/kio/kurlpixmapprovider.h b/kio/kio/kurlpixmapprovider.h index 1fa400c1e..82be4bd1b 100644 --- a/kio/kio/kurlpixmapprovider.h +++ b/kio/kio/kurlpixmapprovider.h @@ -39,7 +39,7 @@ * @short Resolves pixmaps for URLs * @author Carsten Pfeiffer */ -class KIO_EXPORT KURLPixmapProvider : public KPixmapProvider +class TDEIO_EXPORT KURLPixmapProvider : public KPixmapProvider { public: /** diff --git a/kio/kio/kuserprofile.h b/kio/kio/kuserprofile.h index 061657625..45b58fe6a 100644 --- a/kio/kio/kuserprofile.h +++ b/kio/kio/kuserprofile.h @@ -37,7 +37,7 @@ * @see KService * @short Holds the user's preference of a service. */ -class KIO_EXPORT KServiceOffer +class TDEIO_EXPORT KServiceOffer { public: /** @@ -114,7 +114,7 @@ private: * @see KTrader * @short Represents the user's preferences for services of a service type */ -class KIO_EXPORT KServiceTypeProfile +class TDEIO_EXPORT KServiceTypeProfile { public: typedef TQValueList OfferList; diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h index 26bfc71d3..9e4d24eeb 100644 --- a/kio/kio/kzip.h +++ b/kio/kio/kzip.h @@ -50,7 +50,7 @@ class KZipFileEntry; * @author Holger Schroeder * @since 3.1 */ -class KIO_EXPORT KZip : public KArchive +class TDEIO_EXPORT KZip : public KArchive { public: /** @@ -223,7 +223,7 @@ private: /** * @internal */ -class KIO_EXPORT KZipFileEntry : public KArchiveFile +class TDEIO_EXPORT KZipFileEntry : public KArchiveFile { public: /*KZipFileEntry() : st(-1) diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 545c841b0..3787fac80 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -169,12 +169,12 @@ TQStringList MetaInfoJob::supportedMimeTypes() return result; } -KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items) +TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items) { return new MetaInfoJob(items, false); } -KIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items) +TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items) { KFileItemList fileItems; for (KURL::List::ConstIterator it = items.begin(); it != items.end(); ++it) diff --git a/kio/kio/metainfojob.h b/kio/kio/metainfojob.h index 0f7d485b3..e2152bded 100644 --- a/kio/kio/metainfojob.h +++ b/kio/kio/metainfojob.h @@ -32,7 +32,7 @@ namespace TDEIO { * @short KIO Job to retrieve meta information from files. * @since 3.1 */ - class KIO_EXPORT MetaInfoJob : public TDEIO::Job + class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job { Q_OBJECT public: @@ -105,7 +105,7 @@ namespace TDEIO { * @param items files to get metainfo for * @return the MetaInfoJob to retrieve the items */ - KIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items); + TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items); /** * Retrieves meta information for the given items. @@ -113,7 +113,7 @@ namespace TDEIO { * @param items files to get metainfo for * @return the MetaInfoJob to retrieve the items */ - KIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items); + TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items); } #endif diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index ba8988dfc..54dd02974 100644 --- a/kio/kio/netaccess.h +++ b/kio/kio/netaccess.h @@ -56,7 +56,7 @@ namespace TDEIO { * * @short Provides an easy, synchronous interface to KIO file operations. */ -class KIO_EXPORT NetAccess : public TQObject +class TDEIO_EXPORT NetAccess : public TQObject { Q_OBJECT diff --git a/kio/kio/observer.h b/kio/kio/observer.h index 8c20e6f92..1869e5638 100644 --- a/kio/kio/observer.h +++ b/kio/kio/observer.h @@ -52,7 +52,7 @@ namespace TDEIO { * @short Observer for TDEIO::Job progress information * @author David Faure */ -class KIO_EXPORT Observer : public TQObject, public DCOPObject { +class TDEIO_EXPORT Observer : public TQObject, public DCOPObject { K_DCOP Q_OBJECT diff --git a/kio/kio/passdlg.h b/kio/kio/passdlg.h index b071ddef0..864023398 100644 --- a/kio/kio/passdlg.h +++ b/kio/kio/passdlg.h @@ -33,7 +33,7 @@ namespace TDEIO { * instead of directly instantiating this dialog. * @short dialog for requesting login and password from the end user */ -class KIO_EXPORT PasswordDialog : public KDialogBase +class TDEIO_EXPORT PasswordDialog : public KDialogBase { Q_OBJECT diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index 55102c5ed..472f4e313 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -143,7 +143,7 @@ static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, #endif // KDE4: remove -KIO_EXPORT bool TDEIO::isClipboardEmpty() +TDEIO_EXPORT bool TDEIO::isClipboardEmpty() { #ifndef QT_NO_MIMECLIPBOARD TQMimeSource *data = TQApplication::clipboard()->data(); @@ -207,7 +207,7 @@ TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url #endif // The main method for pasting -KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) +TDEIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) { if ( !dest_url.isValid() ) { KMessageBox::error( 0L, i18n( "Malformed URL\n%1" ).arg( dest_url.url() ) ); @@ -256,7 +256,7 @@ KIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move ) } -KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) +TDEIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) { KURL new_url = getNewFileName( u, TQString::null ); // We could use TDEIO::put here, but that would require a class @@ -273,12 +273,12 @@ KIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data ) (void) TDEIO::NetAccess::upload( tempFile.name(), new_url, 0 ); } -KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data ) +TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data ) { return pasteDataAsync( u, _data, TQString::null ); } -KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text ) +TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text ) { KURL new_url = getNewFileName( u, text ); @@ -288,7 +288,7 @@ KIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArr return pasteDataAsyncTo( new_url, _data ); } -KIO_EXPORT TQString TDEIO::pasteActionText() +TDEIO_EXPORT TQString TDEIO::pasteActionText() { TQMimeSource *data = TQApplication::clipboard()->data(); KURL::List urls; diff --git a/kio/kio/paste.h b/kio/kio/paste.h index 36befcd65..66579831a 100644 --- a/kio/kio/paste.h +++ b/kio/kio/paste.h @@ -42,7 +42,7 @@ namespace TDEIO { * @return the job that handles the operation * @see pasteData() */ - KIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false ); + TDEIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false ); /** * Pastes the given @p data to the given destination URL. @@ -54,7 +54,7 @@ namespace TDEIO { * @param data the data to copy * @see pasteClipboard() */ - KIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data ); + TDEIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data ); /** * Pastes the given @p data to the given destination URL. @@ -66,7 +66,7 @@ namespace TDEIO { * @param data the data to copy * @see pasteClipboard() */ - KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data ); + TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data ); /** * Pastes the given @p data to the given destination URL. @@ -79,7 +79,7 @@ namespace TDEIO { * @param dialogText the text to show in the dialog * @see pasteClipboard() */ - KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above + TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above /** @@ -100,7 +100,7 @@ namespace TDEIO { * * @since 3.5 */ - KIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL, + TDEIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL, const TQString& dialogText, TQWidget* widget, bool clipboard = false ); @@ -109,7 +109,7 @@ namespace TDEIO { * @return true if not * Not used anymore, wrong method name, so it will disappear in KDE4. */ - KIO_EXPORT_DEPRECATED bool isClipboardEmpty(); + TDEIO_EXPORT_DEPRECATED bool isClipboardEmpty(); /** * Returns the text to use for the Paste action, when the application supports @@ -119,7 +119,7 @@ namespace TDEIO { * * @since 3.5 */ - KIO_EXPORT TQString pasteActionText(); + TDEIO_EXPORT TQString pasteActionText(); } #endif diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h index a0a137ff4..fe8e16c0f 100644 --- a/kio/kio/previewjob.h +++ b/kio/kio/previewjob.h @@ -34,7 +34,7 @@ namespace TDEIO { * This class catches a preview (thumbnail) for files. * @short KIO Job to get a thumbnail picture */ - class KIO_EXPORT PreviewJob : public TDEIO::Job + class TDEIO_EXPORT PreviewJob : public TDEIO::Job { Q_OBJECT public: @@ -154,7 +154,7 @@ namespace TDEIO { * @return the new PreviewJob * @see PreviewJob::availablePlugins() */ - KIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); + TDEIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); /** * Creates a PreviewJob to generate or retrieve a preview image @@ -176,7 +176,7 @@ namespace TDEIO { * @return the new PreviewJob * @see PreviewJob::availablePlugins() */ - KIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); + TDEIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 ); } #endif diff --git a/kio/kio/progressbase.h b/kio/kio/progressbase.h index cbcab06be..2be545621 100644 --- a/kio/kio/progressbase.h +++ b/kio/kio/progressbase.h @@ -67,7 +67,7 @@ namespace TDEIO * @short Base class for IO progress dialogs. * @author Matej Koss */ -class KIO_EXPORT ProgressBase : public TQWidget { +class TDEIO_EXPORT ProgressBase : public TQWidget { Q_OBJECT diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h index b2347539b..38dcac925 100644 --- a/kio/kio/renamedlg.h +++ b/kio/kio/renamedlg.h @@ -45,7 +45,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW * @short A dialog for renaming files. * @since 3.1 */ -class KIO_EXPORT RenameDlg : public TQDialog +class TDEIO_EXPORT RenameDlg : public TQDialog { Q_OBJECT public: @@ -135,7 +135,7 @@ private: * @param mtimeDest modification time of destination file * @return the result */ -KIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption, +TDEIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption, // KDE4: make those KURLs const TQString& src, const TQString & dest, RenameDlg_Mode mode, TQString& newDestPath, diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h index ab50e6b6a..b3604b084 100644 --- a/kio/kio/renamedlgplugin.h +++ b/kio/kio/renamedlgplugin.h @@ -31,7 +31,7 @@ * @short Base class for RenameDlg plugins. * @since 3.1 */ -class KIO_EXPORT RenameDlgPlugin : public TQWidget +class TDEIO_EXPORT RenameDlgPlugin : public TQWidget { public: /** diff --git a/kio/kio/scheduler.h b/kio/kio/scheduler.h index 9871cd1c2..ac0764dc4 100644 --- a/kio/kio/scheduler.h +++ b/kio/kio/scheduler.h @@ -108,7 +108,7 @@ namespace TDEIO { * @see TDEIO::Job **/ - class KIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { + class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { Q_OBJECT public: diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h index 80b28ace6..4fef02161 100644 --- a/kio/kio/sessiondata.h +++ b/kio/kio/sessiondata.h @@ -32,7 +32,7 @@ class SlaveConfig; /** * @internal */ -class KIO_EXPORT SessionData : public TQObject +class TDEIO_EXPORT SessionData : public TQObject { Q_OBJECT diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h index e1199de97..56252dace 100644 --- a/kio/kio/skipdlg.h +++ b/kio/kio/skipdlg.h @@ -29,12 +29,12 @@ namespace TDEIO { enum SkipDlg_Result { S_SKIP = 1, S_AUTO_SKIP = 2, S_CANCEL = 0 }; - KIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null ); + TDEIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null ); /** * @internal */ -class KIO_EXPORT SkipDlg : public KDialog +class TDEIO_EXPORT SkipDlg : public KDialog { Q_OBJECT public: diff --git a/kio/kio/slave.h b/kio/kio/slave.h index bbede6637..6f9f02a2f 100644 --- a/kio/kio/slave.h +++ b/kio/kio/slave.h @@ -41,7 +41,7 @@ namespace TDEIO { * do *not* use connection() or slaveconn but the respective TDEIO::Slave * accessor methods. Otherwise classes derived from Slave might break. (LS) */ - class KIO_EXPORT Slave : public TDEIO::SlaveInterface + class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface { Q_OBJECT diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index 332646875..a65a1f94f 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -42,7 +42,7 @@ class SlaveBasePrivate; * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT SlaveBase +class TDEIO_EXPORT SlaveBase { public: SlaveBase( const TQCString &protocol, const TQCString &pool_socket, const TQCString &app_socket); diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h index 59abb74ac..5bdc6cda8 100644 --- a/kio/kio/slaveconfig.h +++ b/kio/kio/slaveconfig.h @@ -44,7 +44,7 @@ namespace TDEIO { * only applied when the slave is connecting with a host that matches with * the host and/or domain specified by the group. */ - class KIO_EXPORT SlaveConfig : public TQObject + class TDEIO_EXPORT SlaveConfig : public TQObject { Q_OBJECT public: diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index 79d797e08..8ac7b683e 100644 --- a/kio/kio/slaveinterface.h +++ b/kio/kio/slaveinterface.h @@ -90,7 +90,7 @@ class SlaveInterfacePrivate; * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT SlaveInterface : public TQObject +class TDEIO_EXPORT SlaveInterface : public TQObject { Q_OBJECT @@ -284,7 +284,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSAtom &a ) return s; } -KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e ); -KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e ); +TDEIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e ); +TDEIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e ); #endif diff --git a/kio/kio/statusbarprogress.h b/kio/kio/statusbarprogress.h index 58bd77fa9..d1d591fbe 100644 --- a/kio/kio/statusbarprogress.h +++ b/kio/kio/statusbarprogress.h @@ -57,7 +57,7 @@ class Job; * @short IO progress widget for embedding in a statusbar. * @author Matej Koss */ -class KIO_EXPORT StatusbarProgress : public ProgressBase { +class TDEIO_EXPORT StatusbarProgress : public ProgressBase { Q_OBJECT diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h index 8a4e436ce..52081c807 100644 --- a/kio/kio/tcpslavebase.h +++ b/kio/kio/tcpslavebase.h @@ -42,7 +42,7 @@ namespace TDEIO { * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT TCPSlaveBase : public SlaveBase +class TDEIO_EXPORT TCPSlaveBase : public SlaveBase { public: TCPSlaveBase(unsigned short int defaultPort, const TQCString &protocol, diff --git a/kio/kssl/kopenssl.h b/kio/kssl/kopenssl.h index 24130807a..59cf7b560 100644 --- a/kio/kssl/kopenssl.h +++ b/kio/kssl/kopenssl.h @@ -63,7 +63,7 @@ class KOpenSSLProxyPrivate; * @short KDE OpenSSL Wrapper * @internal */ -class KIO_EXPORT KOpenSSLProxy { +class TDEIO_EXPORT KOpenSSLProxy { friend class KStaticDeleter; public: diff --git a/kio/kssl/ksmimecrypto.h b/kio/kssl/ksmimecrypto.h index 95d17a8a8..5f8e1da73 100644 --- a/kio/kssl/ksmimecrypto.h +++ b/kio/kssl/ksmimecrypto.h @@ -30,7 +30,7 @@ class KOpenSSLProxy; class KSMIMECryptoPrivate; -class KIO_EXPORT KSMIMECrypto { +class TDEIO_EXPORT KSMIMECrypto { public: KSMIMECrypto(); ~KSMIMECrypto(); diff --git a/kio/kssl/kssl.h b/kio/kssl/kssl.h index ffb217980..e10b10eaf 100644 --- a/kio/kssl/kssl.h +++ b/kio/kssl/kssl.h @@ -39,7 +39,7 @@ class KSSLSession; * @see KExtendedSocket, TCPSlaveBase * @short KDE SSL Class */ -class KIO_EXPORT KSSL { +class TDEIO_EXPORT KSSL { public: /** * Construct a KSSL object diff --git a/kio/kssl/ksslcertchain.h b/kio/kssl/ksslcertchain.h index c7e9f3c8f..eb6c27d44 100644 --- a/kio/kssl/ksslcertchain.h +++ b/kio/kssl/ksslcertchain.h @@ -42,7 +42,7 @@ class TQStringList; * @see KSSL, KSSLCertificate, KSSLPeerInfo * @short KDE X.509 Certificate Chain */ -class KIO_EXPORT KSSLCertChain { +class TDEIO_EXPORT KSSLCertChain { friend class KSSL; friend class KSSLPeerInfo; diff --git a/kio/kssl/ksslcertdlg.h b/kio/kssl/ksslcertdlg.h index 314ae677d..8d6f3d777 100644 --- a/kio/kssl/ksslcertdlg.h +++ b/kio/kssl/ksslcertdlg.h @@ -40,7 +40,7 @@ class TQPushButton; * @see KSSL * @short KDE X.509 Certificate Dialog */ -class KIO_EXPORT KSSLCertDlg : public KDialog { +class TDEIO_EXPORT KSSLCertDlg : public KDialog { Q_OBJECT public: /** @@ -119,7 +119,7 @@ private: }; -class KIO_EXPORT KSSLCertDlgRet { +class TDEIO_EXPORT KSSLCertDlgRet { public: bool ok; TQString choice; @@ -131,8 +131,8 @@ protected: KSSLCertDlgRetPrivate *d; }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r); #endif diff --git a/kio/kssl/ksslcertificate.h b/kio/kssl/ksslcertificate.h index a7906581a..0c5f87323 100644 --- a/kio/kssl/ksslcertificate.h +++ b/kio/kssl/ksslcertificate.h @@ -72,7 +72,7 @@ class X509; * @see KSSL * @short KDE X.509 Certificate */ -class KIO_EXPORT KSSLCertificate { +class TDEIO_EXPORT KSSLCertificate { friend class KSSL; friend class KSSLCertificateHome; friend class KSSLCertificateFactory; @@ -350,8 +350,8 @@ public: static TQString getMD5DigestFromKDEKey(const TQString& k); private: - KIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y); - KIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y); + TDEIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y); + TDEIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y); KSSLCertificatePrivate *d; int purposeToOpenSSL(KSSLPurpose p) const; @@ -365,11 +365,11 @@ protected: KSSLValidation processError(int ec); }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r); -KIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y); -KIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y) +TDEIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y); +TDEIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y) { return !(x == y); } #endif diff --git a/kio/kssl/ksslcertificatecache.h b/kio/kssl/ksslcertificatecache.h index 486997265..924cb0f54 100644 --- a/kio/kssl/ksslcertificatecache.h +++ b/kio/kssl/ksslcertificatecache.h @@ -28,7 +28,7 @@ class KSSLCertificate; #include -class KIO_EXPORT KSSLCertificateCache { +class TDEIO_EXPORT KSSLCertificateCache { public: enum KSSLCertificatePolicy { Unknown, Reject, Accept, Prompt, Ambiguous }; @@ -101,7 +101,7 @@ private: }; -KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p); -KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p); +TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p); +TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p); #endif diff --git a/kio/kssl/ksslcertificatefactory.h b/kio/kssl/ksslcertificatefactory.h index c259e60e8..503c591a7 100644 --- a/kio/kssl/ksslcertificatefactory.h +++ b/kio/kssl/ksslcertificatefactory.h @@ -29,7 +29,7 @@ class KSSLCertificate; typedef enum {KEYTYPE_UNKNOWN, KEYTYPE_RSA, KEYTYPE_DSA} KSSLKeyType; -class KIO_EXPORT KSSLCertificateFactory { +class TDEIO_EXPORT KSSLCertificateFactory { public: diff --git a/kio/kssl/ksslcertificatehome.h b/kio/kssl/ksslcertificatehome.h index 549d7c168..f8a18a423 100644 --- a/kio/kssl/ksslcertificatehome.h +++ b/kio/kssl/ksslcertificatehome.h @@ -28,7 +28,7 @@ class KSSLPKCS12; #include -class KIO_EXPORT KSSLCertificateHome { +class TDEIO_EXPORT KSSLCertificateHome { public: diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h index e9bbad831..09fd5cdae 100644 --- a/kio/kssl/ksslconnectioninfo.h +++ b/kio/kssl/ksslconnectioninfo.h @@ -37,7 +37,7 @@ class KSSL; * @see KSSL * @short KDE SSL Connection Information */ -class KIO_EXPORT KSSLConnectionInfo { +class TDEIO_EXPORT KSSLConnectionInfo { friend class KSSL; public: /** diff --git a/kio/kssl/ksslcsessioncache.h b/kio/kssl/ksslcsessioncache.h index 4cfc77aaf..9badfe279 100644 --- a/kio/kssl/ksslcsessioncache.h +++ b/kio/kssl/ksslcsessioncache.h @@ -26,7 +26,7 @@ class KURL; class TQString; -class KIO_EXPORT KSSLCSessionCache { +class TDEIO_EXPORT KSSLCSessionCache { public: /** diff --git a/kio/kssl/ksslinfodlg.h b/kio/kssl/ksslinfodlg.h index 4bd00a9e5..c73afbba1 100644 --- a/kio/kssl/ksslinfodlg.h +++ b/kio/kssl/ksslinfodlg.h @@ -47,7 +47,7 @@ class KSSLCertChain; * @see KSSL * @short KDE SSL Information Dialog */ -class KIO_EXPORT KSSLInfoDlg : public KDialog { +class TDEIO_EXPORT KSSLInfoDlg : public KDialog { Q_OBJECT public: /** @@ -146,7 +146,7 @@ private slots: * @see KSSLInfoDlg * @short KDE SSL Certificate Box */ -class KIO_EXPORT KSSLCertBox : public TQScrollView { +class TDEIO_EXPORT KSSLCertBox : public TQScrollView { public: /** * Construct a certificate box diff --git a/kio/kssl/ksslkeygen.h b/kio/kssl/ksslkeygen.h index cd1d8e7ab..5bb99a593 100644 --- a/kio/kssl/ksslkeygen.h +++ b/kio/kssl/ksslkeygen.h @@ -41,7 +41,7 @@ class KGWizardPage2; * @see KSSL, KSSLCertificate, KSSLPKCS12 * @short KDE Key Generation Dialog */ -class KIO_EXPORT KSSLKeyGen : public KWizard { +class TDEIO_EXPORT KSSLKeyGen : public KWizard { Q_OBJECT public: /** diff --git a/kio/kssl/ksslpeerinfo.h b/kio/kssl/ksslpeerinfo.h index bdcf91231..a5cd017c9 100644 --- a/kio/kssl/ksslpeerinfo.h +++ b/kio/kssl/ksslpeerinfo.h @@ -39,7 +39,7 @@ class KInetSocketAddress; * @see KSSL * @short KDE SSL Peer Data */ -class KIO_EXPORT KSSLPeerInfo { +class TDEIO_EXPORT KSSLPeerInfo { friend class KSSL; public: /** diff --git a/kio/kssl/ksslpemcallback.h b/kio/kssl/ksslpemcallback.h index 0a8978b6e..265edd099 100644 --- a/kio/kssl/ksslpemcallback.h +++ b/kio/kssl/ksslpemcallback.h @@ -23,7 +23,7 @@ #include -int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata); +int TDEIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata); #endif diff --git a/kio/kssl/ksslpkcs12.h b/kio/kssl/ksslpkcs12.h index bfbd78d3e..c9dff0d82 100644 --- a/kio/kssl/ksslpkcs12.h +++ b/kio/kssl/ksslpkcs12.h @@ -58,7 +58,7 @@ class KOpenSSLProxy; * @see KSSL, KSSLCertificate * @short KDE PKCS#12 Certificate */ -class KIO_EXPORT KSSLPKCS12 { +class TDEIO_EXPORT KSSLPKCS12 { friend class KSSL; public: diff --git a/kio/kssl/ksslpkcs7.h b/kio/kssl/ksslpkcs7.h index 07c221464..c94b7bc7a 100644 --- a/kio/kssl/ksslpkcs7.h +++ b/kio/kssl/ksslpkcs7.h @@ -57,7 +57,7 @@ class KOpenSSLProxy; * @see KSSL * @short KDE PKCS#7 Certificate */ -class KIO_EXPORT KSSLPKCS7 { +class TDEIO_EXPORT KSSLPKCS7 { friend class KSSL; public: diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h index d8689833f..394a4b91a 100644 --- a/kio/kssl/ksslsession.h +++ b/kio/kssl/ksslsession.h @@ -39,7 +39,7 @@ class KSSLSessionPrivate; * @see KSSL * @short KDE SSL Session Information */ -class KIO_EXPORT KSSLSession { +class TDEIO_EXPORT KSSLSession { friend class KSSL; public: /** diff --git a/kio/kssl/ksslsettings.h b/kio/kssl/ksslsettings.h index 1b56a7a3a..18dd31249 100644 --- a/kio/kssl/ksslsettings.h +++ b/kio/kssl/ksslsettings.h @@ -36,7 +36,7 @@ class KSSLSettingsPrivate; * @see KSSL * @short KDE SSL Settings */ -class KIO_EXPORT KSSLSettings { +class TDEIO_EXPORT KSSLSettings { public: /** * Construct a KSSL Settings object diff --git a/kio/kssl/ksslsigners.h b/kio/kssl/ksslsigners.h index 21744f1de..3149e852a 100644 --- a/kio/kssl/ksslsigners.h +++ b/kio/kssl/ksslsigners.h @@ -40,7 +40,7 @@ class DCOPClient; * @see KSSL, KSSLCertificate * @short KDE SSL Signer Database */ -class KIO_EXPORT KSSLSigners { +class TDEIO_EXPORT KSSLSigners { public: /** * Construct a KSSLSigner object. diff --git a/kio/kssl/ksslx509map.h b/kio/kssl/ksslx509map.h index 93c46aeec..f76413100 100644 --- a/kio/kssl/ksslx509map.h +++ b/kio/kssl/ksslx509map.h @@ -36,7 +36,7 @@ * @see KSSL, KSSLCertificate * @short X.509 Map Parser */ -class KIO_EXPORT KSSLX509Map { +class TDEIO_EXPORT KSSLX509Map { public: /** * Construct an X.509 Map diff --git a/kio/kssl/ksslx509v3.h b/kio/kssl/ksslx509v3.h index 45c7d706e..c521f3e25 100644 --- a/kio/kssl/ksslx509v3.h +++ b/kio/kssl/ksslx509v3.h @@ -35,7 +35,7 @@ * @see KExtendedSocket, TCPSlaveBase * @short KDE SSL Class */ -class KIO_EXPORT KSSLX509V3 { +class TDEIO_EXPORT KSSLX509V3 { friend class KSSLCertificate; friend class KSSLCertificatePrivate; public: diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h index 462624fcd..06b8febab 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/kntlm/kntlm.h @@ -38,7 +38,7 @@ * This class doesn't maintain any state information, so all methods are static. */ -class KIO_EXPORT KNTLM { +class TDEIO_EXPORT KNTLM { public: enum Flags { diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h index 1f68ac688..0c57096a8 100644 --- a/kio/misc/tdesasl/tdesasl.h +++ b/kio/misc/tdesasl/tdesasl.h @@ -69,7 +69,7 @@ class TQStrIList; * @version $Id$ */ -class KIO_EXPORT KDESasl +class TDEIO_EXPORT KDESasl { public: diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h index c7cfaf5c0..abe935ad5 100644 --- a/kio/misc/uiserver.h +++ b/kio/misc/uiserver.h @@ -55,7 +55,7 @@ struct ListProgressColumnConfig * List view in the UIServer. * @internal */ -class KIO_EXPORT ListProgress : public KListView { +class TDEIO_EXPORT ListProgress : public KListView { Q_OBJECT @@ -103,7 +103,7 @@ protected: * One item in the ListProgress * @internal */ -class KIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { +class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { Q_OBJECT @@ -214,7 +214,7 @@ class UIServerSystemTray; * * @internal */ -class KIO_EXPORT UIServer : public KMainWindow, public DCOPObject { +class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject { K_DCOP Q_OBJECT diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index a0da57244..e811aaec4 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -551,7 +551,7 @@ void JobTest::copyFileToSystem() void JobTest::copyFileToSystem( bool resolve_local_urls ) { kdDebug() << k_funcinfo << resolve_local_urls << endl; - extern KIO_EXPORT bool kio_resolve_local_urls; + extern TDEIO_EXPORT bool kio_resolve_local_urls; kio_resolve_local_urls = resolve_local_urls; const TQString src = homeTmpDir() + "fileFromHome"; diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index cbff13fdf..0973b0b3b 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -2152,7 +2152,7 @@ bool HTTPProtocol::httpOpenConnection() * data to be sent in addition to the header (POST requests) and there is no * way for this function to get that data. This function is called in the * slotPut() or slotGet() functions which, in turn, are called (indirectly) as - * a result of a KIOJob::put() or KIOJob::get(). It is those latter functions + * a result of a TDEIOJob::put() or TDEIOJob::get(). It is those latter functions * which are responsible for starting up this ioslave in the first place. * This means that 'httpOpen' is called (essentially) as soon as the ioslave * is created -- BEFORE any data gets to this slave. @@ -4317,7 +4317,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d) /** * This function is our "receive" function. It is responsible for * downloading the message (not the header) from the HTTP server. It - * is called either as a response to a client's KIOJob::dataEnd() + * is called either as a response to a client's TDEIOJob::dataEnd() * (meaning that the client is done sending data) or by 'httpOpen()' * (if we are in the process of a PUT/POST request). It can also be * called by a webDAV function, to receive stat/list/property/etc. diff --git a/kparts/COMMENTS b/kparts/COMMENTS index 80e5671d1..1a9773212 100644 --- a/kparts/COMMENTS +++ b/kparts/COMMENTS @@ -180,7 +180,7 @@ What do you think ? Did I overlook something ? (Simon) I don't think there's a problem with the async stuff (BrowserView/KReadOnlyPart) . Mosfet's KGhostView browserview or - his dviview are both 100% like KReadOnlyPart (yes, they launch KIOJob::copy() + his dviview are both 100% like KReadOnlyPart (yes, they launch TDEIOJob::copy() and copy the file to some local temp) . It works :-) and noone complains :-)) -> I see no problem with that :-) (David) Sure - but does that answer the question : KReadOnlyPart==KBrowserPart ? diff --git a/kwallet/client/kwallet.h b/kwallet/client/kwallet.h index cbe8188a5..38157955b 100644 --- a/kwallet/client/kwallet.h +++ b/kwallet/client/kwallet.h @@ -50,7 +50,7 @@ namespace KWallet { * @author George Staikos * @short KDE Wallet Class */ -class KIO_EXPORT Wallet : public TQObject, public DCOPObject { +class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject { K_DCOP Q_OBJECT protected: diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp index 951c41244..2424c95e9 100644 --- a/tdecore/kbufferedio.cpp +++ b/tdecore/kbufferedio.cpp @@ -29,7 +29,7 @@ /** * @section impldetails Implementation Details * - * The KBufferedIO class has two purposes: first, it defines an API on how + * The TDEBufferedIO class has two purposes: first, it defines an API on how * that classes providing buffered I/O should provide. Next, it implements on * top of that API a generic buffering, that should suffice for most cases. * @@ -86,7 +86,7 @@ */ // constructor -KBufferedIO::KBufferedIO() : +TDEBufferedIO::TDEBufferedIO() : inBufIndex(0), outBufIndex(0) { inBuf.setAutoDelete(true); @@ -94,14 +94,14 @@ KBufferedIO::KBufferedIO() : } // destructor -KBufferedIO::~KBufferedIO() +TDEBufferedIO::~TDEBufferedIO() { } // sets the buffer sizes // this implementation doesn't support setting the buffer sizes // if any parameter is different than -1 or -2, fail -bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) +bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) { if (wsize != -2 && wsize != -1) return false; @@ -112,27 +112,27 @@ bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) } #ifdef USE_QT3 -int KBufferedIO::bytesAvailable() const +int TDEBufferedIO::bytesAvailable() const #endif // USE_QT3 #ifdef USE_QT4 -qint64 KBufferedIO::bytesAvailable() const +qint64 TDEBufferedIO::bytesAvailable() const #endif // USE_QT4 { return readBufferSize(); } #ifdef USE_QT3 -int KBufferedIO::bytesToWrite() const +int TDEBufferedIO::bytesToWrite() const #endif // USE_QT3 #ifdef USE_QT4 -qint64 KBufferedIO::bytesToWrite() const +qint64 TDEBufferedIO::bytesToWrite() const #endif // USE_QT4 { return writeBufferSize(); } // This function will scan the read buffer for a '\n' -bool KBufferedIO::canReadLine() const +bool TDEBufferedIO::canReadLine() const { if (bytesAvailable() == 0) return false; // no new line in here @@ -140,7 +140,7 @@ bool KBufferedIO::canReadLine() const TQByteArray* buf; // scan each TQByteArray for the occurrence of '\n' - TQPtrList &buflist = ((KBufferedIO*)this)->inBuf; + TQPtrList &buflist = ((TDEBufferedIO*)this)->inBuf; buf = buflist.first(); char *p = buf->data() + inBufIndex; int n = buf->size() - inBufIndex; @@ -162,7 +162,7 @@ bool KBufferedIO::canReadLine() const // unreads the current data // that is, writes into the read buffer, at the beginning -int KBufferedIO::unreadBlock(const char *data, uint len) +int TDEBufferedIO::unreadBlock(const char *data, uint len) { return feedReadBuffer(len, data, true); } @@ -171,7 +171,7 @@ int KBufferedIO::unreadBlock(const char *data, uint len) // protected member functions // -unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard) +unsigned TDEBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard) { { register unsigned u = readBufferSize(); @@ -221,7 +221,7 @@ unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool return copied; } -void KBufferedIO::consumeWriteBuffer(unsigned nbytes) +void TDEBufferedIO::consumeWriteBuffer(unsigned nbytes) { TQByteArray *buf = outBuf.first(); if (buf == NULL) @@ -250,7 +250,7 @@ void KBufferedIO::consumeWriteBuffer(unsigned nbytes) } } -unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning) +unsigned TDEBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning) { if (nbytes == 0) return 0; @@ -266,7 +266,7 @@ unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool a return nbytes; } -unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) +unsigned TDEBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) { if (nbytes == 0) return 0; @@ -277,33 +277,33 @@ unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) return nbytes; } -unsigned KBufferedIO::readBufferSize() const +unsigned TDEBufferedIO::readBufferSize() const { unsigned count = 0; - TQByteArray *buf = ((KBufferedIO*)this)->inBuf.first(); + TQByteArray *buf = ((TDEBufferedIO*)this)->inBuf.first(); while (buf != NULL) { count += buf->size(); - buf = ((KBufferedIO*)this)->inBuf.next(); + buf = ((TDEBufferedIO*)this)->inBuf.next(); } return count - inBufIndex; } -unsigned KBufferedIO::writeBufferSize() const +unsigned TDEBufferedIO::writeBufferSize() const { unsigned count = 0; - TQByteArray *buf = ((KBufferedIO*)this)->outBuf.first(); + TQByteArray *buf = ((TDEBufferedIO*)this)->outBuf.first(); while (buf != NULL) { count += buf->size(); - buf = (const_cast(this))->outBuf.next(); + buf = (const_cast(this))->outBuf.next(); } return count - outBufIndex; } -void KBufferedIO::virtual_hook( int id, void* data ) +void TDEBufferedIO::virtual_hook( int id, void* data ) { KAsyncIO::virtual_hook( id, data ); } #include "kbufferedio.moc" diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h index 78bccc9ef..f00ab52b6 100644 --- a/tdecore/kbufferedio.h +++ b/tdecore/kbufferedio.h @@ -25,7 +25,7 @@ #include #include "kasyncio.h" -class KBufferedIOPrivate; +class TDEBufferedIOPrivate; /** * This abstract class implements basic functionality for buffered * input/output. @@ -39,7 +39,7 @@ class KBufferedIOPrivate; * written using QSocket's buffering characteristics will be more easily * ported to the more powerful KExtendedSocket class. * - * KBufferedIO already provides a powerful internal buffering algorithm. However, + * TDEBufferedIO already provides a powerful internal buffering algorithm. However, * this does not include the I/O itself, which must be implemented in * derived classes. Thus, to implement a class that does some I/O, you must * override, in addition to the pure virtual TQIODevice methods, these two: @@ -53,14 +53,14 @@ class KBufferedIOPrivate; * @author Thiago Macieira * @short Buffered I/O */ -class TDECORE_EXPORT KBufferedIO: public KAsyncIO +class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO { Q_OBJECT protected: // no default public constructor - KBufferedIO(); + TDEBufferedIO(); public: /** @@ -79,7 +79,7 @@ public: * Destroys this class. The flushing of the buffers is implementation dependant. * The default implementation discards the contents */ - virtual ~KBufferedIO(); + virtual ~TDEBufferedIO(); /** * Closes the stream now, discarding the contents of the @@ -294,7 +294,7 @@ protected: protected: virtual void virtual_hook( int id, void* data ); private: - KBufferedIOPrivate *d; + TDEBufferedIOPrivate *d; }; #endif // KBUFFEREDIO_H diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 9813a0e16..ab08d0ed2 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -228,7 +228,7 @@ 7004 kio (KDirListerCache) 7005 kio (Filter) 7006 kio (Scheduler) -7007 kio (KIOJob) +7007 kio (TDEIOJob) 7009 kio (KMimeType) 7010 kio (KRun) 7011 kio (KSycoca) diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index d77d2c561..de1735382 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -1570,7 +1570,7 @@ qint64 KExtendedSocket::bytesAvailable() const // as of now, we don't do any extra processing // we only work in input-buffered sockets if (d->flags & inputBufferedSocket) - return KBufferedIO::bytesAvailable(); + return TDEBufferedIO::bytesAvailable(); return 0; // TODO: FIONREAD ioctl } @@ -2246,6 +2246,6 @@ const char* KAddressInfo::canonname() const } void KExtendedSocket::virtual_hook( int id, void* data ) -{ KBufferedIO::virtual_hook( id, data ); } +{ TDEBufferedIO::virtual_hook( id, data ); } #include "kextsock.moc" diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h index 6327d51dc..fad502c04 100644 --- a/tdecore/kextsock.h +++ b/tdecore/kextsock.h @@ -92,7 +92,7 @@ class KExtendedSocketPrivate; * @author Thiago Macieira * @short an extended socket */ -class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice +class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice { Q_OBJECT @@ -582,7 +582,7 @@ public: * @li #closed() will only be sent if we are indeed reading from the input * stream. That is, if this socket is buffering the input. See setBufferSize * - * Note that, in general, functions inherited/overridden from KBufferedIO will only + * Note that, in general, functions inherited/overridden from TDEBufferedIO will only * work on buffered sockets, like bytesAvailable and bytesToWrite. * @return The return values are: * @li 0: success diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 943ad1b9a..1c6232068 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -17,8 +17,8 @@ */ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) -#undef KIO_EXPORT -#define KIO_EXPORT KDE_EXPORT +#undef TDEIO_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #endif #define KPROTOCOLINFO_TDECORE diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h index 36ceafba6..4dcae30b7 100644 --- a/tdecore/ksimpledirwatch.h +++ b/tdecore/ksimpledirwatch.h @@ -63,7 +63,7 @@ class KSimpleDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej */ -class KIO_EXPORT KSimpleDirWatch : public TQObject +class TDEIO_EXPORT KSimpleDirWatch : public TQObject { Q_OBJECT diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index 1b08d121e..3e9462922 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -35,28 +35,28 @@ using namespace KNetwork; using namespace KNetwork::Internal; -class KNetwork::KBufferedSocketPrivate +class KNetwork::TDEBufferedSocketPrivate { public: mutable TDESocketBuffer *input, *output; - KBufferedSocketPrivate() + TDEBufferedSocketPrivate() { input = 0L; output = 0L; } }; -KBufferedSocket::KBufferedSocket(const TQString& host, const TQString& service, +TDEBufferedSocket::TDEBufferedSocket(const TQString& host, const TQString& service, TQObject *parent, const char *name) : KStreamSocket(host, service, parent, name), - d(new KBufferedSocketPrivate) + d(new TDEBufferedSocketPrivate) { setInputBuffering(true); setOutputBuffering(true); } -KBufferedSocket::~KBufferedSocket() +TDEBufferedSocket::~TDEBufferedSocket() { closeNow(); delete d->input; @@ -64,13 +64,13 @@ KBufferedSocket::~KBufferedSocket() delete d; } -void KBufferedSocket::setSocketDevice(TDESocketDevice* device) +void TDEBufferedSocket::setSocketDevice(TDESocketDevice* device) { KStreamSocket::setSocketDevice(device); device->setBlocking(false); } -bool KBufferedSocket::setSocketOptions(int opts) +bool TDEBufferedSocket::setSocketOptions(int opts) { if (opts == Blocking) return false; @@ -79,7 +79,7 @@ bool KBufferedSocket::setSocketOptions(int opts) return KStreamSocket::setSocketOptions(opts); } -void KBufferedSocket::close() +void TDEBufferedSocket::close() { if (!d->output || d->output->isEmpty()) closeNow(); @@ -94,10 +94,10 @@ void KBufferedSocket::close() } #ifdef USE_QT3 -TQ_LONG KBufferedSocket::bytesAvailable() const +TQ_LONG TDEBufferedSocket::bytesAvailable() const #endif #ifdef USE_QT4 -qint64 KBufferedSocket::bytesAvailable() const +qint64 TDEBufferedSocket::bytesAvailable() const #endif { if (!d->input) @@ -106,7 +106,7 @@ qint64 KBufferedSocket::bytesAvailable() const return d->input->length(); } -TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) +TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout) { TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout); if (d->input) @@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) { if (d->input) { @@ -134,13 +134,13 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return KStreamSocket::tqreadBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return tqreadBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) +TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) return KStreamSocket::peekBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) +TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return peekBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) { if (state() != Connected) { @@ -192,14 +192,14 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len return KStreamSocket::tqwriteBlock(data, len); } -TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, +TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, const TDESocketAddress&) { // ignore the third parameter return tqwriteBlock(data, maxlen); } -void KBufferedSocket::enableRead(bool enable) +void TDEBufferedSocket::enableRead(bool enable) { KStreamSocket::enableRead(enable); if (!enable && d->input) @@ -216,7 +216,7 @@ void KBufferedSocket::enableRead(bool enable) TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); } -void KBufferedSocket::enableWrite(bool enable) +void TDEBufferedSocket::enableWrite(bool enable) { KStreamSocket::enableWrite(enable); if (!enable && d->output && !d->output->isEmpty()) @@ -228,7 +228,7 @@ void KBufferedSocket::enableWrite(bool enable) } } -void KBufferedSocket::stateChanging(SocketState newState) +void TDEBufferedSocket::stateChanging(SocketState newState) { if (newState == Connecting || newState == Connected) { @@ -246,7 +246,7 @@ void KBufferedSocket::stateChanging(SocketState newState) KStreamSocket::stateChanging(newState); } -void KBufferedSocket::setInputBuffering(bool enable) +void TDEBufferedSocket::setInputBuffering(bool enable) { TQMutexLocker locker(mutex()); if (!enable) @@ -260,12 +260,12 @@ void KBufferedSocket::setInputBuffering(bool enable) } } -KIOBufferBase* KBufferedSocket::inputBuffer() +TDEIOBufferBase* TDEBufferedSocket::inputBuffer() { return d->input; } -void KBufferedSocket::setOutputBuffering(bool enable) +void TDEBufferedSocket::setOutputBuffering(bool enable) { TQMutexLocker locker(mutex()); if (!enable) @@ -279,16 +279,16 @@ void KBufferedSocket::setOutputBuffering(bool enable) } } -KIOBufferBase* KBufferedSocket::outputBuffer() +TDEIOBufferBase* TDEBufferedSocket::outputBuffer() { return d->output; } #ifdef USE_QT3 -TQ_ULONG KBufferedSocket::bytesToWrite() const +TQ_ULONG TDEBufferedSocket::bytesToWrite() const #endif #ifdef USE_QT4 -qint64 KBufferedSocket::bytesToWrite() const +qint64 TDEBufferedSocket::bytesToWrite() const #endif { if (!d->output) @@ -297,14 +297,14 @@ qint64 KBufferedSocket::bytesToWrite() const return d->output->length(); } -void KBufferedSocket::closeNow() +void TDEBufferedSocket::closeNow() { KStreamSocket::close(); if (d->output) d->output->clear(); } -bool KBufferedSocket::canReadLine() const +bool TDEBufferedSocket::canReadLine() const { if (!d->input) return false; @@ -312,12 +312,12 @@ bool KBufferedSocket::canReadLine() const return d->input->canReadLine(); } -TQCString KBufferedSocket::readLine() +TQCString TDEBufferedSocket::readLine() { return d->input->readLine(); } -void KBufferedSocket::waitForConnect() +void TDEBufferedSocket::waitForConnect() { if (state() != Connecting) return; // nothing to be waited on @@ -327,7 +327,7 @@ void KBufferedSocket::waitForConnect() KStreamSocket::setSocketOptions(socketOptions() & ~Blocking); } -void KBufferedSocket::slotReadActivity() +void TDEBufferedSocket::slotReadActivity() { if (d->input && state() == Connected) { @@ -374,7 +374,7 @@ void KBufferedSocket::slotReadActivity() } } -void KBufferedSocket::slotWriteActivity() +void TDEBufferedSocket::slotWriteActivity() { if (d->output && !d->output->isEmpty() && (state() == Connected || state() == Closing)) diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index 158a5a434..60ad3e81d 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -31,12 +31,12 @@ #include "kstreamsocket.h" #include -class KIOBufferBase; +class TDEIOBufferBase; namespace KNetwork { -class KBufferedSocketPrivate; -/** @class KBufferedSocket kbufferedsocket.h kbufferedsocket.h +class TDEBufferedSocketPrivate; +/** @class TDEBufferedSocket kbufferedsocket.h kbufferedsocket.h * @brief Buffered stream sockets. * * This class allows the user to create and operate buffered stream sockets @@ -55,7 +55,7 @@ class KBufferedSocketPrivate; * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ -class TDECORE_EXPORT KBufferedSocket: public KStreamSocket +class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket { Q_OBJECT @@ -68,13 +68,13 @@ public: * @param parent the parent object for this object * @param name the internal name for this object */ - KBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null, + TDEBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null, TQObject* parent = 0L, const char *name = 0L); /** * Destructor. */ - virtual ~KBufferedSocket(); + virtual ~TDEBufferedSocket(); /** * Be sure to catch new devices. @@ -168,7 +168,7 @@ public: /** * Retrieves the input buffer object. */ - KIOBufferBase* inputBuffer(); + TDEIOBufferBase* inputBuffer(); /** * Sets the use of output buffering. @@ -178,7 +178,7 @@ public: /** * Retrieves the output buffer object. */ - KIOBufferBase* outputBuffer(); + TDEIOBufferBase* outputBuffer(); /** * Returns the length of the output buffer. @@ -240,10 +240,10 @@ signals: void bytesWritten(int bytes); private: - KBufferedSocket(const KBufferedSocket&); - KBufferedSocket& operator=(const KBufferedSocket&); + TDEBufferedSocket(const TDEBufferedSocket&); + TDEBufferedSocket& operator=(const TDEBufferedSocket&); - KBufferedSocketPrivate *d; + TDEBufferedSocketPrivate *d; public: // KDE4: remove this function @@ -253,7 +253,7 @@ public: * * This function is provided to ease porting from KExtendedSocket, * which required a call to reset() in order to be able to connect again - * using the same device. This is not necessary in KBufferedSocket any more. + * using the same device. This is not necessary in TDEBufferedSocket any more. */ #ifdef USE_QT3 inline void reset() diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 68c45dd28..27da219a9 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -46,7 +46,7 @@ class KClientSocketBasePrivate; * such as, and especially, name resolution and signals. * * @note This class is abstract. If you're looking for a normal, - * client socket class, see @ref KStreamSocket and KBufferedSocket + * client socket class, see @ref KStreamSocket and TDEBufferedSocket * * @author Thiago Macieira */ diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/kiobuffer.h index ac1352a4d..c79daaa70 100644 --- a/tdecore/network/kiobuffer.h +++ b/tdecore/network/kiobuffer.h @@ -32,41 +32,41 @@ class TQIODevice; /** - * @class KIOBufferBase kiobuffer.h kiobuffer.h + * @class TDEIOBufferBase kiobuffer.h kiobuffer.h * @brief base for I/O buffer implementation * * This class declares the base methods to interface with an I/O buffer. * Most applications will not need to access this class directly, since - * it is all handled by @ref KNetwork::KBufferedSocket and other buffering + * it is all handled by @ref KNetwork::TDEBufferedSocket and other buffering * classes. * * @author Thiago Macieira */ -class KIOBufferBase +class TDEIOBufferBase { public: /** * Default constructor. Does nothing. */ - KIOBufferBase() + TDEIOBufferBase() { } /** * Copy constructor. Does nothing here. */ - KIOBufferBase(const KIOBufferBase& ) + TDEIOBufferBase(const TDEIOBufferBase& ) { } /** * Virtual destructor. Does nothing. */ - virtual ~KIOBufferBase() + virtual ~TDEIOBufferBase() { } /** * Assignment operator. Does nothing. */ - KIOBufferBase& operator=(const KIOBufferBase& ) + TDEIOBufferBase& operator=(const TDEIOBufferBase& ) { return *this; } /** diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index d5a1b90bb..16a48cdf2 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -47,11 +47,11 @@ public: int backlog; int timeout; - bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1; + bool bindWhenFound : 1, listenWhenBound : 1, useTDEBufferedSocket : 1; TDEServerSocketPrivate() : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false), - useKBufferedSocket(true) + useTDEBufferedSocket(true) { resolver.setFlags(KResolver::Passive); resolver.setFamily(KResolver::KnownFamily); @@ -277,7 +277,7 @@ void TDEServerSocket::close() void TDEServerSocket::setAcceptBuffered(bool enable) { - d->useKBufferedSocket = enable; + d->useTDEBufferedSocket = enable; } KActiveSocketBase* TDEServerSocket::accept() @@ -319,8 +319,8 @@ KActiveSocketBase* TDEServerSocket::accept() } KStreamSocket* streamsocket; - if (d->useKBufferedSocket) - streamsocket = new KBufferedSocket(); + if (d->useTDEBufferedSocket) + streamsocket = new TDEBufferedSocket(); else streamsocket = new KStreamSocket(); streamsocket->setSocketDevice(accepted); diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index 6821a886a..edb86d0b2 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -95,13 +95,13 @@ class TDEServerSocketPrivate; * * It is important to note that @ref accept can return either an * object of type KNetwork::KStreamSocket or - * KNetwork::KBufferedSocket (default). If you want to accept a + * KNetwork::TDEBufferedSocket (default). If you want to accept a * non-buffered socket, you must first call setAcceptBuffered. * * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread, * you need to accept only KNetwork::KStreamSocket objects. * - * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket + * @see KNetwork::KStreamSocket, KNetwork::TDEBufferedSocket * @author Thiago Macieira */ class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase @@ -338,7 +338,7 @@ public: * Toggles whether the accepted socket will be buffered or not. * That is, the @ref accept function will always return a KStreamSocket * object or descended from it. If buffering is enabled, the class - * to be returned will be KBufferedSocket. + * to be returned will be TDEBufferedSocket. * * By default, this flag is set to true. * @@ -361,7 +361,7 @@ public: * the base class for active sockets, but it is guaranteed * that the object will be a KStreamSocket or derived from it. * - * @sa KBufferedSocket + * @sa TDEBufferedSocket * @sa setAcceptBuffered */ virtual KActiveSocketBase* accept(); diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index d077296c1..c1f9e5848 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -35,7 +35,7 @@ namespace KNetwork { class KResolverEntry; class KResolverResults; class TDEServerSocket; -class KBufferedSocket; +class TDEBufferedSocket; class KStreamSocketPrivate; /** @class KStreamSocket kstreamsocket.h kstreamsocket.h @@ -50,7 +50,7 @@ class KStreamSocketPrivate; * * KStreamSocket objects are thread-safe and can be used in auxiliary * threads (i.e., not the thread in which the Qt event loop runs in). - * Note that KBufferedSocket cannot be used reliably in an auxiliary thread. + * Note that TDEBufferedSocket cannot be used reliably in an auxiliary thread. * * Sample usage: * \code @@ -91,7 +91,7 @@ class KStreamSocketPrivate; * } * \endcode * - * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket + * @see KNetwork::TDEBufferedSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase @@ -242,7 +242,7 @@ private: KStreamSocketPrivate *d; friend class TDEServerSocket; - friend class KBufferedSocket; + friend class TDEBufferedSocket; }; } // namespace KNetwork diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp index 52988d344..33b8fe776 100644 --- a/tdecore/network/tdesocketbuffer.cpp +++ b/tdecore/network/tdesocketbuffer.cpp @@ -39,7 +39,7 @@ TDESocketBuffer::TDESocketBuffer(TQ_LONG size) } TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other) - : KIOBufferBase(other), m_mutex(true) + : TDEIOBufferBase(other), m_mutex(true) { *this = other; } @@ -54,7 +54,7 @@ TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other) TQMutexLocker locker1(&m_mutex); TQMutexLocker locker2(&other.m_mutex); - KIOBufferBase::operator=(other); + TDEIOBufferBase::operator=(other); m_list = other.m_list; // copy-on-write m_offset = other.m_offset; diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h index be71f462e..0fa5d4e37 100644 --- a/tdecore/network/tdesocketbuffer_p.h +++ b/tdecore/network/tdesocketbuffer_p.h @@ -41,11 +41,11 @@ class KActiveSocketBase; * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h * @brief generic socket buffering code * - * This class implements generic buffering used by @ref KBufferedSocket. + * This class implements generic buffering used by @ref TDEBufferedSocket. * * @author Thiago Macieira */ -class TDESocketBuffer: public KIOBufferBase +class TDESocketBuffer: public TDEIOBufferBase { public: /** diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index 767752689..a226eac94 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -37,7 +37,7 @@ #define TDEFX_EXPORT KDE_EXPORT #define TDEPRINT_EXPORT KDE_EXPORT #define KDNSSD_EXPORT KDE_EXPORT -#define KIO_EXPORT KDE_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #define DCOP_EXPORT KDE_EXPORT #define KPARTS_EXPORT KDE_EXPORT #define KTEXTEDITOR_EXPORT KDE_EXPORT @@ -73,8 +73,8 @@ # ifndef TDECORE_EXPORT_DEPRECATED # define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT # endif -# ifndef KIO_EXPORT_DEPRECATED -# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT +# ifndef TDEIO_EXPORT_DEPRECATED +# define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT # endif # ifndef TDEUI_EXPORT_DEPRECATED # define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index b0d61b8ac..e5d45a42a 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -992,7 +992,7 @@ void KMCupsManager::checkUpdatePossibleInternal() { kdDebug(500) << "Checking for update possible" << endl; delete m_socket; - m_socket = new KNetwork::KBufferedSocket; + m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), TQT_SLOT( slotConnectionSuccess() ) ); diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h index 17663a5fa..a61464ed3 100644 --- a/win/tdelibs_export_win.h +++ b/win/tdelibs_export_win.h @@ -63,11 +63,11 @@ # define TDEPRINT_EXPORT KDE_IMPORT #endif -#ifndef KIO_EXPORT +#ifndef TDEIO_EXPORT # ifdef MAKE_KIO_LIB -# define KIO_EXPORT KDE_EXPORT +# define TDEIO_EXPORT KDE_EXPORT # else -# define KIO_EXPORT KDE_IMPORT +# define TDEIO_EXPORT KDE_IMPORT # endif #endif -- cgit v1.2.3 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- CMakeLists.txt | 18 +- KDE2PORTING.html | 16 +- KDE3PORTING.html | 16 +- Mainpage.dox | 4 +- Makefile.am.in | 2 +- README | 4 +- TODO | 6 +- arts/kde/CMakeLists.txt | 6 +- arts/kde/kioinputstream_impl.cpp | 6 +- arts/kde/kioinputstream_impl.h | 2 +- arts/kde/kplayobjectcreator.cc | 2 +- arts/kde/kplayobjectfactory.cc | 4 +- arts/knotify/knotify.cpp | 2 +- configure.in.in | 8 +- configure.in.mid | 2 +- dcop/client/dcopfind.cpp | 6 +- dcop/client/dcopstart.cpp | 2 +- dcop/dcopidlng/kalyptus | 2 +- dnssd/CMakeLists.txt | 2 +- doc/api/kfiledialog.png | Bin 43589 -> 0 bytes doc/api/tdefiledialog.png | Bin 0 -> 43589 bytes doc/tdelibs/man-kbuildsycoca.8.docbook | 221 - doc/tdelibs/man-tdebuildsycoca.8.docbook | 221 + interfaces/kio/CMakeLists.txt | 2 +- interfaces/kio/Makefile.am | 2 +- interfaces/kregexpeditor/Makefile.am | 2 +- interfaces/tdeimproxy/library/CMakeLists.txt | 4 +- interfaces/tdemediaplayer/CMakeLists.txt | 2 +- interfaces/tdemediaplayer/Makefile.am | 4 +- .../kfileaudiopreview/CMakeLists.txt | 46 - .../tdemediaplayer/kfileaudiopreview/Makefile.am | 13 - .../kfileaudiopreview/kfileaudiopreview.cpp | 146 - .../kfileaudiopreview/kfileaudiopreview.h | 64 - .../tdefileaudiopreview/CMakeLists.txt | 46 + .../tdemediaplayer/tdefileaudiopreview/Makefile.am | 13 + .../tdefileaudiopreview/tdefileaudiopreview.cpp | 146 + .../tdefileaudiopreview/tdefileaudiopreview.h | 64 + interfaces/tdescript/CMakeLists.txt | 6 +- interfaces/tdescript/Makefile.am | 2 +- interfaces/tdescript/sample/Makefile.am | 2 +- interfaces/tdescript/scriptloader.cpp | 2 +- interfaces/tdetexteditor/CMakeLists.txt | 4 +- interfaces/tdetexteditor/Makefile.am | 2 +- interfaces/tdetexteditor/configinterface.h | 2 +- interfaces/tdetexteditor/editorchooser.cpp | 2 +- kabc/CMakeLists.txt | 14 +- kabc/Makefile.am | 10 +- kabc/addresseehelper.cpp | 2 +- kabc/addresslineedit.cpp | 2 +- kabc/formatfactory.h | 2 +- kabc/formats/CMakeLists.txt | 4 +- kabc/kab2kabc.cpp | 476 -- kabc/kab2kabc.desktop | 105 - kabc/ldapclient.cpp | 2 +- kabc/ldapclient.h | 2 +- kabc/ldapconfigwidget.h | 2 +- kabc/plugins/dir/CMakeLists.txt | 6 +- kabc/plugins/dir/resourcedir.cpp | 2 +- kabc/plugins/dir/resourcedir.h | 2 +- kabc/plugins/file/CMakeLists.txt | 6 +- kabc/plugins/file/resourcefile.cpp | 4 +- kabc/plugins/file/resourcefile.h | 2 +- kabc/plugins/ldapkio/CMakeLists.txt | 8 +- kabc/plugins/ldapkio/resourceldapkio.cpp | 4 +- kabc/plugins/ldapkio/resourceldapkio.h | 2 +- kabc/plugins/ldapkio/resourceldapkioconfig.cpp | 2 +- kabc/plugins/net/CMakeLists.txt | 6 +- kabc/plugins/net/resourcenet.cpp | 4 +- kabc/plugins/net/resourcenet.h | 2 +- kabc/plugins/sql/resourcesql.h | 2 +- kabc/scripts/field.src.cpp | 2 +- kabc/tdeab2tdeabc.cpp | 476 ++ kabc/tdeab2tdeabc.desktop | 105 + kate/data/bash.xml | 2 +- kate/data/tcsh.xml | 2 +- kate/data/zsh.xml | 2 +- kate/interfaces/katecmd.cpp | 2 +- kate/part/CMakeLists.txt | 6 +- kate/part/kateconfig.cpp | 2 +- kate/part/katedialogs.cpp | 8 +- kate/part/katedocument.cpp | 34 +- kate/part/katefiletype.cpp | 2 +- kate/part/katehighlight.cpp | 2 +- kate/part/katehighlight.h | 2 +- kate/part/katejscript.cpp | 4 +- kate/part/kateluaindentscript.cpp | 2 +- kate/part/kateschema.h | 4 +- kate/part/katesyntaxdocument.cpp | 2 +- kate/part/kateview.cpp | 4 +- kate/part/test_regression.cpp | 2 +- kate/plugins/autobookmarker/autobookmarker.cpp | 2 +- kate/plugins/insertfile/CMakeLists.txt | 6 +- kate/plugins/insertfile/insertfileplugin.cpp | 4 +- kate/plugins/isearch/ISearchPlugin.cpp | 2 +- kate/plugins/kdatatool/CMakeLists.txt | 4 +- kate/plugins/wordcompletion/docwordcompletion.cpp | 2 +- kcmshell/CMakeLists.txt | 41 - kcmshell/Makefile.am | 39 - kcmshell/main.cpp | 350 -- kcmshell/main.h | 104 - kconf_update/CMakeLists.txt | 34 - kconf_update/Mainpage.dox | 31 - kconf_update/Makefile.am | 33 - kconf_update/README.kconf_update | 251 - kconf_update/kconf_update.cpp | 959 --- kded/CMakeLists.txt | 30 +- kded/DESIGN | 4 +- kded/Makefile.am | 22 +- kded/README.kded | 16 +- kded/kbuildsycoca.cpp | 959 --- kded/kbuildsycoca.h | 104 - kded/kde-menu.cpp | 171 - kded/kded.cpp | 16 +- kded/kded.h | 2 +- kded/kdedmodule.cpp | 2 +- kded/kmimelist.cpp | 54 - kded/tde-menu.cpp | 171 + kded/tdebuildsycoca.cpp | 959 +++ kded/tdebuildsycoca.h | 104 + kded/tdemimelist.cpp | 54 + kdewidgets/CMakeLists.txt | 4 +- kdewidgets/Makefile.am | 2 +- kdewidgets/makekdewidgets.cpp | 2 +- kdoctools/CMakeLists.txt | 14 +- kdoctools/Makefile.am | 8 +- kdoctools/docbook/README.kde | 2 +- kdoctools/kio_help.h | 4 +- kdoctools/kio_help.upd | 2 +- kdoctools/move_kio_help_cache.sh | 2 +- kfile-plugins/CMakeLists.txt | 12 - kfile-plugins/elf/CMakeLists.txt | 42 - kfile-plugins/elf/kfile_elf.cpp | 133 - kfile-plugins/elf/kfile_elf.desktop | 66 - kfile-plugins/elf/kfile_elf.h | 50 - kimgio/Makefile.am | 2 +- kimgio/README | 2 +- kinit/CMakeLists.txt | 32 +- kinit/Makefile.am | 30 +- kinit/autostart.cpp | 2 +- kinit/kdostartupconfig.cpp | 143 - kinit/kinit.cpp | 46 +- kinit/kioslave.cpp | 93 - kinit/klauncher.cpp | 1421 ----- kinit/klauncher.h | 200 - kinit/klauncher_cmds.h | 185 - kinit/klauncher_main.cpp | 116 - kinit/kstartupconfig.cpp | 176 - kinit/tdedostartupconfig.cpp | 143 + kinit/tdeioslave.cpp | 93 + kinit/tdelauncher.cpp | 1421 +++++ kinit/tdelauncher.h | 200 + kinit/tdelauncher_cmds.h | 185 + kinit/tdelauncher_main.cpp | 116 + kinit/tdestartupconfig.cpp | 176 + kinit/tests/Makefile.am | 6 +- kinit/tests/klaunchertest.cpp | 54 - kinit/tests/tdelaunchertest.cpp | 54 + kinit/wrapper.c | 4 +- kio/CMakeLists.txt | 71 - kio/DESIGN | 272 - kio/DESIGN.krun | 35 - kio/DESIGN.metadata | 147 - kio/DESIGN.mimetypes | 34 - kio/DESKTOP_ENTRY_STANDARD | 373 -- kio/Mainpage.dox | 120 - kio/Makefile.am | 67 - kio/application.desktop | 124 - kio/bookmarks/CMakeLists.txt | 55 - kio/bookmarks/Makefile.am | 40 - kio/bookmarks/dptrtemplate.h | 57 - kio/bookmarks/kbookmark.cc | 535 -- kio/bookmarks/kbookmark.h | 329 -- kio/bookmarks/kbookmarkbar.cc | 554 -- kio/bookmarks/kbookmarkbar.h | 131 - kio/bookmarks/kbookmarkdombuilder.cc | 81 - kio/bookmarks/kbookmarkdombuilder.h | 48 - kio/bookmarks/kbookmarkdrag.cc | 169 - kio/bookmarks/kbookmarkdrag.h | 57 - kio/bookmarks/kbookmarkexporter.cc | 32 - kio/bookmarks/kbookmarkexporter.h | 50 - kio/bookmarks/kbookmarkimporter.cc | 101 - kio/bookmarks/kbookmarkimporter.h | 106 - kio/bookmarks/kbookmarkimporter_crash.cc | 215 - kio/bookmarks/kbookmarkimporter_crash.h | 74 - kio/bookmarks/kbookmarkimporter_ie.cc | 185 - kio/bookmarks/kbookmarkimporter_ie.h | 90 - kio/bookmarks/kbookmarkimporter_kde1.cc | 156 - kio/bookmarks/kbookmarkimporter_kde1.h | 49 - kio/bookmarks/kbookmarkimporter_ns.cc | 243 - kio/bookmarks/kbookmarkimporter_ns.h | 132 - kio/bookmarks/kbookmarkimporter_opera.cc | 170 - kio/bookmarks/kbookmarkimporter_opera.h | 86 - kio/bookmarks/kbookmarkmanager.cc | 727 --- kio/bookmarks/kbookmarkmanager.h | 367 -- kio/bookmarks/kbookmarkmenu.cc | 1187 ---- kio/bookmarks/kbookmarkmenu.h | 265 - kio/bookmarks/kbookmarkmenu_p.h | 224 - kio/bookmarks/kbookmarknotifier.h | 45 - kio/data.protocol | 71 - kio/httpfilter/CMakeLists.txt | 32 - kio/httpfilter/Makefile.am | 8 - kio/httpfilter/httpfilter.cc | 372 -- kio/httpfilter/httpfilter.h | 119 - kio/kcomprfilter.desktop | 82 - kio/kdatatool.desktop | 96 - kio/kfile/CMakeLists.txt | 76 - kio/kfile/ChangeLog | 725 --- kio/kfile/Makefile.am | 78 - kio/kfile/NOTES | 100 - kio/kfile/TODO | 17 - kio/kfile/config-kfile.h | 32 - kio/kfile/images.h | 277 - kio/kfile/kacleditwidget.cpp | 1054 ---- kio/kfile/kacleditwidget.h | 65 - kio/kfile/kacleditwidget_p.h | 206 - kio/kfile/kcombiview.cpp | 371 -- kio/kfile/kcombiview.h | 133 - kio/kfile/kcustommenueditor.cpp | 242 - kio/kfile/kcustommenueditor.h | 67 - kio/kfile/kdiroperator.cpp | 1740 ------ kio/kfile/kdiroperator.h | 950 --- kio/kfile/kdirselectdialog.cpp | 481 -- kio/kfile/kdirselectdialog.h | 131 - kio/kfile/kdirsize.cpp | 166 - kio/kfile/kdirsize.h | 106 - kio/kfile/kdiskfreesp.cpp | 169 - kio/kfile/kdiskfreesp.h | 89 - kio/kfile/kencodingfiledialog.cpp | 223 - kio/kfile/kencodingfiledialog.h | 313 - kio/kfile/kfile.h | 129 - kio/kfile/kfilebookmarkhandler.cpp | 81 - kio/kfile/kfilebookmarkhandler.h | 63 - kio/kfile/kfiledetailview.cpp | 686 --- kio/kfile/kfiledetailview.h | 219 - kio/kfile/kfiledialog.cpp | 2380 -------- kio/kfile/kfiledialog.h | 989 ---- kio/kfile/kfilefiltercombo.cpp | 203 - kio/kfile/kfilefiltercombo.h | 104 - kio/kfile/kfileiconview.cpp | 943 --- kio/kfile/kfileiconview.h | 267 - kio/kfile/kfilemetainfowidget.cpp | 375 -- kio/kfile/kfilemetainfowidget.h | 95 - kio/kfile/kfilemetapreview.cpp | 196 - kio/kfile/kfilemetapreview.h | 56 - kio/kfile/kfilepreview.cpp | 279 - kio/kfile/kfilepreview.h | 122 - kio/kfile/kfilesharedlg.cpp | 325 -- kio/kfile/kfilesharedlg.h | 70 - kio/kfile/kfilespeedbar.cpp | 147 - kio/kfile/kfilespeedbar.h | 41 - kio/kfile/kfiletreebranch.cpp | 528 -- kio/kfile/kfiletreebranch.h | 242 - kio/kfile/kfiletreeview.cpp | 677 --- kio/kfile/kfiletreeview.h | 273 - kio/kfile/kfiletreeviewitem.cpp | 83 - kio/kfile/kfiletreeviewitem.h | 106 - kio/kfile/kfileview.cpp | 429 -- kio/kfile/kfileview.h | 444 -- kio/kfile/kicondialog.cpp | 772 --- kio/kfile/kicondialog.h | 350 -- kio/kfile/kimagefilepreview.cpp | 187 - kio/kfile/kimagefilepreview.h | 77 - kio/kfile/kmetaprops.cpp | 268 - kio/kfile/kmetaprops.h | 69 - kio/kfile/knotifydialog.cpp | 1191 ---- kio/kfile/knotifydialog.h | 341 -- kio/kfile/knotifywidgetbase.ui | 469 -- kio/kfile/kopenwith.cpp | 851 --- kio/kfile/kopenwith.h | 209 - kio/kfile/kopenwith_p.h | 101 - kio/kfile/kpreviewprops.cpp | 89 - kio/kfile/kpreviewprops.h | 57 - kio/kfile/kpreviewwidgetbase.cpp | 49 - kio/kfile/kpreviewwidgetbase.h | 92 - kio/kfile/kpropertiesdesktopadvbase.ui | 280 - kio/kfile/kpropertiesdesktopbase.ui | 316 - kio/kfile/kpropertiesdialog.cpp | 4170 ------------- kio/kfile/kpropertiesdialog.h | 918 --- kio/kfile/kpropertiesmimetypebase.ui | 70 - kio/kfile/kpropsdlg.h | 4 - kio/kfile/kpropsdlgplugin.desktop | 87 - kio/kfile/krecentdirs.cpp | 99 - kio/kfile/krecentdirs.h | 70 - kio/kfile/krecentdocument.cpp | 177 - kio/kfile/krecentdocument.h | 105 - kio/kfile/kurlbar.cpp | 1049 ---- kio/kfile/kurlbar.h | 660 --- kio/kfile/kurlcombobox.cpp | 363 -- kio/kfile/kurlcombobox.h | 229 - kio/kfile/kurlrequester.cpp | 430 -- kio/kfile/kurlrequester.h | 301 - kio/kfile/kurlrequesterdlg.cpp | 135 - kio/kfile/kurlrequesterdlg.h | 114 - kio/kfile/tests/Makefile.am | 41 - kio/kfile/tests/kcustommenueditortest.cpp | 19 - kio/kfile/tests/kdirselectdialogtest.cpp | 17 - kio/kfile/tests/kfdtest.cpp | 34 - kio/kfile/tests/kfdtest.h | 28 - kio/kfile/tests/kfiletreeviewtest.cpp | 165 - kio/kfile/tests/kfiletreeviewtest.h | 42 - kio/kfile/tests/kfstest.cpp | 183 - kio/kfile/tests/kicondialogtest.cpp | 19 - kio/kfile/tests/knotifytest.cpp | 10 - kio/kfile/tests/kopenwithtest.cpp | 67 - kio/kfile/tests/kurlrequestertest.cpp | 16 - kio/kfileplugin.desktop | 88 - kio/kio/CMakeLists.txt | 138 - kio/kio/KFILEMETAINFO_ISSUES | 4 - kio/kio/Makefile.am | 129 - kio/kio/authinfo.cpp | 332 -- kio/kio/authinfo.h | 320 - kio/kio/chmodjob.cpp | 258 - kio/kio/chmodjob.h | 109 - kio/kio/configure.in.in | 167 - kio/kio/connection.cpp | 273 - kio/kio/connection.h | 158 - kio/kio/dataprotocol.cpp | 339 -- kio/kio/dataprotocol.h | 71 - kio/kio/dataslave.cpp | 213 - kio/kio/dataslave.h | 126 - kio/kio/davjob.cpp | 142 - kio/kio/davjob.h | 127 - kio/kio/defaultprogress.cpp | 507 -- kio/kio/defaultprogress.h | 164 - kio/kio/forwardingslavebase.cpp | 475 -- kio/kio/forwardingslavebase.h | 204 - kio/kio/global.cpp | 2009 ------- kio/kio/global.h | 547 -- kio/kio/http_slave_defaults.h | 49 - kio/kio/ioslave_defaults.h | 53 - kio/kio/job.cpp | 4814 --------------- kio/kio/job.h | 532 -- kio/kio/jobclasses.h | 1909 ------ kio/kio/kacl.cpp | 682 --- kio/kio/kacl.h | 207 - kio/kio/kar.cpp | 170 - kio/kio/kar.h | 103 - kio/kio/karchive.cpp | 717 --- kio/kio/karchive.h | 639 -- kio/kio/kautomount.cpp | 117 - kio/kio/kautomount.h | 122 - kio/kio/kdatatool.cpp | 285 - kio/kio/kdatatool.h | 303 - kio/kio/kdcopservicestarter.cpp | 97 - kio/kio/kdcopservicestarter.h | 103 - kio/kio/kdirlister.cpp | 2538 -------- kio/kio/kdirlister.h | 634 -- kio/kio/kdirlister_p.h | 358 -- kio/kio/kdirnotify.cpp | 40 - kio/kio/kdirnotify.h | 84 - kio/kio/kdirnotify_stub.cpp | 101 - kio/kio/kdirnotify_stub.h | 32 - kio/kio/kdirwatch.cpp | 1774 ------ kio/kio/kdirwatch.h | 290 - kio/kio/kdirwatch_p.h | 158 - kio/kio/kemailsettings.cpp | 272 - kio/kio/kemailsettings.h | 147 - kio/kio/kfilefilter.cpp | 134 - kio/kio/kfilefilter.h | 170 - kio/kio/kfileitem.cpp | 1202 ---- kio/kio/kfileitem.h | 671 --- kio/kio/kfilemetainfo.cpp | 1859 ------ kio/kio/kfilemetainfo.h | 1738 ------ kio/kio/kfileshare.cpp | 346 -- kio/kio/kfileshare.h | 165 - kio/kio/kfilterbase.cpp | 76 - kio/kio/kfilterbase.h | 116 - kio/kio/kfilterdev.cpp | 484 -- kio/kio/kfilterdev.h | 204 - kio/kio/kimageio.cpp | 566 -- kio/kio/kimageio.h | 170 - kio/kio/kimageiofactory.h | 142 - kio/kio/klimitediodevice.h | 105 - kio/kio/kmdbase.h | 6 - kio/kio/kmessageboxwrapper.h | 56 - kio/kio/kmimemagic.cpp | 2317 -------- kio/kio/kmimemagic.h | 218 - kio/kio/kmimetype.cpp | 1172 ---- kio/kio/kmimetype.h | 641 -- kio/kio/kmimetypechooser.cpp | 298 - kio/kio/kmimetypechooser.h | 180 - kio/kio/kmimetyperesolver.h | 255 - kio/kio/knfsshare.cpp | 219 - kio/kio/knfsshare.h | 86 - kio/kio/kprotocolinfo.cpp | 257 - kio/kio/kprotocolinfo.h | 688 --- kio/kio/kprotocolmanager.cpp | 534 -- kio/kio/kprotocolmanager.h | 389 -- kio/kio/kremoteencoding.cpp | 95 - kio/kio/kremoteencoding.h | 127 - kio/kio/krun.cpp | 1574 ----- kio/kio/krun.h | 512 -- kio/kio/ksambashare.cpp | 239 - kio/kio/ksambashare.h | 85 - kio/kio/kscan.cpp | 185 - kio/kio/kscan.h | 370 -- kio/kio/kservice.cpp | 934 --- kio/kio/kservice.h | 562 -- kio/kio/kservice_p.h | 41 - kio/kio/kservicefactory.cpp | 291 - kio/kio/kservicefactory.h | 113 - kio/kio/kservicegroup.cpp | 724 --- kio/kio/kservicegroup.h | 353 -- kio/kio/kservicegroupfactory.cpp | 148 - kio/kio/kservicegroupfactory.h | 80 - kio/kio/kservicetype.cpp | 366 -- kio/kio/kservicetype.h | 251 - kio/kio/kservicetypefactory.cpp | 300 - kio/kio/kservicetypefactory.h | 123 - kio/kio/kshellcompletion.cpp | 311 - kio/kio/kshellcompletion.h | 85 - kio/kio/kshred.cpp | 276 - kio/kio/kshred.h | 156 - kio/kio/ktar.cpp | 980 ---- kio/kio/ktar.h | 171 - kio/kio/ktrader.cpp | 186 - kio/kio/ktrader.h | 295 - kio/kio/ktraderparse.cpp | 159 - kio/kio/ktraderparse.h | 52 - kio/kio/ktraderparsetree.cpp | 714 --- kio/kio/ktraderparsetree.h | 371 -- kio/kio/kurifilter.cpp | 451 -- kio/kio/kurifilter.h | 667 --- kio/kio/kurlcompletion.cpp | 1604 ----- kio/kio/kurlcompletion.h | 236 - kio/kio/kurlpixmapprovider.cpp | 33 - kio/kio/kurlpixmapprovider.h | 59 - kio/kio/kuserprofile.cpp | 355 -- kio/kio/kuserprofile.h | 282 - kio/kio/kzip.cpp | 1460 ----- kio/kio/kzip.h | 284 - kio/kio/lex.c | 1759 ------ kio/kio/lex.l | 126 - kio/kio/metainfojob.cpp | 184 - kio/kio/metainfojob.h | 119 - kio/kio/netaccess.cpp | 536 -- kio/kio/netaccess.h | 540 -- kio/kio/observer.cpp | 417 -- kio/kio/observer.h | 213 - kio/kio/passdlg.cpp | 367 -- kio/kio/passdlg.h | 175 - kio/kio/paste.cpp | 308 - kio/kio/paste.h | 125 - kio/kio/pastedialog.cpp | 84 - kio/kio/pastedialog.h | 64 - kio/kio/posixacladdons.cpp | 236 - kio/kio/posixacladdons.h | 47 - kio/kio/previewjob.cpp | 597 -- kio/kio/previewjob.h | 182 - kio/kio/progressbase.cpp | 180 - kio/kio/progressbase.h | 271 - kio/kio/renamedlg.cpp | 574 -- kio/kio/renamedlg.h | 153 - kio/kio/renamedlgplugin.h | 59 - kio/kio/scheduler.cpp | 922 --- kio/kio/scheduler.h | 364 -- kio/kio/sessiondata.cpp | 311 - kio/kio/sessiondata.h | 67 - kio/kio/skipdlg.cpp | 143 - kio/kio/skipdlg.h | 61 - kio/kio/slave.cpp | 519 -- kio/kio/slave.h | 270 - kio/kio/slavebase.cpp | 1315 ----- kio/kio/slavebase.h | 847 --- kio/kio/slaveconfig.cpp | 225 - kio/kio/slaveconfig.h | 106 - kio/kio/slaveinterface.cpp | 550 -- kio/kio/slaveinterface.h | 290 - kio/kio/statusbarprogress.cpp | 166 - kio/kio/statusbarprogress.h | 112 - kio/kio/tcpslavebase.cpp | 1343 ----- kio/kio/tcpslavebase.h | 389 -- kio/kio/tdelficon.cpp | 89 - kio/kio/tdelficon.h | 54 - kio/kio/thumbcreator.h | 124 - kio/kio/yacc.c | 1522 ----- kio/kio/yacc.h | 93 - kio/kio/yacc.y | 126 - kio/kioexec/CMakeLists.txt | 42 - kio/kioexec/Makefile.am | 19 - kio/kioexec/README | 26 - kio/kioexec/main.cpp | 294 - kio/kioexec/main.h | 35 - kio/kioslave.upd | 18 - kio/kpasswdserver.desktop | 157 - kio/kpasswdserver/CMakeLists.txt | 43 - kio/kpasswdserver/DESIGN | 56 - kio/kpasswdserver/Makefile.am | 15 - kio/kpasswdserver/kpasswdserver.cpp | 715 --- kio/kpasswdserver/kpasswdserver.h | 118 - kio/kscan.desktop | 19 - kio/kssl/CMakeLists.txt | 57 - kio/kssl/KPMG-CA-16389.0.DC80502.pdf | Bin 91118 -> 0 bytes kio/kssl/Makefile.am | 72 - kio/kssl/README | 15 - kio/kssl/SECURITY-HOLES | 17 - kio/kssl/TODO | 25 - kio/kssl/configure.in.in | 7 - kio/kssl/keygenwizard.ui | 46 - kio/kssl/keygenwizard2.ui | 78 - kio/kssl/kopenssl.cc | 1601 ----- kio/kssl/kopenssl.h | 920 --- kio/kssl/ksmimecrypto.cc | 424 -- kio/kssl/ksmimecrypto.h | 128 - kio/kssl/kssl.cc | 688 --- kio/kssl/kssl.h | 301 - kio/kssl/kssl/CMakeLists.txt | 14 - kio/kssl/kssl/DigiCertAssuredIDRootCA.pem | 22 - kio/kssl/kssl/DigiCertGlobalRootCA.pem | 22 - kio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem | 23 - kio/kssl/kssl/GeoTrust_Universal_CA.pem | 32 - kio/kssl/kssl/GeoTrust_Universal_CA2.pem | 31 - kio/kssl/kssl/HOWTO | 30 - kio/kssl/kssl/Makefile.am | 6 - kio/kssl/kssl/StartCom.pem | 148 - kio/kssl/kssl/SwissSign-Gold-G2.pem | 33 - kio/kssl/kssl/SwissSign-Platinum-G2.pem | 33 - kio/kssl/kssl/SwissSign-Silver-G2.pem | 33 - kio/kssl/kssl/WiseKey.pem | 24 - kio/kssl/kssl/ac_offline_raiz_certicamara.pem | 37 - kio/kssl/kssl/argedaten-root-ca-cert.pem | 23 - kio/kssl/kssl/belgacom.pem | 16 - kio/kssl/kssl/caroot/CMakeLists.txt | 12 - kio/kssl/kssl/caroot/Makefile.am | 4 - kio/kssl/kssl/caroot/ca-bundle.crt | 2973 ---------- kio/kssl/kssl/cert_bundle | 47 - kio/kssl/kssl/cert_extract.c | 183 - kio/kssl/kssl/certbundle_Makefile | 43 - kio/kssl/kssl/certkde | 75 - kio/kssl/kssl/certum.pem | 19 - kio/kssl/kssl/certum1.pem | 16 - kio/kssl/kssl/certum2.pem | 16 - kio/kssl/kssl/certum3.pem | 16 - kio/kssl/kssl/certum4.pem | 16 - kio/kssl/kssl/comodo1.pem | 25 - kio/kssl/kssl/comodo2.pem | 25 - kio/kssl/kssl/comodo3.pem | 25 - kio/kssl/kssl/comodo4.pem | 26 - kio/kssl/kssl/comodo5.pem | 26 - kio/kssl/kssl/comodo6.pem | 27 - kio/kssl/kssl/comodo7.pem | 26 - kio/kssl/kssl/dfn-root-ca-cert.pem | 39 - kio/kssl/kssl/gd-class2-root.pem | 24 - kio/kssl/kssl/geotrust-global-1.pem | 20 - kio/kssl/kssl/geotrust-global-2.pem | 22 - kio/kssl/kssl/globalsign-root-r1.pem | 21 - kio/kssl/kssl/globalsign-root-r2.pem | 22 - kio/kssl/kssl/icpbrasil.pem | 28 - kio/kssl/kssl/ipsservidores.pem | 17 - kio/kssl/kssl/ksslcalist | 787 --- kio/kssl/kssl/localcerts | 36 - kio/kssl/kssl/mergelocal | 65 - kio/kssl/kssl/netlock1.pem | 31 - kio/kssl/kssl/netlock2.pem | 37 - kio/kssl/kssl/netlock3.pem | 31 - kio/kssl/kssl/netlock4.pem | 39 - kio/kssl/kssl/oces.pem | 30 - kio/kssl/kssl/quovadis.pem | 34 - kio/kssl/kssl/qvrca2.pem | 33 - kio/kssl/kssl/qvrca3.pem | 38 - kio/kssl/kssl/sf-class2-root.pem | 24 - kio/kssl/kssl/sonera1.pem | 19 - kio/kssl/kssl/sonera2.pem | 19 - kio/kssl/kssl/staatdernederlandenrotca.pem | 22 - kio/kssl/kssl/startcom.pem | 30 - kio/kssl/kssl/startssl.pem | 44 - kio/kssl/kssl/tcclass2-2011.pem | 20 - kio/kssl/kssl/tcclass3-2011.pem | 20 - kio/kssl/kssl/utn-network.pem | 26 - kio/kssl/kssl/utn-sgc.pem | 26 - kio/kssl/kssl/xgca.pem | 25 - kio/kssl/ksslall.h | 41 - kio/kssl/ksslcallback.c | 89 - kio/kssl/ksslcertchain.cc | 216 - kio/kssl/ksslcertchain.h | 136 - kio/kssl/ksslcertdlg.cc | 174 - kio/kssl/ksslcertdlg.h | 138 - kio/kssl/ksslcertificate.cc | 1157 ---- kio/kssl/ksslcertificate.h | 376 -- kio/kssl/ksslcertificatecache.cc | 399 -- kio/kssl/ksslcertificatecache.h | 107 - kio/kssl/ksslcertificatefactory.cc | 122 - kio/kssl/ksslcertificatefactory.h | 50 - kio/kssl/ksslcertificatehome.cc | 246 - kio/kssl/ksslcertificatehome.h | 90 - kio/kssl/ksslconfig.h.cmake | 26 - kio/kssl/ksslconfig.h.in | 26 - kio/kssl/ksslconfig_win.h | 26 - kio/kssl/ksslconnectioninfo.cc | 66 - kio/kssl/ksslconnectioninfo.h | 95 - kio/kssl/ksslcsessioncache.cc | 120 - kio/kssl/ksslcsessioncache.h | 47 - kio/kssl/kssldefs.h | 37 - kio/kssl/ksslinfodlg.cc | 463 -- kio/kssl/ksslinfodlg.h | 173 - kio/kssl/ksslkeygen.cc | 223 - kio/kssl/ksslkeygen.h | 95 - kio/kssl/ksslpeerinfo.cc | 171 - kio/kssl/ksslpeerinfo.h | 108 - kio/kssl/ksslpemcallback.cc | 61 - kio/kssl/ksslpemcallback.h | 29 - kio/kssl/ksslpkcs12.cc | 295 - kio/kssl/ksslpkcs12.h | 194 - kio/kssl/ksslpkcs7.cc | 208 - kio/kssl/ksslpkcs7.h | 156 - kio/kssl/ksslsession.cc | 82 - kio/kssl/ksslsession.h | 73 - kio/kssl/ksslsettings.cc | 356 -- kio/kssl/ksslsettings.h | 224 - kio/kssl/ksslsigners.cc | 251 - kio/kssl/ksslsigners.h | 172 - kio/kssl/ksslutils.cc | 94 - kio/kssl/ksslutils.h | 77 - kio/kssl/ksslx509map.cc | 103 - kio/kssl/ksslx509map.h | 86 - kio/kssl/ksslx509v3.cc | 143 - kio/kssl/ksslx509v3.h | 122 - kio/kurifilterplugin.desktop | 84 - kio/magic | 1065 ---- kio/misc/CMakeLists.txt | 100 - kio/misc/Makefile.am | 60 - kio/misc/fileshareset | 430 -- kio/misc/kfile/CMakeLists.txt | 39 - kio/misc/kfile/Makefile.am | 10 - kio/misc/kfile/README | 4 - kio/misc/kfile/fileprops.cpp | 480 -- kio/misc/kfile/fileprops.h | 74 - kio/misc/kio_uiserver.desktop | 100 - kio/misc/kmailservice.cpp | 45 - kio/misc/kmailservice.protocol | 15 - kio/misc/kpac/CMakeLists.txt | 66 - kio/misc/kpac/Makefile.am | 30 - kio/misc/kpac/README | 9 - kio/misc/kpac/README.wpad | 73 - kio/misc/kpac/TODO | 1 - kio/misc/kpac/configure.in.in | 26 - kio/misc/kpac/dhcp.h | 78 - kio/misc/kpac/discovery.cpp | 147 - kio/misc/kpac/discovery.h | 55 - kio/misc/kpac/downloader.cpp | 89 - kio/misc/kpac/downloader.h | 64 - kio/misc/kpac/eventsrc | 530 -- kio/misc/kpac/kpac_dhcp_helper.c | 229 - kio/misc/kpac/kpactest.pac | 169 - kio/misc/kpac/proxyscout.cpp | 196 - kio/misc/kpac/proxyscout.desktop | 131 - kio/misc/kpac/proxyscout.h | 82 - kio/misc/kpac/script.cpp | 465 -- kio/misc/kpac/script.h | 56 - kio/misc/ksendbugmail/CMakeLists.txt | 37 - kio/misc/ksendbugmail/Makefile.am | 26 - kio/misc/ksendbugmail/main.cpp | 142 - kio/misc/ksendbugmail/main.h | 20 - kio/misc/ksendbugmail/smtp.cpp | 336 -- kio/misc/ksendbugmail/smtp.h | 144 - kio/misc/kssld/CMakeLists.txt | 47 - kio/misc/kssld/Makefile.am | 33 - kio/misc/kssld/kssld.cpp | 1027 ---- kio/misc/kssld/kssld.desktop | 156 - kio/misc/kssld/kssld.h | 154 - kio/misc/ktelnetservice.cpp | 112 - kio/misc/mms.protocol | 73 - kio/misc/mmst.protocol | 15 - kio/misc/mmsu.protocol | 15 - kio/misc/pnm.protocol | 15 - kio/misc/rlogin.protocol | 13 - kio/misc/rtsp.protocol | 15 - kio/misc/rtspt.protocol | 15 - kio/misc/rtspu.protocol | 15 - kio/misc/ssh.protocol | 13 - kio/misc/tdentlm/CMakeLists.txt | 43 - kio/misc/tdentlm/Makefile.am | 12 - kio/misc/tdentlm/des.cpp | 513 -- kio/misc/tdentlm/des.h | 19 - kio/misc/tdentlm/kswap.h | 428 -- kio/misc/tdentlm/tdentlm.cpp | 389 -- kio/misc/tdentlm/tdentlm.h | 233 - kio/misc/tdesasl/CMakeLists.txt | 42 - kio/misc/tdesasl/Makefile.am | 12 - kio/misc/tdesasl/tdesasl.cpp | 285 - kio/misc/tdesasl/tdesasl.h | 169 - kio/misc/tdewalletd/CMakeLists.txt | 49 - kio/misc/tdewalletd/Makefile.am | 35 - kio/misc/tdewalletd/kbetterthankdialogbase.ui | 154 - kio/misc/tdewalletd/kbetterthankdialogbase.ui.h | 50 - kio/misc/tdewalletd/ktimeout.cpp | 84 - kio/misc/tdewalletd/ktimeout.h | 52 - kio/misc/tdewalletd/tdewalletd.cpp | 1514 ----- kio/misc/tdewalletd/tdewalletd.desktop | 151 - kio/misc/tdewalletd/tdewalletd.h | 199 - kio/misc/tdewalletd/tdewalletwizard.ui | 545 -- kio/misc/tdewalletd/tdewalletwizard.ui.h | 74 - kio/misc/telnet.protocol | 13 - kio/misc/uiserver.cpp | 1413 ----- kio/misc/uiserver.h | 430 -- kio/pics/CMakeLists.txt | 14 - kio/pics/Makefile.am | 3 - kio/pics/cr16-app-kio_uiserver.png | Bin 838 -> 0 bytes kio/proxytype.pl | 11 - kio/renamedlgplugin.desktop | 84 - kio/tdecmodule.desktop | 109 - kio/tests/CMakeLists.txt | 36 - kio/tests/Makefile.am | 91 - kio/tests/dataprotocoltest.cpp | 287 - kio/tests/dummymeta.cpp | 20 - kio/tests/dummymeta.desktop | 54 - kio/tests/dummymeta.h | 20 - kio/tests/getalltest.cpp | 44 - kio/tests/jobtest.cpp | 613 -- kio/tests/jobtest.h | 79 - kio/tests/kacltest.cpp | 309 - kio/tests/kacltest.h | 53 - kio/tests/kdcopcheck.cpp | 132 - kio/tests/kdcopcheck.h | 28 - kio/tests/kdefaultprogresstest.cpp | 39 - kio/tests/kdirlistertest.cpp | 162 - kio/tests/kdirlistertest.h | 120 - kio/tests/kdirwatchtest.cpp | 82 - kio/tests/kdirwatchtest.h | 33 - kio/tests/kdirwatchunittest.cpp | 180 - kio/tests/kdirwatchunittest.h | 66 - kio/tests/kfiltertest.cpp | 118 - kio/tests/kionetrctest.cpp | 71 - kio/tests/kiopassdlgtest.cpp | 32 - kio/tests/kioslavetest.cpp | 555 -- kio/tests/kioslavetest.h | 108 - kio/tests/kmfitest.cpp | 28 - kio/tests/kmimefromext.cpp | 53 - kio/tests/kmimemagictest.cpp | 54 - kio/tests/kmimetypetest.cpp | 76 - kio/tests/kpropsdlgtest.cpp | 35 - kio/tests/kprotocolinfotest.cpp | 59 - kio/tests/kruntest.cpp | 209 - kio/tests/kruntest.h | 58 - kio/tests/kscantest.cpp | 16 - kio/tests/kshredtest.cpp | 74 - kio/tests/ktartest.cpp | 178 - kio/tests/ktradertest.cpp | 108 - kio/tests/kurifiltertest.cpp | 361 -- kio/tests/kurlcompletiontest.cpp | 189 - kio/tests/kziptest.cpp | 435 -- kio/tests/metatest.cpp | 321 - kio/tests/netaccesstest.cpp | 48 - kio/tests/previewtest.cpp | 64 - kio/tests/previewtest.h | 25 - kio/tests/speed.cpp | 139 - kio/tests/speed.h | 24 - kio/tests/tdesycocatest.cpp | 360 -- kio/tests/tdesycocaupdatetest.cpp | 11 - kio/tests/wronglocalsizes.zip | Bin 325 -> 0 bytes kio/useragent.pl | 13 - kioslave/CMakeLists.txt | 18 - kioslave/Mainpage.dox | 9 - kioslave/Makefile.am | 27 - kioslave/bzip2/CMakeLists.txt | 42 - kioslave/bzip2/Makefile.am | 11 - kioslave/bzip2/configure.in.in | 11 - kioslave/bzip2/kbzip2filter.cpp | 187 - kioslave/bzip2/kbzip2filter.desktop | 86 - kioslave/bzip2/kbzip2filter.h | 54 - kioslave/file/CMakeLists.txt | 55 - kioslave/file/Makefile.am | 22 - kioslave/file/file.cc | 1831 ------ kioslave/file/file.h | 98 - kioslave/file/file.protocol | 15 - kioslave/ftp/CMakeLists.txt | 44 - kioslave/ftp/Makefile.am | 16 - kioslave/ftp/configure.in.in | 5 - kioslave/ftp/ftp.cc | 2675 --------- kioslave/ftp/ftp.h | 603 -- kioslave/ftp/ftp.protocol | 18 - kioslave/gzip/CMakeLists.txt | 41 - kioslave/gzip/Makefile.am | 12 - kioslave/gzip/kgzipfilter.cpp | 336 -- kioslave/gzip/kgzipfilter.desktop | 86 - kioslave/gzip/kgzipfilter.h | 52 - kioslave/http/CMakeLists.txt | 69 - kioslave/http/Makefile.am | 31 - kioslave/http/README.http_cache_cleaner | 20 - kioslave/http/README.webdav | 184 - kioslave/http/THOUGHTS | 28 - kioslave/http/TODO | 45 - kioslave/http/configure.in.bot | 10 - kioslave/http/configure.in.in | 110 - kioslave/http/http.cc | 6108 -------------------- kioslave/http/http.h | 577 -- kioslave/http/http.protocol | 12 - kioslave/http/http_cache_cleaner.cpp | 284 - kioslave/http/http_cache_cleaner.desktop | 168 - kioslave/http/https.protocol | 12 - kioslave/http/kcookiejar/CMakeLists.txt | 63 - kioslave/http/kcookiejar/Makefile.am | 31 - kioslave/http/kcookiejar/domain_info | 1 - kioslave/http/kcookiejar/kcookiejar.cpp | 1559 ----- kioslave/http/kcookiejar/kcookiejar.desktop | 157 - kioslave/http/kcookiejar/kcookiejar.h | 365 -- kioslave/http/kcookiejar/kcookiescfg.upd | 16 - kioslave/http/kcookiejar/kcookieserver.cpp | 606 -- kioslave/http/kcookiejar/kcookieserver.h | 98 - kioslave/http/kcookiejar/kcookiewin.cpp | 382 -- kioslave/http/kcookiejar/kcookiewin.h | 84 - kioslave/http/kcookiejar/main.cpp | 92 - kioslave/http/kcookiejar/netscape_cookie_spec.html | 331 -- kioslave/http/kcookiejar/rfc2109 | 1179 ---- kioslave/http/kcookiejar/rfc2965 | 1459 ----- kioslave/http/kcookiejar/tests/Makefile.am | 18 - kioslave/http/kcookiejar/tests/cookie.test | 162 - kioslave/http/kcookiejar/tests/cookie_rfc.test | 148 - kioslave/http/kcookiejar/tests/cookie_saving.test | 430 -- .../http/kcookiejar/tests/cookie_settings.test | 116 - kioslave/http/kcookiejar/tests/kcookiejartest.cpp | 270 - kioslave/http/rfc2518.txt | 1 - kioslave/http/rfc2616.txt | 1 - kioslave/http/rfc2617.txt | 1 - kioslave/http/rfc2817.txt | 1 - kioslave/http/rfc2818.txt | 1 - kioslave/http/rfc3229.txt | 1 - kioslave/http/rfc3253.txt | 1 - kioslave/http/shoutcast-icecast.txt | 605 -- kioslave/http/webdav.protocol | 18 - kioslave/http/webdavs.protocol | 18 - kioslave/iso/CMakeLists.txt | 51 - kioslave/iso/Makefile.am | 67 - kioslave/iso/iso.cpp | 525 -- kioslave/iso/iso.h | 51 - kioslave/iso/iso.protocol | 11 - kioslave/iso/isoservice.desktop | 14 - kioslave/iso/kio_iso.desktop | 13 - kioslave/iso/kio_isorc | 2 - kioslave/iso/kiso.cpp | 460 -- kioslave/iso/kiso.h | 112 - kioslave/iso/kisodirectory.cpp | 31 - kioslave/iso/kisodirectory.h | 40 - kioslave/iso/kisofile.cpp | 53 - kioslave/iso/kisofile.h | 49 - kioslave/iso/libisofs/CMakeLists.txt | 23 - kioslave/iso/libisofs/COPYING | 280 - kioslave/iso/libisofs/ChangeLog | 6 - kioslave/iso/libisofs/Makefile.am | 18 - kioslave/iso/libisofs/README | 24 - kioslave/iso/libisofs/bswap.h | 94 - kioslave/iso/libisofs/el_torito.h | 63 - kioslave/iso/libisofs/iso_fs.h | 219 - kioslave/iso/libisofs/isofs.c | 876 --- kioslave/iso/libisofs/isofs.h | 161 - kioslave/iso/libisofs/rock.h | 127 - kioslave/iso/qfilehack.cpp | 40 - kioslave/iso/qfilehack.h | 38 - kioslave/metainfo/CMakeLists.txt | 43 - kioslave/metainfo/Makefile.am | 24 - kioslave/metainfo/metainfo.cpp | 103 - kioslave/metainfo/metainfo.h | 38 - kioslave/metainfo/metainfo.protocol | 9 - knewstuff/CMakeLists.txt | 16 +- knewstuff/Makefile.am | 10 +- knewstuff/downloaddialog.cpp | 6 +- knewstuff/engine.cpp | 2 +- knewstuff/khotnewstuff.cpp | 55 - knewstuff/khotnewstuffrc | 3 - knewstuff/knewstuffgeneric.cpp | 2 +- knewstuff/knewstuffsecure.cpp | 4 +- knewstuff/provider.cpp | 4 +- knewstuff/tdehotnewstuff.cpp | 55 + knewstuff/tdehotnewstuffrc | 3 + knewstuff/uploaddialog.cpp | 2 +- kstyles/plastik/config/CMakeLists.txt | 2 +- kstyles/plastik/config/Makefile.am | 4 +- kstyles/plastik/config/plastikconf.cpp | 223 - kstyles/plastik/config/plastikconf.h | 85 - kstyles/plastik/config/plastitdeconf.cpp | 223 + kstyles/plastik/config/plastitdeconf.h | 85 + libtdemid/deviceman.cc | 2 +- tdecert/CMakeLists.txt | 12 +- tdecert/Makefile.am | 2 +- tdecert/tdecertpart.cc | 8 +- tdecmshell/CMakeLists.txt | 41 + tdecmshell/Makefile.am | 39 + tdecmshell/main.cpp | 350 ++ tdecmshell/main.h | 104 + tdeconf_update/CMakeLists.txt | 34 + tdeconf_update/Mainpage.dox | 31 + tdeconf_update/Makefile.am | 33 + tdeconf_update/README.tdeconf_update | 251 + tdeconf_update/tdeconf_update.cpp | 959 +++ tdecore/CMakeLists.txt | 16 +- tdecore/DESIGN.kconfig | 224 - tdecore/DESIGN.tdeconfig | 224 + tdecore/MAINTAINERS | 10 +- tdecore/Makefile.am | 22 +- tdecore/README.kiosk | 2 +- tdecore/README.kstartupinfo | 2 +- tdecore/kaccelaction.cpp | 2 +- tdecore/kaccelbase.cpp | 2 +- tdecore/kappdcopiface.cpp | 2 +- tdecore/kapplication.cpp | 4 +- tdecore/kcharsets.cpp | 2 +- tdecore/kcheckaccelerators.cpp | 2 +- tdecore/kclipboard.cpp | 2 +- tdecore/kconfig.cpp | 367 -- tdecore/kconfig.h | 296 - tdecore/kconfig_compiler/CMakeLists.txt | 29 - tdecore/kconfig_compiler/Makefile.am | 18 - tdecore/kconfig_compiler/README.dox | 255 - tdecore/kconfig_compiler/TODO | 0 tdecore/kconfig_compiler/checkkcfg.pl | 83 - tdecore/kconfig_compiler/example/Makefile.am | 27 - tdecore/kconfig_compiler/example/autoexample.cpp | 64 - tdecore/kconfig_compiler/example/example.cpp | 52 - tdecore/kconfig_compiler/example/example.kcfg | 63 - .../example/exampleprefs_base.kcfgc | 18 - tdecore/kconfig_compiler/example/general_base.ui | 46 - tdecore/kconfig_compiler/example/myoptions_base.ui | 35 - tdecore/kconfig_compiler/kcfg.xsd | 192 - tdecore/kconfig_compiler/kconfig_compiler.cpp | 1700 ------ tdecore/kconfig_compiler/tests/Makefile.am | 134 - .../tests/kconfigcompiler_test.cpp | 96 - .../kconfig_compiler/tests/kconfigcompiler_test.h | 35 - tdecore/kconfig_compiler/tests/myprefs.h | 7 - tdecore/kconfig_compiler/tests/test1.cpp.ref | 72 - tdecore/kconfig_compiler/tests/test1.h.ref | 196 - tdecore/kconfig_compiler/tests/test1.kcfg | 55 - tdecore/kconfig_compiler/tests/test1.kcfgc | 18 - tdecore/kconfig_compiler/tests/test1main.cpp | 29 - tdecore/kconfig_compiler/tests/test2.cpp.ref | 98 - tdecore/kconfig_compiler/tests/test2.h.ref | 333 -- tdecore/kconfig_compiler/tests/test2.kcfg | 78 - tdecore/kconfig_compiler/tests/test2.kcfgc | 11 - tdecore/kconfig_compiler/tests/test2main.cpp | 29 - tdecore/kconfig_compiler/tests/test3.cpp.ref | 29 - tdecore/kconfig_compiler/tests/test3.h.ref | 138 - tdecore/kconfig_compiler/tests/test3.kcfg | 26 - tdecore/kconfig_compiler/tests/test3.kcfgc | 12 - tdecore/kconfig_compiler/tests/test3main.cpp | 29 - tdecore/kconfig_compiler/tests/test4.cpp.ref | 82 - tdecore/kconfig_compiler/tests/test4.h.ref | 135 - tdecore/kconfig_compiler/tests/test4.kcfg | 42 - tdecore/kconfig_compiler/tests/test4.kcfgc | 11 - tdecore/kconfig_compiler/tests/test4main.cpp | 30 - tdecore/kconfig_compiler/tests/test5.cpp.ref | 82 - tdecore/kconfig_compiler/tests/test5.h.ref | 127 - tdecore/kconfig_compiler/tests/test5.kcfg | 42 - tdecore/kconfig_compiler/tests/test5.kcfgc | 11 - tdecore/kconfig_compiler/tests/test5main.cpp | 30 - tdecore/kconfig_compiler/tests/test6.cpp.ref | 31 - tdecore/kconfig_compiler/tests/test6.h.ref | 93 - tdecore/kconfig_compiler/tests/test6.kcfg | 25 - tdecore/kconfig_compiler/tests/test6.kcfgc | 11 - tdecore/kconfig_compiler/tests/test6main.cpp | 30 - tdecore/kconfig_compiler/tests/test7.cpp.ref | 31 - tdecore/kconfig_compiler/tests/test7.h.ref | 93 - tdecore/kconfig_compiler/tests/test7.kcfg | 25 - tdecore/kconfig_compiler/tests/test7.kcfgc | 11 - tdecore/kconfig_compiler/tests/test7main.cpp | 30 - tdecore/kconfig_compiler/tests/test8a.cpp.ref | 22 - tdecore/kconfig_compiler/tests/test8a.h.ref | 61 - tdecore/kconfig_compiler/tests/test8a.kcfg | 17 - tdecore/kconfig_compiler/tests/test8a.kcfgc | 3 - tdecore/kconfig_compiler/tests/test8b.cpp.ref | 46 - tdecore/kconfig_compiler/tests/test8b.h.ref | 96 - tdecore/kconfig_compiler/tests/test8b.kcfg | 21 - tdecore/kconfig_compiler/tests/test8b.kcfgc | 6 - tdecore/kconfig_compiler/tests/test8main.cpp | 34 - tdecore/kconfig_compiler/tests/test9.cpp.ref | 35 - tdecore/kconfig_compiler/tests/test9.h.ref | 82 - tdecore/kconfig_compiler/tests/test9.kcfg | 24 - tdecore/kconfig_compiler/tests/test9.kcfgc | 18 - tdecore/kconfig_compiler/tests/test9main.cpp | 43 - .../kconfig_compiler/tests/test_dpointer.cpp.ref | 344 -- tdecore/kconfig_compiler/tests/test_dpointer.h.ref | 224 - tdecore/kconfig_compiler/tests/test_dpointer.kcfg | 78 - tdecore/kconfig_compiler/tests/test_dpointer.kcfgc | 11 - .../kconfig_compiler/tests/test_dpointer_main.cpp | 30 - tdecore/kconfigbackend.cpp | 1190 ---- tdecore/kconfigbackend.h | 299 - tdecore/kconfigbase.cpp | 1937 ------- tdecore/kconfigbase.h | 2180 ------- tdecore/kconfigdata.h | 146 - tdecore/kconfigdialogmanager.cpp | 398 -- tdecore/kconfigdialogmanager.h | 236 - tdecore/kconfigskeleton.cpp | 1207 ---- tdecore/kconfigskeleton.h | 1230 ---- tdecore/kcrash.cpp | 4 +- tdecore/kdebug.areas | 20 +- tdecore/kdebug.cpp | 2 +- tdecore/kdesktopfile.cpp | 2 +- tdecore/kdesktopfile.h | 2 +- tdecore/kdetcompmgr.cpp | 2 +- tdecore/kglobal.cpp | 2 +- tdecore/kglobalsettings.cpp | 2 +- tdecore/kiconeffect.cpp | 2 +- tdecore/kiconloader.cpp | 2 +- tdecore/kicontheme.cpp | 2 +- tdecore/kinstance.cpp | 2 +- tdecore/kkeyserver_x11.cpp | 2 +- tdecore/klocale.cpp | 4 +- tdecore/kmdcodec_compat.h | 2 +- tdecore/knotifyclient.cpp | 2 +- tdecore/kprotocolinfo_tdecore.cpp | 4 +- tdecore/kprotocolinfofactory.h | 2 +- tdecore/kshortcutlist.cpp | 2 +- tdecore/ksimpleconfig.cpp | 2 +- tdecore/ksimpleconfig.h | 2 +- tdecore/ksimpledirwatch.cpp | 4 +- tdecore/ksocks.cpp | 2 +- tdecore/kstandarddirs.cpp | 2 +- tdecore/kstdaccel.cpp | 2 +- tdecore/kuniqueapplication.cpp | 2 +- .../network-manager/network-manager.cpp | 10 +- tdecore/tdeconfig.cpp | 367 ++ tdecore/tdeconfig.h | 296 + tdecore/tdeconfig_compiler/CMakeLists.txt | 29 + tdecore/tdeconfig_compiler/Makefile.am | 18 + tdecore/tdeconfig_compiler/README.dox | 255 + tdecore/tdeconfig_compiler/TODO | 0 tdecore/tdeconfig_compiler/checkkcfg.pl | 83 + tdecore/tdeconfig_compiler/example/Makefile.am | 27 + tdecore/tdeconfig_compiler/example/autoexample.cpp | 64 + tdecore/tdeconfig_compiler/example/example.cpp | 52 + tdecore/tdeconfig_compiler/example/example.kcfg | 63 + .../example/exampleprefs_base.kcfgc | 18 + tdecore/tdeconfig_compiler/example/general_base.ui | 46 + .../tdeconfig_compiler/example/myoptions_base.ui | 35 + tdecore/tdeconfig_compiler/kcfg.xsd | 192 + tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp | 1700 ++++++ tdecore/tdeconfig_compiler/tests/Makefile.am | 134 + tdecore/tdeconfig_compiler/tests/myprefs.h | 7 + .../tests/tdeconfigcompiler_test.cpp | 96 + .../tests/tdeconfigcompiler_test.h | 35 + tdecore/tdeconfig_compiler/tests/test1.cpp.ref | 72 + tdecore/tdeconfig_compiler/tests/test1.h.ref | 196 + tdecore/tdeconfig_compiler/tests/test1.kcfg | 55 + tdecore/tdeconfig_compiler/tests/test1.kcfgc | 18 + tdecore/tdeconfig_compiler/tests/test1main.cpp | 29 + tdecore/tdeconfig_compiler/tests/test2.cpp.ref | 98 + tdecore/tdeconfig_compiler/tests/test2.h.ref | 333 ++ tdecore/tdeconfig_compiler/tests/test2.kcfg | 78 + tdecore/tdeconfig_compiler/tests/test2.kcfgc | 11 + tdecore/tdeconfig_compiler/tests/test2main.cpp | 29 + tdecore/tdeconfig_compiler/tests/test3.cpp.ref | 29 + tdecore/tdeconfig_compiler/tests/test3.h.ref | 138 + tdecore/tdeconfig_compiler/tests/test3.kcfg | 26 + tdecore/tdeconfig_compiler/tests/test3.kcfgc | 12 + tdecore/tdeconfig_compiler/tests/test3main.cpp | 29 + tdecore/tdeconfig_compiler/tests/test4.cpp.ref | 82 + tdecore/tdeconfig_compiler/tests/test4.h.ref | 135 + tdecore/tdeconfig_compiler/tests/test4.kcfg | 42 + tdecore/tdeconfig_compiler/tests/test4.kcfgc | 11 + tdecore/tdeconfig_compiler/tests/test4main.cpp | 30 + tdecore/tdeconfig_compiler/tests/test5.cpp.ref | 82 + tdecore/tdeconfig_compiler/tests/test5.h.ref | 127 + tdecore/tdeconfig_compiler/tests/test5.kcfg | 42 + tdecore/tdeconfig_compiler/tests/test5.kcfgc | 11 + tdecore/tdeconfig_compiler/tests/test5main.cpp | 30 + tdecore/tdeconfig_compiler/tests/test6.cpp.ref | 31 + tdecore/tdeconfig_compiler/tests/test6.h.ref | 93 + tdecore/tdeconfig_compiler/tests/test6.kcfg | 25 + tdecore/tdeconfig_compiler/tests/test6.kcfgc | 11 + tdecore/tdeconfig_compiler/tests/test6main.cpp | 30 + tdecore/tdeconfig_compiler/tests/test7.cpp.ref | 31 + tdecore/tdeconfig_compiler/tests/test7.h.ref | 93 + tdecore/tdeconfig_compiler/tests/test7.kcfg | 25 + tdecore/tdeconfig_compiler/tests/test7.kcfgc | 11 + tdecore/tdeconfig_compiler/tests/test7main.cpp | 30 + tdecore/tdeconfig_compiler/tests/test8a.cpp.ref | 22 + tdecore/tdeconfig_compiler/tests/test8a.h.ref | 61 + tdecore/tdeconfig_compiler/tests/test8a.kcfg | 17 + tdecore/tdeconfig_compiler/tests/test8a.kcfgc | 3 + tdecore/tdeconfig_compiler/tests/test8b.cpp.ref | 46 + tdecore/tdeconfig_compiler/tests/test8b.h.ref | 96 + tdecore/tdeconfig_compiler/tests/test8b.kcfg | 21 + tdecore/tdeconfig_compiler/tests/test8b.kcfgc | 6 + tdecore/tdeconfig_compiler/tests/test8main.cpp | 34 + tdecore/tdeconfig_compiler/tests/test9.cpp.ref | 35 + tdecore/tdeconfig_compiler/tests/test9.h.ref | 82 + tdecore/tdeconfig_compiler/tests/test9.kcfg | 24 + tdecore/tdeconfig_compiler/tests/test9.kcfgc | 18 + tdecore/tdeconfig_compiler/tests/test9main.cpp | 43 + .../tdeconfig_compiler/tests/test_dpointer.cpp.ref | 344 ++ .../tdeconfig_compiler/tests/test_dpointer.h.ref | 224 + .../tdeconfig_compiler/tests/test_dpointer.kcfg | 78 + .../tdeconfig_compiler/tests/test_dpointer.kcfgc | 11 + .../tests/test_dpointer_main.cpp | 30 + tdecore/tdeconfigbackend.cpp | 1190 ++++ tdecore/tdeconfigbackend.h | 299 + tdecore/tdeconfigbase.cpp | 1937 +++++++ tdecore/tdeconfigbase.h | 2180 +++++++ tdecore/tdeconfigdata.h | 146 + tdecore/tdeconfigdialogmanager.cpp | 398 ++ tdecore/tdeconfigdialogmanager.h | 236 + tdecore/tdeconfigskeleton.cpp | 1207 ++++ tdecore/tdeconfigskeleton.h | 1230 ++++ tdecore/tdehardwaredevices.cpp | 2 +- tdecore/tdesycoca.cpp | 2 +- tdecore/tdesycoca.h | 4 +- tdecore/tests/Makefile.am | 12 +- tdecore/tests/kconfigtest.cpp | 162 - tdecore/tests/kconfigtestgui.cpp | 200 - tdecore/tests/kconfigtestgui.h | 72 - tdecore/tests/ksimpleconfigtest.cpp | 2 +- tdecore/tests/kstddirstest.cpp | 2 +- tdecore/tests/kurltest.cpp | 10 +- tdecore/tests/tdeconfigtest.cpp | 162 + tdecore/tests/tdeconfigtestgui.cpp | 200 + tdecore/tests/tdeconfigtestgui.h | 72 + tdefile-plugins/CMakeLists.txt | 12 + tdefile-plugins/elf/CMakeLists.txt | 42 + tdefile-plugins/elf/tdefile_elf.cpp | 133 + tdefile-plugins/elf/tdefile_elf.desktop | 66 + tdefile-plugins/elf/tdefile_elf.h | 50 + tdehtml/CMakeLists.txt | 10 +- tdehtml/Makefile.am | 2 +- tdehtml/css/CMakeLists.txt | 4 +- tdehtml/css/Makefile.am | 2 +- tdehtml/css/cssstyleselector.cpp | 2 +- tdehtml/dom/CMakeLists.txt | 2 +- tdehtml/dom/Makefile.am | 2 +- tdehtml/ecma/CMakeLists.txt | 6 +- tdehtml/ecma/Makefile.am | 2 +- tdehtml/ecma/kjs_debugwin.cpp | 4 +- tdehtml/ecma/kjs_navigator.cpp | 10 +- tdehtml/ecma/xmlhttprequest.cpp | 6 +- tdehtml/ecma/xmlhttprequest.h | 2 +- tdehtml/ecma/xmlserializer.h | 2 +- tdehtml/html/CMakeLists.txt | 8 +- tdehtml/html/Makefile.am | 2 +- tdehtml/html/html_formimpl.cpp | 2 +- tdehtml/java/CMakeLists.txt | 6 +- tdehtml/java/Makefile.am | 2 +- tdehtml/java/kjavaappletserver.cpp | 6 +- tdehtml/java/kjavaappletviewer.cpp | 4 +- tdehtml/java/kjavadownloader.cpp | 4 +- tdehtml/java/kjavaprocess.cpp | 2 +- tdehtml/misc/CMakeLists.txt | 6 +- tdehtml/misc/Makefile.am | 2 +- tdehtml/misc/helper.cpp | 2 +- tdehtml/misc/loader.cpp | 6 +- tdehtml/misc/loader.h | 2 +- tdehtml/rendering/CMakeLists.txt | 6 +- tdehtml/rendering/Makefile.am | 4 +- tdehtml/rendering/render_form.cpp | 2 +- tdehtml/tdehtml_ext.cpp | 4 +- tdehtml/tdehtml_ext.h | 2 +- tdehtml/tdehtml_iface.cc | 2 +- tdehtml/tdehtml_part.cpp | 12 +- tdehtml/tdehtml_run.cpp | 2 +- tdehtml/tdehtml_settings.cc | 2 +- tdehtml/tdehtmlimage.cpp | 2 +- tdehtml/tdemultipart/CMakeLists.txt | 4 +- tdehtml/tdemultipart/Makefile.am | 4 +- tdehtml/tdemultipart/tdemultipart.cpp | 2 +- tdehtml/test_regression.cpp | 2 +- tdehtml/testtdehtml.cpp | 2 +- tdehtml/xml/CMakeLists.txt | 4 +- tdehtml/xml/Makefile.am | 2 +- tdehtml/xml/dom_docimpl.cpp | 2 +- tdeio/CMakeLists.txt | 71 + tdeio/DESIGN | 272 + tdeio/DESIGN.krun | 35 + tdeio/DESIGN.metadata | 147 + tdeio/DESIGN.mimetypes | 34 + tdeio/DESKTOP_ENTRY_STANDARD | 373 ++ tdeio/Mainpage.dox | 120 + tdeio/Makefile.am | 67 + tdeio/application.desktop | 124 + tdeio/bookmarks/CMakeLists.txt | 55 + tdeio/bookmarks/Makefile.am | 40 + tdeio/bookmarks/dptrtemplate.h | 57 + tdeio/bookmarks/kbookmark.cc | 535 ++ tdeio/bookmarks/kbookmark.h | 329 ++ tdeio/bookmarks/kbookmarkbar.cc | 554 ++ tdeio/bookmarks/kbookmarkbar.h | 131 + tdeio/bookmarks/kbookmarkdombuilder.cc | 81 + tdeio/bookmarks/kbookmarkdombuilder.h | 48 + tdeio/bookmarks/kbookmarkdrag.cc | 169 + tdeio/bookmarks/kbookmarkdrag.h | 57 + tdeio/bookmarks/kbookmarkexporter.cc | 32 + tdeio/bookmarks/kbookmarkexporter.h | 50 + tdeio/bookmarks/kbookmarkimporter.cc | 101 + tdeio/bookmarks/kbookmarkimporter.h | 106 + tdeio/bookmarks/kbookmarkimporter_crash.cc | 215 + tdeio/bookmarks/kbookmarkimporter_crash.h | 74 + tdeio/bookmarks/kbookmarkimporter_ie.cc | 185 + tdeio/bookmarks/kbookmarkimporter_ie.h | 90 + tdeio/bookmarks/kbookmarkimporter_kde1.cc | 156 + tdeio/bookmarks/kbookmarkimporter_kde1.h | 49 + tdeio/bookmarks/kbookmarkimporter_ns.cc | 243 + tdeio/bookmarks/kbookmarkimporter_ns.h | 132 + tdeio/bookmarks/kbookmarkimporter_opera.cc | 170 + tdeio/bookmarks/kbookmarkimporter_opera.h | 86 + tdeio/bookmarks/kbookmarkmanager.cc | 727 +++ tdeio/bookmarks/kbookmarkmanager.h | 367 ++ tdeio/bookmarks/kbookmarkmenu.cc | 1187 ++++ tdeio/bookmarks/kbookmarkmenu.h | 265 + tdeio/bookmarks/kbookmarkmenu_p.h | 224 + tdeio/bookmarks/kbookmarknotifier.h | 45 + tdeio/data.protocol | 71 + tdeio/httpfilter/CMakeLists.txt | 32 + tdeio/httpfilter/Makefile.am | 8 + tdeio/httpfilter/httpfilter.cc | 372 ++ tdeio/httpfilter/httpfilter.h | 119 + tdeio/kcomprfilter.desktop | 82 + tdeio/kdatatool.desktop | 96 + tdeio/kpasswdserver.desktop | 157 + tdeio/kpasswdserver/CMakeLists.txt | 43 + tdeio/kpasswdserver/DESIGN | 56 + tdeio/kpasswdserver/Makefile.am | 15 + tdeio/kpasswdserver/kpasswdserver.cpp | 715 +++ tdeio/kpasswdserver/kpasswdserver.h | 118 + tdeio/kscan.desktop | 19 + tdeio/kssl/CMakeLists.txt | 57 + tdeio/kssl/KPMG-CA-16389.0.DC80502.pdf | Bin 0 -> 91118 bytes tdeio/kssl/Makefile.am | 72 + tdeio/kssl/README | 15 + tdeio/kssl/SECURITY-HOLES | 17 + tdeio/kssl/TODO | 25 + tdeio/kssl/configure.in.in | 7 + tdeio/kssl/keygenwizard.ui | 46 + tdeio/kssl/keygenwizard2.ui | 78 + tdeio/kssl/kopenssl.cc | 1601 +++++ tdeio/kssl/kopenssl.h | 920 +++ tdeio/kssl/ksmimecrypto.cc | 424 ++ tdeio/kssl/ksmimecrypto.h | 128 + tdeio/kssl/kssl.cc | 688 +++ tdeio/kssl/kssl.h | 301 + tdeio/kssl/kssl/CMakeLists.txt | 14 + tdeio/kssl/kssl/DigiCertAssuredIDRootCA.pem | 22 + tdeio/kssl/kssl/DigiCertGlobalRootCA.pem | 22 + tdeio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem | 23 + tdeio/kssl/kssl/GeoTrust_Universal_CA.pem | 32 + tdeio/kssl/kssl/GeoTrust_Universal_CA2.pem | 31 + tdeio/kssl/kssl/HOWTO | 30 + tdeio/kssl/kssl/Makefile.am | 6 + tdeio/kssl/kssl/StartCom.pem | 148 + tdeio/kssl/kssl/SwissSign-Gold-G2.pem | 33 + tdeio/kssl/kssl/SwissSign-Platinum-G2.pem | 33 + tdeio/kssl/kssl/SwissSign-Silver-G2.pem | 33 + tdeio/kssl/kssl/WiseKey.pem | 24 + tdeio/kssl/kssl/ac_offline_raiz_certicamara.pem | 37 + tdeio/kssl/kssl/argedaten-root-ca-cert.pem | 23 + tdeio/kssl/kssl/belgacom.pem | 16 + tdeio/kssl/kssl/caroot/CMakeLists.txt | 12 + tdeio/kssl/kssl/caroot/Makefile.am | 4 + tdeio/kssl/kssl/caroot/ca-bundle.crt | 2973 ++++++++++ tdeio/kssl/kssl/cert_bundle | 47 + tdeio/kssl/kssl/cert_extract.c | 183 + tdeio/kssl/kssl/certbundle_Makefile | 43 + tdeio/kssl/kssl/certkde | 75 + tdeio/kssl/kssl/certum.pem | 19 + tdeio/kssl/kssl/certum1.pem | 16 + tdeio/kssl/kssl/certum2.pem | 16 + tdeio/kssl/kssl/certum3.pem | 16 + tdeio/kssl/kssl/certum4.pem | 16 + tdeio/kssl/kssl/comodo1.pem | 25 + tdeio/kssl/kssl/comodo2.pem | 25 + tdeio/kssl/kssl/comodo3.pem | 25 + tdeio/kssl/kssl/comodo4.pem | 26 + tdeio/kssl/kssl/comodo5.pem | 26 + tdeio/kssl/kssl/comodo6.pem | 27 + tdeio/kssl/kssl/comodo7.pem | 26 + tdeio/kssl/kssl/dfn-root-ca-cert.pem | 39 + tdeio/kssl/kssl/gd-class2-root.pem | 24 + tdeio/kssl/kssl/geotrust-global-1.pem | 20 + tdeio/kssl/kssl/geotrust-global-2.pem | 22 + tdeio/kssl/kssl/globalsign-root-r1.pem | 21 + tdeio/kssl/kssl/globalsign-root-r2.pem | 22 + tdeio/kssl/kssl/icpbrasil.pem | 28 + tdeio/kssl/kssl/ipsservidores.pem | 17 + tdeio/kssl/kssl/ksslcalist | 787 +++ tdeio/kssl/kssl/localcerts | 36 + tdeio/kssl/kssl/mergelocal | 65 + tdeio/kssl/kssl/netlock1.pem | 31 + tdeio/kssl/kssl/netlock2.pem | 37 + tdeio/kssl/kssl/netlock3.pem | 31 + tdeio/kssl/kssl/netlock4.pem | 39 + tdeio/kssl/kssl/oces.pem | 30 + tdeio/kssl/kssl/quovadis.pem | 34 + tdeio/kssl/kssl/qvrca2.pem | 33 + tdeio/kssl/kssl/qvrca3.pem | 38 + tdeio/kssl/kssl/sf-class2-root.pem | 24 + tdeio/kssl/kssl/sonera1.pem | 19 + tdeio/kssl/kssl/sonera2.pem | 19 + tdeio/kssl/kssl/staatdernederlandenrotca.pem | 22 + tdeio/kssl/kssl/startcom.pem | 30 + tdeio/kssl/kssl/startssl.pem | 44 + tdeio/kssl/kssl/tcclass2-2011.pem | 20 + tdeio/kssl/kssl/tcclass3-2011.pem | 20 + tdeio/kssl/kssl/utn-network.pem | 26 + tdeio/kssl/kssl/utn-sgc.pem | 26 + tdeio/kssl/kssl/xgca.pem | 25 + tdeio/kssl/ksslall.h | 41 + tdeio/kssl/ksslcallback.c | 89 + tdeio/kssl/ksslcertchain.cc | 216 + tdeio/kssl/ksslcertchain.h | 136 + tdeio/kssl/ksslcertdlg.cc | 174 + tdeio/kssl/ksslcertdlg.h | 138 + tdeio/kssl/ksslcertificate.cc | 1157 ++++ tdeio/kssl/ksslcertificate.h | 376 ++ tdeio/kssl/ksslcertificatecache.cc | 399 ++ tdeio/kssl/ksslcertificatecache.h | 107 + tdeio/kssl/ksslcertificatefactory.cc | 122 + tdeio/kssl/ksslcertificatefactory.h | 50 + tdeio/kssl/ksslcertificatehome.cc | 246 + tdeio/kssl/ksslcertificatehome.h | 90 + tdeio/kssl/ksslconfig.h.cmake | 26 + tdeio/kssl/ksslconfig.h.in | 26 + tdeio/kssl/ksslconfig_win.h | 26 + tdeio/kssl/ksslconnectioninfo.cc | 66 + tdeio/kssl/ksslconnectioninfo.h | 95 + tdeio/kssl/ksslcsessioncache.cc | 120 + tdeio/kssl/ksslcsessioncache.h | 47 + tdeio/kssl/kssldefs.h | 37 + tdeio/kssl/ksslinfodlg.cc | 463 ++ tdeio/kssl/ksslinfodlg.h | 173 + tdeio/kssl/ksslkeygen.cc | 223 + tdeio/kssl/ksslkeygen.h | 95 + tdeio/kssl/ksslpeerinfo.cc | 171 + tdeio/kssl/ksslpeerinfo.h | 108 + tdeio/kssl/ksslpemcallback.cc | 61 + tdeio/kssl/ksslpemcallback.h | 29 + tdeio/kssl/ksslpkcs12.cc | 295 + tdeio/kssl/ksslpkcs12.h | 194 + tdeio/kssl/ksslpkcs7.cc | 208 + tdeio/kssl/ksslpkcs7.h | 156 + tdeio/kssl/ksslsession.cc | 82 + tdeio/kssl/ksslsession.h | 73 + tdeio/kssl/ksslsettings.cc | 356 ++ tdeio/kssl/ksslsettings.h | 224 + tdeio/kssl/ksslsigners.cc | 251 + tdeio/kssl/ksslsigners.h | 172 + tdeio/kssl/ksslutils.cc | 94 + tdeio/kssl/ksslutils.h | 77 + tdeio/kssl/ksslx509map.cc | 103 + tdeio/kssl/ksslx509map.h | 86 + tdeio/kssl/ksslx509v3.cc | 143 + tdeio/kssl/ksslx509v3.h | 122 + tdeio/kurifilterplugin.desktop | 84 + tdeio/magic | 1065 ++++ tdeio/misc/CMakeLists.txt | 100 + tdeio/misc/Makefile.am | 60 + tdeio/misc/fileshareset | 430 ++ tdeio/misc/kpac/CMakeLists.txt | 66 + tdeio/misc/kpac/Makefile.am | 30 + tdeio/misc/kpac/README | 9 + tdeio/misc/kpac/README.wpad | 73 + tdeio/misc/kpac/TODO | 1 + tdeio/misc/kpac/configure.in.in | 26 + tdeio/misc/kpac/dhcp.h | 78 + tdeio/misc/kpac/discovery.cpp | 147 + tdeio/misc/kpac/discovery.h | 55 + tdeio/misc/kpac/downloader.cpp | 89 + tdeio/misc/kpac/downloader.h | 64 + tdeio/misc/kpac/eventsrc | 530 ++ tdeio/misc/kpac/kpac_dhcp_helper.c | 229 + tdeio/misc/kpac/kpactest.pac | 169 + tdeio/misc/kpac/proxyscout.cpp | 196 + tdeio/misc/kpac/proxyscout.desktop | 131 + tdeio/misc/kpac/proxyscout.h | 82 + tdeio/misc/kpac/script.cpp | 465 ++ tdeio/misc/kpac/script.h | 56 + tdeio/misc/kssld/CMakeLists.txt | 47 + tdeio/misc/kssld/Makefile.am | 33 + tdeio/misc/kssld/kssld.cpp | 1027 ++++ tdeio/misc/kssld/kssld.desktop | 156 + tdeio/misc/kssld/kssld.h | 154 + tdeio/misc/mms.protocol | 73 + tdeio/misc/mmst.protocol | 15 + tdeio/misc/mmsu.protocol | 15 + tdeio/misc/pnm.protocol | 15 + tdeio/misc/rlogin.protocol | 13 + tdeio/misc/rtsp.protocol | 15 + tdeio/misc/rtspt.protocol | 15 + tdeio/misc/rtspu.protocol | 15 + tdeio/misc/ssh.protocol | 13 + tdeio/misc/tdefile/CMakeLists.txt | 39 + tdeio/misc/tdefile/Makefile.am | 10 + tdeio/misc/tdefile/README | 4 + tdeio/misc/tdefile/fileprops.cpp | 480 ++ tdeio/misc/tdefile/fileprops.h | 74 + tdeio/misc/tdeio_uiserver.desktop | 100 + tdeio/misc/tdemailservice.cpp | 45 + tdeio/misc/tdemailservice.protocol | 15 + tdeio/misc/tdentlm/CMakeLists.txt | 43 + tdeio/misc/tdentlm/Makefile.am | 12 + tdeio/misc/tdentlm/des.cpp | 513 ++ tdeio/misc/tdentlm/des.h | 19 + tdeio/misc/tdentlm/kswap.h | 428 ++ tdeio/misc/tdentlm/tdentlm.cpp | 389 ++ tdeio/misc/tdentlm/tdentlm.h | 233 + tdeio/misc/tdesasl/CMakeLists.txt | 42 + tdeio/misc/tdesasl/Makefile.am | 12 + tdeio/misc/tdesasl/tdesasl.cpp | 285 + tdeio/misc/tdesasl/tdesasl.h | 169 + tdeio/misc/tdesendbugmail/CMakeLists.txt | 37 + tdeio/misc/tdesendbugmail/Makefile.am | 26 + tdeio/misc/tdesendbugmail/main.cpp | 142 + tdeio/misc/tdesendbugmail/main.h | 20 + tdeio/misc/tdesendbugmail/smtp.cpp | 336 ++ tdeio/misc/tdesendbugmail/smtp.h | 144 + tdeio/misc/tdetelnetservice.cpp | 112 + tdeio/misc/tdewalletd/CMakeLists.txt | 49 + tdeio/misc/tdewalletd/Makefile.am | 35 + tdeio/misc/tdewalletd/kbetterthankdialogbase.ui | 154 + tdeio/misc/tdewalletd/kbetterthankdialogbase.ui.h | 50 + tdeio/misc/tdewalletd/ktimeout.cpp | 84 + tdeio/misc/tdewalletd/ktimeout.h | 52 + tdeio/misc/tdewalletd/tdewalletd.cpp | 1514 +++++ tdeio/misc/tdewalletd/tdewalletd.desktop | 151 + tdeio/misc/tdewalletd/tdewalletd.h | 199 + tdeio/misc/tdewalletd/tdewalletwizard.ui | 545 ++ tdeio/misc/tdewalletd/tdewalletwizard.ui.h | 74 + tdeio/misc/telnet.protocol | 13 + tdeio/misc/uiserver.cpp | 1413 +++++ tdeio/misc/uiserver.h | 430 ++ tdeio/pics/CMakeLists.txt | 14 + tdeio/pics/Makefile.am | 3 + tdeio/pics/cr16-app-tdeio_uiserver.png | Bin 0 -> 838 bytes tdeio/proxytype.pl | 11 + tdeio/renamedlgplugin.desktop | 84 + tdeio/tdecmodule.desktop | 109 + tdeio/tdefile/CMakeLists.txt | 76 + tdeio/tdefile/ChangeLog | 725 +++ tdeio/tdefile/Makefile.am | 78 + tdeio/tdefile/NOTES | 100 + tdeio/tdefile/TODO | 17 + tdeio/tdefile/config-tdefile.h | 32 + tdeio/tdefile/images.h | 277 + tdeio/tdefile/kacleditwidget.cpp | 1054 ++++ tdeio/tdefile/kacleditwidget.h | 65 + tdeio/tdefile/kacleditwidget_p.h | 206 + tdeio/tdefile/kcombiview.cpp | 371 ++ tdeio/tdefile/kcombiview.h | 133 + tdeio/tdefile/kcustommenueditor.cpp | 242 + tdeio/tdefile/kcustommenueditor.h | 67 + tdeio/tdefile/kdiroperator.cpp | 1740 ++++++ tdeio/tdefile/kdiroperator.h | 950 +++ tdeio/tdefile/kdirselectdialog.cpp | 481 ++ tdeio/tdefile/kdirselectdialog.h | 131 + tdeio/tdefile/kdirsize.cpp | 166 + tdeio/tdefile/kdirsize.h | 106 + tdeio/tdefile/kdiskfreesp.cpp | 169 + tdeio/tdefile/kdiskfreesp.h | 89 + tdeio/tdefile/kencodingfiledialog.cpp | 223 + tdeio/tdefile/kencodingfiledialog.h | 313 + tdeio/tdefile/kicondialog.cpp | 772 +++ tdeio/tdefile/kicondialog.h | 350 ++ tdeio/tdefile/kimagefilepreview.cpp | 187 + tdeio/tdefile/kimagefilepreview.h | 77 + tdeio/tdefile/kmetaprops.cpp | 268 + tdeio/tdefile/kmetaprops.h | 69 + tdeio/tdefile/knotifydialog.cpp | 1191 ++++ tdeio/tdefile/knotifydialog.h | 341 ++ tdeio/tdefile/knotifywidgetbase.ui | 469 ++ tdeio/tdefile/kopenwith.cpp | 851 +++ tdeio/tdefile/kopenwith.h | 209 + tdeio/tdefile/kopenwith_p.h | 101 + tdeio/tdefile/kpreviewprops.cpp | 89 + tdeio/tdefile/kpreviewprops.h | 57 + tdeio/tdefile/kpreviewwidgetbase.cpp | 49 + tdeio/tdefile/kpreviewwidgetbase.h | 92 + tdeio/tdefile/kpropertiesdesktopadvbase.ui | 280 + tdeio/tdefile/kpropertiesdesktopbase.ui | 316 + tdeio/tdefile/kpropertiesdialog.cpp | 4170 +++++++++++++ tdeio/tdefile/kpropertiesdialog.h | 918 +++ tdeio/tdefile/kpropertiesmimetypebase.ui | 70 + tdeio/tdefile/kpropsdlg.h | 4 + tdeio/tdefile/kpropsdlgplugin.desktop | 87 + tdeio/tdefile/krecentdirs.cpp | 99 + tdeio/tdefile/krecentdirs.h | 70 + tdeio/tdefile/krecentdocument.cpp | 177 + tdeio/tdefile/krecentdocument.h | 105 + tdeio/tdefile/kurlbar.cpp | 1049 ++++ tdeio/tdefile/kurlbar.h | 660 +++ tdeio/tdefile/kurlcombobox.cpp | 363 ++ tdeio/tdefile/kurlcombobox.h | 229 + tdeio/tdefile/kurlrequester.cpp | 430 ++ tdeio/tdefile/kurlrequester.h | 301 + tdeio/tdefile/kurlrequesterdlg.cpp | 135 + tdeio/tdefile/kurlrequesterdlg.h | 114 + tdeio/tdefile/tdefile.h | 129 + tdeio/tdefile/tdefilebookmarkhandler.cpp | 81 + tdeio/tdefile/tdefilebookmarkhandler.h | 63 + tdeio/tdefile/tdefiledetailview.cpp | 686 +++ tdeio/tdefile/tdefiledetailview.h | 219 + tdeio/tdefile/tdefiledialog.cpp | 2380 ++++++++ tdeio/tdefile/tdefiledialog.h | 989 ++++ tdeio/tdefile/tdefilefiltercombo.cpp | 203 + tdeio/tdefile/tdefilefiltercombo.h | 104 + tdeio/tdefile/tdefileiconview.cpp | 943 +++ tdeio/tdefile/tdefileiconview.h | 267 + tdeio/tdefile/tdefilemetainfowidget.cpp | 375 ++ tdeio/tdefile/tdefilemetainfowidget.h | 95 + tdeio/tdefile/tdefilemetapreview.cpp | 196 + tdeio/tdefile/tdefilemetapreview.h | 56 + tdeio/tdefile/tdefilepreview.cpp | 279 + tdeio/tdefile/tdefilepreview.h | 122 + tdeio/tdefile/tdefilesharedlg.cpp | 325 ++ tdeio/tdefile/tdefilesharedlg.h | 70 + tdeio/tdefile/tdefilespeedbar.cpp | 147 + tdeio/tdefile/tdefilespeedbar.h | 41 + tdeio/tdefile/tdefiletreebranch.cpp | 528 ++ tdeio/tdefile/tdefiletreebranch.h | 242 + tdeio/tdefile/tdefiletreeview.cpp | 677 +++ tdeio/tdefile/tdefiletreeview.h | 273 + tdeio/tdefile/tdefiletreeviewitem.cpp | 83 + tdeio/tdefile/tdefiletreeviewitem.h | 106 + tdeio/tdefile/tdefileview.cpp | 429 ++ tdeio/tdefile/tdefileview.h | 444 ++ tdeio/tdefile/tests/Makefile.am | 41 + tdeio/tdefile/tests/kcustommenueditortest.cpp | 19 + tdeio/tdefile/tests/kdirselectdialogtest.cpp | 17 + tdeio/tdefile/tests/kfdtest.cpp | 34 + tdeio/tdefile/tests/kfdtest.h | 28 + tdeio/tdefile/tests/kfstest.cpp | 183 + tdeio/tdefile/tests/kicondialogtest.cpp | 19 + tdeio/tdefile/tests/knotifytest.cpp | 10 + tdeio/tdefile/tests/kopenwithtest.cpp | 67 + tdeio/tdefile/tests/kurlrequestertest.cpp | 16 + tdeio/tdefile/tests/tdefiletreeviewtest.cpp | 165 + tdeio/tdefile/tests/tdefiletreeviewtest.h | 42 + tdeio/tdefileplugin.desktop | 88 + tdeio/tdeio/CMakeLists.txt | 138 + tdeio/tdeio/KFILEMETAINFO_ISSUES | 4 + tdeio/tdeio/Makefile.am | 129 + tdeio/tdeio/authinfo.cpp | 332 ++ tdeio/tdeio/authinfo.h | 320 + tdeio/tdeio/chmodjob.cpp | 258 + tdeio/tdeio/chmodjob.h | 109 + tdeio/tdeio/configure.in.in | 167 + tdeio/tdeio/connection.cpp | 273 + tdeio/tdeio/connection.h | 158 + tdeio/tdeio/dataprotocol.cpp | 339 ++ tdeio/tdeio/dataprotocol.h | 71 + tdeio/tdeio/dataslave.cpp | 213 + tdeio/tdeio/dataslave.h | 126 + tdeio/tdeio/davjob.cpp | 142 + tdeio/tdeio/davjob.h | 127 + tdeio/tdeio/defaultprogress.cpp | 507 ++ tdeio/tdeio/defaultprogress.h | 164 + tdeio/tdeio/forwardingslavebase.cpp | 475 ++ tdeio/tdeio/forwardingslavebase.h | 204 + tdeio/tdeio/global.cpp | 2009 +++++++ tdeio/tdeio/global.h | 547 ++ tdeio/tdeio/http_slave_defaults.h | 49 + tdeio/tdeio/ioslave_defaults.h | 53 + tdeio/tdeio/job.cpp | 4814 +++++++++++++++ tdeio/tdeio/job.h | 532 ++ tdeio/tdeio/jobclasses.h | 1909 ++++++ tdeio/tdeio/kacl.cpp | 682 +++ tdeio/tdeio/kacl.h | 207 + tdeio/tdeio/kar.cpp | 170 + tdeio/tdeio/kar.h | 103 + tdeio/tdeio/karchive.cpp | 717 +++ tdeio/tdeio/karchive.h | 639 ++ tdeio/tdeio/kautomount.cpp | 117 + tdeio/tdeio/kautomount.h | 122 + tdeio/tdeio/kdatatool.cpp | 285 + tdeio/tdeio/kdatatool.h | 303 + tdeio/tdeio/kdcopservicestarter.cpp | 97 + tdeio/tdeio/kdcopservicestarter.h | 103 + tdeio/tdeio/kdirlister.cpp | 2538 ++++++++ tdeio/tdeio/kdirlister.h | 634 ++ tdeio/tdeio/kdirlister_p.h | 358 ++ tdeio/tdeio/kdirnotify.cpp | 40 + tdeio/tdeio/kdirnotify.h | 84 + tdeio/tdeio/kdirnotify_stub.cpp | 101 + tdeio/tdeio/kdirnotify_stub.h | 32 + tdeio/tdeio/kdirwatch.cpp | 1774 ++++++ tdeio/tdeio/kdirwatch.h | 290 + tdeio/tdeio/kdirwatch_p.h | 158 + tdeio/tdeio/kemailsettings.cpp | 272 + tdeio/tdeio/kemailsettings.h | 147 + tdeio/tdeio/kfilterbase.cpp | 76 + tdeio/tdeio/kfilterbase.h | 116 + tdeio/tdeio/kfilterdev.cpp | 484 ++ tdeio/tdeio/kfilterdev.h | 204 + tdeio/tdeio/kimageio.cpp | 566 ++ tdeio/tdeio/kimageio.h | 170 + tdeio/tdeio/kimageiofactory.h | 142 + tdeio/tdeio/klimitediodevice.h | 105 + tdeio/tdeio/kmdbase.h | 6 + tdeio/tdeio/kmessageboxwrapper.h | 56 + tdeio/tdeio/kmimemagic.cpp | 2317 ++++++++ tdeio/tdeio/kmimemagic.h | 218 + tdeio/tdeio/kmimetype.cpp | 1172 ++++ tdeio/tdeio/kmimetype.h | 641 ++ tdeio/tdeio/kmimetypechooser.cpp | 298 + tdeio/tdeio/kmimetypechooser.h | 180 + tdeio/tdeio/kmimetyperesolver.h | 255 + tdeio/tdeio/knfsshare.cpp | 219 + tdeio/tdeio/knfsshare.h | 86 + tdeio/tdeio/kprotocolinfo.cpp | 257 + tdeio/tdeio/kprotocolinfo.h | 688 +++ tdeio/tdeio/kprotocolmanager.cpp | 534 ++ tdeio/tdeio/kprotocolmanager.h | 389 ++ tdeio/tdeio/kremoteencoding.cpp | 95 + tdeio/tdeio/kremoteencoding.h | 127 + tdeio/tdeio/krun.cpp | 1574 +++++ tdeio/tdeio/krun.h | 512 ++ tdeio/tdeio/ksambashare.cpp | 239 + tdeio/tdeio/ksambashare.h | 85 + tdeio/tdeio/kscan.cpp | 185 + tdeio/tdeio/kscan.h | 370 ++ tdeio/tdeio/kservice.cpp | 934 +++ tdeio/tdeio/kservice.h | 562 ++ tdeio/tdeio/kservice_p.h | 41 + tdeio/tdeio/kservicefactory.cpp | 291 + tdeio/tdeio/kservicefactory.h | 113 + tdeio/tdeio/kservicegroup.cpp | 724 +++ tdeio/tdeio/kservicegroup.h | 353 ++ tdeio/tdeio/kservicegroupfactory.cpp | 148 + tdeio/tdeio/kservicegroupfactory.h | 80 + tdeio/tdeio/kservicetype.cpp | 366 ++ tdeio/tdeio/kservicetype.h | 251 + tdeio/tdeio/kservicetypefactory.cpp | 300 + tdeio/tdeio/kservicetypefactory.h | 123 + tdeio/tdeio/kshellcompletion.cpp | 311 + tdeio/tdeio/kshellcompletion.h | 85 + tdeio/tdeio/kshred.cpp | 276 + tdeio/tdeio/kshred.h | 156 + tdeio/tdeio/ktar.cpp | 980 ++++ tdeio/tdeio/ktar.h | 171 + tdeio/tdeio/ktrader.cpp | 186 + tdeio/tdeio/ktrader.h | 295 + tdeio/tdeio/ktraderparse.cpp | 159 + tdeio/tdeio/ktraderparse.h | 52 + tdeio/tdeio/ktraderparsetree.cpp | 714 +++ tdeio/tdeio/ktraderparsetree.h | 371 ++ tdeio/tdeio/kurifilter.cpp | 451 ++ tdeio/tdeio/kurifilter.h | 667 +++ tdeio/tdeio/kurlcompletion.cpp | 1604 +++++ tdeio/tdeio/kurlcompletion.h | 236 + tdeio/tdeio/kurlpixmapprovider.cpp | 33 + tdeio/tdeio/kurlpixmapprovider.h | 59 + tdeio/tdeio/kuserprofile.cpp | 355 ++ tdeio/tdeio/kuserprofile.h | 282 + tdeio/tdeio/kzip.cpp | 1460 +++++ tdeio/tdeio/kzip.h | 284 + tdeio/tdeio/lex.c | 1759 ++++++ tdeio/tdeio/lex.l | 126 + tdeio/tdeio/metainfojob.cpp | 184 + tdeio/tdeio/metainfojob.h | 119 + tdeio/tdeio/netaccess.cpp | 536 ++ tdeio/tdeio/netaccess.h | 540 ++ tdeio/tdeio/observer.cpp | 417 ++ tdeio/tdeio/observer.h | 213 + tdeio/tdeio/passdlg.cpp | 367 ++ tdeio/tdeio/passdlg.h | 175 + tdeio/tdeio/paste.cpp | 308 + tdeio/tdeio/paste.h | 125 + tdeio/tdeio/pastedialog.cpp | 84 + tdeio/tdeio/pastedialog.h | 64 + tdeio/tdeio/posixacladdons.cpp | 236 + tdeio/tdeio/posixacladdons.h | 47 + tdeio/tdeio/previewjob.cpp | 597 ++ tdeio/tdeio/previewjob.h | 182 + tdeio/tdeio/progressbase.cpp | 180 + tdeio/tdeio/progressbase.h | 271 + tdeio/tdeio/renamedlg.cpp | 574 ++ tdeio/tdeio/renamedlg.h | 153 + tdeio/tdeio/renamedlgplugin.h | 59 + tdeio/tdeio/scheduler.cpp | 922 +++ tdeio/tdeio/scheduler.h | 364 ++ tdeio/tdeio/sessiondata.cpp | 311 + tdeio/tdeio/sessiondata.h | 67 + tdeio/tdeio/skipdlg.cpp | 143 + tdeio/tdeio/skipdlg.h | 61 + tdeio/tdeio/slave.cpp | 519 ++ tdeio/tdeio/slave.h | 270 + tdeio/tdeio/slavebase.cpp | 1315 +++++ tdeio/tdeio/slavebase.h | 847 +++ tdeio/tdeio/slaveconfig.cpp | 225 + tdeio/tdeio/slaveconfig.h | 106 + tdeio/tdeio/slaveinterface.cpp | 550 ++ tdeio/tdeio/slaveinterface.h | 290 + tdeio/tdeio/statusbarprogress.cpp | 166 + tdeio/tdeio/statusbarprogress.h | 112 + tdeio/tdeio/tcpslavebase.cpp | 1343 +++++ tdeio/tdeio/tcpslavebase.h | 389 ++ tdeio/tdeio/tdefilefilter.cpp | 134 + tdeio/tdeio/tdefilefilter.h | 170 + tdeio/tdeio/tdefileitem.cpp | 1202 ++++ tdeio/tdeio/tdefileitem.h | 671 +++ tdeio/tdeio/tdefilemetainfo.cpp | 1859 ++++++ tdeio/tdeio/tdefilemetainfo.h | 1738 ++++++ tdeio/tdeio/tdefileshare.cpp | 346 ++ tdeio/tdeio/tdefileshare.h | 165 + tdeio/tdeio/tdelficon.cpp | 89 + tdeio/tdeio/tdelficon.h | 54 + tdeio/tdeio/thumbcreator.h | 124 + tdeio/tdeio/yacc.c | 1522 +++++ tdeio/tdeio/yacc.h | 93 + tdeio/tdeio/yacc.y | 126 + tdeio/tdeioexec/CMakeLists.txt | 42 + tdeio/tdeioexec/Makefile.am | 19 + tdeio/tdeioexec/README | 26 + tdeio/tdeioexec/main.cpp | 294 + tdeio/tdeioexec/main.h | 35 + tdeio/tdeioslave.upd | 18 + tdeio/tests/CMakeLists.txt | 36 + tdeio/tests/Makefile.am | 91 + tdeio/tests/dataprotocoltest.cpp | 287 + tdeio/tests/dummymeta.cpp | 20 + tdeio/tests/dummymeta.desktop | 54 + tdeio/tests/dummymeta.h | 20 + tdeio/tests/getalltest.cpp | 44 + tdeio/tests/jobtest.cpp | 613 ++ tdeio/tests/jobtest.h | 79 + tdeio/tests/kacltest.cpp | 309 + tdeio/tests/kacltest.h | 53 + tdeio/tests/kdcopcheck.cpp | 132 + tdeio/tests/kdcopcheck.h | 28 + tdeio/tests/kdefaultprogresstest.cpp | 39 + tdeio/tests/kdirlistertest.cpp | 162 + tdeio/tests/kdirlistertest.h | 120 + tdeio/tests/kdirwatchtest.cpp | 82 + tdeio/tests/kdirwatchtest.h | 33 + tdeio/tests/kdirwatchunittest.cpp | 180 + tdeio/tests/kdirwatchunittest.h | 66 + tdeio/tests/kfiltertest.cpp | 118 + tdeio/tests/kionetrctest.cpp | 71 + tdeio/tests/kiopassdlgtest.cpp | 32 + tdeio/tests/kmfitest.cpp | 28 + tdeio/tests/kmimefromext.cpp | 53 + tdeio/tests/kmimemagictest.cpp | 54 + tdeio/tests/kmimetypetest.cpp | 76 + tdeio/tests/kpropsdlgtest.cpp | 35 + tdeio/tests/kprotocolinfotest.cpp | 59 + tdeio/tests/kruntest.cpp | 209 + tdeio/tests/kruntest.h | 58 + tdeio/tests/kscantest.cpp | 16 + tdeio/tests/kshredtest.cpp | 74 + tdeio/tests/ktartest.cpp | 178 + tdeio/tests/kurifiltertest.cpp | 361 ++ tdeio/tests/kurlcompletiontest.cpp | 189 + tdeio/tests/kziptest.cpp | 435 ++ tdeio/tests/metatest.cpp | 321 + tdeio/tests/netaccesstest.cpp | 48 + tdeio/tests/previewtest.cpp | 64 + tdeio/tests/previewtest.h | 25 + tdeio/tests/speed.cpp | 139 + tdeio/tests/speed.h | 24 + tdeio/tests/tdeioslavetest.cpp | 555 ++ tdeio/tests/tdeioslavetest.h | 108 + tdeio/tests/tdesycocatest.cpp | 360 ++ tdeio/tests/tdesycocaupdatetest.cpp | 11 + tdeio/tests/tdetradertest.cpp | 108 + tdeio/tests/wronglocalsizes.zip | Bin 0 -> 325 bytes tdeio/useragent.pl | 13 + tdeioslave/CMakeLists.txt | 18 + tdeioslave/Mainpage.dox | 9 + tdeioslave/Makefile.am | 27 + tdeioslave/bzip2/CMakeLists.txt | 42 + tdeioslave/bzip2/Makefile.am | 11 + tdeioslave/bzip2/configure.in.in | 11 + tdeioslave/bzip2/kbzip2filter.cpp | 187 + tdeioslave/bzip2/kbzip2filter.desktop | 86 + tdeioslave/bzip2/kbzip2filter.h | 54 + tdeioslave/file/CMakeLists.txt | 55 + tdeioslave/file/Makefile.am | 22 + tdeioslave/file/file.cc | 1831 ++++++ tdeioslave/file/file.h | 98 + tdeioslave/file/file.protocol | 15 + tdeioslave/ftp/CMakeLists.txt | 44 + tdeioslave/ftp/Makefile.am | 16 + tdeioslave/ftp/configure.in.in | 5 + tdeioslave/ftp/ftp.cc | 2675 +++++++++ tdeioslave/ftp/ftp.h | 603 ++ tdeioslave/ftp/ftp.protocol | 18 + tdeioslave/gzip/CMakeLists.txt | 41 + tdeioslave/gzip/Makefile.am | 12 + tdeioslave/gzip/kgzipfilter.cpp | 336 ++ tdeioslave/gzip/kgzipfilter.desktop | 86 + tdeioslave/gzip/kgzipfilter.h | 52 + tdeioslave/http/CMakeLists.txt | 69 + tdeioslave/http/Makefile.am | 31 + tdeioslave/http/README.http_cache_cleaner | 20 + tdeioslave/http/README.webdav | 184 + tdeioslave/http/THOUGHTS | 28 + tdeioslave/http/TODO | 45 + tdeioslave/http/configure.in.bot | 10 + tdeioslave/http/configure.in.in | 110 + tdeioslave/http/http.cc | 6108 ++++++++++++++++++++ tdeioslave/http/http.h | 577 ++ tdeioslave/http/http.protocol | 12 + tdeioslave/http/http_cache_cleaner.cpp | 284 + tdeioslave/http/http_cache_cleaner.desktop | 168 + tdeioslave/http/https.protocol | 12 + tdeioslave/http/kcookiejar/CMakeLists.txt | 63 + tdeioslave/http/kcookiejar/Makefile.am | 31 + tdeioslave/http/kcookiejar/domain_info | 1 + tdeioslave/http/kcookiejar/kcookiejar.cpp | 1559 +++++ tdeioslave/http/kcookiejar/kcookiejar.desktop | 157 + tdeioslave/http/kcookiejar/kcookiejar.h | 365 ++ tdeioslave/http/kcookiejar/kcookiescfg.upd | 16 + tdeioslave/http/kcookiejar/kcookieserver.cpp | 606 ++ tdeioslave/http/kcookiejar/kcookieserver.h | 98 + tdeioslave/http/kcookiejar/kcookiewin.cpp | 382 ++ tdeioslave/http/kcookiejar/kcookiewin.h | 84 + tdeioslave/http/kcookiejar/main.cpp | 92 + .../http/kcookiejar/netscape_cookie_spec.html | 331 ++ tdeioslave/http/kcookiejar/rfc2109 | 1179 ++++ tdeioslave/http/kcookiejar/rfc2965 | 1459 +++++ tdeioslave/http/kcookiejar/tests/Makefile.am | 18 + tdeioslave/http/kcookiejar/tests/cookie.test | 162 + tdeioslave/http/kcookiejar/tests/cookie_rfc.test | 148 + .../http/kcookiejar/tests/cookie_saving.test | 430 ++ .../http/kcookiejar/tests/cookie_settings.test | 116 + .../http/kcookiejar/tests/kcookiejartest.cpp | 270 + tdeioslave/http/rfc2518.txt | 1 + tdeioslave/http/rfc2616.txt | 1 + tdeioslave/http/rfc2617.txt | 1 + tdeioslave/http/rfc2817.txt | 1 + tdeioslave/http/rfc2818.txt | 1 + tdeioslave/http/rfc3229.txt | 1 + tdeioslave/http/rfc3253.txt | 1 + tdeioslave/http/shoutcast-icecast.txt | 605 ++ tdeioslave/http/webdav.protocol | 18 + tdeioslave/http/webdavs.protocol | 18 + tdeioslave/iso/CMakeLists.txt | 51 + tdeioslave/iso/Makefile.am | 67 + tdeioslave/iso/iso.cpp | 525 ++ tdeioslave/iso/iso.h | 51 + tdeioslave/iso/iso.protocol | 11 + tdeioslave/iso/isoservice.desktop | 14 + tdeioslave/iso/kio_iso.desktop | 13 + tdeioslave/iso/kio_isorc | 2 + tdeioslave/iso/kiso.cpp | 460 ++ tdeioslave/iso/kiso.h | 112 + tdeioslave/iso/kisodirectory.cpp | 31 + tdeioslave/iso/kisodirectory.h | 40 + tdeioslave/iso/kisofile.cpp | 53 + tdeioslave/iso/kisofile.h | 49 + tdeioslave/iso/libisofs/CMakeLists.txt | 23 + tdeioslave/iso/libisofs/COPYING | 280 + tdeioslave/iso/libisofs/ChangeLog | 6 + tdeioslave/iso/libisofs/Makefile.am | 18 + tdeioslave/iso/libisofs/README | 24 + tdeioslave/iso/libisofs/bswap.h | 94 + tdeioslave/iso/libisofs/el_torito.h | 63 + tdeioslave/iso/libisofs/iso_fs.h | 219 + tdeioslave/iso/libisofs/isofs.c | 876 +++ tdeioslave/iso/libisofs/isofs.h | 161 + tdeioslave/iso/libisofs/rock.h | 127 + tdeioslave/iso/qfilehack.cpp | 40 + tdeioslave/iso/qfilehack.h | 38 + tdeioslave/metainfo/CMakeLists.txt | 43 + tdeioslave/metainfo/Makefile.am | 24 + tdeioslave/metainfo/metainfo.cpp | 103 + tdeioslave/metainfo/metainfo.h | 38 + tdeioslave/metainfo/metainfo.protocol | 9 + tdemdi/tdemdi/dockcontainer.cpp | 2 +- tdemdi/tdemdi/guiclient.cpp | 2 +- tdemdi/tdemdichildarea.cpp | 2 +- tdemdi/tdemdidockcontainer.cpp | 2 +- tdemdi/tdemdiguiclient.cpp | 2 +- tdeparts/CMakeLists.txt | 8 +- tdeparts/COMMENTS | 2 +- tdeparts/Makefile.am | 4 +- tdeparts/browserrun.cpp | 6 +- tdeparts/part.cpp | 4 +- tdeparts/part.h | 2 +- tdeparts/plugin.cpp | 2 +- tdeparts/tests/Makefile.am | 2 +- tdeparts/tests/ghostview.cpp | 2 +- tdeprint/CMakeLists.txt | 12 +- tdeprint/Makefile.am | 6 +- tdeprint/cups/CMakeLists.txt | 6 +- tdeprint/cups/Makefile.am | 2 +- tdeprint/cups/cupsaddsmb2.cpp | 2 +- tdeprint/cups/cupsdconf2/CMakeLists.txt | 8 +- tdeprint/cups/cupsdconf2/Makefile.am | 2 +- tdeprint/cups/cupsdconf2/cupsdconf.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsdlogpage.cpp | 2 +- tdeprint/cups/cupsdconf2/qdirlineedit.cpp | 2 +- tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 2 +- tdeprint/cups/cupsinfos.cpp | 6 +- tdeprint/cups/kmconfigcups.cpp | 2 +- tdeprint/cups/kmconfigcupsdir.cpp | 2 +- tdeprint/cups/kmcupsconfigwidget.cpp | 2 +- tdeprint/cups/kmcupsmanager.cpp | 2 +- tdeprint/ext/kextprinterimpl.cpp | 2 +- tdeprint/kfilelist.cpp | 326 -- tdeprint/kfilelist.h | 62 - tdeprint/kmfactory.cpp | 4 +- tdeprint/kmjobmanager.cpp | 2 +- tdeprint/kmmanager.cpp | 2 +- tdeprint/kmprinter.cpp | 2 +- tdeprint/kpfileselectpage.cpp | 2 +- tdeprint/kprintdialog.cpp | 6 +- tdeprint/kprinter.cpp | 2 +- tdeprint/kprinterimpl.cpp | 2 +- tdeprint/kprintpreview.cpp | 2 +- tdeprint/lpd/kmlpdmanager.cpp | 2 +- tdeprint/lpr/kmconfiglpr.cpp | 2 +- tdeprint/lpr/lprsettings.cpp | 2 +- tdeprint/management/CMakeLists.txt | 6 +- tdeprint/management/Makefile.am | 2 +- tdeprint/management/kmconfigdialog.cpp | 2 +- tdeprint/management/kmconfigfilter.cpp | 2 +- tdeprint/management/kmconfigfonts.cpp | 4 +- tdeprint/management/kmconfiggeneral.cpp | 2 +- tdeprint/management/kmconfigjobs.cpp | 2 +- tdeprint/management/kmconfigpreview.cpp | 2 +- tdeprint/management/kmdriverdbwidget.cpp | 4 +- tdeprint/management/kmjobviewer.cpp | 4 +- tdeprint/management/kmmainview.cpp | 2 +- tdeprint/management/kmspecialprinterdlg.cpp | 2 +- tdeprint/management/kmtimer.cpp | 2 +- tdeprint/management/kmwdrivertest.cpp | 2 +- tdeprint/management/kmwfile.cpp | 2 +- tdeprint/management/kxmlcommandselector.cpp | 2 +- tdeprint/printerfilter.cpp | 2 +- tdeprint/rlpr/kmproxywidget.cpp | 2 +- tdeprint/rlpr/krlprprinterimpl.cpp | 2 +- tdeprint/specials.desktop | 2 +- tdeprint/tdefilelist.cpp | 326 ++ tdeprint/tdefilelist.h | 62 + tdeprint/tdeprintcheck.h | 2 +- tdeprint/tdeprintd.cpp | 4 +- tderandr/libtderandr.h | 2 +- tderandr/randr.h | 2 +- tderesources/CMakeLists.txt | 8 +- tderesources/configwidget.h | 2 +- tderesources/factory.h | 4 +- tderesources/managerimpl.cpp | 2 +- tderesources/resource.cpp | 2 +- tderesources/resource.h | 4 +- tderesources/tderesources.desktop | 2 +- tdersync/CMakeLists.txt | 6 +- tdersync/rsyncconfigdialog.cpp | 2 +- tdersync/rsyncconfigdialog.h | 2 +- tdersync/tdersync.cpp | 4 +- tdersync/tdersync.h | 8 +- tdespell2/CMakeLists.txt | 4 +- tdespell2/broker.cpp | 2 +- tdespell2/plugins/ispell/ispell_checker.cpp | 2 +- tdespell2/plugins/ispell/ispell_checker.h | 2 +- tdespell2/settings.cpp | 2 +- tdespell2/ui/dialog.cpp | 2 +- tdespell2/ui/highlighter.cpp | 2 +- tdesu/Makefile.am | 2 +- tdesu/process.cpp | 2 +- tdesu/su.cpp | 2 +- tdeui/CMakeLists.txt | 10 +- tdeui/Makefile.am | 4 +- tdeui/kactionclasses.cpp | 2 +- tdeui/kbugreport.cpp | 10 +- tdeui/kbugreport.h | 2 +- tdeui/kcmenumngr.cpp | 2 +- tdeui/kcolorcombo.cpp | 2 +- tdeui/kcolordialog.cpp | 2 +- tdeui/kcombobox.h | 2 +- tdeui/kcompletionbox.cpp | 2 +- tdeui/kconfigdialog.cpp | 259 - tdeui/kconfigdialog.h | 279 - tdeui/kcursor.cpp | 2 +- tdeui/kdatetbl.cpp | 2 +- tdeui/kdepackages.h | 126 +- tdeui/kdialog.cpp | 2 +- tdeui/kdialogbase.cpp | 2 +- tdeui/kdockwidget.cpp | 2 +- tdeui/kedittoolbar.cpp | 6 +- tdeui/kfontcombo.cpp | 2 +- tdeui/kfontdialog.cpp | 2 +- tdeui/kiconview.cpp | 2 +- tdeui/kkeydialog.cpp | 2 +- tdeui/klineedit.cpp | 2 +- tdeui/klistview.cpp | 2 +- tdeui/kmainwindow.cpp | 2 +- tdeui/kmainwindow.h | 2 +- tdeui/kmenubar.cpp | 2 +- tdeui/kmessagebox.cpp | 2 +- tdeui/kpanelapplet.cpp | 2 +- tdeui/kpanelapplet.h | 2 +- tdeui/kpanelextension.cpp | 2 +- tdeui/kpanelmenu.cpp | 2 +- tdeui/kpassdlg.cpp | 2 +- tdeui/kpassivepopup.cpp | 2 +- tdeui/kpixmapio.cpp | 2 +- tdeui/kpushbutton.cpp | 2 +- tdeui/ksconfig.cpp | 4 +- tdeui/kscrollview.cpp | 2 +- tdeui/kshortcutdialog.cpp | 2 +- tdeui/ksplashscreen.cpp | 2 +- tdeui/kstatusbar.cpp | 2 +- tdeui/kswitchlanguagedialog.cpp | 2 +- tdeui/ksyntaxhighlighter.cpp | 2 +- tdeui/ksystemtray.cpp | 2 +- tdeui/ktabwidget.cpp | 2 +- tdeui/ktimezonewidget.cpp | 2 +- tdeui/ktip.cpp | 2 +- tdeui/ktoolbar.cpp | 2 +- tdeui/tdecmodule.cpp | 4 +- tdeui/tdecmodule.h | 4 +- tdeui/tdeconfigdialog.cpp | 259 + tdeui/tdeconfigdialog.h | 279 + tdeui/tests/itemcontainertest.cpp | 2 +- tdeui/tests/kcolordlgtest.cpp | 2 +- tdeui/tests/kdockwidgetdemo.cpp | 2 +- tdeui/tests/kfontdialogtest.cpp | 2 +- tdeutils/CMakeLists.txt | 2 +- tdeutils/Makefile.am | 2 +- tdeutils/kplugininfo.cpp | 2 +- tdeutils/ksettings/CMakeLists.txt | 2 +- tdeutils/ksettings/componentsdialog.cpp | 2 +- tdeutils/ksettings/dispatcher.cpp | 2 +- tdeutils/tdecmoduleloader.cpp | 4 +- tdeutils/tdecmoduleproxy.cpp | 10 +- tdeutils/tdecmoduleproxyIface.h | 4 +- tdeutils/tdecmoduleproxyIfaceImpl.cpp | 2 +- tdewallet/client/tdewallet.cc | 2 +- win/pro_files/kate/part/part.pro | 2 +- win/pro_files/kded/kded.pro | 10 +- win/pro_files/kded/kded_rel.pro | 2 +- win/pro_files/kdewidgets/kdewidgets.pro | 2 +- .../kio/kfile/tests/kfiletreeviewtest.pro | 29 - win/pro_files/kio/kio.pro | 246 +- .../kio/tdefile/tests/tdefiletreeviewtest.pro | 29 + win/pro_files/kioslave/bzip2/bzip2.pro | 10 - win/pro_files/kioslave/common.pro | 8 - win/pro_files/kioslave/gzip/gzip.pro | 9 - win/pro_files/kioslave/kioslave.pro | 11 - .../tdecore/kconfig_compiler/kconfig_compiler.pro | 18 - .../tdeconfig_compiler/tdeconfig_compiler.pro | 18 + win/pro_files/tdecore/tdecore.pro | 12 +- win/pro_files/tdeioslave/bzip2/bzip2.pro | 10 + win/pro_files/tdeioslave/common.pro | 8 + win/pro_files/tdeioslave/gzip/gzip.pro | 9 + win/pro_files/tdeioslave/tdeioslave.pro | 11 + win/pro_files/tdeparts/tdeparts.pro | 4 +- win/pro_files/tdeui/tdeui.pro | 2 +- win/pro_files/tdeutils/tdeutils.pro | 2 +- win/resources/kbuildsycoca.res | Bin 2332 -> 0 bytes win/resources/tdebuildsycoca.res | Bin 0 -> 2332 bytes win/tools/build_tdelibs_dbg | 4 +- win/tools/build_tdelibs_rel | 4 +- win/tools/kde_env | 2 +- win/win32_utils.h | 2 +- 2039 files changed, 207695 insertions(+), 207695 deletions(-) delete mode 100644 doc/api/kfiledialog.png create mode 100644 doc/api/tdefiledialog.png delete mode 100644 doc/tdelibs/man-kbuildsycoca.8.docbook create mode 100644 doc/tdelibs/man-tdebuildsycoca.8.docbook delete mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt delete mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am delete mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp delete mode 100644 interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h create mode 100644 interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt create mode 100644 interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am create mode 100644 interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp create mode 100644 interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h delete mode 100644 kabc/kab2kabc.cpp delete mode 100644 kabc/kab2kabc.desktop create mode 100644 kabc/tdeab2tdeabc.cpp create mode 100644 kabc/tdeab2tdeabc.desktop delete mode 100644 kcmshell/CMakeLists.txt delete mode 100644 kcmshell/Makefile.am delete mode 100644 kcmshell/main.cpp delete mode 100644 kcmshell/main.h delete mode 100644 kconf_update/CMakeLists.txt delete mode 100644 kconf_update/Mainpage.dox delete mode 100644 kconf_update/Makefile.am delete mode 100644 kconf_update/README.kconf_update delete mode 100644 kconf_update/kconf_update.cpp delete mode 100644 kded/kbuildsycoca.cpp delete mode 100644 kded/kbuildsycoca.h delete mode 100644 kded/kde-menu.cpp delete mode 100644 kded/kmimelist.cpp create mode 100644 kded/tde-menu.cpp create mode 100644 kded/tdebuildsycoca.cpp create mode 100644 kded/tdebuildsycoca.h create mode 100644 kded/tdemimelist.cpp delete mode 100644 kfile-plugins/CMakeLists.txt delete mode 100644 kfile-plugins/elf/CMakeLists.txt delete mode 100644 kfile-plugins/elf/kfile_elf.cpp delete mode 100644 kfile-plugins/elf/kfile_elf.desktop delete mode 100644 kfile-plugins/elf/kfile_elf.h delete mode 100644 kinit/kdostartupconfig.cpp delete mode 100644 kinit/kioslave.cpp delete mode 100644 kinit/klauncher.cpp delete mode 100644 kinit/klauncher.h delete mode 100644 kinit/klauncher_cmds.h delete mode 100644 kinit/klauncher_main.cpp delete mode 100644 kinit/kstartupconfig.cpp create mode 100644 kinit/tdedostartupconfig.cpp create mode 100644 kinit/tdeioslave.cpp create mode 100644 kinit/tdelauncher.cpp create mode 100644 kinit/tdelauncher.h create mode 100644 kinit/tdelauncher_cmds.h create mode 100644 kinit/tdelauncher_main.cpp create mode 100644 kinit/tdestartupconfig.cpp delete mode 100644 kinit/tests/klaunchertest.cpp create mode 100644 kinit/tests/tdelaunchertest.cpp delete mode 100644 kio/CMakeLists.txt delete mode 100644 kio/DESIGN delete mode 100644 kio/DESIGN.krun delete mode 100644 kio/DESIGN.metadata delete mode 100644 kio/DESIGN.mimetypes delete mode 100644 kio/DESKTOP_ENTRY_STANDARD delete mode 100644 kio/Mainpage.dox delete mode 100644 kio/Makefile.am delete mode 100644 kio/application.desktop delete mode 100644 kio/bookmarks/CMakeLists.txt delete mode 100644 kio/bookmarks/Makefile.am delete mode 100644 kio/bookmarks/dptrtemplate.h delete mode 100644 kio/bookmarks/kbookmark.cc delete mode 100644 kio/bookmarks/kbookmark.h delete mode 100644 kio/bookmarks/kbookmarkbar.cc delete mode 100644 kio/bookmarks/kbookmarkbar.h delete mode 100644 kio/bookmarks/kbookmarkdombuilder.cc delete mode 100644 kio/bookmarks/kbookmarkdombuilder.h delete mode 100644 kio/bookmarks/kbookmarkdrag.cc delete mode 100644 kio/bookmarks/kbookmarkdrag.h delete mode 100644 kio/bookmarks/kbookmarkexporter.cc delete mode 100644 kio/bookmarks/kbookmarkexporter.h delete mode 100644 kio/bookmarks/kbookmarkimporter.cc delete mode 100644 kio/bookmarks/kbookmarkimporter.h delete mode 100644 kio/bookmarks/kbookmarkimporter_crash.cc delete mode 100644 kio/bookmarks/kbookmarkimporter_crash.h delete mode 100644 kio/bookmarks/kbookmarkimporter_ie.cc delete mode 100644 kio/bookmarks/kbookmarkimporter_ie.h delete mode 100644 kio/bookmarks/kbookmarkimporter_kde1.cc delete mode 100644 kio/bookmarks/kbookmarkimporter_kde1.h delete mode 100644 kio/bookmarks/kbookmarkimporter_ns.cc delete mode 100644 kio/bookmarks/kbookmarkimporter_ns.h delete mode 100644 kio/bookmarks/kbookmarkimporter_opera.cc delete mode 100644 kio/bookmarks/kbookmarkimporter_opera.h delete mode 100644 kio/bookmarks/kbookmarkmanager.cc delete mode 100644 kio/bookmarks/kbookmarkmanager.h delete mode 100644 kio/bookmarks/kbookmarkmenu.cc delete mode 100644 kio/bookmarks/kbookmarkmenu.h delete mode 100644 kio/bookmarks/kbookmarkmenu_p.h delete mode 100644 kio/bookmarks/kbookmarknotifier.h delete mode 100644 kio/data.protocol delete mode 100644 kio/httpfilter/CMakeLists.txt delete mode 100644 kio/httpfilter/Makefile.am delete mode 100644 kio/httpfilter/httpfilter.cc delete mode 100644 kio/httpfilter/httpfilter.h delete mode 100644 kio/kcomprfilter.desktop delete mode 100644 kio/kdatatool.desktop delete mode 100644 kio/kfile/CMakeLists.txt delete mode 100644 kio/kfile/ChangeLog delete mode 100644 kio/kfile/Makefile.am delete mode 100644 kio/kfile/NOTES delete mode 100644 kio/kfile/TODO delete mode 100644 kio/kfile/config-kfile.h delete mode 100644 kio/kfile/images.h delete mode 100644 kio/kfile/kacleditwidget.cpp delete mode 100644 kio/kfile/kacleditwidget.h delete mode 100644 kio/kfile/kacleditwidget_p.h delete mode 100644 kio/kfile/kcombiview.cpp delete mode 100644 kio/kfile/kcombiview.h delete mode 100644 kio/kfile/kcustommenueditor.cpp delete mode 100644 kio/kfile/kcustommenueditor.h delete mode 100644 kio/kfile/kdiroperator.cpp delete mode 100644 kio/kfile/kdiroperator.h delete mode 100644 kio/kfile/kdirselectdialog.cpp delete mode 100644 kio/kfile/kdirselectdialog.h delete mode 100644 kio/kfile/kdirsize.cpp delete mode 100644 kio/kfile/kdirsize.h delete mode 100644 kio/kfile/kdiskfreesp.cpp delete mode 100644 kio/kfile/kdiskfreesp.h delete mode 100644 kio/kfile/kencodingfiledialog.cpp delete mode 100644 kio/kfile/kencodingfiledialog.h delete mode 100644 kio/kfile/kfile.h delete mode 100644 kio/kfile/kfilebookmarkhandler.cpp delete mode 100644 kio/kfile/kfilebookmarkhandler.h delete mode 100644 kio/kfile/kfiledetailview.cpp delete mode 100644 kio/kfile/kfiledetailview.h delete mode 100644 kio/kfile/kfiledialog.cpp delete mode 100644 kio/kfile/kfiledialog.h delete mode 100644 kio/kfile/kfilefiltercombo.cpp delete mode 100644 kio/kfile/kfilefiltercombo.h delete mode 100644 kio/kfile/kfileiconview.cpp delete mode 100644 kio/kfile/kfileiconview.h delete mode 100644 kio/kfile/kfilemetainfowidget.cpp delete mode 100644 kio/kfile/kfilemetainfowidget.h delete mode 100644 kio/kfile/kfilemetapreview.cpp delete mode 100644 kio/kfile/kfilemetapreview.h delete mode 100644 kio/kfile/kfilepreview.cpp delete mode 100644 kio/kfile/kfilepreview.h delete mode 100644 kio/kfile/kfilesharedlg.cpp delete mode 100644 kio/kfile/kfilesharedlg.h delete mode 100644 kio/kfile/kfilespeedbar.cpp delete mode 100644 kio/kfile/kfilespeedbar.h delete mode 100644 kio/kfile/kfiletreebranch.cpp delete mode 100644 kio/kfile/kfiletreebranch.h delete mode 100644 kio/kfile/kfiletreeview.cpp delete mode 100644 kio/kfile/kfiletreeview.h delete mode 100644 kio/kfile/kfiletreeviewitem.cpp delete mode 100644 kio/kfile/kfiletreeviewitem.h delete mode 100644 kio/kfile/kfileview.cpp delete mode 100644 kio/kfile/kfileview.h delete mode 100644 kio/kfile/kicondialog.cpp delete mode 100644 kio/kfile/kicondialog.h delete mode 100644 kio/kfile/kimagefilepreview.cpp delete mode 100644 kio/kfile/kimagefilepreview.h delete mode 100644 kio/kfile/kmetaprops.cpp delete mode 100644 kio/kfile/kmetaprops.h delete mode 100644 kio/kfile/knotifydialog.cpp delete mode 100644 kio/kfile/knotifydialog.h delete mode 100644 kio/kfile/knotifywidgetbase.ui delete mode 100644 kio/kfile/kopenwith.cpp delete mode 100644 kio/kfile/kopenwith.h delete mode 100644 kio/kfile/kopenwith_p.h delete mode 100644 kio/kfile/kpreviewprops.cpp delete mode 100644 kio/kfile/kpreviewprops.h delete mode 100644 kio/kfile/kpreviewwidgetbase.cpp delete mode 100644 kio/kfile/kpreviewwidgetbase.h delete mode 100644 kio/kfile/kpropertiesdesktopadvbase.ui delete mode 100644 kio/kfile/kpropertiesdesktopbase.ui delete mode 100644 kio/kfile/kpropertiesdialog.cpp delete mode 100644 kio/kfile/kpropertiesdialog.h delete mode 100644 kio/kfile/kpropertiesmimetypebase.ui delete mode 100644 kio/kfile/kpropsdlg.h delete mode 100644 kio/kfile/kpropsdlgplugin.desktop delete mode 100644 kio/kfile/krecentdirs.cpp delete mode 100644 kio/kfile/krecentdirs.h delete mode 100644 kio/kfile/krecentdocument.cpp delete mode 100644 kio/kfile/krecentdocument.h delete mode 100644 kio/kfile/kurlbar.cpp delete mode 100644 kio/kfile/kurlbar.h delete mode 100644 kio/kfile/kurlcombobox.cpp delete mode 100644 kio/kfile/kurlcombobox.h delete mode 100644 kio/kfile/kurlrequester.cpp delete mode 100644 kio/kfile/kurlrequester.h delete mode 100644 kio/kfile/kurlrequesterdlg.cpp delete mode 100644 kio/kfile/kurlrequesterdlg.h delete mode 100644 kio/kfile/tests/Makefile.am delete mode 100644 kio/kfile/tests/kcustommenueditortest.cpp delete mode 100644 kio/kfile/tests/kdirselectdialogtest.cpp delete mode 100644 kio/kfile/tests/kfdtest.cpp delete mode 100644 kio/kfile/tests/kfdtest.h delete mode 100644 kio/kfile/tests/kfiletreeviewtest.cpp delete mode 100644 kio/kfile/tests/kfiletreeviewtest.h delete mode 100644 kio/kfile/tests/kfstest.cpp delete mode 100644 kio/kfile/tests/kicondialogtest.cpp delete mode 100644 kio/kfile/tests/knotifytest.cpp delete mode 100644 kio/kfile/tests/kopenwithtest.cpp delete mode 100644 kio/kfile/tests/kurlrequestertest.cpp delete mode 100644 kio/kfileplugin.desktop delete mode 100644 kio/kio/CMakeLists.txt delete mode 100644 kio/kio/KFILEMETAINFO_ISSUES delete mode 100644 kio/kio/Makefile.am delete mode 100644 kio/kio/authinfo.cpp delete mode 100644 kio/kio/authinfo.h delete mode 100644 kio/kio/chmodjob.cpp delete mode 100644 kio/kio/chmodjob.h delete mode 100644 kio/kio/configure.in.in delete mode 100644 kio/kio/connection.cpp delete mode 100644 kio/kio/connection.h delete mode 100644 kio/kio/dataprotocol.cpp delete mode 100644 kio/kio/dataprotocol.h delete mode 100644 kio/kio/dataslave.cpp delete mode 100644 kio/kio/dataslave.h delete mode 100644 kio/kio/davjob.cpp delete mode 100644 kio/kio/davjob.h delete mode 100644 kio/kio/defaultprogress.cpp delete mode 100644 kio/kio/defaultprogress.h delete mode 100644 kio/kio/forwardingslavebase.cpp delete mode 100644 kio/kio/forwardingslavebase.h delete mode 100644 kio/kio/global.cpp delete mode 100644 kio/kio/global.h delete mode 100644 kio/kio/http_slave_defaults.h delete mode 100644 kio/kio/ioslave_defaults.h delete mode 100644 kio/kio/job.cpp delete mode 100644 kio/kio/job.h delete mode 100644 kio/kio/jobclasses.h delete mode 100644 kio/kio/kacl.cpp delete mode 100644 kio/kio/kacl.h delete mode 100644 kio/kio/kar.cpp delete mode 100644 kio/kio/kar.h delete mode 100644 kio/kio/karchive.cpp delete mode 100644 kio/kio/karchive.h delete mode 100644 kio/kio/kautomount.cpp delete mode 100644 kio/kio/kautomount.h delete mode 100644 kio/kio/kdatatool.cpp delete mode 100644 kio/kio/kdatatool.h delete mode 100644 kio/kio/kdcopservicestarter.cpp delete mode 100644 kio/kio/kdcopservicestarter.h delete mode 100644 kio/kio/kdirlister.cpp delete mode 100644 kio/kio/kdirlister.h delete mode 100644 kio/kio/kdirlister_p.h delete mode 100644 kio/kio/kdirnotify.cpp delete mode 100644 kio/kio/kdirnotify.h delete mode 100644 kio/kio/kdirnotify_stub.cpp delete mode 100644 kio/kio/kdirnotify_stub.h delete mode 100644 kio/kio/kdirwatch.cpp delete mode 100644 kio/kio/kdirwatch.h delete mode 100644 kio/kio/kdirwatch_p.h delete mode 100644 kio/kio/kemailsettings.cpp delete mode 100644 kio/kio/kemailsettings.h delete mode 100644 kio/kio/kfilefilter.cpp delete mode 100644 kio/kio/kfilefilter.h delete mode 100644 kio/kio/kfileitem.cpp delete mode 100644 kio/kio/kfileitem.h delete mode 100644 kio/kio/kfilemetainfo.cpp delete mode 100644 kio/kio/kfilemetainfo.h delete mode 100644 kio/kio/kfileshare.cpp delete mode 100644 kio/kio/kfileshare.h delete mode 100644 kio/kio/kfilterbase.cpp delete mode 100644 kio/kio/kfilterbase.h delete mode 100644 kio/kio/kfilterdev.cpp delete mode 100644 kio/kio/kfilterdev.h delete mode 100644 kio/kio/kimageio.cpp delete mode 100644 kio/kio/kimageio.h delete mode 100644 kio/kio/kimageiofactory.h delete mode 100644 kio/kio/klimitediodevice.h delete mode 100644 kio/kio/kmdbase.h delete mode 100644 kio/kio/kmessageboxwrapper.h delete mode 100644 kio/kio/kmimemagic.cpp delete mode 100644 kio/kio/kmimemagic.h delete mode 100644 kio/kio/kmimetype.cpp delete mode 100644 kio/kio/kmimetype.h delete mode 100644 kio/kio/kmimetypechooser.cpp delete mode 100644 kio/kio/kmimetypechooser.h delete mode 100644 kio/kio/kmimetyperesolver.h delete mode 100644 kio/kio/knfsshare.cpp delete mode 100644 kio/kio/knfsshare.h delete mode 100644 kio/kio/kprotocolinfo.cpp delete mode 100644 kio/kio/kprotocolinfo.h delete mode 100644 kio/kio/kprotocolmanager.cpp delete mode 100644 kio/kio/kprotocolmanager.h delete mode 100644 kio/kio/kremoteencoding.cpp delete mode 100644 kio/kio/kremoteencoding.h delete mode 100644 kio/kio/krun.cpp delete mode 100644 kio/kio/krun.h delete mode 100644 kio/kio/ksambashare.cpp delete mode 100644 kio/kio/ksambashare.h delete mode 100644 kio/kio/kscan.cpp delete mode 100644 kio/kio/kscan.h delete mode 100644 kio/kio/kservice.cpp delete mode 100644 kio/kio/kservice.h delete mode 100644 kio/kio/kservice_p.h delete mode 100644 kio/kio/kservicefactory.cpp delete mode 100644 kio/kio/kservicefactory.h delete mode 100644 kio/kio/kservicegroup.cpp delete mode 100644 kio/kio/kservicegroup.h delete mode 100644 kio/kio/kservicegroupfactory.cpp delete mode 100644 kio/kio/kservicegroupfactory.h delete mode 100644 kio/kio/kservicetype.cpp delete mode 100644 kio/kio/kservicetype.h delete mode 100644 kio/kio/kservicetypefactory.cpp delete mode 100644 kio/kio/kservicetypefactory.h delete mode 100644 kio/kio/kshellcompletion.cpp delete mode 100644 kio/kio/kshellcompletion.h delete mode 100644 kio/kio/kshred.cpp delete mode 100644 kio/kio/kshred.h delete mode 100644 kio/kio/ktar.cpp delete mode 100644 kio/kio/ktar.h delete mode 100644 kio/kio/ktrader.cpp delete mode 100644 kio/kio/ktrader.h delete mode 100644 kio/kio/ktraderparse.cpp delete mode 100644 kio/kio/ktraderparse.h delete mode 100644 kio/kio/ktraderparsetree.cpp delete mode 100644 kio/kio/ktraderparsetree.h delete mode 100644 kio/kio/kurifilter.cpp delete mode 100644 kio/kio/kurifilter.h delete mode 100644 kio/kio/kurlcompletion.cpp delete mode 100644 kio/kio/kurlcompletion.h delete mode 100644 kio/kio/kurlpixmapprovider.cpp delete mode 100644 kio/kio/kurlpixmapprovider.h delete mode 100644 kio/kio/kuserprofile.cpp delete mode 100644 kio/kio/kuserprofile.h delete mode 100644 kio/kio/kzip.cpp delete mode 100644 kio/kio/kzip.h delete mode 100644 kio/kio/lex.c delete mode 100644 kio/kio/lex.l delete mode 100644 kio/kio/metainfojob.cpp delete mode 100644 kio/kio/metainfojob.h delete mode 100644 kio/kio/netaccess.cpp delete mode 100644 kio/kio/netaccess.h delete mode 100644 kio/kio/observer.cpp delete mode 100644 kio/kio/observer.h delete mode 100644 kio/kio/passdlg.cpp delete mode 100644 kio/kio/passdlg.h delete mode 100644 kio/kio/paste.cpp delete mode 100644 kio/kio/paste.h delete mode 100644 kio/kio/pastedialog.cpp delete mode 100644 kio/kio/pastedialog.h delete mode 100644 kio/kio/posixacladdons.cpp delete mode 100644 kio/kio/posixacladdons.h delete mode 100644 kio/kio/previewjob.cpp delete mode 100644 kio/kio/previewjob.h delete mode 100644 kio/kio/progressbase.cpp delete mode 100644 kio/kio/progressbase.h delete mode 100644 kio/kio/renamedlg.cpp delete mode 100644 kio/kio/renamedlg.h delete mode 100644 kio/kio/renamedlgplugin.h delete mode 100644 kio/kio/scheduler.cpp delete mode 100644 kio/kio/scheduler.h delete mode 100644 kio/kio/sessiondata.cpp delete mode 100644 kio/kio/sessiondata.h delete mode 100644 kio/kio/skipdlg.cpp delete mode 100644 kio/kio/skipdlg.h delete mode 100644 kio/kio/slave.cpp delete mode 100644 kio/kio/slave.h delete mode 100644 kio/kio/slavebase.cpp delete mode 100644 kio/kio/slavebase.h delete mode 100644 kio/kio/slaveconfig.cpp delete mode 100644 kio/kio/slaveconfig.h delete mode 100644 kio/kio/slaveinterface.cpp delete mode 100644 kio/kio/slaveinterface.h delete mode 100644 kio/kio/statusbarprogress.cpp delete mode 100644 kio/kio/statusbarprogress.h delete mode 100644 kio/kio/tcpslavebase.cpp delete mode 100644 kio/kio/tcpslavebase.h delete mode 100644 kio/kio/tdelficon.cpp delete mode 100644 kio/kio/tdelficon.h delete mode 100644 kio/kio/thumbcreator.h delete mode 100644 kio/kio/yacc.c delete mode 100644 kio/kio/yacc.h delete mode 100644 kio/kio/yacc.y delete mode 100644 kio/kioexec/CMakeLists.txt delete mode 100644 kio/kioexec/Makefile.am delete mode 100644 kio/kioexec/README delete mode 100644 kio/kioexec/main.cpp delete mode 100644 kio/kioexec/main.h delete mode 100644 kio/kioslave.upd delete mode 100644 kio/kpasswdserver.desktop delete mode 100644 kio/kpasswdserver/CMakeLists.txt delete mode 100644 kio/kpasswdserver/DESIGN delete mode 100644 kio/kpasswdserver/Makefile.am delete mode 100644 kio/kpasswdserver/kpasswdserver.cpp delete mode 100644 kio/kpasswdserver/kpasswdserver.h delete mode 100644 kio/kscan.desktop delete mode 100644 kio/kssl/CMakeLists.txt delete mode 100644 kio/kssl/KPMG-CA-16389.0.DC80502.pdf delete mode 100644 kio/kssl/Makefile.am delete mode 100644 kio/kssl/README delete mode 100644 kio/kssl/SECURITY-HOLES delete mode 100644 kio/kssl/TODO delete mode 100644 kio/kssl/configure.in.in delete mode 100644 kio/kssl/keygenwizard.ui delete mode 100644 kio/kssl/keygenwizard2.ui delete mode 100644 kio/kssl/kopenssl.cc delete mode 100644 kio/kssl/kopenssl.h delete mode 100644 kio/kssl/ksmimecrypto.cc delete mode 100644 kio/kssl/ksmimecrypto.h delete mode 100644 kio/kssl/kssl.cc delete mode 100644 kio/kssl/kssl.h delete mode 100644 kio/kssl/kssl/CMakeLists.txt delete mode 100644 kio/kssl/kssl/DigiCertAssuredIDRootCA.pem delete mode 100644 kio/kssl/kssl/DigiCertGlobalRootCA.pem delete mode 100644 kio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem delete mode 100644 kio/kssl/kssl/GeoTrust_Universal_CA.pem delete mode 100644 kio/kssl/kssl/GeoTrust_Universal_CA2.pem delete mode 100644 kio/kssl/kssl/HOWTO delete mode 100644 kio/kssl/kssl/Makefile.am delete mode 100644 kio/kssl/kssl/StartCom.pem delete mode 100644 kio/kssl/kssl/SwissSign-Gold-G2.pem delete mode 100644 kio/kssl/kssl/SwissSign-Platinum-G2.pem delete mode 100644 kio/kssl/kssl/SwissSign-Silver-G2.pem delete mode 100644 kio/kssl/kssl/WiseKey.pem delete mode 100644 kio/kssl/kssl/ac_offline_raiz_certicamara.pem delete mode 100644 kio/kssl/kssl/argedaten-root-ca-cert.pem delete mode 100644 kio/kssl/kssl/belgacom.pem delete mode 100644 kio/kssl/kssl/caroot/CMakeLists.txt delete mode 100644 kio/kssl/kssl/caroot/Makefile.am delete mode 100644 kio/kssl/kssl/caroot/ca-bundle.crt delete mode 100755 kio/kssl/kssl/cert_bundle delete mode 100644 kio/kssl/kssl/cert_extract.c delete mode 100644 kio/kssl/kssl/certbundle_Makefile delete mode 100755 kio/kssl/kssl/certkde delete mode 100644 kio/kssl/kssl/certum.pem delete mode 100644 kio/kssl/kssl/certum1.pem delete mode 100644 kio/kssl/kssl/certum2.pem delete mode 100644 kio/kssl/kssl/certum3.pem delete mode 100644 kio/kssl/kssl/certum4.pem delete mode 100644 kio/kssl/kssl/comodo1.pem delete mode 100644 kio/kssl/kssl/comodo2.pem delete mode 100644 kio/kssl/kssl/comodo3.pem delete mode 100644 kio/kssl/kssl/comodo4.pem delete mode 100644 kio/kssl/kssl/comodo5.pem delete mode 100644 kio/kssl/kssl/comodo6.pem delete mode 100644 kio/kssl/kssl/comodo7.pem delete mode 100644 kio/kssl/kssl/dfn-root-ca-cert.pem delete mode 100644 kio/kssl/kssl/gd-class2-root.pem delete mode 100644 kio/kssl/kssl/geotrust-global-1.pem delete mode 100644 kio/kssl/kssl/geotrust-global-2.pem delete mode 100644 kio/kssl/kssl/globalsign-root-r1.pem delete mode 100644 kio/kssl/kssl/globalsign-root-r2.pem delete mode 100644 kio/kssl/kssl/icpbrasil.pem delete mode 100644 kio/kssl/kssl/ipsservidores.pem delete mode 100644 kio/kssl/kssl/ksslcalist delete mode 100644 kio/kssl/kssl/localcerts delete mode 100755 kio/kssl/kssl/mergelocal delete mode 100644 kio/kssl/kssl/netlock1.pem delete mode 100644 kio/kssl/kssl/netlock2.pem delete mode 100644 kio/kssl/kssl/netlock3.pem delete mode 100644 kio/kssl/kssl/netlock4.pem delete mode 100644 kio/kssl/kssl/oces.pem delete mode 100644 kio/kssl/kssl/quovadis.pem delete mode 100644 kio/kssl/kssl/qvrca2.pem delete mode 100644 kio/kssl/kssl/qvrca3.pem delete mode 100644 kio/kssl/kssl/sf-class2-root.pem delete mode 100644 kio/kssl/kssl/sonera1.pem delete mode 100644 kio/kssl/kssl/sonera2.pem delete mode 100644 kio/kssl/kssl/staatdernederlandenrotca.pem delete mode 100644 kio/kssl/kssl/startcom.pem delete mode 100644 kio/kssl/kssl/startssl.pem delete mode 100644 kio/kssl/kssl/tcclass2-2011.pem delete mode 100644 kio/kssl/kssl/tcclass3-2011.pem delete mode 100644 kio/kssl/kssl/utn-network.pem delete mode 100644 kio/kssl/kssl/utn-sgc.pem delete mode 100644 kio/kssl/kssl/xgca.pem delete mode 100644 kio/kssl/ksslall.h delete mode 100644 kio/kssl/ksslcallback.c delete mode 100644 kio/kssl/ksslcertchain.cc delete mode 100644 kio/kssl/ksslcertchain.h delete mode 100644 kio/kssl/ksslcertdlg.cc delete mode 100644 kio/kssl/ksslcertdlg.h delete mode 100644 kio/kssl/ksslcertificate.cc delete mode 100644 kio/kssl/ksslcertificate.h delete mode 100644 kio/kssl/ksslcertificatecache.cc delete mode 100644 kio/kssl/ksslcertificatecache.h delete mode 100644 kio/kssl/ksslcertificatefactory.cc delete mode 100644 kio/kssl/ksslcertificatefactory.h delete mode 100644 kio/kssl/ksslcertificatehome.cc delete mode 100644 kio/kssl/ksslcertificatehome.h delete mode 100644 kio/kssl/ksslconfig.h.cmake delete mode 100644 kio/kssl/ksslconfig.h.in delete mode 100644 kio/kssl/ksslconfig_win.h delete mode 100644 kio/kssl/ksslconnectioninfo.cc delete mode 100644 kio/kssl/ksslconnectioninfo.h delete mode 100644 kio/kssl/ksslcsessioncache.cc delete mode 100644 kio/kssl/ksslcsessioncache.h delete mode 100644 kio/kssl/kssldefs.h delete mode 100644 kio/kssl/ksslinfodlg.cc delete mode 100644 kio/kssl/ksslinfodlg.h delete mode 100644 kio/kssl/ksslkeygen.cc delete mode 100644 kio/kssl/ksslkeygen.h delete mode 100644 kio/kssl/ksslpeerinfo.cc delete mode 100644 kio/kssl/ksslpeerinfo.h delete mode 100644 kio/kssl/ksslpemcallback.cc delete mode 100644 kio/kssl/ksslpemcallback.h delete mode 100644 kio/kssl/ksslpkcs12.cc delete mode 100644 kio/kssl/ksslpkcs12.h delete mode 100644 kio/kssl/ksslpkcs7.cc delete mode 100644 kio/kssl/ksslpkcs7.h delete mode 100644 kio/kssl/ksslsession.cc delete mode 100644 kio/kssl/ksslsession.h delete mode 100644 kio/kssl/ksslsettings.cc delete mode 100644 kio/kssl/ksslsettings.h delete mode 100644 kio/kssl/ksslsigners.cc delete mode 100644 kio/kssl/ksslsigners.h delete mode 100644 kio/kssl/ksslutils.cc delete mode 100644 kio/kssl/ksslutils.h delete mode 100644 kio/kssl/ksslx509map.cc delete mode 100644 kio/kssl/ksslx509map.h delete mode 100644 kio/kssl/ksslx509v3.cc delete mode 100644 kio/kssl/ksslx509v3.h delete mode 100644 kio/kurifilterplugin.desktop delete mode 100644 kio/magic delete mode 100644 kio/misc/CMakeLists.txt delete mode 100644 kio/misc/Makefile.am delete mode 100755 kio/misc/fileshareset delete mode 100644 kio/misc/kfile/CMakeLists.txt delete mode 100644 kio/misc/kfile/Makefile.am delete mode 100644 kio/misc/kfile/README delete mode 100644 kio/misc/kfile/fileprops.cpp delete mode 100644 kio/misc/kfile/fileprops.h delete mode 100644 kio/misc/kio_uiserver.desktop delete mode 100644 kio/misc/kmailservice.cpp delete mode 100644 kio/misc/kmailservice.protocol delete mode 100644 kio/misc/kpac/CMakeLists.txt delete mode 100644 kio/misc/kpac/Makefile.am delete mode 100644 kio/misc/kpac/README delete mode 100644 kio/misc/kpac/README.wpad delete mode 100644 kio/misc/kpac/TODO delete mode 100644 kio/misc/kpac/configure.in.in delete mode 100644 kio/misc/kpac/dhcp.h delete mode 100644 kio/misc/kpac/discovery.cpp delete mode 100644 kio/misc/kpac/discovery.h delete mode 100644 kio/misc/kpac/downloader.cpp delete mode 100644 kio/misc/kpac/downloader.h delete mode 100644 kio/misc/kpac/eventsrc delete mode 100644 kio/misc/kpac/kpac_dhcp_helper.c delete mode 100644 kio/misc/kpac/kpactest.pac delete mode 100644 kio/misc/kpac/proxyscout.cpp delete mode 100644 kio/misc/kpac/proxyscout.desktop delete mode 100644 kio/misc/kpac/proxyscout.h delete mode 100644 kio/misc/kpac/script.cpp delete mode 100644 kio/misc/kpac/script.h delete mode 100644 kio/misc/ksendbugmail/CMakeLists.txt delete mode 100644 kio/misc/ksendbugmail/Makefile.am delete mode 100644 kio/misc/ksendbugmail/main.cpp delete mode 100644 kio/misc/ksendbugmail/main.h delete mode 100644 kio/misc/ksendbugmail/smtp.cpp delete mode 100644 kio/misc/ksendbugmail/smtp.h delete mode 100644 kio/misc/kssld/CMakeLists.txt delete mode 100644 kio/misc/kssld/Makefile.am delete mode 100644 kio/misc/kssld/kssld.cpp delete mode 100644 kio/misc/kssld/kssld.desktop delete mode 100644 kio/misc/kssld/kssld.h delete mode 100644 kio/misc/ktelnetservice.cpp delete mode 100644 kio/misc/mms.protocol delete mode 100644 kio/misc/mmst.protocol delete mode 100644 kio/misc/mmsu.protocol delete mode 100644 kio/misc/pnm.protocol delete mode 100644 kio/misc/rlogin.protocol delete mode 100644 kio/misc/rtsp.protocol delete mode 100644 kio/misc/rtspt.protocol delete mode 100644 kio/misc/rtspu.protocol delete mode 100644 kio/misc/ssh.protocol delete mode 100644 kio/misc/tdentlm/CMakeLists.txt delete mode 100644 kio/misc/tdentlm/Makefile.am delete mode 100644 kio/misc/tdentlm/des.cpp delete mode 100644 kio/misc/tdentlm/des.h delete mode 100644 kio/misc/tdentlm/kswap.h delete mode 100644 kio/misc/tdentlm/tdentlm.cpp delete mode 100644 kio/misc/tdentlm/tdentlm.h delete mode 100644 kio/misc/tdesasl/CMakeLists.txt delete mode 100644 kio/misc/tdesasl/Makefile.am delete mode 100644 kio/misc/tdesasl/tdesasl.cpp delete mode 100644 kio/misc/tdesasl/tdesasl.h delete mode 100644 kio/misc/tdewalletd/CMakeLists.txt delete mode 100644 kio/misc/tdewalletd/Makefile.am delete mode 100644 kio/misc/tdewalletd/kbetterthankdialogbase.ui delete mode 100644 kio/misc/tdewalletd/kbetterthankdialogbase.ui.h delete mode 100644 kio/misc/tdewalletd/ktimeout.cpp delete mode 100644 kio/misc/tdewalletd/ktimeout.h delete mode 100644 kio/misc/tdewalletd/tdewalletd.cpp delete mode 100644 kio/misc/tdewalletd/tdewalletd.desktop delete mode 100644 kio/misc/tdewalletd/tdewalletd.h delete mode 100644 kio/misc/tdewalletd/tdewalletwizard.ui delete mode 100644 kio/misc/tdewalletd/tdewalletwizard.ui.h delete mode 100644 kio/misc/telnet.protocol delete mode 100644 kio/misc/uiserver.cpp delete mode 100644 kio/misc/uiserver.h delete mode 100644 kio/pics/CMakeLists.txt delete mode 100644 kio/pics/Makefile.am delete mode 100644 kio/pics/cr16-app-kio_uiserver.png delete mode 100755 kio/proxytype.pl delete mode 100644 kio/renamedlgplugin.desktop delete mode 100644 kio/tdecmodule.desktop delete mode 100644 kio/tests/CMakeLists.txt delete mode 100644 kio/tests/Makefile.am delete mode 100644 kio/tests/dataprotocoltest.cpp delete mode 100644 kio/tests/dummymeta.cpp delete mode 100644 kio/tests/dummymeta.desktop delete mode 100644 kio/tests/dummymeta.h delete mode 100644 kio/tests/getalltest.cpp delete mode 100644 kio/tests/jobtest.cpp delete mode 100644 kio/tests/jobtest.h delete mode 100644 kio/tests/kacltest.cpp delete mode 100644 kio/tests/kacltest.h delete mode 100644 kio/tests/kdcopcheck.cpp delete mode 100644 kio/tests/kdcopcheck.h delete mode 100644 kio/tests/kdefaultprogresstest.cpp delete mode 100644 kio/tests/kdirlistertest.cpp delete mode 100644 kio/tests/kdirlistertest.h delete mode 100644 kio/tests/kdirwatchtest.cpp delete mode 100644 kio/tests/kdirwatchtest.h delete mode 100644 kio/tests/kdirwatchunittest.cpp delete mode 100644 kio/tests/kdirwatchunittest.h delete mode 100644 kio/tests/kfiltertest.cpp delete mode 100644 kio/tests/kionetrctest.cpp delete mode 100644 kio/tests/kiopassdlgtest.cpp delete mode 100644 kio/tests/kioslavetest.cpp delete mode 100644 kio/tests/kioslavetest.h delete mode 100644 kio/tests/kmfitest.cpp delete mode 100644 kio/tests/kmimefromext.cpp delete mode 100644 kio/tests/kmimemagictest.cpp delete mode 100644 kio/tests/kmimetypetest.cpp delete mode 100644 kio/tests/kpropsdlgtest.cpp delete mode 100644 kio/tests/kprotocolinfotest.cpp delete mode 100644 kio/tests/kruntest.cpp delete mode 100644 kio/tests/kruntest.h delete mode 100644 kio/tests/kscantest.cpp delete mode 100644 kio/tests/kshredtest.cpp delete mode 100644 kio/tests/ktartest.cpp delete mode 100644 kio/tests/ktradertest.cpp delete mode 100644 kio/tests/kurifiltertest.cpp delete mode 100644 kio/tests/kurlcompletiontest.cpp delete mode 100644 kio/tests/kziptest.cpp delete mode 100644 kio/tests/metatest.cpp delete mode 100644 kio/tests/netaccesstest.cpp delete mode 100644 kio/tests/previewtest.cpp delete mode 100644 kio/tests/previewtest.h delete mode 100644 kio/tests/speed.cpp delete mode 100644 kio/tests/speed.h delete mode 100644 kio/tests/tdesycocatest.cpp delete mode 100644 kio/tests/tdesycocaupdatetest.cpp delete mode 100644 kio/tests/wronglocalsizes.zip delete mode 100755 kio/useragent.pl delete mode 100644 kioslave/CMakeLists.txt delete mode 100644 kioslave/Mainpage.dox delete mode 100644 kioslave/Makefile.am delete mode 100644 kioslave/bzip2/CMakeLists.txt delete mode 100644 kioslave/bzip2/Makefile.am delete mode 100644 kioslave/bzip2/configure.in.in delete mode 100644 kioslave/bzip2/kbzip2filter.cpp delete mode 100644 kioslave/bzip2/kbzip2filter.desktop delete mode 100644 kioslave/bzip2/kbzip2filter.h delete mode 100644 kioslave/file/CMakeLists.txt delete mode 100644 kioslave/file/Makefile.am delete mode 100644 kioslave/file/file.cc delete mode 100644 kioslave/file/file.h delete mode 100644 kioslave/file/file.protocol delete mode 100644 kioslave/ftp/CMakeLists.txt delete mode 100644 kioslave/ftp/Makefile.am delete mode 100644 kioslave/ftp/configure.in.in delete mode 100644 kioslave/ftp/ftp.cc delete mode 100644 kioslave/ftp/ftp.h delete mode 100644 kioslave/ftp/ftp.protocol delete mode 100644 kioslave/gzip/CMakeLists.txt delete mode 100644 kioslave/gzip/Makefile.am delete mode 100644 kioslave/gzip/kgzipfilter.cpp delete mode 100644 kioslave/gzip/kgzipfilter.desktop delete mode 100644 kioslave/gzip/kgzipfilter.h delete mode 100644 kioslave/http/CMakeLists.txt delete mode 100644 kioslave/http/Makefile.am delete mode 100644 kioslave/http/README.http_cache_cleaner delete mode 100644 kioslave/http/README.webdav delete mode 100644 kioslave/http/THOUGHTS delete mode 100644 kioslave/http/TODO delete mode 100644 kioslave/http/configure.in.bot delete mode 100644 kioslave/http/configure.in.in delete mode 100644 kioslave/http/http.cc delete mode 100644 kioslave/http/http.h delete mode 100644 kioslave/http/http.protocol delete mode 100644 kioslave/http/http_cache_cleaner.cpp delete mode 100644 kioslave/http/http_cache_cleaner.desktop delete mode 100644 kioslave/http/https.protocol delete mode 100644 kioslave/http/kcookiejar/CMakeLists.txt delete mode 100644 kioslave/http/kcookiejar/Makefile.am delete mode 100644 kioslave/http/kcookiejar/domain_info delete mode 100644 kioslave/http/kcookiejar/kcookiejar.cpp delete mode 100644 kioslave/http/kcookiejar/kcookiejar.desktop delete mode 100644 kioslave/http/kcookiejar/kcookiejar.h delete mode 100644 kioslave/http/kcookiejar/kcookiescfg.upd delete mode 100644 kioslave/http/kcookiejar/kcookieserver.cpp delete mode 100644 kioslave/http/kcookiejar/kcookieserver.h delete mode 100644 kioslave/http/kcookiejar/kcookiewin.cpp delete mode 100644 kioslave/http/kcookiejar/kcookiewin.h delete mode 100644 kioslave/http/kcookiejar/main.cpp delete mode 100644 kioslave/http/kcookiejar/netscape_cookie_spec.html delete mode 100644 kioslave/http/kcookiejar/rfc2109 delete mode 100644 kioslave/http/kcookiejar/rfc2965 delete mode 100644 kioslave/http/kcookiejar/tests/Makefile.am delete mode 100644 kioslave/http/kcookiejar/tests/cookie.test delete mode 100644 kioslave/http/kcookiejar/tests/cookie_rfc.test delete mode 100644 kioslave/http/kcookiejar/tests/cookie_saving.test delete mode 100644 kioslave/http/kcookiejar/tests/cookie_settings.test delete mode 100644 kioslave/http/kcookiejar/tests/kcookiejartest.cpp delete mode 100644 kioslave/http/rfc2518.txt delete mode 100644 kioslave/http/rfc2616.txt delete mode 100644 kioslave/http/rfc2617.txt delete mode 100644 kioslave/http/rfc2817.txt delete mode 100644 kioslave/http/rfc2818.txt delete mode 100644 kioslave/http/rfc3229.txt delete mode 100644 kioslave/http/rfc3253.txt delete mode 100644 kioslave/http/shoutcast-icecast.txt delete mode 100644 kioslave/http/webdav.protocol delete mode 100644 kioslave/http/webdavs.protocol delete mode 100644 kioslave/iso/CMakeLists.txt delete mode 100644 kioslave/iso/Makefile.am delete mode 100644 kioslave/iso/iso.cpp delete mode 100644 kioslave/iso/iso.h delete mode 100644 kioslave/iso/iso.protocol delete mode 100644 kioslave/iso/isoservice.desktop delete mode 100644 kioslave/iso/kio_iso.desktop delete mode 100644 kioslave/iso/kio_isorc delete mode 100644 kioslave/iso/kiso.cpp delete mode 100644 kioslave/iso/kiso.h delete mode 100644 kioslave/iso/kisodirectory.cpp delete mode 100644 kioslave/iso/kisodirectory.h delete mode 100644 kioslave/iso/kisofile.cpp delete mode 100644 kioslave/iso/kisofile.h delete mode 100644 kioslave/iso/libisofs/CMakeLists.txt delete mode 100644 kioslave/iso/libisofs/COPYING delete mode 100644 kioslave/iso/libisofs/ChangeLog delete mode 100644 kioslave/iso/libisofs/Makefile.am delete mode 100644 kioslave/iso/libisofs/README delete mode 100644 kioslave/iso/libisofs/bswap.h delete mode 100644 kioslave/iso/libisofs/el_torito.h delete mode 100644 kioslave/iso/libisofs/iso_fs.h delete mode 100644 kioslave/iso/libisofs/isofs.c delete mode 100644 kioslave/iso/libisofs/isofs.h delete mode 100644 kioslave/iso/libisofs/rock.h delete mode 100644 kioslave/iso/qfilehack.cpp delete mode 100644 kioslave/iso/qfilehack.h delete mode 100644 kioslave/metainfo/CMakeLists.txt delete mode 100644 kioslave/metainfo/Makefile.am delete mode 100644 kioslave/metainfo/metainfo.cpp delete mode 100644 kioslave/metainfo/metainfo.h delete mode 100644 kioslave/metainfo/metainfo.protocol delete mode 100644 knewstuff/khotnewstuff.cpp delete mode 100644 knewstuff/khotnewstuffrc create mode 100644 knewstuff/tdehotnewstuff.cpp create mode 100644 knewstuff/tdehotnewstuffrc delete mode 100644 kstyles/plastik/config/plastikconf.cpp delete mode 100644 kstyles/plastik/config/plastikconf.h create mode 100644 kstyles/plastik/config/plastitdeconf.cpp create mode 100644 kstyles/plastik/config/plastitdeconf.h create mode 100644 tdecmshell/CMakeLists.txt create mode 100644 tdecmshell/Makefile.am create mode 100644 tdecmshell/main.cpp create mode 100644 tdecmshell/main.h create mode 100644 tdeconf_update/CMakeLists.txt create mode 100644 tdeconf_update/Mainpage.dox create mode 100644 tdeconf_update/Makefile.am create mode 100644 tdeconf_update/README.tdeconf_update create mode 100644 tdeconf_update/tdeconf_update.cpp delete mode 100644 tdecore/DESIGN.kconfig create mode 100644 tdecore/DESIGN.tdeconfig delete mode 100644 tdecore/kconfig.cpp delete mode 100644 tdecore/kconfig.h delete mode 100644 tdecore/kconfig_compiler/CMakeLists.txt delete mode 100644 tdecore/kconfig_compiler/Makefile.am delete mode 100644 tdecore/kconfig_compiler/README.dox delete mode 100644 tdecore/kconfig_compiler/TODO delete mode 100755 tdecore/kconfig_compiler/checkkcfg.pl delete mode 100644 tdecore/kconfig_compiler/example/Makefile.am delete mode 100644 tdecore/kconfig_compiler/example/autoexample.cpp delete mode 100644 tdecore/kconfig_compiler/example/example.cpp delete mode 100644 tdecore/kconfig_compiler/example/example.kcfg delete mode 100644 tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc delete mode 100644 tdecore/kconfig_compiler/example/general_base.ui delete mode 100644 tdecore/kconfig_compiler/example/myoptions_base.ui delete mode 100644 tdecore/kconfig_compiler/kcfg.xsd delete mode 100644 tdecore/kconfig_compiler/kconfig_compiler.cpp delete mode 100644 tdecore/kconfig_compiler/tests/Makefile.am delete mode 100644 tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp delete mode 100644 tdecore/kconfig_compiler/tests/kconfigcompiler_test.h delete mode 100644 tdecore/kconfig_compiler/tests/myprefs.h delete mode 100644 tdecore/kconfig_compiler/tests/test1.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test1.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test1.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test1.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test1main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test2.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test2.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test2.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test2.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test2main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test3.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test3.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test3.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test3.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test3main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test4.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test4.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test4.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test4.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test4main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test5.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test5.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test5.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test5.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test5main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test6.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test6.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test6.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test6.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test6main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test7.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test7.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test7.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test7.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test7main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test8a.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test8a.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test8a.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test8a.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test8b.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test8b.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test8b.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test8b.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test8main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test9.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test9.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test9.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test9.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test9main.cpp delete mode 100644 tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref delete mode 100644 tdecore/kconfig_compiler/tests/test_dpointer.h.ref delete mode 100644 tdecore/kconfig_compiler/tests/test_dpointer.kcfg delete mode 100644 tdecore/kconfig_compiler/tests/test_dpointer.kcfgc delete mode 100644 tdecore/kconfig_compiler/tests/test_dpointer_main.cpp delete mode 100644 tdecore/kconfigbackend.cpp delete mode 100644 tdecore/kconfigbackend.h delete mode 100644 tdecore/kconfigbase.cpp delete mode 100644 tdecore/kconfigbase.h delete mode 100644 tdecore/kconfigdata.h delete mode 100644 tdecore/kconfigdialogmanager.cpp delete mode 100644 tdecore/kconfigdialogmanager.h delete mode 100644 tdecore/kconfigskeleton.cpp delete mode 100644 tdecore/kconfigskeleton.h create mode 100644 tdecore/tdeconfig.cpp create mode 100644 tdecore/tdeconfig.h create mode 100644 tdecore/tdeconfig_compiler/CMakeLists.txt create mode 100644 tdecore/tdeconfig_compiler/Makefile.am create mode 100644 tdecore/tdeconfig_compiler/README.dox create mode 100644 tdecore/tdeconfig_compiler/TODO create mode 100755 tdecore/tdeconfig_compiler/checkkcfg.pl create mode 100644 tdecore/tdeconfig_compiler/example/Makefile.am create mode 100644 tdecore/tdeconfig_compiler/example/autoexample.cpp create mode 100644 tdecore/tdeconfig_compiler/example/example.cpp create mode 100644 tdecore/tdeconfig_compiler/example/example.kcfg create mode 100644 tdecore/tdeconfig_compiler/example/exampleprefs_base.kcfgc create mode 100644 tdecore/tdeconfig_compiler/example/general_base.ui create mode 100644 tdecore/tdeconfig_compiler/example/myoptions_base.ui create mode 100644 tdecore/tdeconfig_compiler/kcfg.xsd create mode 100644 tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/Makefile.am create mode 100644 tdecore/tdeconfig_compiler/tests/myprefs.h create mode 100644 tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h create mode 100644 tdecore/tdeconfig_compiler/tests/test1.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test1.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test1.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test1.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test1main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test2.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test2.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test2.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test2.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test2main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test3.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test3.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test3.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test3.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test3main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test4.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test4.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test4.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test4.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test4main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test5.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test5.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test5.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test5.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test5main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test6.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test6.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test6.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test6.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test6main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test7.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test7.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test7.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test7.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test7main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test8a.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test8a.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test8a.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test8a.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test8b.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test8b.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test8b.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test8b.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test8main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test9.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test9.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test9.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test9.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test9main.cpp create mode 100644 tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test_dpointer.h.ref create mode 100644 tdecore/tdeconfig_compiler/tests/test_dpointer.kcfg create mode 100644 tdecore/tdeconfig_compiler/tests/test_dpointer.kcfgc create mode 100644 tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp create mode 100644 tdecore/tdeconfigbackend.cpp create mode 100644 tdecore/tdeconfigbackend.h create mode 100644 tdecore/tdeconfigbase.cpp create mode 100644 tdecore/tdeconfigbase.h create mode 100644 tdecore/tdeconfigdata.h create mode 100644 tdecore/tdeconfigdialogmanager.cpp create mode 100644 tdecore/tdeconfigdialogmanager.h create mode 100644 tdecore/tdeconfigskeleton.cpp create mode 100644 tdecore/tdeconfigskeleton.h delete mode 100644 tdecore/tests/kconfigtest.cpp delete mode 100644 tdecore/tests/kconfigtestgui.cpp delete mode 100644 tdecore/tests/kconfigtestgui.h create mode 100644 tdecore/tests/tdeconfigtest.cpp create mode 100644 tdecore/tests/tdeconfigtestgui.cpp create mode 100644 tdecore/tests/tdeconfigtestgui.h create mode 100644 tdefile-plugins/CMakeLists.txt create mode 100644 tdefile-plugins/elf/CMakeLists.txt create mode 100644 tdefile-plugins/elf/tdefile_elf.cpp create mode 100644 tdefile-plugins/elf/tdefile_elf.desktop create mode 100644 tdefile-plugins/elf/tdefile_elf.h create mode 100644 tdeio/CMakeLists.txt create mode 100644 tdeio/DESIGN create mode 100644 tdeio/DESIGN.krun create mode 100644 tdeio/DESIGN.metadata create mode 100644 tdeio/DESIGN.mimetypes create mode 100644 tdeio/DESKTOP_ENTRY_STANDARD create mode 100644 tdeio/Mainpage.dox create mode 100644 tdeio/Makefile.am create mode 100644 tdeio/application.desktop create mode 100644 tdeio/bookmarks/CMakeLists.txt create mode 100644 tdeio/bookmarks/Makefile.am create mode 100644 tdeio/bookmarks/dptrtemplate.h create mode 100644 tdeio/bookmarks/kbookmark.cc create mode 100644 tdeio/bookmarks/kbookmark.h create mode 100644 tdeio/bookmarks/kbookmarkbar.cc create mode 100644 tdeio/bookmarks/kbookmarkbar.h create mode 100644 tdeio/bookmarks/kbookmarkdombuilder.cc create mode 100644 tdeio/bookmarks/kbookmarkdombuilder.h create mode 100644 tdeio/bookmarks/kbookmarkdrag.cc create mode 100644 tdeio/bookmarks/kbookmarkdrag.h create mode 100644 tdeio/bookmarks/kbookmarkexporter.cc create mode 100644 tdeio/bookmarks/kbookmarkexporter.h create mode 100644 tdeio/bookmarks/kbookmarkimporter.cc create mode 100644 tdeio/bookmarks/kbookmarkimporter.h create mode 100644 tdeio/bookmarks/kbookmarkimporter_crash.cc create mode 100644 tdeio/bookmarks/kbookmarkimporter_crash.h create mode 100644 tdeio/bookmarks/kbookmarkimporter_ie.cc create mode 100644 tdeio/bookmarks/kbookmarkimporter_ie.h create mode 100644 tdeio/bookmarks/kbookmarkimporter_kde1.cc create mode 100644 tdeio/bookmarks/kbookmarkimporter_kde1.h create mode 100644 tdeio/bookmarks/kbookmarkimporter_ns.cc create mode 100644 tdeio/bookmarks/kbookmarkimporter_ns.h create mode 100644 tdeio/bookmarks/kbookmarkimporter_opera.cc create mode 100644 tdeio/bookmarks/kbookmarkimporter_opera.h create mode 100644 tdeio/bookmarks/kbookmarkmanager.cc create mode 100644 tdeio/bookmarks/kbookmarkmanager.h create mode 100644 tdeio/bookmarks/kbookmarkmenu.cc create mode 100644 tdeio/bookmarks/kbookmarkmenu.h create mode 100644 tdeio/bookmarks/kbookmarkmenu_p.h create mode 100644 tdeio/bookmarks/kbookmarknotifier.h create mode 100644 tdeio/data.protocol create mode 100644 tdeio/httpfilter/CMakeLists.txt create mode 100644 tdeio/httpfilter/Makefile.am create mode 100644 tdeio/httpfilter/httpfilter.cc create mode 100644 tdeio/httpfilter/httpfilter.h create mode 100644 tdeio/kcomprfilter.desktop create mode 100644 tdeio/kdatatool.desktop create mode 100644 tdeio/kpasswdserver.desktop create mode 100644 tdeio/kpasswdserver/CMakeLists.txt create mode 100644 tdeio/kpasswdserver/DESIGN create mode 100644 tdeio/kpasswdserver/Makefile.am create mode 100644 tdeio/kpasswdserver/kpasswdserver.cpp create mode 100644 tdeio/kpasswdserver/kpasswdserver.h create mode 100644 tdeio/kscan.desktop create mode 100644 tdeio/kssl/CMakeLists.txt create mode 100644 tdeio/kssl/KPMG-CA-16389.0.DC80502.pdf create mode 100644 tdeio/kssl/Makefile.am create mode 100644 tdeio/kssl/README create mode 100644 tdeio/kssl/SECURITY-HOLES create mode 100644 tdeio/kssl/TODO create mode 100644 tdeio/kssl/configure.in.in create mode 100644 tdeio/kssl/keygenwizard.ui create mode 100644 tdeio/kssl/keygenwizard2.ui create mode 100644 tdeio/kssl/kopenssl.cc create mode 100644 tdeio/kssl/kopenssl.h create mode 100644 tdeio/kssl/ksmimecrypto.cc create mode 100644 tdeio/kssl/ksmimecrypto.h create mode 100644 tdeio/kssl/kssl.cc create mode 100644 tdeio/kssl/kssl.h create mode 100644 tdeio/kssl/kssl/CMakeLists.txt create mode 100644 tdeio/kssl/kssl/DigiCertAssuredIDRootCA.pem create mode 100644 tdeio/kssl/kssl/DigiCertGlobalRootCA.pem create mode 100644 tdeio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem create mode 100644 tdeio/kssl/kssl/GeoTrust_Universal_CA.pem create mode 100644 tdeio/kssl/kssl/GeoTrust_Universal_CA2.pem create mode 100644 tdeio/kssl/kssl/HOWTO create mode 100644 tdeio/kssl/kssl/Makefile.am create mode 100644 tdeio/kssl/kssl/StartCom.pem create mode 100644 tdeio/kssl/kssl/SwissSign-Gold-G2.pem create mode 100644 tdeio/kssl/kssl/SwissSign-Platinum-G2.pem create mode 100644 tdeio/kssl/kssl/SwissSign-Silver-G2.pem create mode 100644 tdeio/kssl/kssl/WiseKey.pem create mode 100644 tdeio/kssl/kssl/ac_offline_raiz_certicamara.pem create mode 100644 tdeio/kssl/kssl/argedaten-root-ca-cert.pem create mode 100644 tdeio/kssl/kssl/belgacom.pem create mode 100644 tdeio/kssl/kssl/caroot/CMakeLists.txt create mode 100644 tdeio/kssl/kssl/caroot/Makefile.am create mode 100644 tdeio/kssl/kssl/caroot/ca-bundle.crt create mode 100755 tdeio/kssl/kssl/cert_bundle create mode 100644 tdeio/kssl/kssl/cert_extract.c create mode 100644 tdeio/kssl/kssl/certbundle_Makefile create mode 100755 tdeio/kssl/kssl/certkde create mode 100644 tdeio/kssl/kssl/certum.pem create mode 100644 tdeio/kssl/kssl/certum1.pem create mode 100644 tdeio/kssl/kssl/certum2.pem create mode 100644 tdeio/kssl/kssl/certum3.pem create mode 100644 tdeio/kssl/kssl/certum4.pem create mode 100644 tdeio/kssl/kssl/comodo1.pem create mode 100644 tdeio/kssl/kssl/comodo2.pem create mode 100644 tdeio/kssl/kssl/comodo3.pem create mode 100644 tdeio/kssl/kssl/comodo4.pem create mode 100644 tdeio/kssl/kssl/comodo5.pem create mode 100644 tdeio/kssl/kssl/comodo6.pem create mode 100644 tdeio/kssl/kssl/comodo7.pem create mode 100644 tdeio/kssl/kssl/dfn-root-ca-cert.pem create mode 100644 tdeio/kssl/kssl/gd-class2-root.pem create mode 100644 tdeio/kssl/kssl/geotrust-global-1.pem create mode 100644 tdeio/kssl/kssl/geotrust-global-2.pem create mode 100644 tdeio/kssl/kssl/globalsign-root-r1.pem create mode 100644 tdeio/kssl/kssl/globalsign-root-r2.pem create mode 100644 tdeio/kssl/kssl/icpbrasil.pem create mode 100644 tdeio/kssl/kssl/ipsservidores.pem create mode 100644 tdeio/kssl/kssl/ksslcalist create mode 100644 tdeio/kssl/kssl/localcerts create mode 100755 tdeio/kssl/kssl/mergelocal create mode 100644 tdeio/kssl/kssl/netlock1.pem create mode 100644 tdeio/kssl/kssl/netlock2.pem create mode 100644 tdeio/kssl/kssl/netlock3.pem create mode 100644 tdeio/kssl/kssl/netlock4.pem create mode 100644 tdeio/kssl/kssl/oces.pem create mode 100644 tdeio/kssl/kssl/quovadis.pem create mode 100644 tdeio/kssl/kssl/qvrca2.pem create mode 100644 tdeio/kssl/kssl/qvrca3.pem create mode 100644 tdeio/kssl/kssl/sf-class2-root.pem create mode 100644 tdeio/kssl/kssl/sonera1.pem create mode 100644 tdeio/kssl/kssl/sonera2.pem create mode 100644 tdeio/kssl/kssl/staatdernederlandenrotca.pem create mode 100644 tdeio/kssl/kssl/startcom.pem create mode 100644 tdeio/kssl/kssl/startssl.pem create mode 100644 tdeio/kssl/kssl/tcclass2-2011.pem create mode 100644 tdeio/kssl/kssl/tcclass3-2011.pem create mode 100644 tdeio/kssl/kssl/utn-network.pem create mode 100644 tdeio/kssl/kssl/utn-sgc.pem create mode 100644 tdeio/kssl/kssl/xgca.pem create mode 100644 tdeio/kssl/ksslall.h create mode 100644 tdeio/kssl/ksslcallback.c create mode 100644 tdeio/kssl/ksslcertchain.cc create mode 100644 tdeio/kssl/ksslcertchain.h create mode 100644 tdeio/kssl/ksslcertdlg.cc create mode 100644 tdeio/kssl/ksslcertdlg.h create mode 100644 tdeio/kssl/ksslcertificate.cc create mode 100644 tdeio/kssl/ksslcertificate.h create mode 100644 tdeio/kssl/ksslcertificatecache.cc create mode 100644 tdeio/kssl/ksslcertificatecache.h create mode 100644 tdeio/kssl/ksslcertificatefactory.cc create mode 100644 tdeio/kssl/ksslcertificatefactory.h create mode 100644 tdeio/kssl/ksslcertificatehome.cc create mode 100644 tdeio/kssl/ksslcertificatehome.h create mode 100644 tdeio/kssl/ksslconfig.h.cmake create mode 100644 tdeio/kssl/ksslconfig.h.in create mode 100644 tdeio/kssl/ksslconfig_win.h create mode 100644 tdeio/kssl/ksslconnectioninfo.cc create mode 100644 tdeio/kssl/ksslconnectioninfo.h create mode 100644 tdeio/kssl/ksslcsessioncache.cc create mode 100644 tdeio/kssl/ksslcsessioncache.h create mode 100644 tdeio/kssl/kssldefs.h create mode 100644 tdeio/kssl/ksslinfodlg.cc create mode 100644 tdeio/kssl/ksslinfodlg.h create mode 100644 tdeio/kssl/ksslkeygen.cc create mode 100644 tdeio/kssl/ksslkeygen.h create mode 100644 tdeio/kssl/ksslpeerinfo.cc create mode 100644 tdeio/kssl/ksslpeerinfo.h create mode 100644 tdeio/kssl/ksslpemcallback.cc create mode 100644 tdeio/kssl/ksslpemcallback.h create mode 100644 tdeio/kssl/ksslpkcs12.cc create mode 100644 tdeio/kssl/ksslpkcs12.h create mode 100644 tdeio/kssl/ksslpkcs7.cc create mode 100644 tdeio/kssl/ksslpkcs7.h create mode 100644 tdeio/kssl/ksslsession.cc create mode 100644 tdeio/kssl/ksslsession.h create mode 100644 tdeio/kssl/ksslsettings.cc create mode 100644 tdeio/kssl/ksslsettings.h create mode 100644 tdeio/kssl/ksslsigners.cc create mode 100644 tdeio/kssl/ksslsigners.h create mode 100644 tdeio/kssl/ksslutils.cc create mode 100644 tdeio/kssl/ksslutils.h create mode 100644 tdeio/kssl/ksslx509map.cc create mode 100644 tdeio/kssl/ksslx509map.h create mode 100644 tdeio/kssl/ksslx509v3.cc create mode 100644 tdeio/kssl/ksslx509v3.h create mode 100644 tdeio/kurifilterplugin.desktop create mode 100644 tdeio/magic create mode 100644 tdeio/misc/CMakeLists.txt create mode 100644 tdeio/misc/Makefile.am create mode 100755 tdeio/misc/fileshareset create mode 100644 tdeio/misc/kpac/CMakeLists.txt create mode 100644 tdeio/misc/kpac/Makefile.am create mode 100644 tdeio/misc/kpac/README create mode 100644 tdeio/misc/kpac/README.wpad create mode 100644 tdeio/misc/kpac/TODO create mode 100644 tdeio/misc/kpac/configure.in.in create mode 100644 tdeio/misc/kpac/dhcp.h create mode 100644 tdeio/misc/kpac/discovery.cpp create mode 100644 tdeio/misc/kpac/discovery.h create mode 100644 tdeio/misc/kpac/downloader.cpp create mode 100644 tdeio/misc/kpac/downloader.h create mode 100644 tdeio/misc/kpac/eventsrc create mode 100644 tdeio/misc/kpac/kpac_dhcp_helper.c create mode 100644 tdeio/misc/kpac/kpactest.pac create mode 100644 tdeio/misc/kpac/proxyscout.cpp create mode 100644 tdeio/misc/kpac/proxyscout.desktop create mode 100644 tdeio/misc/kpac/proxyscout.h create mode 100644 tdeio/misc/kpac/script.cpp create mode 100644 tdeio/misc/kpac/script.h create mode 100644 tdeio/misc/kssld/CMakeLists.txt create mode 100644 tdeio/misc/kssld/Makefile.am create mode 100644 tdeio/misc/kssld/kssld.cpp create mode 100644 tdeio/misc/kssld/kssld.desktop create mode 100644 tdeio/misc/kssld/kssld.h create mode 100644 tdeio/misc/mms.protocol create mode 100644 tdeio/misc/mmst.protocol create mode 100644 tdeio/misc/mmsu.protocol create mode 100644 tdeio/misc/pnm.protocol create mode 100644 tdeio/misc/rlogin.protocol create mode 100644 tdeio/misc/rtsp.protocol create mode 100644 tdeio/misc/rtspt.protocol create mode 100644 tdeio/misc/rtspu.protocol create mode 100644 tdeio/misc/ssh.protocol create mode 100644 tdeio/misc/tdefile/CMakeLists.txt create mode 100644 tdeio/misc/tdefile/Makefile.am create mode 100644 tdeio/misc/tdefile/README create mode 100644 tdeio/misc/tdefile/fileprops.cpp create mode 100644 tdeio/misc/tdefile/fileprops.h create mode 100644 tdeio/misc/tdeio_uiserver.desktop create mode 100644 tdeio/misc/tdemailservice.cpp create mode 100644 tdeio/misc/tdemailservice.protocol create mode 100644 tdeio/misc/tdentlm/CMakeLists.txt create mode 100644 tdeio/misc/tdentlm/Makefile.am create mode 100644 tdeio/misc/tdentlm/des.cpp create mode 100644 tdeio/misc/tdentlm/des.h create mode 100644 tdeio/misc/tdentlm/kswap.h create mode 100644 tdeio/misc/tdentlm/tdentlm.cpp create mode 100644 tdeio/misc/tdentlm/tdentlm.h create mode 100644 tdeio/misc/tdesasl/CMakeLists.txt create mode 100644 tdeio/misc/tdesasl/Makefile.am create mode 100644 tdeio/misc/tdesasl/tdesasl.cpp create mode 100644 tdeio/misc/tdesasl/tdesasl.h create mode 100644 tdeio/misc/tdesendbugmail/CMakeLists.txt create mode 100644 tdeio/misc/tdesendbugmail/Makefile.am create mode 100644 tdeio/misc/tdesendbugmail/main.cpp create mode 100644 tdeio/misc/tdesendbugmail/main.h create mode 100644 tdeio/misc/tdesendbugmail/smtp.cpp create mode 100644 tdeio/misc/tdesendbugmail/smtp.h create mode 100644 tdeio/misc/tdetelnetservice.cpp create mode 100644 tdeio/misc/tdewalletd/CMakeLists.txt create mode 100644 tdeio/misc/tdewalletd/Makefile.am create mode 100644 tdeio/misc/tdewalletd/kbetterthankdialogbase.ui create mode 100644 tdeio/misc/tdewalletd/kbetterthankdialogbase.ui.h create mode 100644 tdeio/misc/tdewalletd/ktimeout.cpp create mode 100644 tdeio/misc/tdewalletd/ktimeout.h create mode 100644 tdeio/misc/tdewalletd/tdewalletd.cpp create mode 100644 tdeio/misc/tdewalletd/tdewalletd.desktop create mode 100644 tdeio/misc/tdewalletd/tdewalletd.h create mode 100644 tdeio/misc/tdewalletd/tdewalletwizard.ui create mode 100644 tdeio/misc/tdewalletd/tdewalletwizard.ui.h create mode 100644 tdeio/misc/telnet.protocol create mode 100644 tdeio/misc/uiserver.cpp create mode 100644 tdeio/misc/uiserver.h create mode 100644 tdeio/pics/CMakeLists.txt create mode 100644 tdeio/pics/Makefile.am create mode 100644 tdeio/pics/cr16-app-tdeio_uiserver.png create mode 100755 tdeio/proxytype.pl create mode 100644 tdeio/renamedlgplugin.desktop create mode 100644 tdeio/tdecmodule.desktop create mode 100644 tdeio/tdefile/CMakeLists.txt create mode 100644 tdeio/tdefile/ChangeLog create mode 100644 tdeio/tdefile/Makefile.am create mode 100644 tdeio/tdefile/NOTES create mode 100644 tdeio/tdefile/TODO create mode 100644 tdeio/tdefile/config-tdefile.h create mode 100644 tdeio/tdefile/images.h create mode 100644 tdeio/tdefile/kacleditwidget.cpp create mode 100644 tdeio/tdefile/kacleditwidget.h create mode 100644 tdeio/tdefile/kacleditwidget_p.h create mode 100644 tdeio/tdefile/kcombiview.cpp create mode 100644 tdeio/tdefile/kcombiview.h create mode 100644 tdeio/tdefile/kcustommenueditor.cpp create mode 100644 tdeio/tdefile/kcustommenueditor.h create mode 100644 tdeio/tdefile/kdiroperator.cpp create mode 100644 tdeio/tdefile/kdiroperator.h create mode 100644 tdeio/tdefile/kdirselectdialog.cpp create mode 100644 tdeio/tdefile/kdirselectdialog.h create mode 100644 tdeio/tdefile/kdirsize.cpp create mode 100644 tdeio/tdefile/kdirsize.h create mode 100644 tdeio/tdefile/kdiskfreesp.cpp create mode 100644 tdeio/tdefile/kdiskfreesp.h create mode 100644 tdeio/tdefile/kencodingfiledialog.cpp create mode 100644 tdeio/tdefile/kencodingfiledialog.h create mode 100644 tdeio/tdefile/kicondialog.cpp create mode 100644 tdeio/tdefile/kicondialog.h create mode 100644 tdeio/tdefile/kimagefilepreview.cpp create mode 100644 tdeio/tdefile/kimagefilepreview.h create mode 100644 tdeio/tdefile/kmetaprops.cpp create mode 100644 tdeio/tdefile/kmetaprops.h create mode 100644 tdeio/tdefile/knotifydialog.cpp create mode 100644 tdeio/tdefile/knotifydialog.h create mode 100644 tdeio/tdefile/knotifywidgetbase.ui create mode 100644 tdeio/tdefile/kopenwith.cpp create mode 100644 tdeio/tdefile/kopenwith.h create mode 100644 tdeio/tdefile/kopenwith_p.h create mode 100644 tdeio/tdefile/kpreviewprops.cpp create mode 100644 tdeio/tdefile/kpreviewprops.h create mode 100644 tdeio/tdefile/kpreviewwidgetbase.cpp create mode 100644 tdeio/tdefile/kpreviewwidgetbase.h create mode 100644 tdeio/tdefile/kpropertiesdesktopadvbase.ui create mode 100644 tdeio/tdefile/kpropertiesdesktopbase.ui create mode 100644 tdeio/tdefile/kpropertiesdialog.cpp create mode 100644 tdeio/tdefile/kpropertiesdialog.h create mode 100644 tdeio/tdefile/kpropertiesmimetypebase.ui create mode 100644 tdeio/tdefile/kpropsdlg.h create mode 100644 tdeio/tdefile/kpropsdlgplugin.desktop create mode 100644 tdeio/tdefile/krecentdirs.cpp create mode 100644 tdeio/tdefile/krecentdirs.h create mode 100644 tdeio/tdefile/krecentdocument.cpp create mode 100644 tdeio/tdefile/krecentdocument.h create mode 100644 tdeio/tdefile/kurlbar.cpp create mode 100644 tdeio/tdefile/kurlbar.h create mode 100644 tdeio/tdefile/kurlcombobox.cpp create mode 100644 tdeio/tdefile/kurlcombobox.h create mode 100644 tdeio/tdefile/kurlrequester.cpp create mode 100644 tdeio/tdefile/kurlrequester.h create mode 100644 tdeio/tdefile/kurlrequesterdlg.cpp create mode 100644 tdeio/tdefile/kurlrequesterdlg.h create mode 100644 tdeio/tdefile/tdefile.h create mode 100644 tdeio/tdefile/tdefilebookmarkhandler.cpp create mode 100644 tdeio/tdefile/tdefilebookmarkhandler.h create mode 100644 tdeio/tdefile/tdefiledetailview.cpp create mode 100644 tdeio/tdefile/tdefiledetailview.h create mode 100644 tdeio/tdefile/tdefiledialog.cpp create mode 100644 tdeio/tdefile/tdefiledialog.h create mode 100644 tdeio/tdefile/tdefilefiltercombo.cpp create mode 100644 tdeio/tdefile/tdefilefiltercombo.h create mode 100644 tdeio/tdefile/tdefileiconview.cpp create mode 100644 tdeio/tdefile/tdefileiconview.h create mode 100644 tdeio/tdefile/tdefilemetainfowidget.cpp create mode 100644 tdeio/tdefile/tdefilemetainfowidget.h create mode 100644 tdeio/tdefile/tdefilemetapreview.cpp create mode 100644 tdeio/tdefile/tdefilemetapreview.h create mode 100644 tdeio/tdefile/tdefilepreview.cpp create mode 100644 tdeio/tdefile/tdefilepreview.h create mode 100644 tdeio/tdefile/tdefilesharedlg.cpp create mode 100644 tdeio/tdefile/tdefilesharedlg.h create mode 100644 tdeio/tdefile/tdefilespeedbar.cpp create mode 100644 tdeio/tdefile/tdefilespeedbar.h create mode 100644 tdeio/tdefile/tdefiletreebranch.cpp create mode 100644 tdeio/tdefile/tdefiletreebranch.h create mode 100644 tdeio/tdefile/tdefiletreeview.cpp create mode 100644 tdeio/tdefile/tdefiletreeview.h create mode 100644 tdeio/tdefile/tdefiletreeviewitem.cpp create mode 100644 tdeio/tdefile/tdefiletreeviewitem.h create mode 100644 tdeio/tdefile/tdefileview.cpp create mode 100644 tdeio/tdefile/tdefileview.h create mode 100644 tdeio/tdefile/tests/Makefile.am create mode 100644 tdeio/tdefile/tests/kcustommenueditortest.cpp create mode 100644 tdeio/tdefile/tests/kdirselectdialogtest.cpp create mode 100644 tdeio/tdefile/tests/kfdtest.cpp create mode 100644 tdeio/tdefile/tests/kfdtest.h create mode 100644 tdeio/tdefile/tests/kfstest.cpp create mode 100644 tdeio/tdefile/tests/kicondialogtest.cpp create mode 100644 tdeio/tdefile/tests/knotifytest.cpp create mode 100644 tdeio/tdefile/tests/kopenwithtest.cpp create mode 100644 tdeio/tdefile/tests/kurlrequestertest.cpp create mode 100644 tdeio/tdefile/tests/tdefiletreeviewtest.cpp create mode 100644 tdeio/tdefile/tests/tdefiletreeviewtest.h create mode 100644 tdeio/tdefileplugin.desktop create mode 100644 tdeio/tdeio/CMakeLists.txt create mode 100644 tdeio/tdeio/KFILEMETAINFO_ISSUES create mode 100644 tdeio/tdeio/Makefile.am create mode 100644 tdeio/tdeio/authinfo.cpp create mode 100644 tdeio/tdeio/authinfo.h create mode 100644 tdeio/tdeio/chmodjob.cpp create mode 100644 tdeio/tdeio/chmodjob.h create mode 100644 tdeio/tdeio/configure.in.in create mode 100644 tdeio/tdeio/connection.cpp create mode 100644 tdeio/tdeio/connection.h create mode 100644 tdeio/tdeio/dataprotocol.cpp create mode 100644 tdeio/tdeio/dataprotocol.h create mode 100644 tdeio/tdeio/dataslave.cpp create mode 100644 tdeio/tdeio/dataslave.h create mode 100644 tdeio/tdeio/davjob.cpp create mode 100644 tdeio/tdeio/davjob.h create mode 100644 tdeio/tdeio/defaultprogress.cpp create mode 100644 tdeio/tdeio/defaultprogress.h create mode 100644 tdeio/tdeio/forwardingslavebase.cpp create mode 100644 tdeio/tdeio/forwardingslavebase.h create mode 100644 tdeio/tdeio/global.cpp create mode 100644 tdeio/tdeio/global.h create mode 100644 tdeio/tdeio/http_slave_defaults.h create mode 100644 tdeio/tdeio/ioslave_defaults.h create mode 100644 tdeio/tdeio/job.cpp create mode 100644 tdeio/tdeio/job.h create mode 100644 tdeio/tdeio/jobclasses.h create mode 100644 tdeio/tdeio/kacl.cpp create mode 100644 tdeio/tdeio/kacl.h create mode 100644 tdeio/tdeio/kar.cpp create mode 100644 tdeio/tdeio/kar.h create mode 100644 tdeio/tdeio/karchive.cpp create mode 100644 tdeio/tdeio/karchive.h create mode 100644 tdeio/tdeio/kautomount.cpp create mode 100644 tdeio/tdeio/kautomount.h create mode 100644 tdeio/tdeio/kdatatool.cpp create mode 100644 tdeio/tdeio/kdatatool.h create mode 100644 tdeio/tdeio/kdcopservicestarter.cpp create mode 100644 tdeio/tdeio/kdcopservicestarter.h create mode 100644 tdeio/tdeio/kdirlister.cpp create mode 100644 tdeio/tdeio/kdirlister.h create mode 100644 tdeio/tdeio/kdirlister_p.h create mode 100644 tdeio/tdeio/kdirnotify.cpp create mode 100644 tdeio/tdeio/kdirnotify.h create mode 100644 tdeio/tdeio/kdirnotify_stub.cpp create mode 100644 tdeio/tdeio/kdirnotify_stub.h create mode 100644 tdeio/tdeio/kdirwatch.cpp create mode 100644 tdeio/tdeio/kdirwatch.h create mode 100644 tdeio/tdeio/kdirwatch_p.h create mode 100644 tdeio/tdeio/kemailsettings.cpp create mode 100644 tdeio/tdeio/kemailsettings.h create mode 100644 tdeio/tdeio/kfilterbase.cpp create mode 100644 tdeio/tdeio/kfilterbase.h create mode 100644 tdeio/tdeio/kfilterdev.cpp create mode 100644 tdeio/tdeio/kfilterdev.h create mode 100644 tdeio/tdeio/kimageio.cpp create mode 100644 tdeio/tdeio/kimageio.h create mode 100644 tdeio/tdeio/kimageiofactory.h create mode 100644 tdeio/tdeio/klimitediodevice.h create mode 100644 tdeio/tdeio/kmdbase.h create mode 100644 tdeio/tdeio/kmessageboxwrapper.h create mode 100644 tdeio/tdeio/kmimemagic.cpp create mode 100644 tdeio/tdeio/kmimemagic.h create mode 100644 tdeio/tdeio/kmimetype.cpp create mode 100644 tdeio/tdeio/kmimetype.h create mode 100644 tdeio/tdeio/kmimetypechooser.cpp create mode 100644 tdeio/tdeio/kmimetypechooser.h create mode 100644 tdeio/tdeio/kmimetyperesolver.h create mode 100644 tdeio/tdeio/knfsshare.cpp create mode 100644 tdeio/tdeio/knfsshare.h create mode 100644 tdeio/tdeio/kprotocolinfo.cpp create mode 100644 tdeio/tdeio/kprotocolinfo.h create mode 100644 tdeio/tdeio/kprotocolmanager.cpp create mode 100644 tdeio/tdeio/kprotocolmanager.h create mode 100644 tdeio/tdeio/kremoteencoding.cpp create mode 100644 tdeio/tdeio/kremoteencoding.h create mode 100644 tdeio/tdeio/krun.cpp create mode 100644 tdeio/tdeio/krun.h create mode 100644 tdeio/tdeio/ksambashare.cpp create mode 100644 tdeio/tdeio/ksambashare.h create mode 100644 tdeio/tdeio/kscan.cpp create mode 100644 tdeio/tdeio/kscan.h create mode 100644 tdeio/tdeio/kservice.cpp create mode 100644 tdeio/tdeio/kservice.h create mode 100644 tdeio/tdeio/kservice_p.h create mode 100644 tdeio/tdeio/kservicefactory.cpp create mode 100644 tdeio/tdeio/kservicefactory.h create mode 100644 tdeio/tdeio/kservicegroup.cpp create mode 100644 tdeio/tdeio/kservicegroup.h create mode 100644 tdeio/tdeio/kservicegroupfactory.cpp create mode 100644 tdeio/tdeio/kservicegroupfactory.h create mode 100644 tdeio/tdeio/kservicetype.cpp create mode 100644 tdeio/tdeio/kservicetype.h create mode 100644 tdeio/tdeio/kservicetypefactory.cpp create mode 100644 tdeio/tdeio/kservicetypefactory.h create mode 100644 tdeio/tdeio/kshellcompletion.cpp create mode 100644 tdeio/tdeio/kshellcompletion.h create mode 100644 tdeio/tdeio/kshred.cpp create mode 100644 tdeio/tdeio/kshred.h create mode 100644 tdeio/tdeio/ktar.cpp create mode 100644 tdeio/tdeio/ktar.h create mode 100644 tdeio/tdeio/ktrader.cpp create mode 100644 tdeio/tdeio/ktrader.h create mode 100644 tdeio/tdeio/ktraderparse.cpp create mode 100644 tdeio/tdeio/ktraderparse.h create mode 100644 tdeio/tdeio/ktraderparsetree.cpp create mode 100644 tdeio/tdeio/ktraderparsetree.h create mode 100644 tdeio/tdeio/kurifilter.cpp create mode 100644 tdeio/tdeio/kurifilter.h create mode 100644 tdeio/tdeio/kurlcompletion.cpp create mode 100644 tdeio/tdeio/kurlcompletion.h create mode 100644 tdeio/tdeio/kurlpixmapprovider.cpp create mode 100644 tdeio/tdeio/kurlpixmapprovider.h create mode 100644 tdeio/tdeio/kuserprofile.cpp create mode 100644 tdeio/tdeio/kuserprofile.h create mode 100644 tdeio/tdeio/kzip.cpp create mode 100644 tdeio/tdeio/kzip.h create mode 100644 tdeio/tdeio/lex.c create mode 100644 tdeio/tdeio/lex.l create mode 100644 tdeio/tdeio/metainfojob.cpp create mode 100644 tdeio/tdeio/metainfojob.h create mode 100644 tdeio/tdeio/netaccess.cpp create mode 100644 tdeio/tdeio/netaccess.h create mode 100644 tdeio/tdeio/observer.cpp create mode 100644 tdeio/tdeio/observer.h create mode 100644 tdeio/tdeio/passdlg.cpp create mode 100644 tdeio/tdeio/passdlg.h create mode 100644 tdeio/tdeio/paste.cpp create mode 100644 tdeio/tdeio/paste.h create mode 100644 tdeio/tdeio/pastedialog.cpp create mode 100644 tdeio/tdeio/pastedialog.h create mode 100644 tdeio/tdeio/posixacladdons.cpp create mode 100644 tdeio/tdeio/posixacladdons.h create mode 100644 tdeio/tdeio/previewjob.cpp create mode 100644 tdeio/tdeio/previewjob.h create mode 100644 tdeio/tdeio/progressbase.cpp create mode 100644 tdeio/tdeio/progressbase.h create mode 100644 tdeio/tdeio/renamedlg.cpp create mode 100644 tdeio/tdeio/renamedlg.h create mode 100644 tdeio/tdeio/renamedlgplugin.h create mode 100644 tdeio/tdeio/scheduler.cpp create mode 100644 tdeio/tdeio/scheduler.h create mode 100644 tdeio/tdeio/sessiondata.cpp create mode 100644 tdeio/tdeio/sessiondata.h create mode 100644 tdeio/tdeio/skipdlg.cpp create mode 100644 tdeio/tdeio/skipdlg.h create mode 100644 tdeio/tdeio/slave.cpp create mode 100644 tdeio/tdeio/slave.h create mode 100644 tdeio/tdeio/slavebase.cpp create mode 100644 tdeio/tdeio/slavebase.h create mode 100644 tdeio/tdeio/slaveconfig.cpp create mode 100644 tdeio/tdeio/slaveconfig.h create mode 100644 tdeio/tdeio/slaveinterface.cpp create mode 100644 tdeio/tdeio/slaveinterface.h create mode 100644 tdeio/tdeio/statusbarprogress.cpp create mode 100644 tdeio/tdeio/statusbarprogress.h create mode 100644 tdeio/tdeio/tcpslavebase.cpp create mode 100644 tdeio/tdeio/tcpslavebase.h create mode 100644 tdeio/tdeio/tdefilefilter.cpp create mode 100644 tdeio/tdeio/tdefilefilter.h create mode 100644 tdeio/tdeio/tdefileitem.cpp create mode 100644 tdeio/tdeio/tdefileitem.h create mode 100644 tdeio/tdeio/tdefilemetainfo.cpp create mode 100644 tdeio/tdeio/tdefilemetainfo.h create mode 100644 tdeio/tdeio/tdefileshare.cpp create mode 100644 tdeio/tdeio/tdefileshare.h create mode 100644 tdeio/tdeio/tdelficon.cpp create mode 100644 tdeio/tdeio/tdelficon.h create mode 100644 tdeio/tdeio/thumbcreator.h create mode 100644 tdeio/tdeio/yacc.c create mode 100644 tdeio/tdeio/yacc.h create mode 100644 tdeio/tdeio/yacc.y create mode 100644 tdeio/tdeioexec/CMakeLists.txt create mode 100644 tdeio/tdeioexec/Makefile.am create mode 100644 tdeio/tdeioexec/README create mode 100644 tdeio/tdeioexec/main.cpp create mode 100644 tdeio/tdeioexec/main.h create mode 100644 tdeio/tdeioslave.upd create mode 100644 tdeio/tests/CMakeLists.txt create mode 100644 tdeio/tests/Makefile.am create mode 100644 tdeio/tests/dataprotocoltest.cpp create mode 100644 tdeio/tests/dummymeta.cpp create mode 100644 tdeio/tests/dummymeta.desktop create mode 100644 tdeio/tests/dummymeta.h create mode 100644 tdeio/tests/getalltest.cpp create mode 100644 tdeio/tests/jobtest.cpp create mode 100644 tdeio/tests/jobtest.h create mode 100644 tdeio/tests/kacltest.cpp create mode 100644 tdeio/tests/kacltest.h create mode 100644 tdeio/tests/kdcopcheck.cpp create mode 100644 tdeio/tests/kdcopcheck.h create mode 100644 tdeio/tests/kdefaultprogresstest.cpp create mode 100644 tdeio/tests/kdirlistertest.cpp create mode 100644 tdeio/tests/kdirlistertest.h create mode 100644 tdeio/tests/kdirwatchtest.cpp create mode 100644 tdeio/tests/kdirwatchtest.h create mode 100644 tdeio/tests/kdirwatchunittest.cpp create mode 100644 tdeio/tests/kdirwatchunittest.h create mode 100644 tdeio/tests/kfiltertest.cpp create mode 100644 tdeio/tests/kionetrctest.cpp create mode 100644 tdeio/tests/kiopassdlgtest.cpp create mode 100644 tdeio/tests/kmfitest.cpp create mode 100644 tdeio/tests/kmimefromext.cpp create mode 100644 tdeio/tests/kmimemagictest.cpp create mode 100644 tdeio/tests/kmimetypetest.cpp create mode 100644 tdeio/tests/kpropsdlgtest.cpp create mode 100644 tdeio/tests/kprotocolinfotest.cpp create mode 100644 tdeio/tests/kruntest.cpp create mode 100644 tdeio/tests/kruntest.h create mode 100644 tdeio/tests/kscantest.cpp create mode 100644 tdeio/tests/kshredtest.cpp create mode 100644 tdeio/tests/ktartest.cpp create mode 100644 tdeio/tests/kurifiltertest.cpp create mode 100644 tdeio/tests/kurlcompletiontest.cpp create mode 100644 tdeio/tests/kziptest.cpp create mode 100644 tdeio/tests/metatest.cpp create mode 100644 tdeio/tests/netaccesstest.cpp create mode 100644 tdeio/tests/previewtest.cpp create mode 100644 tdeio/tests/previewtest.h create mode 100644 tdeio/tests/speed.cpp create mode 100644 tdeio/tests/speed.h create mode 100644 tdeio/tests/tdeioslavetest.cpp create mode 100644 tdeio/tests/tdeioslavetest.h create mode 100644 tdeio/tests/tdesycocatest.cpp create mode 100644 tdeio/tests/tdesycocaupdatetest.cpp create mode 100644 tdeio/tests/tdetradertest.cpp create mode 100644 tdeio/tests/wronglocalsizes.zip create mode 100755 tdeio/useragent.pl create mode 100644 tdeioslave/CMakeLists.txt create mode 100644 tdeioslave/Mainpage.dox create mode 100644 tdeioslave/Makefile.am create mode 100644 tdeioslave/bzip2/CMakeLists.txt create mode 100644 tdeioslave/bzip2/Makefile.am create mode 100644 tdeioslave/bzip2/configure.in.in create mode 100644 tdeioslave/bzip2/kbzip2filter.cpp create mode 100644 tdeioslave/bzip2/kbzip2filter.desktop create mode 100644 tdeioslave/bzip2/kbzip2filter.h create mode 100644 tdeioslave/file/CMakeLists.txt create mode 100644 tdeioslave/file/Makefile.am create mode 100644 tdeioslave/file/file.cc create mode 100644 tdeioslave/file/file.h create mode 100644 tdeioslave/file/file.protocol create mode 100644 tdeioslave/ftp/CMakeLists.txt create mode 100644 tdeioslave/ftp/Makefile.am create mode 100644 tdeioslave/ftp/configure.in.in create mode 100644 tdeioslave/ftp/ftp.cc create mode 100644 tdeioslave/ftp/ftp.h create mode 100644 tdeioslave/ftp/ftp.protocol create mode 100644 tdeioslave/gzip/CMakeLists.txt create mode 100644 tdeioslave/gzip/Makefile.am create mode 100644 tdeioslave/gzip/kgzipfilter.cpp create mode 100644 tdeioslave/gzip/kgzipfilter.desktop create mode 100644 tdeioslave/gzip/kgzipfilter.h create mode 100644 tdeioslave/http/CMakeLists.txt create mode 100644 tdeioslave/http/Makefile.am create mode 100644 tdeioslave/http/README.http_cache_cleaner create mode 100644 tdeioslave/http/README.webdav create mode 100644 tdeioslave/http/THOUGHTS create mode 100644 tdeioslave/http/TODO create mode 100644 tdeioslave/http/configure.in.bot create mode 100644 tdeioslave/http/configure.in.in create mode 100644 tdeioslave/http/http.cc create mode 100644 tdeioslave/http/http.h create mode 100644 tdeioslave/http/http.protocol create mode 100644 tdeioslave/http/http_cache_cleaner.cpp create mode 100644 tdeioslave/http/http_cache_cleaner.desktop create mode 100644 tdeioslave/http/https.protocol create mode 100644 tdeioslave/http/kcookiejar/CMakeLists.txt create mode 100644 tdeioslave/http/kcookiejar/Makefile.am create mode 100644 tdeioslave/http/kcookiejar/domain_info create mode 100644 tdeioslave/http/kcookiejar/kcookiejar.cpp create mode 100644 tdeioslave/http/kcookiejar/kcookiejar.desktop create mode 100644 tdeioslave/http/kcookiejar/kcookiejar.h create mode 100644 tdeioslave/http/kcookiejar/kcookiescfg.upd create mode 100644 tdeioslave/http/kcookiejar/kcookieserver.cpp create mode 100644 tdeioslave/http/kcookiejar/kcookieserver.h create mode 100644 tdeioslave/http/kcookiejar/kcookiewin.cpp create mode 100644 tdeioslave/http/kcookiejar/kcookiewin.h create mode 100644 tdeioslave/http/kcookiejar/main.cpp create mode 100644 tdeioslave/http/kcookiejar/netscape_cookie_spec.html create mode 100644 tdeioslave/http/kcookiejar/rfc2109 create mode 100644 tdeioslave/http/kcookiejar/rfc2965 create mode 100644 tdeioslave/http/kcookiejar/tests/Makefile.am create mode 100644 tdeioslave/http/kcookiejar/tests/cookie.test create mode 100644 tdeioslave/http/kcookiejar/tests/cookie_rfc.test create mode 100644 tdeioslave/http/kcookiejar/tests/cookie_saving.test create mode 100644 tdeioslave/http/kcookiejar/tests/cookie_settings.test create mode 100644 tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp create mode 100644 tdeioslave/http/rfc2518.txt create mode 100644 tdeioslave/http/rfc2616.txt create mode 100644 tdeioslave/http/rfc2617.txt create mode 100644 tdeioslave/http/rfc2817.txt create mode 100644 tdeioslave/http/rfc2818.txt create mode 100644 tdeioslave/http/rfc3229.txt create mode 100644 tdeioslave/http/rfc3253.txt create mode 100644 tdeioslave/http/shoutcast-icecast.txt create mode 100644 tdeioslave/http/webdav.protocol create mode 100644 tdeioslave/http/webdavs.protocol create mode 100644 tdeioslave/iso/CMakeLists.txt create mode 100644 tdeioslave/iso/Makefile.am create mode 100644 tdeioslave/iso/iso.cpp create mode 100644 tdeioslave/iso/iso.h create mode 100644 tdeioslave/iso/iso.protocol create mode 100644 tdeioslave/iso/isoservice.desktop create mode 100644 tdeioslave/iso/kio_iso.desktop create mode 100644 tdeioslave/iso/kio_isorc create mode 100644 tdeioslave/iso/kiso.cpp create mode 100644 tdeioslave/iso/kiso.h create mode 100644 tdeioslave/iso/kisodirectory.cpp create mode 100644 tdeioslave/iso/kisodirectory.h create mode 100644 tdeioslave/iso/kisofile.cpp create mode 100644 tdeioslave/iso/kisofile.h create mode 100644 tdeioslave/iso/libisofs/CMakeLists.txt create mode 100644 tdeioslave/iso/libisofs/COPYING create mode 100644 tdeioslave/iso/libisofs/ChangeLog create mode 100644 tdeioslave/iso/libisofs/Makefile.am create mode 100644 tdeioslave/iso/libisofs/README create mode 100644 tdeioslave/iso/libisofs/bswap.h create mode 100644 tdeioslave/iso/libisofs/el_torito.h create mode 100644 tdeioslave/iso/libisofs/iso_fs.h create mode 100644 tdeioslave/iso/libisofs/isofs.c create mode 100644 tdeioslave/iso/libisofs/isofs.h create mode 100644 tdeioslave/iso/libisofs/rock.h create mode 100644 tdeioslave/iso/qfilehack.cpp create mode 100644 tdeioslave/iso/qfilehack.h create mode 100644 tdeioslave/metainfo/CMakeLists.txt create mode 100644 tdeioslave/metainfo/Makefile.am create mode 100644 tdeioslave/metainfo/metainfo.cpp create mode 100644 tdeioslave/metainfo/metainfo.h create mode 100644 tdeioslave/metainfo/metainfo.protocol delete mode 100644 tdeprint/kfilelist.cpp delete mode 100644 tdeprint/kfilelist.h create mode 100644 tdeprint/tdefilelist.cpp create mode 100644 tdeprint/tdefilelist.h delete mode 100644 tdeui/kconfigdialog.cpp delete mode 100644 tdeui/kconfigdialog.h create mode 100644 tdeui/tdeconfigdialog.cpp create mode 100644 tdeui/tdeconfigdialog.h delete mode 100644 win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro create mode 100644 win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro delete mode 100644 win/pro_files/kioslave/bzip2/bzip2.pro delete mode 100644 win/pro_files/kioslave/common.pro delete mode 100644 win/pro_files/kioslave/gzip/gzip.pro delete mode 100644 win/pro_files/kioslave/kioslave.pro delete mode 100644 win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro create mode 100644 win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro create mode 100644 win/pro_files/tdeioslave/bzip2/bzip2.pro create mode 100644 win/pro_files/tdeioslave/common.pro create mode 100644 win/pro_files/tdeioslave/gzip/gzip.pro create mode 100644 win/pro_files/tdeioslave/tdeioslave.pro delete mode 100644 win/resources/kbuildsycoca.res create mode 100644 win/resources/tdebuildsycoca.res (limited to 'kio/kfile/kfiledetailview.h') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a1f952dd..3a9f23a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_INOTIFY "Enable inotify support for kio" ON ) +OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON ) OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF ) @@ -745,7 +745,7 @@ endif( ) # before altering the LIBR_VERSION check, # please ensure that nothing changed in the # duplicated data definitions present in -# kio/kio/kfileitem.cpp +# tdeio/tdeio/tdefileitem.cpp if( WITH_ELFICON ) pkg_search_module( LIBR libr ) @@ -886,7 +886,7 @@ configure_file( config.h.cmake config.h ) configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h ) configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h ) configure_file( kjs/global.h.in kjs/global.h ) -configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h ) +configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h ) configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) @@ -895,7 +895,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl ) set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp ) set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc ) -set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler ) +set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/tdeconfig_compiler/tdeconfig_compiler ) ##### global compiler settings ################## @@ -937,7 +937,7 @@ add_subdirectory( tdeui ) add_subdirectory( tdesu ) add_subdirectory( kjs ) add_subdirectory( tdewallet ) -add_subdirectory( kio ) +add_subdirectory( tdeio ) add_subdirectory( kded ) # FIXME this directory/target doesn't exists @@ -962,11 +962,11 @@ if( XRANDR_FOUND ) add_subdirectory( tderandr ) endif( XRANDR_FOUND ) add_subdirectory( tdehtml ) -add_subdirectory( kcmshell ) -add_subdirectory( kconf_update ) +add_subdirectory( tdecmshell ) +add_subdirectory( tdeconf_update ) add_subdirectory( kdewidgets ) add_subdirectory( kimgio ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) add_subdirectory( kstyles ) add_subdirectory( libtdemid ) add_subdirectory( libtdescreensaver ) @@ -977,7 +977,7 @@ add_subdirectory( licenses ) add_subdirectory( dnssd ) add_subdirectory( pics ) add_subdirectory( mimetypes ) -add_subdirectory( kfile-plugins ) +add_subdirectory( tdefile-plugins ) ##### install import cmake modules ############### diff --git a/KDE2PORTING.html b/KDE2PORTING.html index c373e83f5..131c74577 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.

       #include <kglobal.h>
-      #include <kconfig.h>      // Needed to use TDEConfig
+      #include <tdeconfig.h>      // Needed to use TDEConfig
       #include <klocale.h>      // Needed to use KLocale
       #include <kiconloader.h>  // Needed to use KIconLoader
@@ -501,20 +501,20 @@ are necessary to convert your old KDND-based stuff to Qt DND.

libkfm has disappeared

Lots of other functionalities have been taken out of kfm, some being - now in libkio, some in libkonq.

+ now in libtdeio, some in libkonq.

Replacement table :

- + - + - - - + + +
KFM::download -> TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)
KFM::download -> TDEIO::NetAccess::download (tdelibs/tdeio/netaccess.h)
KFM::removeTempFile -> TDEIO::NetAccess::removeTempFile
refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it
KFM::configure -> see konqueror DCOP interface
KFM::openURL -> "(void) new KRun (url)" (tdelibs/kio/krun.h)
KFM::openURL -> "(void) new KRun (url)" (tdelibs/tdeio/krun.h)
KFM::refreshDirectory -> not needed anymore since konqy/kdesktop use KDirWatch
KFM::openProperties -> "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)
KFM::exec -> "(void) new KRun (url)" (tdelibs/kio/krun.h)
KFM::copy, KFM::move -> TDEIO::Job (async, see kio/job.h)
- or TDEIO::NetAccess (sync, see kio/netaccess.h)
KFM::openProperties -> "(void) new KPropertiesDialog (url)" (tdelibs/tdefile/kpropsdlg.h)
KFM::exec -> "(void) new KRun (url)" (tdelibs/tdeio/krun.h)
KFM::copy, KFM::move -> TDEIO::Job (async, see tdeio/job.h)
+ or TDEIO::NetAccess (sync, see tdeio/netaccess.h)
DlgLocation -> Use KLineEditDlg (tdeui/klineeditdlg.h) instead
diff --git a/KDE3PORTING.html b/KDE3PORTING.html index 645bd7612..7d6130ac4 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -23,7 +23,7 @@ or this page online.

  • Changes in tdeparts
  • Changes in tdespell
  • API-cleanup in KHTML
    • -
  • Changes in kfile
    • +
  • Changes in tdefile
  • TDE Control Center
  • Panel Applets and Extensions
    • @@ -214,7 +214,7 @@ The preferred means of defining a shortcut, however, is to use KAction.

    KIconLoader, KIconTheme

    Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments. The change should affect only code using hardcoded numeric values instead of using the proper enum constants. -This applies to classes KIconLoader, KIconTheme and (in kio and kfile) KMimeType, KService, KIconDialog, KIconButton, +This applies to classes KIconLoader, KIconTheme and (in kio and tdefile) KMimeType, KService, KIconDialog, KIconButton, KURLBar and KURLBarItem.

    Return to the Table of Contents

    @@ -416,7 +416,7 @@ TQString&) is not a slot anymore.

    KOpenWithHandler / KFileOpenWithHandler

    Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore. -The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has +The merging of libtdeio, libtdesycoca, libtdefile and libkssl into a single libtdeio has allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.

    KMimeType, KService

    @@ -520,14 +520,14 @@ disable this use a #define KDE_NO_COMPAT.

    Return to the Table of Contents

    -

    Changes in kfile

    -The kfile-library, as used by the KFileDialog provides classes for directory browsing widgets. +

    Changes in tdefile

    +The tdefile-library, as used by the KFileDialog provides classes for directory browsing widgets. Those classes gained some new features, some parts were merged with other existing classes -and in some cases the API was cleaned up/fixed. The library is now built as part of libkio -library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -lkfile). +and in some cases the API was cleaned up/fixed. The library is now built as part of libtdeio +library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -ltdefile).

    Even if the list of changes is long, the affected code base should be relatively small, as most -parts are rarely used outside of kfile. +parts are rarely used outside of tdefile.

    The changes are:

    KFileItem

    diff --git a/Mainpage.dox b/Mainpage.dox index ef5745224..15904678c 100644 --- a/Mainpage.dox +++ b/Mainpage.dox @@ -20,8 +20,8 @@ * - kjs * (classes)\n * Javascript (aka. ECMAScript and JScript) support. - * - kio - * (classes)\n + * - kio + * (classes)\n * Low level access to network files. Also provides access to facilities * such as KDirWatcher which monitors directories for changes. * - tdeparts diff --git a/Makefile.am.in b/Makefile.am.in index 10e9219dd..83d0901fa 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -27,7 +27,7 @@ COMPILE_BEFORE_kabc = kab tderesources COMPILE_BEFORE_kate = interfaces tdeutils COMPILE_BEFORE_tdemdi = tdeutils COMPILE_BEFORE_tdespell2 = tdeutils -COMPILE_BEFORE_kcmshell = tdeutils +COMPILE_BEFORE_tdecmshell = tdeutils COMPILE_BEFORE_kdewidgets = kabc tdehtml COMPILE_BEFORE_interfaces = arts kabc diff --git a/README b/README index 1392e27c5..c96978eb9 100644 --- a/README +++ b/README @@ -42,7 +42,7 @@ Here is an alphabetical list: * tdecert Personal certification manager. -* kconf_update +* tdeconf_update Auto-Updater for config files. * tdecore @@ -89,7 +89,7 @@ Here is an alphabetical list: contains "tdesycoca", the system configure cache containing services, applications, servicetypes and mimetypes. -* kioslave +* tdeioslave I/O subprocesses to handle files, ftp, http, gzip and bzip2 streams. * kjs diff --git a/TODO b/TODO index dcbfec292..75f989156 100644 --- a/TODO +++ b/TODO @@ -180,9 +180,9 @@ that we would like to make for the next binary incompatible release. - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog -- Make libtdewalletclient part of libkio and get rid of libtdewalletclient. +- Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient. -- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*, +- Get rid of libtdesu dependency in libtdeio, get rid of SessionData::AuthData*, get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization - Make functions in KHelpMenu virtual so they can be overridden (ex: to provide @@ -215,7 +215,7 @@ an alternative help->contents action) - 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. +- Refactor the tdeio/bookmarks code so we don't need to use the static d-pointer trick anymore. - Rename the parameters to KDEDesktopMimeType::pixmap so that they use meaningful names rather than just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt index 3877ddb9d..3b585256d 100644 --- a/arts/kde/CMakeLists.txt +++ b/arts/kde/CMakeLists.txt @@ -18,8 +18,8 @@ include_directories( ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -65,6 +65,6 @@ add_custom_command( tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop + LINK tdeio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index 4ff509980..bf6b3654a 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include "artsversion.h" diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index d0a872881..1d18f6421 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "artskde.h" #include "stdsynthmodule.h" diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc index 2e8187e67..039c8a3bc 100644 --- a/arts/kde/kplayobjectcreator.cc +++ b/arts/kde/kplayobjectcreator.cc @@ -19,7 +19,7 @@ */ -#include +#include #include "artskde.h" #include "kplayobjectcreator.h" #include "kplayobjectcreator.moc" diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index db4110792..fa9e2c5a1 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -19,7 +19,7 @@ */ -#include +#include #include "kplayobject.h" #include "artskde.h" #include "kplayobjectfactory.h" @@ -33,7 +33,7 @@ #include #include "kaudiomanagerplay.h" #include -#include +#include using namespace std; diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index b8c1642f9..71006c1a7 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -50,7 +50,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/configure.in.in b/configure.in.in index c899ee519..00870d24c 100644 --- a/configure.in.in +++ b/configure.in.in @@ -252,9 +252,9 @@ AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la') AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la') AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la') AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la') -AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la') -AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la') -AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la') +AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la') +AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la') +AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la') AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la') AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la') AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la') @@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl') AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng') AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp') AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets') -AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler') +AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler') ac_save_LIBS="$LIBS" LIBS="$LIBS $X_LDFLAGS -lICE" diff --git a/configure.in.mid b/configure.in.mid index 669f0d13c..bf0c8d021 100644 --- a/configure.in.mid +++ b/configure.in.mid @@ -1,7 +1,7 @@ dnl put here things which have to be done after all usual autoconf macros dnl have been run, but before the Makefiles are created -all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)' +all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdeio/tdeio -I$(top_srcdir)/tdeio/tdefile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)' AC_SUBST(all_includes) CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp index a4bcb67bb..940d62fd6 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -166,16 +166,16 @@ bool launchApp(TQString app) TQDataStream arg(data, IO_WriteOnly); arg << app << URLs; - if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)", + if ( !dcop->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { - tqWarning( "call to klauncher failed."); + tqWarning( "call to tdelauncher failed."); return false; } TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { - tqWarning( "unexpected result '%s' from klauncher.", replyType.data()); + tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data()); return false; } int result; diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp index 737184385..a3ea04726 100644 --- a/dcop/client/dcopstart.cpp +++ b/dcop/client/dcopstart.cpp @@ -49,7 +49,7 @@ void startApp(const char *_app, int argc, const char **args) TQDataStream arg(data, IO_WriteOnly); arg << app << URLs; - if ( !dcop->call( "klauncher", "klauncher", function, data, replyType, replyData) ) { + if ( !dcop->call( "tdelauncher", "tdelauncher", function, data, replyType, replyData) ) { tqWarning( "call failed"); exit(1); } else { diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus index 41f49333d..ec16d8fa8 100644 --- a/dcop/dcopidlng/kalyptus +++ b/dcop/dcopidlng/kalyptus @@ -1514,7 +1514,7 @@ sub makeParamList($$$) } if (defined $defaultparam && $isEnum) { - # Remove any casts in enum values, for example this in kfileitem.h: + # Remove any casts in enum values, for example this in tdefileitem.h: # 'enum { Unknown = (mode_t) - 1 };' $defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/; } diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index 09d96161d..01be9831c 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -45,6 +45,6 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 LINK tdecore-shared - DEPENDENCIES kconfig_compiler + DEPENDENCIES tdeconfig_compiler DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/doc/api/kfiledialog.png b/doc/api/kfiledialog.png deleted file mode 100644 index fa54aa3b2..000000000 Binary files a/doc/api/kfiledialog.png and /dev/null differ diff --git a/doc/api/tdefiledialog.png b/doc/api/tdefiledialog.png new file mode 100644 index 000000000..fa54aa3b2 Binary files /dev/null and b/doc/api/tdefiledialog.png differ diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-kbuildsycoca.8.docbook deleted file mode 100644 index 670c000c0..000000000 --- a/doc/tdelibs/man-kbuildsycoca.8.docbook +++ /dev/null @@ -1,221 +0,0 @@ - - -]> - - - - - - -Darian -Lanx - -
    content@openprojects.net
    -     -     - -2001-04-25 -0.01.01 - -     - - -KBuildSycoca -8 - - - -Description -Rebuilds the system configuration cache. - - - -Synopsis - - -kbuildsycoca - - ---nosignal ---incremental ---help ---help-qt ---help-kde ---help-all ---author --v, --version ---license - - - - - - -Description - - -kbuildsyscoca, as part of the &tde; command line -tools ensures the proper operation of &tde; by reading in all the -.desktop, .directory, .kimgio and .protocol files to constructs a binary -database. - - - -&tde; itself accesses this databse during operation to provide -configurational information a program needs to run. - - - -This tool is part of ksyscoca, which stands for &tde; System -Configuration Cache - - - - - -Options - - - - - -Don't signal applications - - - - - - -Incremental Update - - - - - - - - - - -Show help about options - - - - - - - - -Show Qt specific options - - - - - - - - -Show KDE specific options - - - - - - - - -Show all options - - - - - - - - -Show author information - - - - - - - - -Show version information - - - - - - - - -Show license information - - - - - - - - -Usage - -A standard way to run this program is by simply specifying the following -command at the prompt -kbuildsyscoca - - - - - -Files - - - -/tmp/tde-$USER/ksyscoca - -... - - - - - - - -Environment Variables - - -$TDEDIRS - -Specifies which directories are part of the KDE -installations - - - - - - - -See Also - -tdesycoca(3), kblah(4), knogga(6) - - - - -Bugs - -There are no known bugs at the time of writing. - - - -     - - - diff --git a/doc/tdelibs/man-tdebuildsycoca.8.docbook b/doc/tdelibs/man-tdebuildsycoca.8.docbook new file mode 100644 index 000000000..243e0f9a5 --- /dev/null +++ b/doc/tdelibs/man-tdebuildsycoca.8.docbook @@ -0,0 +1,221 @@ + + +]> + + + + + + +Darian +Lanx + +
    content@openprojects.net
    +     +     + +2001-04-25 +0.01.01 + +     + + +KBuildSycoca +8 + + + +Description +Rebuilds the system configuration cache. + + + +Synopsis + + +tdebuildsycoca + + +--nosignal +--incremental +--help +--help-qt +--help-kde +--help-all +--author +-v, --version +--license + + + + + + +Description + + +kbuildsyscoca, as part of the &tde; command line +tools ensures the proper operation of &tde; by reading in all the +.desktop, .directory, .kimgio and .protocol files to constructs a binary +database. + + + +&tde; itself accesses this databse during operation to provide +configurational information a program needs to run. + + + +This tool is part of ksyscoca, which stands for &tde; System +Configuration Cache + + + + + +Options + + + + + +Don't signal applications + + + + + + +Incremental Update + + + + + + + + + + +Show help about options + + + + + + + + +Show Qt specific options + + + + + + + + +Show KDE specific options + + + + + + + + +Show all options + + + + + + + + +Show author information + + + + + + + + +Show version information + + + + + + + + +Show license information + + + + + + + + +Usage + +A standard way to run this program is by simply specifying the following +command at the prompt +kbuildsyscoca + + + + + +Files + + + +/tmp/tde-$USER/ksyscoca + +... + + + + + + + +Environment Variables + + +$TDEDIRS + +Specifies which directories are part of the KDE +installations + + + + + + + +See Also + +tdesycoca(3), kblah(4), knogga(6) + + + + +Bugs + +There are no known bugs at the time of writing. + + + +     + + + diff --git a/interfaces/kio/CMakeLists.txt b/interfaces/kio/CMakeLists.txt index efcecf65e..a8d8a2189 100644 --- a/interfaces/kio/CMakeLists.txt +++ b/interfaces/kio/CMakeLists.txt @@ -13,5 +13,5 @@ install( FILES http.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio ) diff --git a/interfaces/kio/Makefile.am b/interfaces/kio/Makefile.am index 8fad24200..daa98db05 100644 --- a/interfaces/kio/Makefile.am +++ b/interfaces/kio/Makefile.am @@ -1,3 +1,3 @@ -kioincludedir = $(includedir)/kio +kioincludedir = $(includedir)/tdeio kioinclude_HEADERS = http.h diff --git a/interfaces/kregexpeditor/Makefile.am b/interfaces/kregexpeditor/Makefile.am index 2007129da..4e8f5af2a 100644 --- a/interfaces/kregexpeditor/Makefile.am +++ b/interfaces/kregexpeditor/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes) include_HEADERS = kregexpeditorinterface.h diff --git a/interfaces/tdeimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt index 9aa1f60ee..40974d722 100644 --- a/interfaces/tdeimproxy/library/CMakeLists.txt +++ b/interfaces/tdeimproxy/library/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -45,7 +45,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES dcopidl ) diff --git a/interfaces/tdemediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt index 00ab7f3d9..0c9355560 100644 --- a/interfaces/tdemediaplayer/CMakeLists.txt +++ b/interfaces/tdemediaplayer/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# if( ARTS_FOUND ) - add_subdirectory( kfileaudiopreview ) + add_subdirectory( tdefileaudiopreview ) endif( ARTS_FOUND ) include_directories( diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am index 0b7aded07..91ed342bd 100644 --- a/interfaces/tdemediaplayer/Makefile.am +++ b/interfaces/tdemediaplayer/Makefile.am @@ -1,8 +1,8 @@ if include_ARTS -kfileaudiopreview_subdir = kfileaudiopreview +tdefileaudiopreview_subdir = tdefileaudiopreview endif -SUBDIRS = . $(kfileaudiopreview_subdir) +SUBDIRS = . $(tdefileaudiopreview_subdir) INCLUDES = -I$(srcdir)/.. $(all_includes) lib_LTLIBRARIES = libtdemediaplayer.la diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt deleted file mode 100644 index 17485b65a..000000000 --- a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -################################################# -# -# (C) 2010 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${TQT_INCLUDE_DIRS} - ${ARTS_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/tdecore - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/interfaces - ${CMAKE_SOURCE_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/arts/kde -) - -link_directories( - ${TQT_LIBRARY_DIRS} - ${ARTS_LIBRARY_DIRS} -) - - -##### kfileaudiopreview ######################### - -set( target kfileaudiopreview ) - -set( ${target}_SRCS - kfileaudiopreview.cpp -) - -tde_add_kpart( ${target} AUTOMOC - SOURCES ${${target}_SRCS} - LINK tdemediaplayer-shared artskde-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am deleted file mode 100644 index 4f88a0c87..000000000 --- a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = kfileaudiopreview.la - -kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp -kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) - -noinst_HEADERS = kfileaudiopreview.h - -messages: - $(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp deleted file mode 100644 index 1d83fc590..000000000 --- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include "kfileaudiopreview.h" - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -class KFileAudioPreviewFactory : public KLibFactory -{ -protected: - virtual TQObject *createObject( TQObject *parent, const char *name, - const char *className, const TQStringList & args) - { - Q_UNUSED(className); - Q_UNUSED(args); - return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast( parent ), name )); - } -}; - -K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory ) - - -/////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////// - - -class KFileAudioPreview::KFileAudioPreviewPrivate -{ -public: - KFileAudioPreviewPrivate( TQWidget *parent ) - { - player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) ); - } - - ~KFileAudioPreviewPrivate() - { - delete player; - } - - KMediaPlayer::Player *player; -}; - - -KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) - : KPreviewWidgetBase( parent, name ) -{ - TDEGlobal::locale()->insertCatalogue("kfileaudiopreview"); - - TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); - // ### - TQStringList::ConstIterator it = formats.begin(); - for ( ; it != formats.end(); ++it ) - m_supportedFormats.insert( *it, (void*) 1 ); - - TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->addWidget( box ); - - (void) new TQWidget( box ); // spacer - - d = new KFileAudioPreviewPrivate( 0L ); // not box -- being reparented anyway - if ( d->player ) // only if there actually is a component... - { - setSupportedMimeTypes( formats ); - KMediaPlayer::View *view = d->player->view(); - view->setEnabled( false ); - - // if we have access to the video widget, show it above the player - // So, reparent first the video widget, then the view. - if ( view->videoWidget() ) - { - TQHBox *frame = new TQHBox( box ); - frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - view->videoWidget()->reparent( frame, TQPoint(0,0) ); - } - - view->reparent( box, TQPoint(0,0) ); - } - - m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); - 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() -{ - TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); - config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() ); - - delete d; -} - -void KFileAudioPreview::showPreview( const KURL &url ) -{ - if ( !d->player || !url.isValid() ) - return; - - KMimeType::Ptr mt = KMimeType::findByURL( url ); - bool supported = m_supportedFormats.find( mt->name() ); - d->player->view()->setEnabled( supported ); - if ( !supported ) - return; - - static_cast(d->player)->openURL( url ); - if ( m_autoPlay->isChecked() ) - d->player->play(); -} - -void KFileAudioPreview::clearPreview() -{ - if ( d->player ) - { - d->player->stop(); - d->player->closeURL(); - } -} - -void KFileAudioPreview::toggleAuto( bool on ) -{ - if ( !d->player ) - return; - - if ( on && m_currentURL.isValid() && d->player->view()->isEnabled() ) - d->player->play(); - else - d->player->stop(); -} - -void KFileAudioPreview::virtual_hook( int, void* ) -{} - -#include "kfileaudiopreview.moc" diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h deleted file mode 100644 index de48e4712..000000000 --- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h +++ /dev/null @@ -1,64 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2003 Carsten Pfeiffer - - library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation, version 2. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KFILEAUDIOPREVIEW_H -#define KFILEAUDIOPREVIEW_H - -#include - -#include -#include - -class TQCheckBox; -class TQPushButton; -class TQLabel; - -class KFileDialog; -class KFileItem; - -/** - * Audio "preview" widget for the file dialog. - */ -class KFileAudioPreview : public KPreviewWidgetBase -{ - Q_OBJECT - -public: - KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 ); - ~KFileAudioPreview(); - -public slots: - virtual void showPreview(const KURL &url); - virtual void clearPreview(); - -private slots: - void toggleAuto(bool); - -private: - TQDict m_supportedFormats; - KURL m_currentURL; - TQCheckBox *m_autoPlay; - -protected: - virtual void virtual_hook( int id, void* data ); -private: - class KFileAudioPreviewPrivate; - KFileAudioPreviewPrivate *d; -}; - -#endif // KFILEAUDIOPREVIEW_H diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt new file mode 100644 index 000000000..8e561e1f3 --- /dev/null +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt @@ -0,0 +1,46 @@ +################################################# +# +# (C) 2010 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${TQT_INCLUDE_DIRS} + ${ARTS_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/dcop + ${CMAKE_SOURCE_DIR}/interfaces + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile + ${CMAKE_SOURCE_DIR}/arts/kde +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${ARTS_LIBRARY_DIRS} +) + + +##### tdefileaudiopreview ######################### + +set( target tdefileaudiopreview ) + +set( ${target}_SRCS + tdefileaudiopreview.cpp +) + +tde_add_kpart( ${target} AUTOMOC + SOURCES ${${target}_SRCS} + LINK tdemediaplayer-shared artskde-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am new file mode 100644 index 000000000..d73cf545f --- /dev/null +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am @@ -0,0 +1,13 @@ +INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes) +METASOURCES = AUTO + +kde_module_LTLIBRARIES = tdefileaudiopreview.la + +tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp +tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined +tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) + +noinst_HEADERS = tdefileaudiopreview.h + +messages: + $(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp new file mode 100644 index 000000000..7dd746c4f --- /dev/null +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp @@ -0,0 +1,146 @@ +#include "tdefileaudiopreview.h" + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +class KFileAudioPreviewFactory : public KLibFactory +{ +protected: + virtual TQObject *createObject( TQObject *parent, const char *name, + const char *className, const TQStringList & args) + { + Q_UNUSED(className); + Q_UNUSED(args); + return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast( parent ), name )); + } +}; + +K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory ) + + +/////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////// + + +class KFileAudioPreview::KFileAudioPreviewPrivate +{ +public: + KFileAudioPreviewPrivate( TQWidget *parent ) + { + player = KParts::ComponentFactory::createInstanceFromQuery( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) ); + } + + ~KFileAudioPreviewPrivate() + { + delete player; + } + + KMediaPlayer::Player *player; +}; + + +KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) + : KPreviewWidgetBase( parent, name ) +{ + TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview"); + + TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); + // ### + TQStringList::ConstIterator it = formats.begin(); + for ( ; it != formats.end(); ++it ) + m_supportedFormats.insert( *it, (void*) 1 ); + + TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( box ); + + (void) new TQWidget( box ); // spacer + + d = new KFileAudioPreviewPrivate( 0L ); // not box -- being reparented anyway + if ( d->player ) // only if there actually is a component... + { + setSupportedMimeTypes( formats ); + KMediaPlayer::View *view = d->player->view(); + view->setEnabled( false ); + + // if we have access to the video widget, show it above the player + // So, reparent first the video widget, then the view. + if ( view->videoWidget() ) + { + TQHBox *frame = new TQHBox( box ); + frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); + frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + view->videoWidget()->reparent( frame, TQPoint(0,0) ); + } + + view->reparent( box, TQPoint(0,0) ); + } + + m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); + 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() +{ + TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); + config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() ); + + delete d; +} + +void KFileAudioPreview::showPreview( const KURL &url ) +{ + if ( !d->player || !url.isValid() ) + return; + + KMimeType::Ptr mt = KMimeType::findByURL( url ); + bool supported = m_supportedFormats.find( mt->name() ); + d->player->view()->setEnabled( supported ); + if ( !supported ) + return; + + static_cast(d->player)->openURL( url ); + if ( m_autoPlay->isChecked() ) + d->player->play(); +} + +void KFileAudioPreview::clearPreview() +{ + if ( d->player ) + { + d->player->stop(); + d->player->closeURL(); + } +} + +void KFileAudioPreview::toggleAuto( bool on ) +{ + if ( !d->player ) + return; + + if ( on && m_currentURL.isValid() && d->player->view()->isEnabled() ) + d->player->play(); + else + d->player->stop(); +} + +void KFileAudioPreview::virtual_hook( int, void* ) +{} + +#include "tdefileaudiopreview.moc" diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h new file mode 100644 index 000000000..de48e4712 --- /dev/null +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h @@ -0,0 +1,64 @@ +/* This file is part of the KDE libraries + Copyright (C) 2003 Carsten Pfeiffer + + library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation, version 2. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KFILEAUDIOPREVIEW_H +#define KFILEAUDIOPREVIEW_H + +#include + +#include +#include + +class TQCheckBox; +class TQPushButton; +class TQLabel; + +class KFileDialog; +class KFileItem; + +/** + * Audio "preview" widget for the file dialog. + */ +class KFileAudioPreview : public KPreviewWidgetBase +{ + Q_OBJECT + +public: + KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 ); + ~KFileAudioPreview(); + +public slots: + virtual void showPreview(const KURL &url); + virtual void clearPreview(); + +private slots: + void toggleAuto(bool); + +private: + TQDict m_supportedFormats; + KURL m_currentURL; + TQCheckBox *m_autoPlay; + +protected: + virtual void virtual_hook( int id, void* data ); +private: + class KFileAudioPreviewPrivate; + KFileAudioPreviewPrivate *d; +}; + +#endif // KFILEAUDIOPREVIEW_H diff --git a/interfaces/tdescript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt index bcddb1068..6b57cdeb9 100644 --- a/interfaces/tdescript/CMakeLists.txt +++ b/interfaces/tdescript/CMakeLists.txt @@ -19,8 +19,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -51,6 +51,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am index 55d4cac35..03c7efc87 100644 --- a/interfaces/tdescript/Makefile.am +++ b/interfaces/tdescript/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . sample -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes) #lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la lib_LTLIBRARIES = libtdescript.la diff --git a/interfaces/tdescript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am index 77d39b28c..e20854c70 100644 --- a/interfaces/tdescript/sample/Makefile.am +++ b/interfaces/tdescript/sample/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes) kde_module_LTLIBRARIES = libshellscript.la diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index 79fa2055a..1ff34f98a 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt index a9d39edbb..0808a84f3 100644 --- a/interfaces/tdetexteditor/CMakeLists.txt +++ b/interfaces/tdetexteditor/CMakeLists.txt @@ -20,8 +20,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am index 5663bb761..fce0ec563 100644 --- a/interfaces/tdetexteditor/Makefile.am +++ b/interfaces/tdetexteditor/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) lib_LTLIBRARIES = libtdetexteditor.la diff --git a/interfaces/tdetexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h index ed6a80d81..10a6173a0 100644 --- a/interfaces/tdetexteditor/configinterface.h +++ b/interfaces/tdetexteditor/configinterface.h @@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT ConfigInterface virtual void writeConfig () = 0; /** - Read/Write the config of the part to a given kconfig object + Read/Write the config of the part to a given tdeconfig object to store the settings in a different place than the standard */ virtual void readConfig (TDEConfig *) = 0; diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp index 807d342d0..ce493018d 100644 --- a/interfaces/tdetexteditor/editorchooser.cpp +++ b/interfaces/tdetexteditor/editorchooser.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt index 5f2619cf9..57c4741fe 100644 --- a/kabc/CMakeLists.txt +++ b/kabc/CMakeLists.txt @@ -29,8 +29,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/kab ) @@ -58,7 +58,7 @@ install( FILES ##### other data ################################ -install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc ) @@ -102,18 +102,18 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK vcards-static vcard-shared kio-shared tderesources-shared + LINK vcards-static vcard-shared tdeio-shared tderesources-shared DEPENDENCIES addressee.h dcopidl DESTINATION ${LIB_INSTALL_DIR} ) -##### kab2kabc ################################## +##### tdeab2tdeabc ################################## -set( target kab2kabc ) +set( target tdeab2tdeabc ) set( ${target}_SRCS - kab2kabc.cpp + tdeab2tdeabc.cpp ) tde_add_executable( ${target} diff --git a/kabc/Makefile.am b/kabc/Makefile.am index ef989662f..57e72aec2 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -50,13 +50,13 @@ kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ METASOURCES = AUTO -bin_PROGRAMS = kab2kabc +bin_PROGRAMS = tdeab2tdeabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kab2kabc_LDADD = libkabc.la ../kab/libkab.la -kab2kabc_SOURCES = kab2kabc.cpp +tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la +tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp -autostart_DATA = kab2kabc.desktop +autostart_DATA = tdeab2tdeabc.desktop autostartdir = $(datadir)/autostart manager_DATA = kabc_manager.desktop diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp index 908795869..5b8998852 100644 --- a/kabc/addresseehelper.cpp +++ b/kabc/addresseehelper.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include "addresseehelper.h" diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index 76d99f634..efb0738aa 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h index 76a3704d5..ff9da5504 100644 --- a/kabc/formatfactory.h +++ b/kabc/formatfactory.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "formatplugin.h" diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt index 327cb1ea6..60ea1c3fd 100644 --- a/kabc/formats/CMakeLists.txt +++ b/kabc/formats/CMakeLists.txt @@ -18,8 +18,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp deleted file mode 100644 index 11b80639a..000000000 --- a/kabc/kab2kabc.cpp +++ /dev/null @@ -1,476 +0,0 @@ -/* - This file is part of libkabc. - Copyright (c) 2001 Cornelius Schumacher - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "addressbook.h" -#include "stdaddressbook.h" - -using namespace KABC; - -static const KCmdLineOptions options[] = -{ - { "disable-autostart", I18N_NOOP( "Disable automatic startup on login" ), 0 }, - { "quiet", "", 0 }, - { "o", 0, 0 }, - { "override", I18N_NOOP( "Override existing entries" ), "1" }, - KCmdLineLastOption -}; - -void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) -{ - kdDebug() << "KMAILENTRY: " << kmailEntry << endl; - - TQString entry = kmailEntry.simplifyWhiteSpace(); - if ( entry.isEmpty() ) return; - - TQString email; - TQString name; - TQString comment; - - if ( entry.at( entry.length() -1 ) == ')' ) { - int br = entry.findRev( '(' ); - if ( br >= 0 ) { - comment = entry.mid( br + 1, entry.length() - br - 2 ); - entry.truncate( br ); - if ( entry.at( entry.length() - 1 ).isSpace() ) { - entry.truncate( br - 1 ); - } - } - } - - int posSpace = entry.findRev( ' ' ); - if ( posSpace < 0 ) { - email = entry; - if ( !comment.isEmpty() ) { - name = comment; - comment = ""; - } - } else { - email = entry.mid( posSpace + 1 ); - name = entry.left( posSpace ); - } - - if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) { - email = email.mid( 1, email.length() - 2 ); - } - if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) { - name = name.mid( 1, name.length() - 2 ); - } - if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) { - name = name.mid( 1, name.length() - 2 ); - } - - if ( name.at( name.length() -1 ) == ')' ) { - int br = name.findRev( '(' ); - if ( br >= 0 ) { - comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment; - name.truncate( br ); - if ( name.at( name.length() - 1 ).isSpace() ) { - name.truncate( br - 1 ); - } - } - } - - kdDebug() << " EMAIL : " << email << endl; - kdDebug() << " NAME : " << name << endl; - kdDebug() << " COMMENT : " << comment << endl; - - KABC::Addressee::List al = ab->findByEmail( email ); - if ( al.isEmpty() ) { - KABC::Addressee a; - a.setNameFromString( name ); - a.insertEmail( email ); - a.setNote( comment ); - - ab->insertAddressee( a ); - - kdDebug() << "--INSERTED: " << a.realName() << endl; - } -} - -void importKMailAddressBook( KABC::AddressBook *ab ) -{ - TQString fileName = locateLocal( "data", "kmail/addressbook" ); - TQString kmailConfigName = locate( "config", "kmailrc" ); - if ( !kmailConfigName.isEmpty() ) { - TDEConfig cfg( kmailConfigName ); - cfg.setGroup( "Addressbook" ); - fileName = cfg.readPathEntry( "default", fileName ); - } - if ( !KStandardDirs::exists( fileName ) ) { - kdDebug(5700) << "Couldn't find KMail addressbook." << endl; - return; - } - - TQFile f( fileName ); - if ( !f.open(IO_ReadOnly) ) { - kdDebug(5700) << "Couldn't open file '" << fileName << "'" << endl; - return; - } - - TQStringList kmailEntries; - - TQTextStream t( &f ); - while ( !t.eof() ) { - kmailEntries.append( t.readLine() ); - } - f.close(); - - TQStringList::ConstIterator it; - for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) { - if ( (*it).at( 0 ) == '#' ) continue; - bool insideQuote = false; - int end = (*it).length() - 1; - for ( int i = end; i; i-- ) { - if ( (*it).at( i ) == '"' ) { - if ( insideQuote ) - insideQuote = false; - else - insideQuote = true; - } else if ( (*it).at( i ) == ',' && !insideQuote ) { - readKMailEntry( (*it).mid( i + 1, end - i ), ab ); - end = i - 1; - } - } - - readKMailEntry( (*it).mid( 0, end + 1 ), ab ); - } -} - -void readKAddressBookEntries( const TQString &dataString, Addressee &a ) -{ - // Strip "KMail:1.0" prefix and "[EOS]" suffix. - TQString str = dataString.mid( 11, dataString.length() - 24 ); - - TQStringList entries = TQStringList::split( "\n[EOR]\n ", str ); - - Address homeAddress( Address::Home ); - Address businessAddress( Address::Work ); - Address otherAddress; - - TQStringList::ConstIterator it; - for ( it = entries.begin(); it != entries.end(); ++it ) { - int pos = (*it).find( "\n" ); - TQString fieldName = (*it).left( pos ); - TQString fieldValue = (*it).mid( pos + 2 ); - - if ( fieldName == "X-HomeFax" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home | - PhoneNumber::Fax ) ); - } else if ( fieldName == "X-OtherPhone" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, 0 ) ); - } else if ( fieldName == "X-PrimaryPhone" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Pref ) ); - } else if ( fieldName == "X-BusinessFax" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Work | - PhoneNumber::Fax ) ); - } else if ( fieldName == "X-CarPhone" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Car ) ); - } else if ( fieldName == "X-MobilePhone" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Cell ) ); - } else if ( fieldName == "X-ISDN" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Isdn ) ); - } else if ( fieldName == "X-OtherFax" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Fax ) ); - } else if ( fieldName == "X-Pager" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Pager ) ); - } else if ( fieldName == "X-BusinessPhone" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Work ) ); - } else if ( fieldName == "X-HomePhone" ) { - a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home ) ); - } else if ( fieldName == "X-HomeAddress" ) { - homeAddress.setLabel( fieldValue ); - } else if ( fieldName == "X-HomeAddressStreet" ) { - homeAddress.setStreet( fieldValue ); - } else if ( fieldName == "X-HomeAddressCity" ) { - homeAddress.setLocality( fieldValue ); - } else if ( fieldName == "X-HomeAddressPostalCode" ) { - homeAddress.setPostalCode( fieldValue ); - } else if ( fieldName == "X-HomeAddressState" ) { - homeAddress.setRegion( fieldValue ); - } else if ( fieldName == "X-HomeAddressCountry" ) { - homeAddress.setCountry( fieldValue ); - } else if ( fieldName == "X-BusinessAddress" ) { - businessAddress.setLabel( fieldValue ); - } else if ( fieldName == "X-BusinessAddressStreet" ) { - businessAddress.setStreet( fieldValue ); - } else if ( fieldName == "X-BusinessAddressCity" ) { - businessAddress.setLocality( fieldValue ); - } else if ( fieldName == "X-BusinessAddressPostalCode" ) { - businessAddress.setPostalCode( fieldValue ); - } else if ( fieldName == "X-BusinessAddressState" ) { - businessAddress.setRegion( fieldValue ); - } else if ( fieldName == "X-BusinessAddressCountry" ) { - businessAddress.setCountry( fieldValue ); - } else if ( fieldName == "X-OtherAddress" ) { - otherAddress.setLabel( fieldValue ); - } else if ( fieldName == "X-OtherAddressStreet" ) { - otherAddress.setStreet( fieldValue ); - } else if ( fieldName == "X-OtherAddressCity" ) { - otherAddress.setLocality( fieldValue ); - } else if ( fieldName == "X-OtherAddressPostalCode" ) { - otherAddress.setPostalCode( fieldValue ); - } else if ( fieldName == "X-OtherAddressState" ) { - otherAddress.setRegion( fieldValue ); - } else if ( fieldName == "X-OtherAddressCountry" ) { - otherAddress.setCountry( fieldValue ); - } else if ( fieldName == "NICKNAME" ) { - a.setNickName( fieldValue ); - } else if ( fieldName == "ORG" ) { - a.setOrganization( fieldValue ); - } else if ( fieldName == "ROLE" ) { - a.setRole( fieldValue ); - } else if ( fieldName == "BDAY" ) { - a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) ); - } else if ( fieldName == "WEBPAGE" ) { - a.setUrl( KURL( fieldValue ) ); - } else if ( fieldName == "N" ) { - } else if ( fieldName == "X-FirstName" ) { - } else if ( fieldName == "X-MiddleName" ) { - } else if ( fieldName == "X-LastName" ) { - } else if ( fieldName == "X-Title" ) { - } else if ( fieldName == "X-Suffix" ) { - } else if ( fieldName == "X-FileAs" ) { - } else if ( fieldName == "EMAIL" ) { - a.insertEmail( fieldValue, true ); - } else if ( fieldName == "X-E-mail2" ) { - a.insertEmail( fieldValue ); - } else if ( fieldName == "X-E-mail3" ) { - a.insertEmail( fieldValue ); - } else if ( fieldName == "X-Notes" ) { - } else { - a.insertCustom( "KADDRESSBOOK", fieldName, fieldValue ); - } - } - - if ( !homeAddress.isEmpty() ) a.insertAddress( homeAddress ); - if ( !businessAddress.isEmpty() ) a.insertAddress( businessAddress ); - if ( !otherAddress.isEmpty() ) a.insertAddress( otherAddress ); -} - -void importKab( KABC::AddressBook *ab, bool override, bool quiet ) -{ - TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" ); - fileName += "addressbook.kab"; - if ( !TQFile::exists( fileName ) ) { - if ( !quiet ) { - KMessageBox::error( 0, "" + i18n( "Address book file %1 not found! Make sure the old address book is located there and you have read permission for this file." ) - .arg( fileName ) + "" ); - } - kdDebug(5700) << "No KDE 2 addressbook found." << endl; - return; - } - - kdDebug(5700) << "Converting old-style kab addressbook to " - "new-style kabc addressbook." << endl; - - KabAPI kab( 0 ); - if ( kab.init() != ::AddressBook::NoError ) { - kdDebug(5700) << "Error initing kab" << endl; - exit( 1 ); - } - - KabKey key; - ::AddressBook::Entry entry; - - int num = kab.addressbook()->noOfEntries(); - - kdDebug(5700) << "kab Addressbook has " << num << " entries." << endl; - - for ( int i = 0; i < num; ++i ) { - if ( ::AddressBook::NoError != kab.addressbook()->getKey( i, key ) ) { - kdDebug(5700) << "Error getting key for index " << i << " from kab." << endl; - continue; - } - if ( ::AddressBook::NoError != kab.addressbook()->getEntry( key, entry ) ) { - kdDebug(5700) << "Error getting entry for index " << i << " from kab." << endl; - continue; - } - - Addressee a; - - // Convert custom entries - int count = 0; - bool idFound = false; - TQStringList::ConstIterator customIt; - for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) { - if ( (*customIt).startsWith( "X-KABC-UID:" ) ) { - a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) ); - idFound = true; - } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) { - readKAddressBookEntries( *customIt, a ); - } else { - a.insertCustom( "kab2kabc", TQString::number( count++ ), *customIt ); - } - } - if ( idFound ) { - if ( !override ) continue; - } else { - entry.custom << "X-KABC-UID:" + a.uid(); - ::AddressBook::ErrorCode error = kab.addressbook()->change( key, entry ); - if ( error != ::AddressBook::NoError ) { - kdDebug(5700) << "kab.change returned with error " << error << endl; - } else { - kdDebug(5700) << "Wrote back to kab uid " << a.uid() << endl; - } - } - - a.setTitle( entry.title ); - a.setFormattedName( entry.fn ); - a.setPrefix( entry.nameprefix ); - a.setGivenName( entry.firstname ); - a.setAdditionalName( entry.middlename ); - a.setFamilyName( entry.lastname ); - a.setBirthday( entry.birthday ); - - TQStringList::ConstIterator emailIt; - for ( emailIt = entry.emails.begin(); emailIt != entry.emails.end(); ++emailIt ) - a.insertEmail( *emailIt ); - - TQStringList::ConstIterator phoneIt; - for ( phoneIt = entry.telephone.begin(); phoneIt != entry.telephone.end(); ++phoneIt ) { - int kabType = (*phoneIt++).toInt(); - if ( phoneIt == entry.telephone.end() ) break; - TQString number = *phoneIt; - int type = 0; - if ( kabType == ::AddressBook::Fixed ) type = PhoneNumber::Voice; - else if ( kabType == ::AddressBook::Mobile ) type = PhoneNumber::Cell | PhoneNumber::Voice; - else if ( kabType == ::AddressBook::Fax ) type = PhoneNumber::Fax; - else if ( kabType == ::AddressBook::Modem ) type = PhoneNumber::Modem; - a.insertPhoneNumber( PhoneNumber( number, type ) ); - } - - if ( entry.URLs.count() > 0 ) { - a.setUrl( KURL( entry.URLs.first() ) ); - if ( entry.URLs.count() > 1 ) { - kdWarning() << "More than one URL. Ignoring all but the first." << endl; - } - } - - int noAdr = entry.noOfAddresses(); - for ( int j = 0; j < noAdr; ++j ) { - ::AddressBook::Entry::Address kabAddress; - entry.getAddress( j, kabAddress ); - - Address adr; - - adr.setStreet( kabAddress.address ); - adr.setPostalCode( kabAddress.zip ); - adr.setLocality( kabAddress.town ); - adr.setCountry( kabAddress.country ); - adr.setRegion( kabAddress.state ); - - TQString label; - if ( !kabAddress.headline.isEmpty() ) label += kabAddress.headline + "\n"; - if ( !kabAddress.position.isEmpty() ) label += kabAddress.position + "\n"; - if ( !kabAddress.org.isEmpty() ) label += kabAddress.org + "\n"; - if ( !kabAddress.orgUnit.isEmpty() ) label += kabAddress.orgUnit + "\n"; - if ( !kabAddress.orgSubUnit.isEmpty() ) label += kabAddress.orgSubUnit + "\n"; - if ( !kabAddress.deliveryLabel.isEmpty() ) label += kabAddress.deliveryLabel + "\n"; - adr.setLabel( label ); - - a.insertAddress( adr ); - } - - TQString note = entry.comment; - - if ( !entry.user1.isEmpty() ) note += "\nUser1: " + entry.user1; - if ( !entry.user2.isEmpty() ) note += "\nUser2: " + entry.user2; - if ( !entry.user3.isEmpty() ) note += "\nUser3: " + entry.user3; - if ( !entry.user4.isEmpty() ) note += "\nUser4: " + entry.user4; - - if ( !entry.keywords.count() == 0 ) note += "\nKeywords: " + entry.keywords.join( ", " ); - - TQStringList::ConstIterator talkIt; - for ( talkIt = entry.talk.begin(); talkIt != entry.talk.end(); ++talkIt ) { - note += "\nTalk: " + (*talkIt); - } - - a.setNote( note ); - - a.setPrefix( entry.rank + a.prefix() ); // Add rank to prefix - - a.setCategories( entry.categories ); - - kdDebug(5700) << "Addressee: " << a.familyName() << endl; - - ab->insertAddressee( a ); - } - - kab.save( true ); -} - -int main( int argc, char **argv ) -{ - TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" ); - aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - - TDECmdLineArgs::init( argc, argv, &aboutData ); - TDECmdLineArgs::addCmdLineOptions( options ); - - TDEApplication app; - - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - bool override = false; - - if ( args->isSet( "override" ) ) { - kdDebug() << "Override existing entries." << endl; - - override = true; - } - - bool quiet = false; - - if ( args->isSet( "quiet" ) ) - quiet = true; - - if ( args->isSet( "disable-autostart" ) ) { - kdDebug() << "Disable autostart." << endl; - - TDEConfig *config = app.config(); - config->setGroup( "Startup" ); - config->writeEntry( "EnableAutostart", false ); - } - - KABC::AddressBook *kabcBook = StdAddressBook::self(); - - importKMailAddressBook( kabcBook ); - - importKab( kabcBook, override, quiet ); - - StdAddressBook::save(); - - kdDebug(5700) << "Saved kabc addressbook to '" << kabcBook->identifier() << "'" << endl; -} - diff --git a/kabc/kab2kabc.desktop b/kabc/kab2kabc.desktop deleted file mode 100644 index 3015b3935..000000000 --- a/kabc/kab2kabc.desktop +++ /dev/null @@ -1,105 +0,0 @@ -[Desktop Entry] -Name=kab2kabc -Name[af]=kab-na-kabc -Name[csb]=Kònwersëjô adresowi knéżczi -Name[eo]=Konvertilo de "kab" al "kabc" -Name[fr]=KAB2KABC -Name[fy]=Kab2kabc -Name[hu]=Kab2kabc -Name[it]=Kab2Kabc -Name[nl]=Kab2kabc -Name[pl]=Konwersja książki adresowej -Name[pt_BR]=Conversão de kab para kabc -Name[ro]=Kab2kabc -Name[sv]=Kab2kabc -Name[te]=కెఎబి2కెఎబిసి -Name[zu]=i-kab2kabc -Exec=kab2kabc --disable-autostart --quiet -Icon=misc -Type=Application -Comment=libkab to libkabc conversion tool. -Comment[af]=libkab na libkabc omskakeling program. -Comment[ar]=أداة تحويل libkab إلى libkabc. -Comment[az]=libkab - libkabc dönüşdürmÉ™ vasitÉ™si. -Comment[be]=ІнÑтрумент пераўтварÑÐ½Ð½Ñ libkab у libkabc. -Comment[bg]=Програма за конвертиране на libkab до libkabc. -Comment[bn]=libkab থেকে libkabc-তে পরিবরà§à¦¤à¦¨ করার পà§à¦°à§‹à¦—à§à¦°à¦¾à¦®à¥¤ -Comment[bs]=alat za pretvaranje libkab u libkabc. -Comment[ca]=Eina de conversió de libkab a libkabc. -Comment[cs]=PÅ™evod dat z libkab do libkabc. -Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc. -Comment[cy]=erfyn trosi libkab i libkabc -Comment[da]=libkab-til-libkabc-konverteringsværktøj. -Comment[de]=Konvertierung von libkab in libkabc -Comment[el]=ΕÏγαλείο μετατÏοπής από το libkab στο libkabc. -Comment[eo]=Konvertilo de "libkab" al "libkabc" -Comment[es]=Conversor libkab a libkabc. -Comment[et]=libkab -> libkabc teisendamine -Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna. -Comment[fa]=ابزار تبدیل libkab به libcabc. -Comment[fi]=libkab-libkabc -muunnin -Comment[fr]=Outil de conversion de libkab vers libkabc. -Comment[fy]=Konversjeprogramma fan libkab nei libkabc. -Comment[ga]=Uirlis tiontaithe ó libkab go libkabc. -Comment[gl]=Ferramenta de conversión de libkab a libkabc. -Comment[he]=כלי המרה מ־libkab ל־libkabc -Comment[hi]=libkab से libkabc बदलने वाला औजार -Comment[hr]=Alat za pretvaranje iz libkab u libkabc -Comment[hsb]=libkab -> libkabc konwerter -Comment[hu]=libkab -> libkabc konvertáló. -Comment[id]=konverter libkab ke libkabc. -Comment[is]=libkab í libkabc breytingatól. -Comment[it]=Strumento di conversione da libkab a libkabc. -Comment[ja]=libkab ã‹ã‚‰ libkabc ã¸ã®å¤‰æ›ãƒ„ール -Comment[ka]=libkab => libkabc გáƒáƒ áƒ“áƒáƒ¥áƒ›áƒœáƒ˜áƒ¡ ხელსáƒáƒ¬áƒ§áƒ. -Comment[kk]=libkab дегеннен libkabc дегенге айналдыру құралы. -Comment[km]=ឧបករណáŸâ€‹áž”ម្លែង​ពី libkab ទៅ libkabc -Comment[ko]=libkabì„ libkabcë¡œ 바꿔주는 연장. -Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel. -Comment[lt]=libkab į libkabc konvertavimo įrankis. -Comment[lv]=libkab uz libkabc kovertÄ“Å¡anas rÄ«ks. -Comment[mk]=алатка за претворање од libkab во libkabc. -Comment[mn]=libkab-Ð°Ð°Ñ libkabc-руу хөрвүүлÑгч -Comment[ms]=perkakasan penukaran libkab to libkabc. -Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc -Comment[nb]=libkab til libkabc konverteringsverktøy. -Comment[nds]=Warktüüch för't Ãœmwanneln vun libkab na libkabc. -Comment[ne]=libkab to libkabc रूपानà¥à¤¤à¤°à¤£ उपकरण । -Comment[nl]=Conversieprogramma van libkab naar libkabc. -Comment[nn]=Konverterer libkab til libkabc -Comment[nso]=Sebereka sa phetosetso ya libkab go libkabc -Comment[pa]=libkab ਤੋ libkabc ਤਬਦੀਲੀ ਸੰਦ। -Comment[pl]=NarzÄ™dzie do konwersji z libkab do libkabc. -Comment[pt]=Ferramenta de conversão de libkab para libkabc. -Comment[pt_BR]=Ferramenta de conversão de libkab para libkabc. -Comment[ro]=Utilitar de conversie de la "libkab" la "libkabc". -Comment[ru]=утилита Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ libkab в libkabc. -Comment[rw]=Igikoresho cy'ihindura libkab muri libkabc. -Comment[se]=konverterenreaidu libkab:as libkabc:ai -Comment[sk]=Prevod dát z libkab do libkabc. -Comment[sl]=Orodje za pretvorbo iz libkab v libkabc -Comment[sq]=Vegla për shëndrimin e libkab në libkabc. -Comment[sr]=Ðлат за конверзију из libkab-а у libkabc. -Comment[sr@Latn]=Alat za konverziju iz libkab-a u libkabc. -Comment[ss]=Lithulusi lekutjintja le-libkab kuya ku-libkabc. -Comment[sv]=Konverteringsverktyg frÃ¥n libkab till libkabc -Comment[ta]=libkab இலிரà¯à®¨à¯à®¤à¯ libkabc கà¯à®•à¯ மாறà¯à®±à¯à®®à¯ கரà¯à®µà®¿. -Comment[te]=libkab à°¨à±à°‚à°šà°¿ libkabc కౠమారà±à°šà± పనిమà±à°Ÿà±à°Ÿà± -Comment[tg]=аÑбоби дигаргунÑози libkab ба libkabc -Comment[th]=เครื่องมือเปลี่ยน libkab เป็น libkabc -Comment[tr]=libkab' tan libkabc' ye dönüştürme aracı -Comment[tt]=libkab-›libkabc äyländerü qoralı. -Comment[uk]=ЗаÑіб Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ libkab до libkabc. -Comment[uz]=libkab'ni libkabc'ga aylantiradigan vosita. -Comment[uz@cyrillic]=libkab'ни libkabc'га айлантирадиган воÑита. -Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc -Comment[vi]=Công cụ chuyển đổi libkab sang libkabc. -Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela. -Comment[zh_CN]=libkab 到 libkabc 的转æ¢å·¥å…·ã€‚ -Comment[zh_HK]=libkab 至 libkabc 的轉æ›å·¥å…· -Comment[zh_TW]=libkab 至 libkabc 轉æ›å·¥å…· -Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc -Terminal=false -NoDisplay=true -X-TDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true -OnlyShowIn=TDE; diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp index 568408ba2..f696ae915 100644 --- a/kabc/ldapclient.cpp +++ b/kabc/ldapclient.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h index 5f8513599..f43a644ce 100644 --- a/kabc/ldapclient.h +++ b/kabc/ldapclient.h @@ -31,7 +31,7 @@ #include #include -#include +#include namespace KABC { diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h index 0fd0dd7e5..01074292e 100644 --- a/kabc/ldapconfigwidget.h +++ b/kabc/ldapconfigwidget.h @@ -27,7 +27,7 @@ #include #include -#include +#include class TQGridLayout; class TQSpinBox; diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt index 47f81a355..737d1144e 100644 --- a/kabc/plugins/dir/CMakeLists.txt +++ b/kabc/plugins/dir/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index 0dfd0352a..6b1759f1d 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h index a7b041643..f62ee91ba 100644 --- a/kabc/plugins/dir/resourcedir.h +++ b/kabc/plugins/dir/resourcedir.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCEDIR_H #define KABC_RESOURCEDIR_H -#include +#include #include #include diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt index 3dbcd639f..f8847d7e9 100644 --- a/kabc/plugins/file/CMakeLists.txt +++ b/kabc/plugins/file/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 3e5b1fa8f..2d2008c0d 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -30,9 +30,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index 494c43ea6..3d2efe85f 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCEFILE_H #define KABC_RESOURCEFILE_H -#include +#include #include #include diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt index 150377bd9..0869c54e1 100644 --- a/kabc/plugins/ldapkio/CMakeLists.txt +++ b/kabc/plugins/ldapkio/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfiles + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefiles ) link_directories( @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kabc_ldapkio-shared + LINK kabc_ldaptdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index cdf21fb82..034fb0ef8 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -29,12 +29,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h index 6f40b12f8..5c9282b9c 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.h +++ b/kabc/plugins/ldapkio/resourceldapkio.h @@ -24,7 +24,7 @@ #include #include -#include +#include class TDEConfig; diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp index 53c72aa2b..b517cffa5 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "resourceldapkio.h" diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt index 365922d6c..e92fbfc32 100644 --- a/kabc/plugins/net/CMakeLists.txt +++ b/kabc/plugins/net/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kabc/plugins/net/resourcenet.cpp b/kabc/plugins/net/resourcenet.cpp index 78fb16256..9ef909904 100644 --- a/kabc/plugins/net/resourcenet.cpp +++ b/kabc/plugins/net/resourcenet.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/kabc/plugins/net/resourcenet.h b/kabc/plugins/net/resourcenet.h index a13bfa175..940627ecb 100644 --- a/kabc/plugins/net/resourcenet.h +++ b/kabc/plugins/net/resourcenet.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCENET_H #define KABC_RESOURCENET_H -#include +#include #include diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h index 9f1201844..770e5b73b 100644 --- a/kabc/plugins/sql/resourcesql.h +++ b/kabc/plugins/sql/resourcesql.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCESQL_H #define KABC_RESOURCESQL_H -#include +#include #include "addressbook.h" #include "resource.h" diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp index 6362d223c..2c80810b7 100644 --- a/kabc/scripts/field.src.cpp +++ b/kabc/scripts/field.src.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include "field.h" diff --git a/kabc/tdeab2tdeabc.cpp b/kabc/tdeab2tdeabc.cpp new file mode 100644 index 000000000..afb688078 --- /dev/null +++ b/kabc/tdeab2tdeabc.cpp @@ -0,0 +1,476 @@ +/* + This file is part of libkabc. + Copyright (c) 2001 Cornelius Schumacher + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "addressbook.h" +#include "stdaddressbook.h" + +using namespace KABC; + +static const KCmdLineOptions options[] = +{ + { "disable-autostart", I18N_NOOP( "Disable automatic startup on login" ), 0 }, + { "quiet", "", 0 }, + { "o", 0, 0 }, + { "override", I18N_NOOP( "Override existing entries" ), "1" }, + KCmdLineLastOption +}; + +void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) +{ + kdDebug() << "KMAILENTRY: " << kmailEntry << endl; + + TQString entry = kmailEntry.simplifyWhiteSpace(); + if ( entry.isEmpty() ) return; + + TQString email; + TQString name; + TQString comment; + + if ( entry.at( entry.length() -1 ) == ')' ) { + int br = entry.findRev( '(' ); + if ( br >= 0 ) { + comment = entry.mid( br + 1, entry.length() - br - 2 ); + entry.truncate( br ); + if ( entry.at( entry.length() - 1 ).isSpace() ) { + entry.truncate( br - 1 ); + } + } + } + + int posSpace = entry.findRev( ' ' ); + if ( posSpace < 0 ) { + email = entry; + if ( !comment.isEmpty() ) { + name = comment; + comment = ""; + } + } else { + email = entry.mid( posSpace + 1 ); + name = entry.left( posSpace ); + } + + if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) { + email = email.mid( 1, email.length() - 2 ); + } + if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) { + name = name.mid( 1, name.length() - 2 ); + } + if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) { + name = name.mid( 1, name.length() - 2 ); + } + + if ( name.at( name.length() -1 ) == ')' ) { + int br = name.findRev( '(' ); + if ( br >= 0 ) { + comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment; + name.truncate( br ); + if ( name.at( name.length() - 1 ).isSpace() ) { + name.truncate( br - 1 ); + } + } + } + + kdDebug() << " EMAIL : " << email << endl; + kdDebug() << " NAME : " << name << endl; + kdDebug() << " COMMENT : " << comment << endl; + + KABC::Addressee::List al = ab->findByEmail( email ); + if ( al.isEmpty() ) { + KABC::Addressee a; + a.setNameFromString( name ); + a.insertEmail( email ); + a.setNote( comment ); + + ab->insertAddressee( a ); + + kdDebug() << "--INSERTED: " << a.realName() << endl; + } +} + +void importKMailAddressBook( KABC::AddressBook *ab ) +{ + TQString fileName = locateLocal( "data", "kmail/addressbook" ); + TQString kmailConfigName = locate( "config", "kmailrc" ); + if ( !kmailConfigName.isEmpty() ) { + TDEConfig cfg( kmailConfigName ); + cfg.setGroup( "Addressbook" ); + fileName = cfg.readPathEntry( "default", fileName ); + } + if ( !KStandardDirs::exists( fileName ) ) { + kdDebug(5700) << "Couldn't find KMail addressbook." << endl; + return; + } + + TQFile f( fileName ); + if ( !f.open(IO_ReadOnly) ) { + kdDebug(5700) << "Couldn't open file '" << fileName << "'" << endl; + return; + } + + TQStringList kmailEntries; + + TQTextStream t( &f ); + while ( !t.eof() ) { + kmailEntries.append( t.readLine() ); + } + f.close(); + + TQStringList::ConstIterator it; + for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) { + if ( (*it).at( 0 ) == '#' ) continue; + bool insideQuote = false; + int end = (*it).length() - 1; + for ( int i = end; i; i-- ) { + if ( (*it).at( i ) == '"' ) { + if ( insideQuote ) + insideQuote = false; + else + insideQuote = true; + } else if ( (*it).at( i ) == ',' && !insideQuote ) { + readKMailEntry( (*it).mid( i + 1, end - i ), ab ); + end = i - 1; + } + } + + readKMailEntry( (*it).mid( 0, end + 1 ), ab ); + } +} + +void readKAddressBookEntries( const TQString &dataString, Addressee &a ) +{ + // Strip "KMail:1.0" prefix and "[EOS]" suffix. + TQString str = dataString.mid( 11, dataString.length() - 24 ); + + TQStringList entries = TQStringList::split( "\n[EOR]\n ", str ); + + Address homeAddress( Address::Home ); + Address businessAddress( Address::Work ); + Address otherAddress; + + TQStringList::ConstIterator it; + for ( it = entries.begin(); it != entries.end(); ++it ) { + int pos = (*it).find( "\n" ); + TQString fieldName = (*it).left( pos ); + TQString fieldValue = (*it).mid( pos + 2 ); + + if ( fieldName == "X-HomeFax" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home | + PhoneNumber::Fax ) ); + } else if ( fieldName == "X-OtherPhone" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, 0 ) ); + } else if ( fieldName == "X-PrimaryPhone" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Pref ) ); + } else if ( fieldName == "X-BusinessFax" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Work | + PhoneNumber::Fax ) ); + } else if ( fieldName == "X-CarPhone" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Car ) ); + } else if ( fieldName == "X-MobilePhone" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Cell ) ); + } else if ( fieldName == "X-ISDN" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Isdn ) ); + } else if ( fieldName == "X-OtherFax" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Fax ) ); + } else if ( fieldName == "X-Pager" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Pager ) ); + } else if ( fieldName == "X-BusinessPhone" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Work ) ); + } else if ( fieldName == "X-HomePhone" ) { + a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home ) ); + } else if ( fieldName == "X-HomeAddress" ) { + homeAddress.setLabel( fieldValue ); + } else if ( fieldName == "X-HomeAddressStreet" ) { + homeAddress.setStreet( fieldValue ); + } else if ( fieldName == "X-HomeAddressCity" ) { + homeAddress.setLocality( fieldValue ); + } else if ( fieldName == "X-HomeAddressPostalCode" ) { + homeAddress.setPostalCode( fieldValue ); + } else if ( fieldName == "X-HomeAddressState" ) { + homeAddress.setRegion( fieldValue ); + } else if ( fieldName == "X-HomeAddressCountry" ) { + homeAddress.setCountry( fieldValue ); + } else if ( fieldName == "X-BusinessAddress" ) { + businessAddress.setLabel( fieldValue ); + } else if ( fieldName == "X-BusinessAddressStreet" ) { + businessAddress.setStreet( fieldValue ); + } else if ( fieldName == "X-BusinessAddressCity" ) { + businessAddress.setLocality( fieldValue ); + } else if ( fieldName == "X-BusinessAddressPostalCode" ) { + businessAddress.setPostalCode( fieldValue ); + } else if ( fieldName == "X-BusinessAddressState" ) { + businessAddress.setRegion( fieldValue ); + } else if ( fieldName == "X-BusinessAddressCountry" ) { + businessAddress.setCountry( fieldValue ); + } else if ( fieldName == "X-OtherAddress" ) { + otherAddress.setLabel( fieldValue ); + } else if ( fieldName == "X-OtherAddressStreet" ) { + otherAddress.setStreet( fieldValue ); + } else if ( fieldName == "X-OtherAddressCity" ) { + otherAddress.setLocality( fieldValue ); + } else if ( fieldName == "X-OtherAddressPostalCode" ) { + otherAddress.setPostalCode( fieldValue ); + } else if ( fieldName == "X-OtherAddressState" ) { + otherAddress.setRegion( fieldValue ); + } else if ( fieldName == "X-OtherAddressCountry" ) { + otherAddress.setCountry( fieldValue ); + } else if ( fieldName == "NICKNAME" ) { + a.setNickName( fieldValue ); + } else if ( fieldName == "ORG" ) { + a.setOrganization( fieldValue ); + } else if ( fieldName == "ROLE" ) { + a.setRole( fieldValue ); + } else if ( fieldName == "BDAY" ) { + a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) ); + } else if ( fieldName == "WEBPAGE" ) { + a.setUrl( KURL( fieldValue ) ); + } else if ( fieldName == "N" ) { + } else if ( fieldName == "X-FirstName" ) { + } else if ( fieldName == "X-MiddleName" ) { + } else if ( fieldName == "X-LastName" ) { + } else if ( fieldName == "X-Title" ) { + } else if ( fieldName == "X-Suffix" ) { + } else if ( fieldName == "X-FileAs" ) { + } else if ( fieldName == "EMAIL" ) { + a.insertEmail( fieldValue, true ); + } else if ( fieldName == "X-E-mail2" ) { + a.insertEmail( fieldValue ); + } else if ( fieldName == "X-E-mail3" ) { + a.insertEmail( fieldValue ); + } else if ( fieldName == "X-Notes" ) { + } else { + a.insertCustom( "KADDRESSBOOK", fieldName, fieldValue ); + } + } + + if ( !homeAddress.isEmpty() ) a.insertAddress( homeAddress ); + if ( !businessAddress.isEmpty() ) a.insertAddress( businessAddress ); + if ( !otherAddress.isEmpty() ) a.insertAddress( otherAddress ); +} + +void importKab( KABC::AddressBook *ab, bool override, bool quiet ) +{ + TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" ); + fileName += "addressbook.kab"; + if ( !TQFile::exists( fileName ) ) { + if ( !quiet ) { + KMessageBox::error( 0, "" + i18n( "Address book file %1 not found! Make sure the old address book is located there and you have read permission for this file." ) + .arg( fileName ) + "" ); + } + kdDebug(5700) << "No KDE 2 addressbook found." << endl; + return; + } + + kdDebug(5700) << "Converting old-style kab addressbook to " + "new-style kabc addressbook." << endl; + + KabAPI kab( 0 ); + if ( kab.init() != ::AddressBook::NoError ) { + kdDebug(5700) << "Error initing kab" << endl; + exit( 1 ); + } + + KabKey key; + ::AddressBook::Entry entry; + + int num = kab.addressbook()->noOfEntries(); + + kdDebug(5700) << "kab Addressbook has " << num << " entries." << endl; + + for ( int i = 0; i < num; ++i ) { + if ( ::AddressBook::NoError != kab.addressbook()->getKey( i, key ) ) { + kdDebug(5700) << "Error getting key for index " << i << " from kab." << endl; + continue; + } + if ( ::AddressBook::NoError != kab.addressbook()->getEntry( key, entry ) ) { + kdDebug(5700) << "Error getting entry for index " << i << " from kab." << endl; + continue; + } + + Addressee a; + + // Convert custom entries + int count = 0; + bool idFound = false; + TQStringList::ConstIterator customIt; + for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) { + if ( (*customIt).startsWith( "X-KABC-UID:" ) ) { + a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) ); + idFound = true; + } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) { + readKAddressBookEntries( *customIt, a ); + } else { + a.insertCustom( "tdeab2tdeabc", TQString::number( count++ ), *customIt ); + } + } + if ( idFound ) { + if ( !override ) continue; + } else { + entry.custom << "X-KABC-UID:" + a.uid(); + ::AddressBook::ErrorCode error = kab.addressbook()->change( key, entry ); + if ( error != ::AddressBook::NoError ) { + kdDebug(5700) << "kab.change returned with error " << error << endl; + } else { + kdDebug(5700) << "Wrote back to kab uid " << a.uid() << endl; + } + } + + a.setTitle( entry.title ); + a.setFormattedName( entry.fn ); + a.setPrefix( entry.nameprefix ); + a.setGivenName( entry.firstname ); + a.setAdditionalName( entry.middlename ); + a.setFamilyName( entry.lastname ); + a.setBirthday( entry.birthday ); + + TQStringList::ConstIterator emailIt; + for ( emailIt = entry.emails.begin(); emailIt != entry.emails.end(); ++emailIt ) + a.insertEmail( *emailIt ); + + TQStringList::ConstIterator phoneIt; + for ( phoneIt = entry.telephone.begin(); phoneIt != entry.telephone.end(); ++phoneIt ) { + int kabType = (*phoneIt++).toInt(); + if ( phoneIt == entry.telephone.end() ) break; + TQString number = *phoneIt; + int type = 0; + if ( kabType == ::AddressBook::Fixed ) type = PhoneNumber::Voice; + else if ( kabType == ::AddressBook::Mobile ) type = PhoneNumber::Cell | PhoneNumber::Voice; + else if ( kabType == ::AddressBook::Fax ) type = PhoneNumber::Fax; + else if ( kabType == ::AddressBook::Modem ) type = PhoneNumber::Modem; + a.insertPhoneNumber( PhoneNumber( number, type ) ); + } + + if ( entry.URLs.count() > 0 ) { + a.setUrl( KURL( entry.URLs.first() ) ); + if ( entry.URLs.count() > 1 ) { + kdWarning() << "More than one URL. Ignoring all but the first." << endl; + } + } + + int noAdr = entry.noOfAddresses(); + for ( int j = 0; j < noAdr; ++j ) { + ::AddressBook::Entry::Address kabAddress; + entry.getAddress( j, kabAddress ); + + Address adr; + + adr.setStreet( kabAddress.address ); + adr.setPostalCode( kabAddress.zip ); + adr.setLocality( kabAddress.town ); + adr.setCountry( kabAddress.country ); + adr.setRegion( kabAddress.state ); + + TQString label; + if ( !kabAddress.headline.isEmpty() ) label += kabAddress.headline + "\n"; + if ( !kabAddress.position.isEmpty() ) label += kabAddress.position + "\n"; + if ( !kabAddress.org.isEmpty() ) label += kabAddress.org + "\n"; + if ( !kabAddress.orgUnit.isEmpty() ) label += kabAddress.orgUnit + "\n"; + if ( !kabAddress.orgSubUnit.isEmpty() ) label += kabAddress.orgSubUnit + "\n"; + if ( !kabAddress.deliveryLabel.isEmpty() ) label += kabAddress.deliveryLabel + "\n"; + adr.setLabel( label ); + + a.insertAddress( adr ); + } + + TQString note = entry.comment; + + if ( !entry.user1.isEmpty() ) note += "\nUser1: " + entry.user1; + if ( !entry.user2.isEmpty() ) note += "\nUser2: " + entry.user2; + if ( !entry.user3.isEmpty() ) note += "\nUser3: " + entry.user3; + if ( !entry.user4.isEmpty() ) note += "\nUser4: " + entry.user4; + + if ( !entry.keywords.count() == 0 ) note += "\nKeywords: " + entry.keywords.join( ", " ); + + TQStringList::ConstIterator talkIt; + for ( talkIt = entry.talk.begin(); talkIt != entry.talk.end(); ++talkIt ) { + note += "\nTalk: " + (*talkIt); + } + + a.setNote( note ); + + a.setPrefix( entry.rank + a.prefix() ); // Add rank to prefix + + a.setCategories( entry.categories ); + + kdDebug(5700) << "Addressee: " << a.familyName() << endl; + + ab->insertAddressee( a ); + } + + kab.save( true ); +} + +int main( int argc, char **argv ) +{ + TDEAboutData aboutData( "tdeab2tdeabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" ); + aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); + + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); + + TDEApplication app; + + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + + bool override = false; + + if ( args->isSet( "override" ) ) { + kdDebug() << "Override existing entries." << endl; + + override = true; + } + + bool quiet = false; + + if ( args->isSet( "quiet" ) ) + quiet = true; + + if ( args->isSet( "disable-autostart" ) ) { + kdDebug() << "Disable autostart." << endl; + + TDEConfig *config = app.config(); + config->setGroup( "Startup" ); + config->writeEntry( "EnableAutostart", false ); + } + + KABC::AddressBook *kabcBook = StdAddressBook::self(); + + importKMailAddressBook( kabcBook ); + + importKab( kabcBook, override, quiet ); + + StdAddressBook::save(); + + kdDebug(5700) << "Saved kabc addressbook to '" << kabcBook->identifier() << "'" << endl; +} + diff --git a/kabc/tdeab2tdeabc.desktop b/kabc/tdeab2tdeabc.desktop new file mode 100644 index 000000000..945f044d4 --- /dev/null +++ b/kabc/tdeab2tdeabc.desktop @@ -0,0 +1,105 @@ +[Desktop Entry] +Name=tdeab2tdeabc +Name[af]=kab-na-kabc +Name[csb]=Kònwersëjô adresowi knéżczi +Name[eo]=Konvertilo de "kab" al "kabc" +Name[fr]=KAB2KABC +Name[fy]=Kab2kabc +Name[hu]=Kab2kabc +Name[it]=Kab2Kabc +Name[nl]=Kab2kabc +Name[pl]=Konwersja książki adresowej +Name[pt_BR]=Conversão de kab para kabc +Name[ro]=Kab2kabc +Name[sv]=Kab2kabc +Name[te]=కెఎబి2కెఎబిసి +Name[zu]=i-tdeab2tdeabc +Exec=tdeab2tdeabc --disable-autostart --quiet +Icon=misc +Type=Application +Comment=libkab to libkabc conversion tool. +Comment[af]=libkab na libkabc omskakeling program. +Comment[ar]=أداة تحويل libkab إلى libkabc. +Comment[az]=libkab - libkabc dönüşdürmÉ™ vasitÉ™si. +Comment[be]=ІнÑтрумент пераўтварÑÐ½Ð½Ñ libkab у libkabc. +Comment[bg]=Програма за конвертиране на libkab до libkabc. +Comment[bn]=libkab থেকে libkabc-তে পরিবরà§à¦¤à¦¨ করার পà§à¦°à§‹à¦—à§à¦°à¦¾à¦®à¥¤ +Comment[bs]=alat za pretvaranje libkab u libkabc. +Comment[ca]=Eina de conversió de libkab a libkabc. +Comment[cs]=PÅ™evod dat z libkab do libkabc. +Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc. +Comment[cy]=erfyn trosi libkab i libkabc +Comment[da]=libkab-til-libkabc-konverteringsværktøj. +Comment[de]=Konvertierung von libkab in libkabc +Comment[el]=ΕÏγαλείο μετατÏοπής από το libkab στο libkabc. +Comment[eo]=Konvertilo de "libkab" al "libkabc" +Comment[es]=Conversor libkab a libkabc. +Comment[et]=libkab -> libkabc teisendamine +Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna. +Comment[fa]=ابزار تبدیل libkab به libcabc. +Comment[fi]=libkab-libkabc -muunnin +Comment[fr]=Outil de conversion de libkab vers libkabc. +Comment[fy]=Konversjeprogramma fan libkab nei libkabc. +Comment[ga]=Uirlis tiontaithe ó libkab go libkabc. +Comment[gl]=Ferramenta de conversión de libkab a libkabc. +Comment[he]=כלי המרה מ־libkab ל־libkabc +Comment[hi]=libkab से libkabc बदलने वाला औजार +Comment[hr]=Alat za pretvaranje iz libkab u libkabc +Comment[hsb]=libkab -> libkabc konwerter +Comment[hu]=libkab -> libkabc konvertáló. +Comment[id]=konverter libkab ke libkabc. +Comment[is]=libkab í libkabc breytingatól. +Comment[it]=Strumento di conversione da libkab a libkabc. +Comment[ja]=libkab ã‹ã‚‰ libkabc ã¸ã®å¤‰æ›ãƒ„ール +Comment[ka]=libkab => libkabc გáƒáƒ áƒ“áƒáƒ¥áƒ›áƒœáƒ˜áƒ¡ ხელსáƒáƒ¬áƒ§áƒ. +Comment[kk]=libkab дегеннен libkabc дегенге айналдыру құралы. +Comment[km]=ឧបករណáŸâ€‹áž”ម្លែង​ពី libkab ទៅ libkabc +Comment[ko]=libkabì„ libkabcë¡œ 바꿔주는 연장. +Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel. +Comment[lt]=libkab į libkabc konvertavimo įrankis. +Comment[lv]=libkab uz libkabc kovertÄ“Å¡anas rÄ«ks. +Comment[mk]=алатка за претворање од libkab во libkabc. +Comment[mn]=libkab-Ð°Ð°Ñ libkabc-руу хөрвүүлÑгч +Comment[ms]=perkakasan penukaran libkab to libkabc. +Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc +Comment[nb]=libkab til libkabc konverteringsverktøy. +Comment[nds]=Warktüüch för't Ãœmwanneln vun libkab na libkabc. +Comment[ne]=libkab to libkabc रूपानà¥à¤¤à¤°à¤£ उपकरण । +Comment[nl]=Conversieprogramma van libkab naar libkabc. +Comment[nn]=Konverterer libkab til libkabc +Comment[nso]=Sebereka sa phetosetso ya libkab go libkabc +Comment[pa]=libkab ਤੋ libkabc ਤਬਦੀਲੀ ਸੰਦ। +Comment[pl]=NarzÄ™dzie do konwersji z libkab do libkabc. +Comment[pt]=Ferramenta de conversão de libkab para libkabc. +Comment[pt_BR]=Ferramenta de conversão de libkab para libkabc. +Comment[ro]=Utilitar de conversie de la "libkab" la "libkabc". +Comment[ru]=утилита Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ libkab в libkabc. +Comment[rw]=Igikoresho cy'ihindura libkab muri libkabc. +Comment[se]=konverterenreaidu libkab:as libkabc:ai +Comment[sk]=Prevod dát z libkab do libkabc. +Comment[sl]=Orodje za pretvorbo iz libkab v libkabc +Comment[sq]=Vegla për shëndrimin e libkab në libkabc. +Comment[sr]=Ðлат за конверзију из libkab-а у libkabc. +Comment[sr@Latn]=Alat za konverziju iz libkab-a u libkabc. +Comment[ss]=Lithulusi lekutjintja le-libkab kuya ku-libkabc. +Comment[sv]=Konverteringsverktyg frÃ¥n libkab till libkabc +Comment[ta]=libkab இலிரà¯à®¨à¯à®¤à¯ libkabc கà¯à®•à¯ மாறà¯à®±à¯à®®à¯ கரà¯à®µà®¿. +Comment[te]=libkab à°¨à±à°‚à°šà°¿ libkabc కౠమారà±à°šà± పనిమà±à°Ÿà±à°Ÿà± +Comment[tg]=аÑбоби дигаргунÑози libkab ба libkabc +Comment[th]=เครื่องมือเปลี่ยน libkab เป็น libkabc +Comment[tr]=libkab' tan libkabc' ye dönüştürme aracı +Comment[tt]=libkab-›libkabc äyländerü qoralı. +Comment[uk]=ЗаÑіб Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ libkab до libkabc. +Comment[uz]=libkab'ni libkabc'ga aylantiradigan vosita. +Comment[uz@cyrillic]=libkab'ни libkabc'га айлантирадиган воÑита. +Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc +Comment[vi]=Công cụ chuyển đổi libkab sang libkabc. +Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela. +Comment[zh_CN]=libkab 到 libkabc 的转æ¢å·¥å…·ã€‚ +Comment[zh_HK]=libkab 至 libkabc 的轉æ›å·¥å…· +Comment[zh_TW]=libkab 至 libkabc 轉æ›å·¥å…· +Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc +Terminal=false +NoDisplay=true +X-TDE-autostart-condition=tdeab2tdeabcrc:Startup:EnableAutostart:true +OnlyShowIn=TDE; diff --git a/kate/data/bash.xml b/kate/data/bash.xml index 84c91596d..e3bc4abdd 100644 --- a/kate/data/bash.xml +++ b/kate/data/bash.xml @@ -439,7 +439,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml index f9dffa2e4..19c94beaa 100644 --- a/kate/data/tcsh.xml +++ b/kate/data/tcsh.xml @@ -431,7 +431,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml index 5d0575ab9..e69c15354 100644 --- a/kate/data/zsh.xml +++ b/kate/data/zsh.xml @@ -497,7 +497,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp index 69263b57c..2104ef157 100644 --- a/kate/interfaces/katecmd.cpp +++ b/kate/interfaces/katecmd.cpp @@ -118,7 +118,7 @@ const TQString KateCmd::fromHistory( uint index ) const //BEGIN KateCmdShellCompletion /* A lot of the code in the below class is copied from - tdelibs/kio/kio/kshellcompletion.cpp + tdelibs/tdeio/tdeio/kshellcompletion.cpp Copyright (C) 2000 David Smith Copyright (C) 2004 Anders Lund */ diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index 72ac36f8a..dcbc0eecd 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -21,9 +21,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/kjs ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdeprint diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 81b001c3c..d1c9fd1ee 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 43f5977d8..5006ddd6c 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 03c8ac638..74e5c3225 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -42,9 +42,9 @@ #include "katetemplatehandler.h" #include -#include -#include -#include +#include +#include +#include #include @@ -53,8 +53,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -1924,13 +1924,13 @@ void KateDocument::writeConfig() config->sync(); } -void KateDocument::readSessionConfig(TDEConfig *kconfig) +void KateDocument::readSessionConfig(TDEConfig *tdeconfig) { // restore the url - KURL url (kconfig->readEntry("URL")); + KURL url (tdeconfig->readEntry("URL")); // get the encoding - TQString tmpenc=kconfig->readEntry("Encoding"); + TQString tmpenc=tdeconfig->readEntry("Encoding"); if (!tmpenc.isEmpty() && (tmpenc != encoding())) setEncoding(tmpenc); @@ -1939,34 +1939,34 @@ void KateDocument::readSessionConfig(TDEConfig *kconfig) openURL (url); // restore the hl stuff - m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig->readEntry("Highlighting"))); + m_buffer->setHighlight(KateHlManager::self()->nameFind(tdeconfig->readEntry("Highlighting"))); if (hlMode() > 0) hlSetByUser = true; // indent mode - config()->setIndentationMode( (uint)kconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) ); + config()->setIndentationMode( (uint)tdeconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) ); // Restore Bookmarks - TQValueList marks = kconfig->readIntListEntry("Bookmarks"); + TQValueList marks = tdeconfig->readIntListEntry("Bookmarks"); for( uint i = 0; i < marks.count(); i++ ) addMark( marks[i], KateDocument::markType01 ); } -void KateDocument::writeSessionConfig(TDEConfig *kconfig) +void KateDocument::writeSessionConfig(TDEConfig *tdeconfig) { if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) return; // save url - kconfig->writeEntry("URL", m_url.prettyURL() ); + tdeconfig->writeEntry("URL", m_url.prettyURL() ); // save encoding - kconfig->writeEntry("Encoding",encoding()); + tdeconfig->writeEntry("Encoding",encoding()); // save hl - kconfig->writeEntry("Highlighting", highlight()->name()); + tdeconfig->writeEntry("Highlighting", highlight()->name()); - kconfig->writeEntry("Indentation Mode", config()->indentationMode() ); + tdeconfig->writeEntry("Indentation Mode", config()->indentationMode() ); // Save Bookmarks TQValueList marks; @@ -1975,7 +1975,7 @@ void KateDocument::writeSessionConfig(TDEConfig *kconfig) ++it ) marks << it.current()->line; - kconfig->writeEntry( "Bookmarks", marks ); + tdeconfig->writeEntry( "Bookmarks", marks ); } void KateDocument::configDialog() diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index a00d39bfb..15dd7c9f6 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -25,7 +25,7 @@ #include "kateview.h" #include "katefactory.h" -#include +#include #include #include #include diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 08da7e97f..f06518649 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -32,7 +32,7 @@ #include "kateschema.h" #include "kateconfig.h" -#include +#include #include #include #include diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index 1b71e454a..8ff5e31b2 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -26,7 +26,7 @@ #include "../interfaces/document.h" -#include +#include #include #include diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 28b22c74e..f3a5cd548 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -688,7 +688,7 @@ void KateJScriptManager::collectScripts (bool force) TDEConfig df (desktopFile, true, false); df.setDesktopGroup (); - // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback + // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback TQString cmdname = df.readEntry ("X-Kate-Command"); if (cmdname.isEmpty()) { diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index c06f3864e..46cf531a7 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index f6eb8ef60..2e92812de 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include class KateView; @@ -53,7 +53,7 @@ class KateSchemaManager void update (bool readfromfile = true); /** - * return kconfig with right group set or set to Normal if not there + * return tdeconfig with right group set or set to Normal if not there */ TDEConfig *schema (uint number); diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 4093f8722..d90f5de73 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 193f411fd..22a4799d6 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -50,9 +50,9 @@ #include -#include +#include -#include +#include #include #include #include diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 4f2ef26a5..1463c8bcd 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -42,7 +42,7 @@ #include #include #include "katefactory.h" -#include +#include #include #include #include diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index ceb76eedd..cf3190c4e 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt index 0c80a1e0c..56bdfd9cd 100644 --- a/kate/plugins/insertfile/CMakeLists.txt +++ b/kate/plugins/insertfile/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index ee46a7cff..aa9f998b6 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -24,9 +24,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 26c49576d..de1c1c376 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "ISearchPlugin.h" diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt index 1adced175..7ceccc10d 100644 --- a/kate/plugins/kdatatool/CMakeLists.txt +++ b/kate/plugins/kdatatool/CMakeLists.txt @@ -17,8 +17,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index a468edd13..fbd5a4db7 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcmshell/CMakeLists.txt b/kcmshell/CMakeLists.txt deleted file mode 100644 index 92c2205d0..000000000 --- a/kcmshell/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -################################################# -# -# (C) 2010 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${TQT_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/tdeutils -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### kcmshell ################################## - -set( target kcmshell ) - -set( ${target}_SRCS - main.cpp main.skel -) - -tde_add_tdeinit_executable( ${target} AUTOMOC - SOURCES ${${target}_SRCS} - LINK tdeutils-shared - DEPENDENCIES dcopidl -) diff --git a/kcmshell/Makefile.am b/kcmshell/Makefile.am deleted file mode 100644 index 9c755d8bb..000000000 --- a/kcmshell/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 1999 Matthias Hoelzer-Kluepfel -# Copyright (c) 2000 Matthias Elter -# Copyright (c) 2004 Frans Englich -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# - -AM_CPPFLAGS = -I$(top_srcdir)/tdeutils $(all_includes) -METASOURCES = AUTO - -lib_LTLIBRARIES = -bin_PROGRAMS = -tdeinit_LTLIBRARIES = kcmshell.la - -kcmshell_la_SOURCES = main.cpp main.skel -kcmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE) -kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version - -noinst_HEADERS = main.h - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmshell.pot - - -include $(top_srcdir)/admin/Doxyfile.am - diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp deleted file mode 100644 index 29aba0501..000000000 --- a/kcmshell/main.cpp +++ /dev/null @@ -1,350 +0,0 @@ -/* - Copyright (c) 1999 Matthias Hoelzer-Kluepfel - Copyright (c) 2000 Matthias Elter - Copyright (c) 2004 Frans Englich - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -*/ - -#include - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "main.h" -#include "main.moc" - -using namespace std; - -KService::List m_modules; - -static KCmdLineOptions options[] = -{ - { "list", I18N_NOOP("List all possible modules"), 0}, - { "+module", I18N_NOOP("Configuration module to open"), 0 }, - { "lang ", I18N_NOOP("Specify a particular language"), 0 }, - { "embed ", I18N_NOOP("Embeds the module with buttons in window with id "), 0 }, - { "embed-proxy ", I18N_NOOP("Embeds the module without buttons in window with id "), 0 }, - { "silent", I18N_NOOP("Do not display main window"), 0 }, - KCmdLineLastOption -}; - -static void listModules(const TQString &baseGroup) -{ - - KServiceGroup::Ptr group = KServiceGroup::group(baseGroup); - - if (!group || !group->isValid()) - return; - - KServiceGroup::List list = group->entries(true, true); - - for( KServiceGroup::List::ConstIterator it = list.begin(); - it != list.end(); it++) - { - KSycocaEntry *p = (*it); - if (p->isType(KST_KService)) - { - KService *s = static_cast(p); - if (!kapp->authorizeControlModule(s->menuId())) - continue; - m_modules.append(s); - } - else if (p->isType(KST_KServiceGroup)) - listModules(p->entryPath()); - } -} - -static KService::Ptr locateModule(const TQCString& module) -{ - TQString path = TQFile::decodeName(module); - - if (!path.endsWith(".desktop")) - path += ".desktop"; - - KService::Ptr service = KService::serviceByStorageId( path ); - if (!service) - { - kdWarning(780) << "Could not find module '" << module << "'." << endl; - return 0; - } - - // avoid finding random non-TDE applications - if ( module.left( 4 ) != "kde-" && service->library().isEmpty() ) - return locateModule( "kde-" + module ); - - if(!TDECModuleLoader::testModule( module )) - { - kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl; - return 0; - } - - return service; -} - -bool KCMShell::isRunning() -{ - if( dcopClient()->appId() == m_dcopName ) - return false; // We are the one and only. - - kdDebug(780) << "kcmshell with modules '" << - m_dcopName << "' is already running." << endl; - - dcopClient()->attach(); // Reregister as anonymous - dcopClient()->setNotifications(true); - - TQByteArray data; - TQDataStream str( data, IO_WriteOnly ); - str << kapp->startupId(); - TQCString replyType; - TQByteArray replyData; - if (!dcopClient()->call(m_dcopName, "dialog", "activate(TQCString)", - data, replyType, replyData)) - { - kdDebug(780) << "Calling DCOP function dialog::activate() failed." << endl; - return false; // Error, we have to do it ourselves. - } - - return true; -} - -KCMShellMultiDialog::KCMShellMultiDialog( int dialogFace, const TQString& caption, - TQWidget *parent, const char *name, bool modal) - : KCMultiDialog( dialogFace, caption, parent, name, modal ), - DCOPObject("dialog") -{ -} - -void KCMShellMultiDialog::activate( TQCString asn_id ) -{ - kdDebug(780) << k_funcinfo << endl; - - KStartupInfo::setNewStartupId( this, asn_id ); -} - -void KCMShell::setDCOPName(const TQCString &dcopName, bool rootMode ) -{ - m_dcopName = "kcmshell_"; - if( rootMode ) - m_dcopName += "rootMode_"; - - m_dcopName += dcopName; - - dcopClient()->registerAs(m_dcopName, false); -} - -void KCMShell::waitForExit() -{ - kdDebug(780) << k_funcinfo << endl; - - connect(dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT( appExit(const TQCString&) )); - exec(); -} - -void KCMShell::appExit(const TQCString &appId) -{ - kdDebug(780) << k_funcinfo << endl; - - if( appId == m_dcopName ) - { - kdDebug(780) << "'" << appId << "' closed, dereferencing." << endl; - deref(); - } -} - -static void setIcon(TQWidget *w, const TQString &iconName) -{ - TQPixmap icon = DesktopIcon(iconName); - TQPixmap miniIcon = SmallIcon(iconName); - w->setIcon( icon ); //standard X11 -#if defined Q_WS_X11 && ! defined K_WS_QTONLY - KWin::setIcons(w->winId(), icon, miniIcon ); -#endif -} - -extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) -{ - TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"), - 0, - I18N_NOOP("A tool to start single TDE control modules"), - TDEAboutData::License_GPL, - I18N_NOOP("(c) 1999-2004, The KDE Developers") ); - - aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org"); - aboutData.addAuthor("Daniel Molkentin", 0, "molkentin@kde.org"); - aboutData.addAuthor("Matthias Hoelzer-Kluepfel",0, "hoelzer@kde.org"); - aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); - aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); - aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); - - TDEGlobal::locale()->setMainCatalogue("kcmshell"); - - TDECmdLineArgs::init(_argc, _argv, &aboutData); - TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KCMShell app; - - const TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - const TQCString lang = args->getOption("lang"); - if( !lang.isNull() ) - TDEGlobal::locale()->setLanguage(lang); - - if (args->isSet("list")) - { - cout << static_cast(i18n("The following modules are available:").local8Bit()) << endl; - - listModules( "Settings/" ); - - int maxLen=0; - - for( KService::List::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) - { - int len = (*it)->desktopEntryName().length(); - if (len > maxLen) - maxLen = len; - } - - for( KService::List::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) - { - TQString entry("%1 - %2"); - - entry = entry.arg((*it)->desktopEntryName().leftJustify(maxLen, ' ')) - .arg(!(*it)->comment().isEmpty() ? (*it)->comment() - : i18n("No description available")); - - cout << static_cast(entry.local8Bit()) << endl; - } - return 0; - } - - if (args->count() < 1) - { - args->usage(); - return -1; - } - - TQCString dcopName; - KService::List modules; - for (int i = 0; i < args->count(); i++) - { - KService::Ptr service = locateModule(args->arg(i)); - if( service ) - { - modules.append(service); - if( !dcopName.isEmpty() ) - dcopName += "_"; - - dcopName += args->arg(i); - } - } - - /* Check if this particular module combination is already running, but - * allow the same module to run when embedding(root mode) */ - app.setDCOPName(dcopName, - ( args->isSet( "embed-proxy" ) || args->isSet( "embed" ))); - if( app.isRunning() ) - { - app.waitForExit(); - return 0; - } - - //KDialogBase::DialogType dtype = KDialogBase::Plain; // FIXME - KDialogBase::DialogType dtype = KDialogBase::IconList; // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with kcmshell in the Plain mode - // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );] - // In fact, this method of display may be preferable to the Plain mode from a UX perspective, - // as the icon shows the user what the active kcontrol module is called. - - if ( modules.count() < 1 ) - return 0; - else if( modules.count() > 1 ) - dtype = KDialogBase::IconList; - - bool idValid; - int id; - - if ( args->isSet( "embed-proxy" )) - { - id = args->getOption( "embed-proxy" ).toInt(&idValid); - if( idValid ) - { - TDECModuleProxy *module = new TDECModuleProxy( modules.first()->desktopEntryName() ); - module->realModule(); - QXEmbed::embedClientIntoWindow( module, id); - app.exec(); - delete module; - } - else - kdDebug(780) << "Supplied id '" << id << "' is not valid." << endl; - - return 0; - - } - - KCMShellMultiDialog *dlg = new KCMShellMultiDialog( dtype, - i18n("Configure - %1").arg(kapp->caption()), 0, "", true ); - - for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it) - dlg->addModule(TDECModuleInfo(*it)); - - if ( args->isSet( "embed" )) - { - id = args->getOption( "embed" ).toInt(&idValid); - if( idValid ) - { - QXEmbed::embedClientIntoWindow( dlg, id ); - dlg->exec(); - delete dlg; - } - else - kdDebug(780) << "Supplied id '" << id << "' is not valid." << endl; - - } - else - { - - if (kapp->iconName() != kapp->name()) - setIcon(dlg, kapp->iconName()); - else if ( modules.count() == 1 ) - setIcon(dlg, TDECModuleInfo( modules.first()).icon()); - - dlg->exec(); - delete dlg; - } - - return 0; -} -// vim: sw=4 et sts=4 diff --git a/kcmshell/main.h b/kcmshell/main.h deleted file mode 100644 index f43cf98cb..000000000 --- a/kcmshell/main.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - Copyright (c) 2001 Waldo Bastian - Copyright (c) 2004 Frans Englich - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#ifndef __kcmshell_h__ -#define __kcmshell_h__ - -#include - -#include -#include - -/** - * The TDEApplication instance for kcmshell. - */ -class KCMShell : public TDEApplication -{ - Q_OBJECT - -public: - - /** - * Sets m_dcopName basically to @p dcopName, - * and then registers with DCOP. - * - * @param dcopName name to set the DCOP name to - * @param rootMode true if the kcmshell is embedding - */ - void setDCOPName(const TQCString &dcopName, bool rootMode ); - - /** - * Waits until the last instance of kcmshell with the same - * module as this one exits, and then exits. - */ - void waitForExit(); - - /** - * @return true if the shell is running - */ - bool isRunning(); - -private slots: - - /** - */ - void appExit( const TQCString &appId ); - -private: - - /** - * The DCOP name which actually is registered. - * For example "kcmshell_mouse". - */ - TQCString m_dcopName; - -}; - - -/** - * Essentially a plain KCMultiDialog, but has the additional functionality - * of allowing it to be told to request windows focus. - * - * @author Waldo Bastian - */ -class KCMShellMultiDialog : public KCMultiDialog, public DCOPObject -{ - Q_OBJECT - K_DCOP - -public: - - /** - */ - KCMShellMultiDialog( int dialogFace, const TQString& caption, - TQWidget *parent=0, const char *name=0, bool modal=false); - -k_dcop: - - /** - */ - virtual void activate( TQCString asn_id ); - -}; - - -// vim: sw=4 et sts=4 -#endif //__kcmshell_h__ diff --git a/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt deleted file mode 100644 index 2e25811a7..000000000 --- a/kconf_update/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -################################################# -# -# (C) 2010 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/tdecore -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### kconf_update ############################## - -set( target kconf_update ) - -set( ${target}_SRCS - kconf_update.cpp -) - -tde_add_tdeinit_executable( ${target} AUTOMOC - SOURCES ${${target}_SRCS} - LINK tdecore-shared -) diff --git a/kconf_update/Mainpage.dox b/kconf_update/Mainpage.dox deleted file mode 100644 index 9db5adb3b..000000000 --- a/kconf_update/Mainpage.dox +++ /dev/null @@ -1,31 +0,0 @@ -/** @mainpage ./kconf_update - -kconf_update is a tool designed to update config files. Over time applications -sometimes need to rearrange the way configuration options are stored. Since -such an update shouldn't influence the configuration options that the user -has selected, the application must take care that the options stored in the -old way will still be honored. - -What used to happen is that the application looks up both the old and the -new configuration option and then decides which one to use. This method has -several drawbacks: -- The application may need to read more configuration files than strictly - needed, resulting in a slower startup. -- The application becomes bigger with code that will only be used once. - -kconf_update addresses these problems by offering a framework to update -configuration files without adding code to the application itself. - -See the README file for more information. - -@authors -Waldo Bastian \ - -@maintainers -[Unknown/None] - -@licenses -@lgpl - -*/ -// vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kconf_update/Makefile.am b/kconf_update/Makefile.am deleted file mode 100644 index afe3864d9..000000000 --- a/kconf_update/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# This file is part of the KDE libraries -# Copyright (C) 2001 Waldo Bastian - -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. - -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. - -# You should have received a copy of the GNU Library General Public License -# along with this library; see the file COPYING.LIB. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. - -INCLUDES= -I../kded $(all_includes) - -bin_PROGRAMS = -lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kconf_update.la - -kconf_update_la_SOURCES = kconf_update.cpp -kconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) -kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version - -METASOURCES = AUTO - -# Internal -# noinst_HEADERS = kconf_update.h - diff --git a/kconf_update/README.kconf_update b/kconf_update/README.kconf_update deleted file mode 100644 index c8229c735..000000000 --- a/kconf_update/README.kconf_update +++ /dev/null @@ -1,251 +0,0 @@ -README kconf_update - -Version: 1.1 -Author: Waldo Bastian , - -What it does -============ - -kconf_update is a tool designed to update config files. Over time applications -sometimes need to rearrange the way configuration options are stored. Since -such an update shouldn't influence the configuration options that the user -has selected, the application must take care that the options stored in the -old way will still be honored. - -What used to happen is that the application looks up both the old and the -new configuration option and then decides which one to use. This method has -several drawbacks: -* The application may need to read more configuration files than strictly -needed, resulting in a slower startup. -* The application becomes bigger with code that will only be used once. - -kconf_update addresses these problems by offering a framework to update -configuration files without adding code to the application itself. - - -How it works -============ - -Applications can install so called "update files" under -$TDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and -contains instructions for transferring/converting configuration information -from one place to another. - -Updating the configuration happens automatically, either when KDE gets started -or when kded detects a new update file in the above mentioned location. - -Update files are separated into sections. Each section has an Id. When a -section describing a configuration change has been applied, the Id will be -stored in the file "kconf_updaterc". This information is used to make sure -that a configuration update is only performed once. - -If you overwrite an existing update file with a new version that contains a -new section, only the update instructions from this extra section will be -performed. - -File format of the update file -============================== - -Empty lines or lines that start with '#' are considered comments. -Commas (,) are used to seperate fields and may not occur as part -of any field and all of the keywords are case-sensitive, i.e. you -cannot say "key" instead of "Key" for example. - -For the rest the file is parsed and executed sequentially from top to bottom. -Each line can contain one entry. The following entries are recognized: - - -Id= - -With identifying the group of update entries that follows. Once a group -of entries have been applied, their is stored and this group of entries -will not be applied again. - - -File=, -File= - -Specifies that configuration information is read from and written -to . If you only specify , the information is read from -as well as written to . - -Script=