diff options
Diffstat (limited to 'kio/bookmarks')
-rw-r--r-- | kio/bookmarks/dptrtemplate.h | 4 | ||||
-rw-r--r-- | kio/bookmarks/kbookmark.cc | 6 | ||||
-rw-r--r-- | kio/bookmarks/kbookmark.h | 4 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkbar.cc | 6 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkbar.h | 7 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkdrag.cc | 12 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkdrag.h | 4 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter.h | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_crash.cc | 8 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_crash.h | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_ie.cc | 6 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_ie.h | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_kde1.cc | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_ns.cc | 14 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_ns.h | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_opera.h | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkmanager.cc | 20 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkmenu.cc | 10 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkmenu.h | 8 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkmenu_p.h | 2 |
20 files changed, 62 insertions, 61 deletions
diff --git a/kio/bookmarks/dptrtemplate.h b/kio/bookmarks/dptrtemplate.h index 2a69d6a54..a34f021be 100644 --- a/kio/bookmarks/dptrtemplate.h +++ b/kio/bookmarks/dptrtemplate.h @@ -34,10 +34,10 @@ public: d_ptr = new TQPtrDict<PrivateData>; qAddPostRoutine( cleanup_d_ptr ); } - PrivateData* ret = d_ptr->find( (void*) instance ); + PrivateData* ret = d_ptr->tqfind( (void*) instance ); if ( ! ret ) { ret = new PrivateData; - d_ptr->replace( (void*) instance, ret ); + d_ptr->tqreplace( (void*) instance, ret ); } return ret; } diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 44b8b496c..2d456ddeb 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.parentNode().toElement(); + TQDomElement parent = element.tqparentNode().toElement(); return !parent.isNull(); } @@ -311,7 +311,7 @@ TQString KBookmark::icon() const KBookmarkGroup KBookmark::parentGroup() const { - return KBookmarkGroup( element.parentNode().toElement() ); + return KBookmarkGroup( element.tqparentNode().toElement() ); } KBookmarkGroup KBookmark::toGroup() const @@ -447,7 +447,7 @@ void KBookmark::updateAccessMetadata() { kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl; - const uint timet = TQDateTime::currentDateTime().toTime_t(); + const uint timet = TQDateTime::tqcurrentDateTime().toTime_t(); setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData ); setMetaDataItem( "time_visited", TQString::number( timet ) ); diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 84f177522..0046eb689 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.findRev('/') ); } + { return address.left( address.tqfindRev('/') ); } /** * @return position in parent (e.g. /4/5/2 -> 2) */ static uint positionInParent( const TQString & address ) - { return address.mid( address.findRev('/') + 1 ).toInt(); } + { return address.mid( address.tqfindRev('/') + 1 ).toInt(); } /** * @return address of previous sibling (e.g. /4/5/2 -> /4/5/1) diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index ec1e3e670..4709988a4 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -252,7 +252,7 @@ bool KBookmarkBar::isReadOnly() const return dptr()->m_readOnly; } -void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, Qt::ButtonState state ) +void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state ) { if (!m_pOwner) return; // this view doesn't handle bookmarks... @@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent( int index = 0; KToolBarButton* b; - b = dynamic_cast<KToolBarButton*>(tb->childAt(pos)); + b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos)); KAction *a = 0; TQString address; atFirst = false; @@ -394,7 +394,7 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions Q_ASSERT(tb); KToolBarButton *b; - b = dynamic_cast<KToolBarButton*>(tb->childAt(pos)); + b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos)); if (!b) return 0; diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index 71c2dcc8c..4eefbb9a1 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,9 +39,10 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public QObject +class KIO_EXPORT KBookmarkBar : public TQObject { Q_OBJECT + TQ_OBJECT friend class RMB; public: /** @@ -86,7 +87,7 @@ signals: /** * @since 3.4 */ - void openBookmark( const TQString& url, Qt::ButtonState state ); + void openBookmark( const TQString& url, TQt::ButtonState state ); public slots: void clear(); @@ -97,7 +98,7 @@ public slots: /** * @since 3.4 */ - void slotBookmarkSelected( KAction::ActivationReason reason, Qt::ButtonState state ); + void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state ); /// @since 3.2 void slotRMBActionRemove( int ); diff --git a/kio/bookmarks/kbookmarkdrag.cc b/kio/bookmarks/kbookmarkdrag.cc index d13893eed..358e329a9 100644 --- a/kio/bookmarks/kbookmarkdrag.cc +++ b/kio/bookmarks/kbookmarkdrag.cc @@ -54,8 +54,8 @@ KBookmarkDrag::KBookmarkDrag( const TQValueList<KBookmark> & 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 encodedData because when cutting a folder, the children - // wouldn't be part of the bookmarks anymore, when encodedData + // in tqencodedData because when cutting a folder, the children + // wouldn't be part of the bookmarks anymore, when tqencodedData // 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::encodedData( const char* mime ) const +TQByteArray KBookmarkDrag::tqencodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::encodedData( mime ); + return TQUriDrag::tqencodedData( mime ); else if ( mimetype == "application/x-xbel" ) { a = m_doc.toCString(); - //kdDebug(7043) << "KBookmarkDrag::encodedData " << m_doc.toCString() << endl; + //kdDebug(7043) << "KBookmarkDrag::tqencodedData " << m_doc.toCString() << endl; } else if ( mimetype == "text/plain" ) { @@ -117,7 +117,7 @@ TQValueList<KBookmark> KBookmarkDrag::decode( const TQMimeSource * e ) TQValueList<KBookmark> bookmarks; if ( e->provides("application/x-xbel") ) { - TQByteArray s( e->encodedData("application/x-xbel") ); + TQByteArray s( e->tqencodedData("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 98aa3b881..c67f1ea19 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -25,7 +25,7 @@ #include <kbookmark.h> // Clipboard/dnd data : URLs + XML for bookmarks -class KIO_EXPORT KBookmarkDrag : public QUriDrag +class KIO_EXPORT KBookmarkDrag : public TQUriDrag { public: static KBookmarkDrag * newDrag( const TQValueList<KBookmark> & bookmarks, @@ -43,7 +43,7 @@ public: virtual ~KBookmarkDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray encodedData( const char* mime ) const; + virtual TQByteArray tqencodedData( const char* mime ) const; static bool canDecode( const TQMimeSource * e ); static TQValueList<KBookmark> decode( const TQMimeSource * e ); diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index bf8d61137..8fb684c7e 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 QObject +class KIO_EXPORT KBookmarkImporterBase : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc index 594dc0239..7e0831e83 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.cc +++ b/kio/bookmarks/kbookmarkimporter_crash.cc @@ -104,7 +104,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() { TQCString &clientId = *it; - if ( qstrncmp(clientId, "konqueror", 9) != 0 ) + if ( tqstrncmp(clientId, "konqueror", 9) != 0 ) continue; TQByteArray data, replyData; @@ -132,8 +132,8 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() d.setFilter( TQDir::Files ); d.setNameFilter( "konqueror-crash-*.log" ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; TQStringList crashFiles; @@ -141,7 +141,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() int count = 0; for ( ; (( fi = it.current() ) != 0) && (count < 20); ++it, ++count ) { - bool stillAlive = activeLogs.contains( fi->absFilePath() ); + bool stillAlive = activeLogs.tqcontains( fi->absFilePath() ); if ( !stillAlive ) crashFiles << fi->absFilePath(); } diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index e22ef1b9e..a5ae08d96 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 QObject +class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/kio/bookmarks/kbookmarkimporter_ie.cc index f37a6a4be..8d1372194 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.cc +++ b/kio/bookmarks/kbookmarkimporter_ie.cc @@ -51,7 +51,7 @@ void KIEBookmarkImporter::parseIEBookmarks_url_file( TQString filename, TQString TQCString t = s.stripWhiteSpace(); TQRegExp rx( "URL=(.*)" ); if (rx.exactMatch(t)) { - emit newBookmark( name, rx.cap(1).latin1(), TQString("") ); + emit newBookmark( name, TQString(rx.cap(1)).latin1(), TQString("") ); } } @@ -69,13 +69,13 @@ void KIEBookmarkImporter::parseIEBookmarks_dir( TQString dirname, TQString folde dir.setNameFilter("*.url"); // AK - possibly add ";index.ini" ? dir.setMatchAllDirs(true); - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); if (!list) return; if (dirname != m_fileName) emit newFolder( foldername, false, "" ); - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index 2a9ddac6d..eddf20f41 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 QObject +class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc index 49999e675..79568be02 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.contains(canonical) ) + if ( m_lstParsedDirs.tqcontains(canonical) ) { kdWarning() << "Directory " << canonical << " already parsed" << endl; return; diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc index 5521bee7e..f7b438f78 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.cc +++ b/kio/bookmarks/kbookmarkimporter_ns.cc @@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse() TQCString t = s.stripWhiteSpace(); if(t.left(12).upper() == "<DT><A HREF=" || t.left(16).upper() == "<DT><H3><A HREF=") { - int firstQuotes = t.find('"')+1; - int secondQuotes = t.find('"', firstQuotes); + int firstQuotes = t.tqfind('"')+1; + int secondQuotes = t.tqfind('"', firstQuotes); if (firstQuotes != -1 && secondQuotes != -1) { TQCString link = t.mid(firstQuotes, secondQuotes-firstQuotes); - int endTag = t.find('>', secondQuotes+1); + int endTag = t.tqfind('>', secondQuotes+1); TQCString name = t.mid(endTag+1); - name = name.left(name.findRev('<')); + name = name.left(name.tqfindRev('<')); if ( name.right(4) == "</A>" ) 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() == "<DT><H3") { - int endTag = t.find('>', 7); + int endTag = t.tqfind('>', 7); TQCString name = t.mid(endTag+1); - name = name.left(name.findRev('<')); + name = name.left(name.tqfindRev('<')); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); TQCString additionalInfo = t.mid( 8, endTag-8 ); bool folded = (additionalInfo.left(6) == "FOLDED"); @@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) { fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); TQString charset - = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper(); + = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper(); fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl << i18n("<!-- This file was generated by Konqueror -->") << endl diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h index 8b5c76338..fdf79a3b9 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 QObject +class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index e87df2efe..0f9a3ba00 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 QObject +class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 1a9e5dc4e..fa4ce416b 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.parentNode().removeChild(pi); + pi.tqparentNode().removeChild(pi); } TQDomProcessingInstruction pi; @@ -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::fromLatin1(".tbcache"); + const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache"); if(toolbarCache && !root().isToolbarGroup()) { KSaveFile cacheFile( cacheFilename ); @@ -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 (qApp->type() != TQApplication::Tty) + if (tqApp->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::fromLatin1(".tbcache"); + const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache"); TQFileInfo bmInfo(m_bookmarksFile); TQFileInfo cacheInfo(cacheFilename); if (m_toolbarDoc.isNull() && @@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { KProcess proc; - proc << TQString::fromLatin1("keditbookmarks"); + proc << TQString::tqfromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) - proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; + proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) - proc << TQString::fromLatin1("--nobrowser"); + proc << TQString::tqfromLatin1("--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::fromLatin1("keditbookmarks") - << TQString::fromLatin1("--address") << address + proc << TQString::tqfromLatin1("keditbookmarks") + << TQString::tqfromLatin1("--address") << address << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic TQString KBookmarkManager::userBookmarksFile() { - return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); + return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); } KBookmarkManager* KBookmarkManager::userBookmarksManager() diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index 69c9debd6..916690c19 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -403,9 +403,9 @@ void RMB::slotRMBActionCopyLocation( int val ) if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), QClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), QClipboard::Clipboard ); } } @@ -537,7 +537,7 @@ void KBookmarkMenu::addNewFolder() TQString title = i18n( "&New Bookmark Folder..." ); int p; - while ( ( p = title.find( '&' ) ) >= 0 ) + while ( ( p = title.tqfind( '&' ) ) >= 0 ) title.remove( p, 1 ); KAction * paNewFolder = new KAction( title, @@ -743,7 +743,7 @@ void KBookmarkMenu::slotNewFolder() } } -void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, Qt::ButtonState state ) +void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state ) { kdDebug(7043) << "KBookmarkMenu::slotBookmarkSelected()" << endl; if ( !m_pOwner ) return; // this view doesn't handle bookmarks... @@ -1175,7 +1175,7 @@ void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &n // make sure list includes type config.setGroup("Bookmarks"); - if (elist.contains(id) < 1) { + if (elist.tqcontains(id) < 1) { elist << id; config.writeEntry("DynamicMenus", elist); } diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index f3d1c75b6..fa0368b68 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 QObject +class KIO_EXPORT KBookmarkMenu : public TQObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -162,7 +162,7 @@ signals: /** * @since 3.4 */ - void openBookmark( const TQString& url, Qt::ButtonState state ); + void openBookmark( const TQString& url, TQt::ButtonState state ); public slots: // public for bookmark bar void slotBookmarksChanged( const TQString & ); @@ -182,7 +182,7 @@ protected slots: /** * @ since 3.4 */ - void slotBookmarkSelected( KAction::ActivationReason reason, Qt::ButtonState state ); + void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state ); void slotAddBookmarksList(); void slotAddBookmark(); void slotNewFolder(); @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public QObject +class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/kio/bookmarks/kbookmarkmenu_p.h index 9d979e505..4ea245b1a 100644 --- a/kio/bookmarks/kbookmarkmenu_p.h +++ b/kio/bookmarks/kbookmarkmenu_p.h @@ -165,7 +165,7 @@ private: TQString m_address; }; -class KBookmarkFolderTreeItem : public QListViewItem +class KBookmarkFolderTreeItem : public TQListViewItem { // make this an accessor friend class KBookmarkFolderTree; |