summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/html/html_formimpl.cpp20
-rw-r--r--tdehtml/html/html_formimpl.h4
-rw-r--r--tdehtml/tdehtml_part.cpp20
-rw-r--r--tdehtml/tdehtml_part.h6
-rw-r--r--tdehtml/tdehtmlpart_p.h12
5 files changed, 31 insertions, 31 deletions
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 6fae233dd..5dc44ad04 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -428,8 +428,8 @@ void HTMLFormElementImpl::doAutoFill()
#ifndef TDEHTML_NO_WALLET
const TQString key = calculateAutoFillKey(*this);
- if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
- KWallet::Wallet::FormDataFolder(),
+ if (TDEWallet::Wallet::keyDoesNotExist(TDEWallet::Wallet::NetworkWallet(),
+ TDEWallet::Wallet::FormDataFolder(),
key))
return;
@@ -439,14 +439,14 @@ void HTMLFormElementImpl::doAutoFill()
}
-void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
+void HTMLFormElementImpl::walletOpened(TDEWallet::Wallet *w) {
#ifndef TDEHTML_NO_WALLET
assert(w);
const TQString key = calculateAutoFillKey(*this);
- if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) {
+ if (!w->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
return; // failed
}
- w->setFolder(KWallet::Wallet::FormDataFolder());
+ w->setFolder(TDEWallet::Wallet::FormDataFolder());
TQMap<TQString, TQString> map;
if (w->readMap(key, map))
return; // failed, abort
@@ -578,17 +578,17 @@ void HTMLFormElementImpl::submit( )
gatherWalletData();
}
#ifndef TDEHTML_NO_WALLET
- if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
+ if (m_havePassword && !m_haveTextarea && TDEWallet::Wallet::isEnabled()) {
const TQString key = calculateAutoFillKey(*this);
- const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key);
- KWallet::Wallet* const w = view->part()->wallet();
+ const bool doesnotexist = TDEWallet::Wallet::keyDoesNotExist(TDEWallet::Wallet::NetworkWallet(), TDEWallet::Wallet::FormDataFolder(), key);
+ TDEWallet::Wallet* const w = view->part()->wallet();
bool login_changed = false;
if (!doesnotexist && w) {
// check if the login information changed from what
// we had so far.
- if (w->hasFolder(KWallet::Wallet::FormDataFolder())) {
- w->setFolder(KWallet::Wallet::FormDataFolder());
+ if (w->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
+ w->setFolder(TDEWallet::Wallet::FormDataFolder());
TQMap<TQString, TQString> map;
if (!w->readMap(key, map)) {
TQMapConstIterator<TQString, TQString> it = map.begin();
diff --git a/tdehtml/html/html_formimpl.h b/tdehtml/html/html_formimpl.h
index 8fe0ef1dd..0888db146 100644
--- a/tdehtml/html/html_formimpl.h
+++ b/tdehtml/html/html_formimpl.h
@@ -49,7 +49,7 @@ namespace tdehtml
typedef TQValueList<TQCString> encodingList;
}
-namespace KWallet {
+namespace TDEWallet {
class Wallet;
}
@@ -85,7 +85,7 @@ public:
bool autoComplete() const { return m_autocomplete; }
void doAutoFill();
- void walletOpened(KWallet::Wallet *w);
+ void walletOpened(TDEWallet::Wallet *w);
virtual void parseAttribute(AttributeImpl *attr);
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index b0a075e99..dd0238aad 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -7163,11 +7163,11 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
}
if (!d->m_wq) {
- KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+ TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
d->m_wq = new TDEHTMLWalletQueue(this);
d->m_wq->wallet = wallet;
connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
- connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*)));
+ connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
}
assert(form);
d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument()));
@@ -7191,10 +7191,10 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin
if (d->m_wallet) {
if (d->m_bWalletOpened) {
if (d->m_wallet->isOpen()) {
- if (!d->m_wallet->hasFolder(KWallet::Wallet::FormDataFolder())) {
- d->m_wallet->createFolder(KWallet::Wallet::FormDataFolder());
+ if (!d->m_wallet->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
+ d->m_wallet->createFolder(TDEWallet::Wallet::FormDataFolder());
}
- d->m_wallet->setFolder(KWallet::Wallet::FormDataFolder());
+ d->m_wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
d->m_wallet->writeMap(key, data);
return;
}
@@ -7205,11 +7205,11 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin
}
if (!d->m_wq) {
- KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+ TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
d->m_wq = new TDEHTMLWalletQueue(this);
d->m_wq->wallet = wallet;
connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
- connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*)));
+ connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
}
d->m_wq->savers.append(qMakePair(key, data));
#endif // TDEHTML_NO_WALLET
@@ -7235,7 +7235,7 @@ void TDEHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
}
-void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) {
+void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) {
#ifndef TDEHTML_NO_WALLET
assert(!d->m_wallet);
assert(d->m_wq);
@@ -7264,12 +7264,12 @@ void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) {
} else {
TQToolTip::remove(d->m_statusBarWalletLabel);
}
- TQToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(KWallet::Wallet::NetworkWallet()));
+ TQToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(TDEWallet::Wallet::NetworkWallet()));
#endif // TDEHTML_NO_WALLET
}
-KWallet::Wallet *TDEHTMLPart::wallet()
+TDEWallet::Wallet *TDEHTMLPart::wallet()
{
#ifndef TDEHTML_NO_WALLET
TDEHTMLPart *p;
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 452083708..38a54e18a 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -106,7 +106,7 @@ namespace KParts
class LiveConnectExtension;
}
-namespace KWallet
+namespace TDEWallet
{
class Wallet;
}
@@ -1540,7 +1540,7 @@ private slots:
*/
void restoreScrollPosition();
- void walletOpened(KWallet::Wallet*);
+ void walletOpened(TDEWallet::Wallet*);
private:
@@ -1564,7 +1564,7 @@ private:
bool processObjectRequest( tdehtml::ChildFrame *child, const KURL &url, const TQString &mimetype );
- KWallet::Wallet* wallet();
+ TDEWallet::Wallet* wallet();
void openWallet(DOM::HTMLFormElementImpl*);
void saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data);
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index de99c9400..90be612b2 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -144,7 +144,7 @@ class TDEHTMLWalletQueue : public TQObject
#endif // TDEHTML_NO_WALLET
}
#ifndef TDEHTML_NO_WALLET
- KWallet::Wallet *wallet;
+ TDEWallet::Wallet *wallet;
#endif // TDEHTML_NO_WALLET
typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
typedef TQValueList<Caller> CallerList;
@@ -152,7 +152,7 @@ class TDEHTMLWalletQueue : public TQObject
TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers;
signals:
- void walletOpened(KWallet::Wallet*);
+ void walletOpened(TDEWallet::Wallet*);
public slots:
void walletOpened(bool success) {
@@ -163,15 +163,15 @@ class TDEHTMLWalletQueue : public TQObject
}
emit walletOpened(wallet);
if (wallet) {
- if (!wallet->hasFolder(KWallet::Wallet::FormDataFolder())) {
- wallet->createFolder(KWallet::Wallet::FormDataFolder());
+ if (!wallet->hasFolder(TDEWallet::Wallet::FormDataFolder())) {
+ wallet->createFolder(TDEWallet::Wallet::FormDataFolder());
}
for (CallerList::Iterator i = callers.begin(); i != callers.end(); ++i) {
if ((*i).first && (*i).second) {
(*i).first->walletOpened(wallet);
}
}
- wallet->setFolder(KWallet::Wallet::FormDataFolder());
+ wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
wallet->writeMap((*i).first, (*i).second);
}
@@ -326,7 +326,7 @@ public:
TQString scheduledScript;
DOM::Node scheduledScriptNode;
- KWallet::Wallet* m_wallet;
+ TDEWallet::Wallet* m_wallet;
int m_runningScripts;
bool m_bOpenMiddleClick :1;
bool m_bBackRightClick :1;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 12:51:33 +0000