From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kio/bookmarks/kbookmark.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kio/bookmarks/kbookmark.cc') diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index a33c24ffc..44b8b496c 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -220,7 +220,7 @@ bool KBookmarkGroup::isToolbarGroup() const return ( element.attribute("toolbar") == "yes" ); } -TQDomElement KBookmarkGroup::tqfindToolbar() const +TQDomElement KBookmarkGroup::findToolbar() const { if ( element.attribute("toolbar") == "yes" ) return element; @@ -234,7 +234,7 @@ TQDomElement KBookmarkGroup::tqfindToolbar() const return e; else { - TQDomElement result = KBookmarkGroup(e).tqfindToolbar(); + TQDomElement result = KBookmarkGroup(e).findToolbar(); if (!result.isNull()) return result; } @@ -412,7 +412,7 @@ static TQDomText get_or_create_text(TQDomNode node) } // Look for a metadata with owner="http://www.kde.org" or without any owner (for compatibility) -static TQDomNode tqfindOrCreateMetadata( TQDomNode& parent ) +static TQDomNode findOrCreateMetadata( TQDomNode& parent ) { static const char kdeOwner[] = "http://www.kde.org"; TQDomElement metadataElement; @@ -440,14 +440,14 @@ bool KBookmark::hasMetaData() const // It doesn't matter much in practice since it's only called for newly-created bookmarks, // which will get metadata soon after anyway. TQDomNode n = cd_or_create( internalElement(), "info" ); - return tqfindOrCreateMetadata( n ).hasChildNodes(); + return findOrCreateMetadata( n ).hasChildNodes(); } void KBookmark::updateAccessMetadata() { kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl; - const uint timet = TQDateTime::tqcurrentDateTime().toTime_t(); + const uint timet = TQDateTime::currentDateTime().toTime_t(); setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData ); setMetaDataItem( "time_visited", TQString::number( timet ) ); @@ -465,7 +465,7 @@ void KBookmark::updateAccessMetadata() TQString KBookmark::metaDataItem( const TQString &key ) const { TQDomNode infoNode = cd_or_create( internalElement(), "info" ); - infoNode = tqfindOrCreateMetadata( infoNode ); + infoNode = findOrCreateMetadata( infoNode ); for ( TQDomNode n = infoNode.firstChild(); !n.isNull(); n = n.nextSibling() ) { if ( !n.isElement() ) { continue; @@ -481,7 +481,7 @@ TQString KBookmark::metaDataItem( const TQString &key ) const void KBookmark::setMetaDataItem( const TQString &key, const TQString &value, MetaDataOverwriteMode mode ) { TQDomNode infoNode = cd_or_create( internalElement(), "info" ); - infoNode = tqfindOrCreateMetadata( infoNode ); + infoNode = findOrCreateMetadata( infoNode ); TQDomNode item = cd_or_create( infoNode, key ); TQDomText text = get_or_create_text( item ); -- cgit v1.2.1