diff options
Diffstat (limited to 'kio/misc')
| -rw-r--r-- | kio/misc/kpac/discovery.cpp | 2 | ||||
| -rw-r--r-- | kio/misc/kpac/downloader.cpp | 2 | ||||
| -rw-r--r-- | kio/misc/kssld/kssld.cpp | 10 | ||||
| -rw-r--r-- | kio/misc/kwalletd/kwalletd.cpp | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..4f33d1389 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -54,7 +54,7 @@ namespace KPAC m_helper( new KProcIO ) { connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 6f419f5f5..19417b1fb 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -71,7 +71,7 @@ namespace KPAC if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() ) { bool dummy; - m_script = KGlobal::charsets()->codecForName( + m_script = TDEGlobal::charsets()->codecForName( job->queryMetaData( "charset" ), dummy )->toUnicode( m_data ); emit result( true ); } diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 760e654d7..40c52a1be 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -117,7 +117,7 @@ KSSLD::KSSLD(const TQCString &name) : KDEDModule(name) if (2 != cfg->readNumEntry("policies version", 0)) { ::updatePoliciesConfig(cfg); } - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); caVerifyUpdate(); cacheLoadDefaultPolicies(); certList.setAutoDelete(false); @@ -195,7 +195,7 @@ KSSLCNode *node; cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "ksslpolicies")); if (!cfgName.isEmpty()) { ::chmod(TQFile::encodeName(cfgName), 0600); @@ -618,12 +618,12 @@ return false; /////////////////////////////////////////////////////////////////////////// void KSSLD::caVerifyUpdate() { - TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; + TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; if (!TQFile::exists(path)) return; cfg->setGroup(TQString::null); - TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + TQ_UINT32 newStamp = TDEGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); if (oldStamp != newStamp) { @@ -634,7 +634,7 @@ void KSSLD::caVerifyUpdate() { } bool KSSLD::caRegenerate() { -TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; +TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; TQFile out(path); diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index a88f4e5b1..e87f96c31 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name) _idleTime = 0; connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "KWallet Directory Watcher"); - _dw->addDir(KGlobal::dirs()->saveLocation("kwallet")); + _dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); _dw->startScan(true); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); } @@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W int KWalletD::deleteWallet(const TQString& wallet) { - TQString path = KGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; if (TQFile::exists(path)) { close(wallet, true); @@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) { TQStringList KWalletD::wallets() const { - TQString path = KGlobal::dirs()->saveLocation("kwallet"); + TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); TQDir dir(path, "*.kwl"); TQStringList rc; |