diff options
Diffstat (limited to 'certmanager')
| -rw-r--r-- | certmanager/Makefile.am | 4 | ||||
| -rw-r--r-- | certmanager/aboutdata.cpp | 2 | ||||
| -rw-r--r-- | certmanager/certificatewizardimpl.cpp | 2 | ||||
| -rw-r--r-- | certmanager/kwatchgnupg/Makefile.am | 4 | ||||
| -rw-r--r-- | certmanager/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | certmanager/lib/kleo/tdeconfigbasedkeyfilter.h | 6 | ||||
| -rw-r--r-- | certmanager/storedtransferjob.cpp | 6 | ||||
| -rw-r--r-- | certmanager/storedtransferjob.h | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index 68ab9ae05..6d23b5ea0 100644 --- a/certmanager/Makefile.am +++ b/certmanager/Makefile.am @@ -17,8 +17,8 @@ kleopatra_SOURCES = \ METASOURCES = AUTO -kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) +kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kleopatra rc_DATA = kleopatraui.rc diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp index 21cae2286..80501daeb 100644 --- a/certmanager/aboutdata.cpp +++ b/certmanager/aboutdata.cpp @@ -58,7 +58,7 @@ static const about_data authors[] = { static const about_data credits[] = { { "David Faure", - I18N_NOOP("Backend configuration framework, KIO integration"), + I18N_NOOP("Backend configuration framework, TDEIO integration"), "faure@kde.org", 0 }, { "Michel Boyer de la Giroday", I18N_NOOP("Key-state dependant colors and fonts in the key list"), diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 12eebf966..e1d47f993 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -498,7 +498,7 @@ void CertificateWizardImpl::accept() } /** - This slot is invoked by the KIO job used in newCertificate + This slot is invoked by the TDEIO job used in newCertificate to save/upload the certificate, when finished (success or error). */ void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job ) diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index 990ce7d38..07702a24c 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/certmanager/kwatchgnupg/Makefile.am @@ -13,8 +13,8 @@ kwatchgnupg_SOURCES = \ METASOURCES = AUTO -kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) +kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kwatchgnupg rc_DATA = kwatchgnupgui.rc diff --git a/certmanager/lib/Makefile.am b/certmanager/lib/Makefile.am index 4512f42fe..0de1f06c2 100644 --- a/certmanager/lib/Makefile.am +++ b/certmanager/lib/Makefile.am @@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \ ui/libkleopatra_ui.la \ \ $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \ - $(LIB_KIO) $(LIB_TDEUI) + $(LIB_TDEIO) $(LIB_TDEUI) # Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp # backends/kpgp/libkleopatra_backend_kpgp.la diff --git a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h index 3d65e7a2f..53a404133 100644 --- a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h +++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h @@ -30,8 +30,8 @@ your version. */ -#ifndef __KLEO_KCONFIGBASEDKEYFILTER_H__ -#define __KLEO_KCONFIGBASEDKEYFILTER_H__ +#ifndef __KLEO_TDECONFIGBASEDKEYFILTER_H__ +#define __KLEO_TDECONFIGBASEDKEYFILTER_H__ #include "keyfilter.h" @@ -101,4 +101,4 @@ namespace Kleo { } -#endif // __KLEO_KCONFIGBASEDKEYFILTER_H__ +#endif // __KLEO_TDECONFIGBASEDKEYFILTER_H__ diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index bae0d3972..b9816c897 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -21,7 +21,7 @@ using namespace TDEIOext; -#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream +#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream StoredTransferJob::StoredTransferJob(const KURL& url, int command, const TQByteArray &packedArgs, @@ -79,7 +79,7 @@ void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data ) StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showProgressInfo ) { // Send decoded path and encoded query - KIO_ARGS << url; + TDEIO_ARGS << url; StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo ); if (reload) job->addMetaData("cache", "reload"); @@ -89,7 +89,7 @@ StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showP StoredTransferJob *TDEIOext::put( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { - KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; + TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); job->setData( arr ); return job; diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h index 163c431ec..cfbc68119 100644 --- a/certmanager/storedtransferjob.h +++ b/certmanager/storedtransferjob.h @@ -22,7 +22,7 @@ #include <tdeio/job.h> -// To be moved to KIO? +// To be moved to TDEIO? namespace TDEIOext { /** |