diff options
Diffstat (limited to 'kio')
-rw-r--r-- | kio/bookmarks/kbookmark.cc | 4 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkmanager.cc | 2 | ||||
-rw-r--r-- | kio/kfile/kfilepreview.cpp | 2 | ||||
-rw-r--r-- | kio/kfile/knotifydialog.cpp | 2 | ||||
-rw-r--r-- | kio/kfile/kurlbar.cpp | 2 | ||||
-rw-r--r-- | kio/kfile/kurlrequester.cpp | 2 | ||||
-rw-r--r-- | kio/kio/job.cpp | 4 | ||||
-rw-r--r-- | kio/kio/jobclasses.h | 6 | ||||
-rw-r--r-- | kio/kio/kacl.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kfileitem.cpp | 2 | ||||
-rw-r--r-- | kio/misc/kwalletd/kwalletd.cpp | 6 | ||||
-rw-r--r-- | kio/misc/kwalletd/kwalletd.h | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 2d456ddeb..9721788a2 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -271,7 +271,7 @@ bool KBookmark::isSeparator() const bool KBookmark::hasParent() const { - TQDomElement parent = element.tqparentNode().toElement(); + TQDomElement parent = element.parentNode().toElement(); return !parent.isNull(); } @@ -311,7 +311,7 @@ TQString KBookmark::icon() const KBookmarkGroup KBookmark::parentGroup() const { - return KBookmarkGroup( element.tqparentNode().toElement() ); + return KBookmarkGroup( element.parentNode().toElement() ); } KBookmarkGroup KBookmark::toGroup() const diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index fa4ce416b..250d62a59 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -234,7 +234,7 @@ void KBookmarkManager::parse() const if ( n.isProcessingInstruction() ) { TQDomProcessingInstruction pi = n.toProcessingInstruction(); - pi.tqparentNode().removeChild(pi); + pi.parentNode().removeChild(pi); } TQDomProcessingInstruction pi; diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index c0f73949e..8ce3e87af 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -53,7 +53,7 @@ KFilePreview::~KFilePreview() // don't delete the preview, we can reuse it // (it will get deleted by ~KDirOperator) - if ( preview && preview->tqparentWidget() == this ) { + if ( preview && preview->parentWidget() == this ) { preview->reparent(0L, 0, TQPoint(0, 0), false); } } diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index a04f89773..3c0a85423 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -130,7 +130,7 @@ namespace KNotify protected: virtual void maybeTip ( const TQPoint& p ) { - TQHeader *header = static_cast<TQHeader*>( tqparentWidget() ); + TQHeader *header = static_cast<TQHeader*>( parentWidget() ); int section = 0; if ( header->orientation() == Qt::Horizontal ) diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 5cb7afe58..218a72f37 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -401,7 +401,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) } else { m_listBox = view; - if ( m_listBox->tqparentWidget() != this ) + if ( m_listBox->parentWidget() != this ) m_listBox->reparent( this, TQPoint(0,0) ); m_listBox->resize( width(), height() ); } diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index 66b79925e..86286bcda 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const KFileDialog * KURLRequester::fileDialog() const { if ( !myFileDialog ) { - TQWidget *p = tqparentWidget(); + TQWidget *p = parentWidget(); myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p, "file dialog", true ); diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 510d3538c..867d4004f 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -318,10 +318,10 @@ void Job::showErrorDialog( TQWidget * parent ) } } -void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget ) +void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget ) { d->m_autoErrorHandling = enable; - d->m_errorParentWidget = tqparentWidget; + d->m_errorParentWidget = parentWidget; } bool Job::isAutoErrorHandlingEnabled() const diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 6651565f1..03ff3d452 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -155,17 +155,17 @@ namespace KIO { /** * Enable or disable the automatic error handling. When automatic * error handling is enabled and an error occurs, then showErrorDialog() - * is called with the specified @p tqparentWidget (if supplied) , right before + * is called with the specified @p parentWidget (if supplied) , right before * the emission of the result signal. * * The default is false. * * @param enable enable or disable automatic error handling - * @param tqparentWidget the parent widget, passed to showErrorDialog. + * @param parentWidget the parent widget, passed to showErrorDialog. * Can be 0 for top-level * @see isAutoErrorHandlingEnabled(), showErrorDialog() */ - void setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget = 0 ); + void setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget = 0 ); /** * Returns whether automatic error handling is enabled or disabled. diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index 4d12bf3e9..5dd138b05 100644 --- a/kio/kio/kacl.cpp +++ b/kio/kio/kacl.cpp @@ -447,7 +447,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, if ( currentTag == type ) { acl_delete_entry( newACL, entry ); // we have to start from the beginning, the iterator is - // tqinvalidated, on deletion + // invalidated, on deletion ret = acl_get_entry( newACL, ACL_FIRST_ENTRY, &entry ); } else { ret = acl_get_entry( newACL, ACL_NEXT_ENTRY, &entry ); diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index b15731f1c..6574ba012 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -1098,7 +1098,7 @@ void KFileItem::virtual_hook( int, void* ) TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ) { - // We don't need to save/restore anything that refresh() tqinvalidates, + // We don't need to save/restore anything that refresh() invalidates, // since that means we can re-determine those by ourselves. s << a.m_url; s << a.m_strName; diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 748f62347..b2b27d363 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -712,7 +712,7 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { const TQString& wallet = w->walletName(); assert(_passwords.tqcontains(wallet)); if (w->refCount() == 0 || force) { - tqinvalidateHandle(handle); + invalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } @@ -757,7 +757,7 @@ int KWalletD::close(int handle, bool force) { } _wallets.remove(handle); if (force) { - tqinvalidateHandle(handle); + invalidateHandle(handle); } if (_passwords.tqcontains(w->walletName())) { w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length())); @@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) { } -void KWalletD::tqinvalidateHandle(int handle) { +void KWalletD::invalidateHandle(int handle) { for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); i != _handles.end(); ++i) { diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h index ba83b4efc..2aea371ba 100644 --- a/kio/misc/kwalletd/kwalletd.h +++ b/kio/misc/kwalletd/kwalletd.h @@ -161,7 +161,7 @@ class KWalletD : public KDEDModule { // Generate a new unique handle. int generateHandle(); // Invalidate a handle (remove it from the TQMap) - void tqinvalidateHandle(int handle); + void invalidateHandle(int handle); // Emit signals about closing wallets void doCloseSignals(int,const TQString&); void emitFolderUpdated(const TQString&, const TQString&); |