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/dptrtemplate.h | 4 +-- kio/bookmarks/kbookmark.cc | 14 +++++------ kio/bookmarks/kbookmark.h | 6 ++--- kio/bookmarks/kbookmarkbar.cc | 28 ++++++++++----------- kio/bookmarks/kbookmarkbar.h | 2 +- kio/bookmarks/kbookmarkdrag.cc | 12 ++++----- kio/bookmarks/kbookmarkdrag.h | 2 +- kio/bookmarks/kbookmarkimporter.h | 6 ++--- kio/bookmarks/kbookmarkimporter_crash.cc | 12 ++++----- kio/bookmarks/kbookmarkimporter_crash.h | 4 +-- kio/bookmarks/kbookmarkimporter_ie.cc | 6 ++--- kio/bookmarks/kbookmarkimporter_ie.h | 4 +-- kio/bookmarks/kbookmarkimporter_kde1.cc | 2 +- kio/bookmarks/kbookmarkimporter_ns.cc | 22 ++++++++--------- kio/bookmarks/kbookmarkimporter_ns.h | 4 +-- kio/bookmarks/kbookmarkimporter_opera.cc | 4 +-- kio/bookmarks/kbookmarkimporter_opera.h | 4 +-- kio/bookmarks/kbookmarkmanager.cc | 42 ++++++++++++++++---------------- kio/bookmarks/kbookmarkmanager.h | 6 ++--- kio/bookmarks/kbookmarkmenu.cc | 20 +++++++-------- kio/bookmarks/kbookmarkmenu.h | 4 +-- 21 files changed, 104 insertions(+), 104 deletions(-) (limited to 'kio/bookmarks') diff --git a/kio/bookmarks/dptrtemplate.h b/kio/bookmarks/dptrtemplate.h index a34f021be..2a69d6a54 100644 --- a/kio/bookmarks/dptrtemplate.h +++ b/kio/bookmarks/dptrtemplate.h @@ -34,10 +34,10 @@ public: d_ptr = new TQPtrDict; qAddPostRoutine( cleanup_d_ptr ); } - PrivateData* ret = d_ptr->tqfind( (void*) instance ); + PrivateData* ret = d_ptr->find( (void*) instance ); if ( ! ret ) { ret = new PrivateData; - d_ptr->tqreplace( (void*) instance, ret ); + d_ptr->replace( (void*) instance, ret ); } return ret; } 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 ); diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 06915e141..84f177522 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -130,13 +130,13 @@ public: * @return address of parent */ static TQString parentAddress( const TQString & address ) - { return address.left( address.tqfindRev('/') ); } + { return address.left( address.findRev('/') ); } /** * @return position in parent (e.g. /4/5/2 -> 2) */ static uint positionInParent( const TQString & address ) - { return address.mid( address.tqfindRev('/') + 1 ).toInt(); } + { return address.mid( address.findRev('/') + 1 ).toInt(); } /** * @return address of previous sibling (e.g. /4/5/2 -> /4/5/1) @@ -293,7 +293,7 @@ public: /** * @internal */ - TQDomElement tqfindToolbar() const; + TQDomElement findToolbar() const; /** * @return the list of urls of bookmarks at top level of the group diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index 203e6bf33..ec1e3e670 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -192,7 +192,7 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) for (KBookmark bm = parent.first(); !bm.isNull(); bm = parent.next(bm)) { TQString text = bm.text(); - text.tqreplace( '&', "&&" ); + text.replace( '&', "&&" ); if (!bm.isGroup()) { if ( bm.isSeparator() ) @@ -282,7 +282,7 @@ static void removeTempSep(KBookmarkBarPrivate* p) } } -static KAction* tqfindPluggedAction(TQPtrList actions, KToolBar *tb, int id) +static KAction* findPluggedAction(TQPtrList actions, KToolBar *tb, int id) { TQPtrListIterator it( actions ); for (; (*it); ++it ) @@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent( int index = 0; KToolBarButton* b; - b = dynamic_cast(tb->tqchildAt(pos)); + b = dynamic_cast(tb->childAt(pos)); KAction *a = 0; TQString address; atFirst = false; @@ -321,7 +321,7 @@ static TQString handleToolbarDragMoveEvent( if (b) { index = tb->itemIndex(b->id()); - TQRect r = b->tqgeometry(); + TQRect r = b->geometry(); if (pos.x() < ((r.left() + r.right())/2)) { // if in first half of button then @@ -350,28 +350,28 @@ static TQString handleToolbarDragMoveEvent( { index = actions.count() - 1; b = tb->getButton(tb->idAt(index)); - // if !b and not past last button, we didn't tqfind button - if (pos.x() <= b->tqgeometry().left()) + // if !b and not past last button, we didn't find button + if (pos.x() <= b->geometry().left()) goto skipact; // TODO - rename } if ( !b ) return TQString::null; // TODO Make it works for that case - a = tqfindPluggedAction(actions, tb, b->id()); + a = findPluggedAction(actions, tb, b->id()); Q_ASSERT(a); address = a->property("address").toString(); p->m_sepIndex = index + (atFirst ? 0 : 1); #if 0 { // ugly workaround to fix the goto scoping problems... - KBookmark bk = mgr->tqfindByAddress( address ); + KBookmark bk = mgr->findByAddress( address ); if (bk.isGroup()) // TODO - fix this ****!!!, manhatten distance should be used!!! { kdDebug() << "kbookmarkbar:: popping up " << bk.text() << endl; KBookmarkActionMenu *menu = dynamic_cast(a); Q_ASSERT(menu); - menu->popup(tb->mapToGlobal(b->tqgeometry().center())); + menu->popup(tb->mapToGlobal(b->geometry().center())); } } #endif @@ -394,12 +394,12 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList actions Q_ASSERT(tb); KToolBarButton *b; - b = dynamic_cast(tb->tqchildAt(pos)); + b = dynamic_cast(tb->childAt(pos)); if (!b) return 0; KAction *a = 0; - a = tqfindPluggedAction(actions, tb, b->id()); + a = findPluggedAction(actions, tb, b->id()); Q_ASSERT(a); pt = tb->mapToGlobal(pos); @@ -461,7 +461,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) if (_a && mev->button() == Qt::RightButton) { dptr()->m_highlightedAddress = _a->property("address").toString(); - KBookmark bookmark = m_pManager->tqfindByAddress( dptr()->m_highlightedAddress ); + KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress ); RMB::begin_rmb_action(this); KPopupMenu *pm = new KPopupMenu; rmbSelf(this)->fillContextMenu( pm, dptr()->m_highlightedAddress, 0 ); @@ -471,7 +471,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) mev->accept(); } - return !!_a; // ignore the event if we didn't tqfind the button + return !!_a; // ignore the event if we didn't find the button } else if ( e->type() == TQEvent::DragLeave ) { @@ -489,7 +489,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) kdWarning(7043) << "Sorry, currently you can only drop one address " "onto the bookmark bar!" << endl; KBookmark toInsert = list.first(); - KBookmark bookmark = m_pManager->tqfindByAddress( dptr()->m_dropAddress ); + KBookmark bookmark = m_pManager->findByAddress( dptr()->m_dropAddress ); Q_ASSERT(!bookmark.isNull()); kdDebug(7043) << "inserting " << TQString(dptr()->m_atFirst ? "before" : "after") diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index dd3b1ebed..71c2dcc8c 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,7 +39,7 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public TQObject +class KIO_EXPORT KBookmarkBar : public QObject { Q_OBJECT friend class RMB; diff --git a/kio/bookmarks/kbookmarkdrag.cc b/kio/bookmarks/kbookmarkdrag.cc index 358e329a9..d13893eed 100644 --- a/kio/bookmarks/kbookmarkdrag.cc +++ b/kio/bookmarks/kbookmarkdrag.cc @@ -54,8 +54,8 @@ KBookmarkDrag::KBookmarkDrag( const TQValueList & bookmarks, const TQ : TQUriDrag( urls, dragSource, name ), m_bookmarks( bookmarks ), m_doc("xbel") { // We need to create the XML for this drag right now and not - // in tqencodedData because when cutting a folder, the children - // wouldn't be part of the bookmarks anymore, when tqencodedData + // in encodedData because when cutting a folder, the children + // wouldn't be part of the bookmarks anymore, when encodedData // is requested. TQDomElement elem = m_doc.createElement("xbel"); m_doc.appendChild( elem ); @@ -76,16 +76,16 @@ const char* KBookmarkDrag::format( int i ) const else return 0; } -TQByteArray KBookmarkDrag::tqencodedData( const char* mime ) const +TQByteArray KBookmarkDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::tqencodedData( mime ); + return TQUriDrag::encodedData( mime ); else if ( mimetype == "application/x-xbel" ) { a = m_doc.toCString(); - //kdDebug(7043) << "KBookmarkDrag::tqencodedData " << m_doc.toCString() << endl; + //kdDebug(7043) << "KBookmarkDrag::encodedData " << m_doc.toCString() << endl; } else if ( mimetype == "text/plain" ) { @@ -117,7 +117,7 @@ TQValueList KBookmarkDrag::decode( const TQMimeSource * e ) TQValueList bookmarks; if ( e->provides("application/x-xbel") ) { - TQByteArray s( e->tqencodedData("application/x-xbel") ); + TQByteArray s( e->encodedData("application/x-xbel") ); //kdDebug(7043) << "KBookmarkDrag::decode s=" << TQCString(s) << endl; TQDomDocument doc; doc.setContent( s ); diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h index acdc9efce..98aa3b881 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -43,7 +43,7 @@ public: virtual ~KBookmarkDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; static bool canDecode( const TQMimeSource * e ); static TQValueList decode( const TQMimeSource * e ); diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index 2fd1925d2..bf8d61137 100644 --- a/kio/bookmarks/kbookmarkimporter.h +++ b/kio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ * and KActionMenu uses it to create actions directly. * @since 3.2 */ -class KIO_EXPORT KBookmarkImporterBase : public TQObject +class KIO_EXPORT KBookmarkImporterBase : public QObject { Q_OBJECT public: @@ -44,7 +44,7 @@ public: void setFilename(const TQString &filename) { m_fileName = filename; } virtual void parse() = 0; - virtual TQString tqfindDefaultLocation(bool forSaving = false) const = 0; + virtual TQString findDefaultLocation(bool forSaving = false) const = 0; // TODO - make this static? void setupSignalForwards(TQObject *src, TQObject *dst); @@ -90,7 +90,7 @@ class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, prote public: KXBELBookmarkImporterImpl() {} virtual void parse(); - virtual TQString tqfindDefaultLocation(bool = false) const { return TQString::null; } + virtual TQString findDefaultLocation(bool = false) const { return TQString::null; } protected: virtual void visit(const KBookmark &); virtual void visitEnter(const KBookmarkGroup &); diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc index 6e83d9a6b..594dc0239 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.cc +++ b/kio/bookmarks/kbookmarkimporter_crash.cc @@ -104,7 +104,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() { TQCString &clientId = *it; - if ( tqstrncmp(clientId, "konqueror", 9) != 0 ) + if ( qstrncmp(clientId, "konqueror", 9) != 0 ) continue; TQByteArray data, replyData; @@ -114,7 +114,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() if ( !dcop->call( clientId.data(), "KonquerorIface", "crashLogFile()", data, replyType, replyData) ) { - kdWarning() << "can't tqfind dcop function KonquerorIface::crashLogFile()" << endl; + kdWarning() << "can't find dcop function KonquerorIface::crashLogFile()" << endl; continue; } @@ -127,7 +127,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() activeLogs[ret] = true; } - TQDir d( KCrashBookmarkImporterImpl().tqfindDefaultLocation() ); + TQDir d( KCrashBookmarkImporterImpl().findDefaultLocation() ); d.setSorting( TQDir::Time ); d.setFilter( TQDir::Files ); d.setNameFilter( "konqueror-crash-*.log" ); @@ -141,7 +141,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() int count = 0; for ( ; (( fi = it.current() ) != 0) && (count < 20); ++it, ++count ) { - bool stillAlive = activeLogs.tqcontains( fi->absFilePath() ); + bool stillAlive = activeLogs.contains( fi->absFilePath() ); if ( !stillAlive ) crashFiles << fi->absFilePath(); } @@ -190,7 +190,7 @@ TQString KCrashBookmarkImporter::crashBookmarksDir() static KCrashBookmarkImporterImpl *p = 0; if (!p) p = new KCrashBookmarkImporterImpl; - return p->tqfindDefaultLocation(); + return p->findDefaultLocation(); } void KCrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) @@ -207,7 +207,7 @@ void KCrashBookmarkImporter::parseCrashBookmarks( bool del ) importer.parse(); } -TQString KCrashBookmarkImporterImpl::tqfindDefaultLocation( bool ) const +TQString KCrashBookmarkImporterImpl::findDefaultLocation( bool ) const { return locateLocal( "tmp", "" ); } diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index 79b01852e..e22ef1b9e 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.h +++ b/kio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ * A class for importing all crash sessions as bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public QObject { Q_OBJECT public: @@ -63,7 +63,7 @@ public: KCrashBookmarkImporterImpl() : m_shouldDelete(false) { } void setShouldDelete(bool); virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; static TQStringList getCrashLogs(); private: bool m_shouldDelete; diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/kio/bookmarks/kbookmarkimporter_ie.cc index 5c63062fd..f37a6a4be 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.cc +++ b/kio/bookmarks/kbookmarkimporter_ie.cc @@ -111,7 +111,7 @@ TQString KIEBookmarkImporter::IEBookmarksDir() static KIEBookmarkImporterImpl* p = 0; if (!p) p = new KIEBookmarkImporterImpl; - return p->tqfindDefaultLocation(); + return p->findDefaultLocation(); } void KIEBookmarkImporterImpl::parse() { @@ -120,7 +120,7 @@ void KIEBookmarkImporterImpl::parse() { importer.parseIEBookmarks(); } -TQString KIEBookmarkImporterImpl::tqfindDefaultLocation(bool) const +TQString KIEBookmarkImporterImpl::findDefaultLocation(bool) const { // notify user that they must give a new dir such // as "Favourites" as otherwise it'll just place @@ -147,7 +147,7 @@ private: static TQString ieStyleQuote( const TQString &str ) { TQString s(str); - s.tqreplace(TQRegExp("[/\\:*?\"<>|]"), "_"); + s.replace(TQRegExp("[/\\:*?\"<>|]"), "_"); return s; } diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index af286d6c1..2a9ddac6d 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.h +++ b/kio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ * A class for importing IE bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public QObject { Q_OBJECT public: @@ -67,7 +67,7 @@ class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase public: KIEBookmarkImporterImpl() { } virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; private: class KIEBookmarkImporterImplPrivate *d; }; diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc index 79568be02..49999e675 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.cc +++ b/kio/bookmarks/kbookmarkimporter_kde1.cc @@ -48,7 +48,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & TQDir dir( _path ); TQString canonical = dir.canonicalPath(); - if ( m_lstParsedDirs.tqcontains(canonical) ) + if ( m_lstParsedDirs.contains(canonical) ) { kdWarning() << "Directory " << canonical << " already parsed" << endl; return; diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc index f9e0c7be4..5521bee7e 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.cc +++ b/kio/bookmarks/kbookmarkimporter_ns.cc @@ -50,7 +50,7 @@ void KNSBookmarkImporterImpl::parse() static const int g_lineLimit = 16*1024; TQCString s(g_lineLimit); // skip header - while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.tqcontains("
")); + while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.contains("
")); while(f.readLine(s.data(), g_lineLimit)>=0) { if ( s[s.length()-1] != '\n' ) // Gosh, this line is longer than g_lineLimit. Skipping. @@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse() TQCString t = s.stripWhiteSpace(); if(t.left(12).upper() == "

', secondQuotes+1); + int endTag = t.find('>', secondQuotes+1); TQCString name = t.mid(endTag+1); - name = name.left(name.tqfindRev('<')); + name = name.left(name.findRev('<')); if ( name.right(4) == "" ) name = name.left( name.length() - 4 ); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); @@ -79,9 +79,9 @@ void KNSBookmarkImporterImpl::parse() } } else if(t.left(7).upper() == "
', 7); + int endTag = t.find('>', 7); TQCString name = t.mid(endTag+1); - name = name.left(name.tqfindRev('<')); + name = name.left(name.findRev('<')); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); TQCString additionalInfo = t.mid( 8, endTag-8 ); bool folded = (additionalInfo.left(6) == "FOLDED"); @@ -101,7 +101,7 @@ void KNSBookmarkImporterImpl::parse() } } -TQString KNSBookmarkImporterImpl::tqfindDefaultLocation(bool forSaving) const +TQString KNSBookmarkImporterImpl::findDefaultLocation(bool forSaving) const { if (m_utf8) { @@ -138,7 +138,7 @@ TQString KNSBookmarkImporter::netscapeBookmarksFile( bool forSaving ) p = new KNSBookmarkImporterImpl; p->setUtf8(false); } - return p->tqfindDefaultLocation(forSaving); + return p->findDefaultLocation(forSaving); } TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving ) @@ -149,7 +149,7 @@ TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving ) p = new KNSBookmarkImporterImpl; p->setUtf8(true); } - return p->tqfindDefaultLocation(forSaving); + return p->findDefaultLocation(forSaving); } @@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) { fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); TQString charset - = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper(); + = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper(); fstream << "" << endl << i18n("") << endl diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h index 666cc1e0f..8b5c76338 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.h +++ b/kio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ * A class for importing NS bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public QObject { Q_OBJECT public: @@ -70,7 +70,7 @@ public: KNSBookmarkImporterImpl() : m_utf8(false) { } void setUtf8(bool utf8) { m_utf8 = utf8; } virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; private: bool m_utf8; class KNSBookmarkImporterImplPrivate *d; diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/kio/bookmarks/kbookmarkimporter_opera.cc index 648c2ca25..45ac1a7ca 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.cc +++ b/kio/bookmarks/kbookmarkimporter_opera.cc @@ -94,7 +94,7 @@ TQString KOperaBookmarkImporter::operaBookmarksFile() static KOperaBookmarkImporterImpl *p = 0; if (!p) p = new KOperaBookmarkImporterImpl; - return p->tqfindDefaultLocation(); + return p->findDefaultLocation(); } void KOperaBookmarkImporterImpl::parse() { @@ -103,7 +103,7 @@ void KOperaBookmarkImporterImpl::parse() { importer.parseOperaBookmarks(); } -TQString KOperaBookmarkImporterImpl::tqfindDefaultLocation(bool saving) const +TQString KOperaBookmarkImporterImpl::findDefaultLocation(bool saving) const { return saving ? KFileDialog::getSaveFileName( TQDir::homeDirPath() + "/.opera", diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index 14087957b..e87df2efe 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.h +++ b/kio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ * A class for importing Opera bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject +class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public QObject { Q_OBJECT public: @@ -63,7 +63,7 @@ class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase public: KOperaBookmarkImporterImpl() { } virtual void parse(); - virtual TQString tqfindDefaultLocation(bool forSaving = false) const; + virtual TQString findDefaultLocation(bool forSaving = false) const; private: class KOperaBookmarkImporterImplPrivate *d; }; diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 0afdf413a..1a9e5dc4e 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -63,7 +63,7 @@ class KBookmarkMap : private KBookmarkGroupTraverser { public: KBookmarkMap( KBookmarkManager * ); void update(); - TQValueList tqfind( const TQString &url ) const + TQValueList find( const TQString &url ) const { return m_bk_map[url]; } private: virtual void visit(const KBookmark &); @@ -329,7 +329,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co // Save the bookmark toolbar folder for quick loading // but only when it will actually make things quicker - const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache"); + const TQString cacheFilename = filename + TQString::fromLatin1(".tbcache"); if(toolbarCache && !root().isToolbarGroup()) { KSaveFile cacheFile( cacheFilename ); @@ -337,7 +337,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co { TQString str; TQTextStream stream(&str, IO_WriteOnly); - stream << root().tqfindToolbar(); + stream << root().findToolbar(); TQCString cstr = str.utf8(); cacheFile.file()->writeBlock( cstr.data(), cstr.length() ); cacheFile.close(); @@ -367,7 +367,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co "of the error needs to be fixed as quickly as possible, " "which is most likely a full hard drive.") .arg(filename).arg(TQString::fromLocal8Bit(strerror(file.status()))); - if (tqApp->type() != TQApplication::Tty) + if (qApp->type() != TQApplication::Tty) KMessageBox::error( 0L, error ); else kdError() << error << endl; @@ -388,7 +388,7 @@ KBookmarkGroup KBookmarkManager::toolbar() if(!m_docIsLoaded) { kdDebug(7043) << "KBookmarkManager::toolbar trying cache" << endl; - const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache"); + const TQString cacheFilename = m_bookmarksFile + TQString::fromLatin1(".tbcache"); TQFileInfo bmInfo(m_bookmarksFile); TQFileInfo cacheInfo(cacheFilename); if (m_toolbarDoc.isNull() && @@ -415,16 +415,16 @@ KBookmarkGroup KBookmarkManager::toolbar() // Fallback to the normal way if there is no cache or if the bookmark file // is already loaded - TQDomElement elem = root().tqfindToolbar(); + TQDomElement elem = root().findToolbar(); if (elem.isNull()) return root(); // Root is the bookmark toolbar if none has been set. else - return KBookmarkGroup(root().tqfindToolbar()); + return KBookmarkGroup(root().findToolbar()); } -KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tolerant ) +KBookmark KBookmarkManager::findByAddress( const TQString & address, bool tolerant ) { - //kdDebug(7043) << "KBookmarkManager::tqfindByAddress " << address << endl; + //kdDebug(7043) << "KBookmarkManager::findByAddress " << address << endl; KBookmark result = root(); // The address is something like /5/10/2+ TQStringList addresses = TQStringList::split(TQRegExp("[/+]"),address); @@ -452,7 +452,7 @@ KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tole result = bk; } if (result.isNull()) { - kdWarning() << "KBookmarkManager::tqfindByAddress: couldn't tqfind item " << address << endl; + kdWarning() << "KBookmarkManager::findByAddress: couldn't find item " << address << endl; Q_ASSERT(!tolerant); } //kdWarning() << "found " << result.address() << endl; @@ -462,7 +462,7 @@ KBookmark KBookmarkManager::tqfindByAddress( const TQString & address, bool tole static TQString pickUnusedTitle( KBookmarkGroup parentBookmark, const TQString &title, const TQString &url ) { - // If this title is already used, we'll try to tqfind something unused. + // If this title is already used, we'll try to find something unused. KBookmark ch = parentBookmark.first(); int count = 1; TQString uniqueTitle = title; @@ -521,7 +521,7 @@ KBookmarkGroup KBookmarkManager::addBookmarkDialog( } KBookmarkGroup parentBookmark; - parentBookmark = tqfindByAddress( parentBookmarkAddress ).toGroup(); + parentBookmark = findByAddress( parentBookmarkAddress ).toGroup(); Q_ASSERT( !parentBookmark.isNull() ); TQString uniqueTitle = pickUnusedTitle( parentBookmark, title, url ); @@ -584,7 +584,7 @@ void KBookmarkManager::notifyChanged( TQString groupAddress ) // DCOP call parse(); //kdDebug(7043) << "KBookmarkManager::notifyChanged " << groupAddress << endl; - //KBookmarkGroup group = tqfindByAddress( groupAddress ).toGroup(); + //KBookmarkGroup group = findByAddress( groupAddress ).toGroup(); //Q_ASSERT(!group.isNull()); emit changed( groupAddress, TQString::null ); } @@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { KProcess proc; - proc << TQString::tqfromLatin1("keditbookmarks"); + proc << TQString::fromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) - proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption; + proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) - proc << TQString::tqfromLatin1("--nobrowser"); + proc << TQString::fromLatin1("--nobrowser"); proc << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -626,8 +626,8 @@ void KBookmarkManager::slotEditBookmarks() void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address ) { KProcess proc; - proc << TQString::tqfromLatin1("keditbookmarks") - << TQString::tqfromLatin1("--address") << address + proc << TQString::fromLatin1("keditbookmarks") + << TQString::fromLatin1("--address") << address << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -649,7 +649,7 @@ bool KBookmarkManager::updateAccessMetadata( const TQString & url, bool emitSign s_bk_map->update(); } - TQValueList list = s_bk_map->tqfind(url); + TQValueList list = s_bk_map->find(url); if ( list.count() == 0 ) return false; @@ -672,7 +672,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic s_bk_map->update(); } - TQValueList list = s_bk_map->tqfind(url); + TQValueList list = s_bk_map->find(url); for ( TQValueList::iterator it = list.begin(); it != list.end(); ++it ) { @@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic TQString KBookmarkManager::userBookmarksFile() { - return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); } KBookmarkManager* KBookmarkManager::userBookmarksManager() diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index e8fcd6196..403a2e1b3 100644 --- a/kio/bookmarks/kbookmarkmanager.h +++ b/kio/bookmarks/kbookmarkmanager.h @@ -57,7 +57,7 @@ class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject protected: /** * Creates a bookmark manager with a path to the bookmarks. By - * default, it will use the KDE standard dirs to tqfind and create the + * default, it will use the KDE standard dirs to find and create the * correct location. If you are using your own app-specific * bookmarks directory, you must instantiate this class with your * own path before KBookmarkManager::managerForFile() is ever @@ -152,10 +152,10 @@ public: /** * @return the bookmark designated by @p address * @param address the address belonging to the bookmark you're looking for - * @param tolerate when true tries to tqfind the most tolerable bookmark position + * @param tolerate when true tries to find the most tolerable bookmark position * @see KBookmark::address */ - KBookmark tqfindByAddress( const TQString & address, bool tolerate = false ); + KBookmark findByAddress( const TQString & address, bool tolerate = false ); /** * Saves the bookmark file and notifies everyone. diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index a7b3c02a7..69c9debd6 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -226,7 +226,7 @@ bool RMB::invalid( int val ) KBookmark RMB::atAddress(const TQString & address) { - KBookmark bookmark = m_pManager->tqfindByAddress( address ); + KBookmark bookmark = m_pManager->findByAddress( address ); Q_ASSERT(!bookmark.isNull()); return bookmark; } @@ -537,7 +537,7 @@ void KBookmarkMenu::addNewFolder() TQString title = i18n( "&New Bookmark Folder..." ); int p; - while ( ( p = title.tqfind( '&' ) ) >= 0 ) + while ( ( p = title.find( '&' ) ) >= 0 ) title.remove( p, 1 ); KAction * paNewFolder = new KAction( title, @@ -617,13 +617,13 @@ void KBookmarkMenu::fillBookmarkMenu() } } - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); bool separatorInserted = false; for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { TQString text = KStringHandler::csqueeze(bm.fullText(), 60); - text.tqreplace( '&', "&&" ); + text.replace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); @@ -708,7 +708,7 @@ void KBookmarkMenu::slotAddBookmarksList() KExtendedBookmarkOwner::QStringPairList list; extOwner->fillBookmarksList( list ); - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager ); if ( group.isNull() ) @@ -733,7 +733,7 @@ void KBookmarkMenu::slotAddBookmark() void KBookmarkMenu::slotNewFolder() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); KBookmarkGroup group = parentBookmark.createNewFolder( m_pManager ); if ( !group.isNull() ) @@ -895,7 +895,7 @@ void KBookmarkEditDialog::slotUser1() TQString address = KBookmarkFolderTree::selectedAddress( m_folderTree ); if ( address.isNull() ) return; - KBookmarkGroup bm = m_mgr->tqfindByAddress( address ).toGroup(); + KBookmarkGroup bm = m_mgr->findByAddress( address ).toGroup(); Q_ASSERT(!bm.isNull()); Q_ASSERT(m_editType == InsertionMode); @@ -1056,7 +1056,7 @@ void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer) void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & ) { TQString _text = KStringHandler::csqueeze(text); - _text.tqreplace( '&', "&&" ); + _text.replace( '&', "&&" ); KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0); connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, Qt::ButtonState )), m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, Qt::ButtonState ) )); @@ -1069,7 +1069,7 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQString & ) { TQString _text = KStringHandler::csqueeze(text); - _text.tqreplace( '&', "&&" ); + _text.replace( '&', "&&" ); KActionMenu * actionMenu = new KActionMenu( _text, "folder", m_actionCollection, 0L ); actionMenu->plug( mstack.top()->m_parentMenu ); mstack.top()->m_actions.append( actionMenu ); @@ -1175,7 +1175,7 @@ void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &n // make sure list includes type config.setGroup("Bookmarks"); - if (elist.tqcontains(id) < 1) { + if (elist.contains(id) < 1) { elist << id; config.writeEntry("DynamicMenus", elist); } diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index 13691e5e0..f3d1c75b6 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace KIO { class Job; } * 1a) Reimplement your own KBookmarkOwner * 1b) Reimplement and instantiate your own KBookmarkManager */ -class KIO_EXPORT KBookmarkMenu : public TQObject +class KIO_EXPORT KBookmarkMenu : public QObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject +class KIO_EXPORT KBookmarkMenuNSImporter : public QObject { Q_OBJECT public: -- cgit v1.2.1